|
@@ -57,6 +57,11 @@ class MatchSmallGroupScheduleService extends CrudService {
|
|
const user2 = await this.baseUserModel.findById(ptuid);
|
|
const user2 = await this.baseUserModel.findById(ptuid);
|
|
d.player_two_name = _.get(user2, 'name');
|
|
d.player_two_name = _.get(user2, 'name');
|
|
d.player_two = _.get(data, 'player_two._id');
|
|
d.player_two = _.get(data, 'player_two._id');
|
|
|
|
+ } else if (player_type === 'TeamApply') {
|
|
|
|
+ d.player_one_name = `${_.get(d, 'player_one.one_member_name')}-${_.get(d, 'player_one.two_member_name')}`;
|
|
|
|
+ d.player_one = _.get(d, 'player_one._id');
|
|
|
|
+ d.player_two_name = `${_.get(d, 'player_two.one_member_name')}-${_.get(d, 'player_two.two_member_name')}`;
|
|
|
|
+ d.player_two = _.get(d, 'player_two._id');
|
|
}
|
|
}
|
|
|
|
|
|
const referee = await this.userModel.findById(referee_id).populate({
|
|
const referee = await this.userModel.findById(referee_id).populate({
|
|
@@ -118,6 +123,11 @@ class MatchSmallGroupScheduleService extends CrudService {
|
|
const user2 = await this.baseUserModel.findById(ptuid);
|
|
const user2 = await this.baseUserModel.findById(ptuid);
|
|
d.player_two_name = _.get(user2, 'name');
|
|
d.player_two_name = _.get(user2, 'name');
|
|
d.player_two = _.get(d, 'player_two._id');
|
|
d.player_two = _.get(d, 'player_two._id');
|
|
|
|
+ } else if (player_type === 'TeamApply') {
|
|
|
|
+ d.player_one_name = `${_.get(d, 'player_one.one_member_name')}-${_.get(d, 'player_one.two_member_name')}`;
|
|
|
|
+ d.player_one = _.get(d, 'player_one._id');
|
|
|
|
+ d.player_two_name = `${_.get(d, 'player_two.one_member_name')}-${_.get(d, 'player_two.two_member_name')}`;
|
|
|
|
+ d.player_two = _.get(d, 'player_two._id');
|
|
}
|
|
}
|
|
const referee = await this.userModel.findById(referee_id).populate({
|
|
const referee = await this.userModel.findById(referee_id).populate({
|
|
path: 'user_id',
|
|
path: 'user_id',
|