return count with recently created group

Author: tudddorrr

src/services/player-group.service.ts

@@ -7,6 +7,8 @@ import { ruleModeValidation, rulesValidation } from '../lib/groups/rulesValidati
 import createGameActivity from '../lib/logging/createGameActivity'
 import PlayerGroupPolicy from '../policies/player-group.policy'
 
+type PlayerGroupWithCount = Pick<PlayerGroup, 'id' | 'name' | 'description' | 'rules' | 'ruleMode' | 'updatedAt'> & { count: number }
+
 @Routes([
   {
     method: 'GET'
@@ -32,16 +34,22 @@ import PlayerGroupPolicy from '../policies/player-group.policy'
   }
 ])
 export default class PlayerGroupService extends Service {
+  private async groupWithCount(group: PlayerGroup): Promise<PlayerGroupWithCount> {
+    return {
+      ...group.toJSON(),
+      count: await group.members.loadCount()
+    }
+  }
+
   @HasPermission(PlayerGroupPolicy, 'index')
   async index(req: Request): Promise<Response> {
     const em: EntityManager = req.ctx.em
     const groups = await em.getRepository(PlayerGroup).find({ game: req.ctx.state.game })
-    const counts = await Promise.all(groups.map(async (group) => await group.members.loadCount()))
 
     return {
       status: 200,
       body: {
-        groups: groups.map((group, idx) => ({ ...group.toJSON(), count: counts[idx] }))
+        groups: await Promise.all(groups.map(this.groupWithCount))
       }
     }
   }
@@ -83,7 +91,7 @@ export default class PlayerGroupService extends Service {
     return {
       status: 200,
       body: {
-        group: { ...group.toJSON(), count: await group.members.loadCount() }
+        group: await this.groupWithCount(group)
       }
     }
   }

tests/services/player-group/post.test.ts

@@ -8,7 +8,6 @@ import GameActivity, { GameActivityType } from '../../../src/entities/game-activ
 import PlayerGroupRule, { PlayerGroupRuleCastType, PlayerGroupRuleName } from '../../../src/entities/player-group-rule'
 import PlayerProp from '../../../src/entities/player-prop'
 import PlayerFactory from '../../fixtures/PlayerFactory'
-import PlayerGroup from '../../../src/entities/player-group'
 
 describe('Player group service - post', () => {
   it.each(userPermissionProvider([
@@ -48,6 +47,7 @@ describe('Player group service - post', () => {
       expect(res.body.group.name).toBe('Winners')
       expect(res.body.group.description).toBe('People who have completed the game')
       expect(res.body.group.rules).toStrictEqual(rules)
+      expect(res.body.group.count).toBe(0)
 
       expect(activity.extra.groupName).toBe(res.body.group.name)
     } else {
@@ -90,10 +90,7 @@ describe('Player group service - post', () => {
       .auth(token, { type: 'bearer' })
       .expect(200)
 
-    const newGroupId = res.body.group.id
-    const group = await (<EntityManager>global.em).getRepository(PlayerGroup).findOne(newGroupId)
-    const count = await group.members.loadCount()
-    expect(count).toBe(1)
+    expect(res.body.group.count).toBe(1)
   })
 
   it('should require a valid ruleMode', async () => {