optimise getting events + headlines

Author: tudddorrr

src/services/api/leaderboard-api.service.ts

@@ -83,13 +83,13 @@ export default class LeaderboardAPIService extends APIService {
       return integration.handleLeaderboardEntryCreated(em, entry)
     })
 
-    let query = em.createQueryBuilder(LeaderboardEntry, 'le')
+    const query = em.createQueryBuilder(LeaderboardEntry, 'le')
       .select('le.*', true)
       .where({ leaderboard: entry.leaderboard })
       .orderBy({ score: entry.leaderboard.sortMode })
 
     if (!req.ctx.state.includeDevData) {
-      query = query.andWhere({
+      query.andWhere({
         playerAlias: {
           player: devDataPlayerFilter(em)
         }

src/services/event.service.ts

@@ -20,14 +20,17 @@ export default class EventService extends Service {
   })
   @HasPermission(EventPolicy, 'index')
   async index(req: Request): Promise<Response> {
-    const { startDate, endDate } = req.query
+    const { startDate: startDateQuery, endDate: endDateQuery } = req.query
     const em: EntityManager = req.ctx.em
 
+    const startDate = new Date(startDateQuery)
+    const endDate = new Date(endDateQuery)
+
     const where: FilterQuery<Event> = {
       game: req.ctx.state.game,
       createdAt: {
-        $gte: new Date(startDate),
-        $lte: endOfDay(new Date(endDate))
+        $gte: startDate,
+        $lte: endOfDay(endDate)
       }
     }
 
@@ -51,16 +54,19 @@ export default class EventService extends Service {
     // }
 
     const data = groupBy(events, 'name')
+
     for (const name in data) {
       const processed: EventData[] = []
 
-      for (let date = new Date(startDate).getTime(); date <= new Date(endDate).getTime(); date += 86400000 /* 24 hours in ms */) {
-        const count = data[name].filter((event: Event) => isSameDay(new Date(date), new Date(event.createdAt))).length
+      for (let time = startDate.getTime(); time <= endDate.getTime(); time += 86400000 /* 24 hours in ms */) {
+        const dateFromTime = new Date(time)
+
+        const count = data[name].filter((event: Event) => isSameDay(dateFromTime, event.createdAt)).length
         const change = processed.length > 0 ? this.calculateChange(count, processed[processed.length - 1]) : 0
 
         processed.push({
           name,
-          date,
+          date: time,
           count,
           change
         })

src/services/game-feedback.service.ts

@@ -40,14 +40,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 +56,7 @@ export default class GameFeedbackService extends Service {
     }
 
     if (search) {
-      query = query.andWhere({
+      query.andWhere({
         $or: [
           { comment: { $like: `%${search}%` } },
           {

src/services/headline.service.ts

@@ -1,7 +1,6 @@
 import { FilterQuery, EntityManager } from '@mikro-orm/mysql'
 import { endOfDay, isSameDay } from 'date-fns'
 import { Service, Request, Response, Validate, HasPermission, Routes } from 'koa-clay'
-import groupBy from 'lodash.groupby'
 import Event from '../entities/event'
 import Player from '../entities/player'
 import HeadlinePolicy from '../policies/headline.policy'
@@ -127,30 +126,28 @@ export default class HeadlineService extends Service {
     const { startDate, endDate } = req.query
     const em: EntityManager = req.ctx.em
 
-    const where: FilterQuery<Event> = {
-      game: req.ctx.state.game,
-      createdAt: {
-        $gte: new Date(startDate),
-        $lte: endOfDay(new Date(endDate))
-      }
-    }
+    const query = em.qb(Event, 'e')
+      .join('e.playerAlias', 'pa')
+      .count('pa.player_id', true)
+      .where({
+        game: req.ctx.state.game.id,
+        createdAt: { $gte: new Date(startDate), $lte: endOfDay(new Date(endDate)) }
+      })
 
     if (!req.ctx.state.includeDevData) {
-      where.playerAlias = {
-        player: devDataPlayerFilter(em)
-      }
+      query.andWhere({
+        playerAlias: {
+          player: devDataPlayerFilter(em)
+        }
+      })
     }
 
-    const events = await em.getRepository(Event).find(where, {
-      populate: ['playerAlias.player']
-    })
-
-    const count = Object.keys(groupBy(events, 'playerAlias.player.id')).length
+    const result = await query.execute('get')
 
     return {
       status: 200,
       body: {
-        count
+        count: result.count
       }
     }
   }

src/services/player.service.ts

@@ -127,14 +127,14 @@ export default class PlayerService extends Service {
     const { search, page } = req.query
     const em: EntityManager = req.ctx.em
 
-    let query = em.qb(Player, 'p')
+    const query = em.qb(Player, 'p')
       .select('p.*')
       .orderBy({ lastSeenAt: QueryOrder.DESC })
       .limit(itemsPerPage)
       .offset(Number(page) * itemsPerPage)
 
     if (search) {
-      query = query
+      query
         .where({
           props: {
             $in: em.qb(PlayerProp).select('id').where({
@@ -167,7 +167,7 @@ export default class PlayerService extends Service {
       }
 
       if (groups.length > 0) {
-        query = query
+        query
           .orWhere({
             groups: {
               $in: groups
@@ -177,7 +177,7 @@ export default class PlayerService extends Service {
     }
 
     if (!req.ctx.state.includeDevData) {
-      query = query.andWhere(devDataPlayerFilter(em))
+      query.andWhere(devDataPlayerFilter(em))
     }
 
     const [players, count] = await query
@@ -257,14 +257,14 @@ export default class PlayerService extends Service {
     const em: EntityManager = req.ctx.em
     const player: Player = req.ctx.state.player // set in the policy
 
-    let query = em.createQueryBuilder(Event, 'e')
+    const query = em.createQueryBuilder(Event, 'e')
       .select('e.*')
       .orderBy({ createdAt: QueryOrder.DESC })
       .limit(itemsPerPage)
       .offset(Number(page) * itemsPerPage)
 
     if (search) {
-      query = query
+      query
         .where('json_extract(props, \'$[*].value\') like ?', [`%${search}%`])
         .orWhere({
           name: {