Merge pull request #318 from TaloDev/feedback-dev-data-filter

Add dev data filter to feedback index endpoint

Author: tudddorrr

src/services/game-feedback.service.ts

@@ -5,6 +5,7 @@ import GameFeedbackPolicy from '../policies/game-feedback.policy'
 import GameFeedbackCategory from '../entities/game-feedback-category'
 import createGameActivity from '../lib/logging/createGameActivity'
 import { GameActivityType } from '../entities/game-activity'
+import { devDataPlayerFilter } from '../middlewares/dev-data-middleware'
 
 const itemsPerPage = 50
 
@@ -40,14 +41,14 @@ export default class GameFeedbackService extends Service {
     const { feedbackCategoryInternalName, search, page } = req.query
     const em: EntityManager = req.ctx.em
 
-    let query = em.qb(GameFeedback, 'gf')
+    const query = em.qb(GameFeedback, 'gf')
       .select('gf.*')
       .orderBy({ createdAt: QueryOrder.DESC })
       .limit(itemsPerPage)
       .offset(Number(page) * itemsPerPage)
 
     if (feedbackCategoryInternalName) {
-      query = query
+      query
         .andWhere({
           category: {
             internalName: feedbackCategoryInternalName
@@ -56,7 +57,7 @@ export default class GameFeedbackService extends Service {
     }
 
     if (search) {
-      query = query.andWhere({
+      query.andWhere({
         $or: [
           { comment: { $like: `%${search}%` } },
           {
@@ -69,6 +70,14 @@ export default class GameFeedbackService extends Service {
       })
     }
 
+    if (!req.ctx.state.includeDevData) {
+      query.andWhere({
+        playerAlias: {
+          player: devDataPlayerFilter(em)
+        }
+      })
+    }
+
     const [feedback, count] = await query
       .andWhere({
         category: {

tests/services/game-feedback/index.test.ts

@@ -217,4 +217,21 @@ describe('Game feedback service - index', () => {
 
     expect(res.body.feedback).toHaveLength(feedbackWithRelevantCategoryAndAlias.length)
   })
+
+  it('should not return feedback from dev build players if the dev data header is not set', async () => {
+    const [organisation, game] = await createOrganisationAndGame()
+    const [token] = await createUserAndToken({}, organisation)
+
+    const player = await new PlayerFactory([game]).state('dev build').one()
+    const feedback = await new GameFeedbackFactory(game).with(() => ({ playerAlias: player.aliases[0] })).many(10)
+    await (<EntityManager>global.em).persistAndFlush(feedback)
+
+    const res = await request(global.app)
+      .get(`/games/${game.id}/game-feedback`)
+      .query({ page: 0 })
+      .auth(token, { type: 'bearer' })
+      .expect(200)
+
+    expect(res.body.feedback).toHaveLength(0)
+  })
 })