update

app/service/matchSmallGroupSchedule.js

@@ -90,17 +90,13 @@ class MatchSmallGroupScheduleService extends CrudService {
     for (const d of data) {
       const { player_type, player_one, player_two, referee_id } = d;
       if (player_type === 'Race.User') {
-        const pouid = _.get(player_one, 'user_id');
-        const user1 = await this.baseUserModel.findById(pouid);
-        d.player_one_name = _.get(user1, 'name');
-        d.player_one = _.get(d, 'player_one._id');
-        const ptuid = _.get(player_two, 'user_id');
-        const user2 = await this.baseUserModel.findById(ptuid);
-        d.player_two_name = _.get(user2, 'name');
-        d.player_two = _.get(d, 'player_two._id');
+        const p1 = await this.userModel.findById(player_one, { user_id: 1 }).populate({ path: 'user_id', model: this.baseUserModel, select: 'name' });
+        const p2 = await this.userModel.findById(player_two, { user_id: 1 }).populate({ path: 'user_id', model: this.baseUserModel, select: 'name' });
+        d.player_one_name = _.get(p1, 'user_id.name');
+        d.player_two_name = _.get(p2, 'user_id.name');
       } else if (player_type === 'Race.TeamApply') {
-        const p1 = await this.teamApplyModel.findById(player_one);
-        const p2 = await this.teamApplyModel.findById(player_two);
+        const p1 = await this.teamApplyModel.findById(player_one, { one_member_name: 1, two_member_name: 1 });
+        const p2 = await this.teamApplyModel.findById(player_two, { one_member_name: 1, two_member_name: 1 });
         d.player_one_name = `${_.get(p1, 'one_member_name')}-${_.get(p1, 'two_member_name')}`;
         d.player_two_name = `${_.get(p2, 'one_member_name')}-${_.get(p2, 'two_member_name')}`;
       }
@@ -155,19 +151,15 @@ class MatchSmallGroupScheduleService extends CrudService {
   async afterFetch(filter, d) {
     const { player_type, player_one, player_two, referee_id } = d;
     if (player_type === 'Race.User') {
-      const pouid = _.get(player_one, 'user_id');
-      const user1 = await this.baseUserModel.findById(pouid);
-      d.player_one_name = _.get(user1, 'name');
-      d.player_one = _.get(d, 'player_one._id');
-      const ptuid = _.get(player_two, 'user_id');
-      const user2 = await this.baseUserModel.findById(ptuid);
-      d.player_two_name = _.get(user2, 'name');
-      d.player_two = _.get(d, 'player_two._id');
+      const p1 = await this.userModel.findById(player_one, { user_id: 1 }).populate({ path: 'user_id', model: this.baseUserModel, select: 'name' });
+      const p2 = await this.userModel.findById(player_two, { user_id: 1 }).populate({ path: 'user_id', model: this.baseUserModel, select: 'name' });
+      d.player_one_name = _.get(p1, 'user_id.name');
+      d.player_two_name = _.get(p2, 'user_id.name');
     } else if (player_type === 'Race.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 p1 = await this.teamApplyModel.findById(player_one, { one_member_name: 1, two_member_name: 1 });
+      const p2 = await this.teamApplyModel.findById(player_two, { one_member_name: 1, two_member_name: 1 });
+      d.player_one_name = `${_.get(p1, 'one_member_name')}-${_.get(p1, 'two_member_name')}`;
+      d.player_two_name = `${_.get(p2, 'one_member_name')}-${_.get(p2, 'two_member_name')}`;
     }
     const referee = await this.userModel.findById(referee_id).populate({
       path: 'user_id',