Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/api/models/othello-matching.ts
View file

@ -3,14 +3,14 @@ import deepcopy = require('deepcopy');
import db from '../../../db/mongodb';
import { IUser, pack as packUser } from './user';
const Matching = db.get<IMatching>('othello_matchings');
const Matching = db.get<IMatching>('othelloMatchings');
export default Matching;
export interface IMatching {
_id: mongo.ObjectID;
created_at: Date;
parent_id: mongo.ObjectID;
child_id: mongo.ObjectID;
createdAt: Date;
parentId: mongo.ObjectID;
childId: mongo.ObjectID;
}
/**
@ -37,8 +37,8 @@ export const pack = (
delete _matching._id;
// Populate user
_matching.parent = await packUser(_matching.parent_id, meId);
_matching.child = await packUser(_matching.child_id, meId);
_matching.parent = await packUser(_matching.parentId, meId);
_matching.child = await packUser(_matching.childId, meId);
resolve(_matching);
});