update deps

Author: tudddorrr

package-lock.json

@@ -54,7 +54,7 @@
     "@mikro-orm/migrations": "^6.3.9",
     "@mikro-orm/mysql": "^6.3.9",
     "@mikro-orm/reflection": "^6.3.9",
-    "@sendgrid/mail": "^7.6.2",
+    "@sendgrid/mail": "^8.1.3",
     "@sentry/node": "^7.47.0",
     "@sentry/utils": "^7.47.0",
     "adm-zip": "^0.5.6",
@@ -70,14 +70,11 @@
     "jsonwebtoken": "^9.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
-    "koa-clay": "^6.5.0",
+    "koa-clay": "^6.6.1",
     "koa-helmet": "^7.0.0",
     "koa-jwt": "^4.0.4",
     "koa-logger": "^3.2.1",
-    "lodash.get": "^4.4.2",
-    "lodash.groupby": "^4.6.0",
-    "lodash.pick": "^4.4.0",
-    "lodash.uniqwith": "^4.5.0",
+    "lodash": "^4.17.21",
     "otplib": "^12.0.1",
     "qrcode": "^1.5.0",
     "qs": "^6.11.0",

package.json

@@ -4,7 +4,7 @@ import { decrypt, encrypt } from '../lib/crypto/string-encryption'
 import Game from './game'
 import { createSteamworksLeaderboard, createSteamworksLeaderboardEntry, deleteSteamworksLeaderboard, deleteSteamworksLeaderboardEntry, setSteamworksStat, syncSteamworksLeaderboards, syncSteamworksStats } from '../lib/integrations/steamworks-integration'
 import Leaderboard from './leaderboard'
-import pick from 'lodash.pick'
+import { pick } from 'lodash'
 import LeaderboardEntry from './leaderboard-entry'
 import { PlayerAliasService } from './player-alias'
 import PlayerGameStat from './player-game-stat'
@@ -90,7 +90,7 @@ export default class Integration {
     }
   }
 
-  getConfig(): IntegrationConfig {
+  getConfig(): Omit<IntegrationConfig, 'apiKey'> {
     switch (this.type) {
       case IntegrationType.STEAMWORKS:
         return pick(this.config, ['appId', 'syncLeaderboards', 'syncStats'])

src/entities/integration.ts

@@ -3,7 +3,7 @@ import { HasPermission, Service, Request, Response, Routes, Validate } from 'koa
 import APIKey, { APIKeyScope } from '../entities/api-key'
 import jwt from 'jsonwebtoken'
 import APIKeyPolicy from '../policies/api-key.policy'
-import groupBy from 'lodash.groupby'
+import { groupBy } from 'lodash'
 import { promisify } from 'util'
 import createGameActivity from '../lib/logging/createGameActivity'
 import { GameActivityType } from '../entities/game-activity'

src/services/api-key.service.ts

@@ -6,7 +6,7 @@ import GameSave from '../../entities/game-save'
 import PlayerAlias, { PlayerAliasService } from '../../entities/player-alias'
 import PlayerAPIPolicy from '../../policies/api/player-api.policy'
 import APIService from './api-service'
-import uniqWith from 'lodash.uniqwith'
+import { uniqWith } from 'lodash'
 import PlayerAPIDocs from '../../docs/player-api.docs'
 import PlayerProp from '../../entities/player-prop'
 import PlayerGameStat from '../../entities/player-game-stat'

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

@@ -4,7 +4,7 @@ import DataExport, { DataExportAvailableEntities, DataExportStatus } from '../en
 import DataExportPolicy from '../policies/data-export.policy'
 import Event, { ClickhouseEvent, createEventFromClickhouse } from '../entities/event'
 import AdmZip from 'adm-zip'
-import get from 'lodash.get'
+import { get } from 'lodash'
 import Prop from '../entities/prop'
 import Player from '../entities/player'
 import PlayerAlias from '../entities/player-alias'
@@ -22,7 +22,7 @@ import handlePricingPlanAction from '../lib/billing/handlePricingPlanAction'
 import { PricingPlanActionType } from '../entities/pricing-plan-action'
 import queueEmail from '../lib/messaging/queueEmail'
 import OrganisationPricingPlanAction from '../entities/organisation-pricing-plan-action'
-import pick from 'lodash.pick'
+import { pick } from 'lodash'
 import PlayerProp from '../entities/player-prop'
 import { Job, Queue } from 'bullmq'
 import createEmailQueue from '../lib/queues/createEmailQueue'
@@ -346,7 +346,8 @@ export default class DataExportService extends Service {
         value = get(object, 'extra')
         return `"${JSON.stringify(value).replace(/"/g, '\'')}"`
       case 'globalValue':
-        return get(object, 'hydratedGlobalValue') ?? 'N/A'
+        value = get(object, 'hydratedGlobalValue')
+        return value ? String(value) : 'N/A'
       case 'playerAlias.id':
       case 'playerAlias.service':
       case 'playerAlias.identifier':

src/services/data-export.service.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from '@mikro-orm/mysql'
 import { HasPermission, Service, Request, Response, Validate } from 'koa-clay'
-import uniqWith from 'lodash.uniqwith'
+import { uniqWith } from 'lodash'
 import Game from '../entities/game'
 import { GameActivityType } from '../entities/game-activity'
 import GameSecret from '../entities/game-secret'

src/services/game.service.ts

@@ -1,6 +1,6 @@
 import { EntityManager, MikroORM } from '@mikro-orm/mysql'
 import { HasPermission, Request, Response, Routes, Service, Validate } from 'koa-clay'
-import pick from 'lodash.pick'
+import { pick } from 'lodash'
 import { GameActivityType } from '../entities/game-activity'
 import Integration, { IntegrationConfig, IntegrationType } from '../entities/integration'
 import createGameActivity from '../lib/logging/createGameActivity'
@@ -91,7 +91,7 @@ export default class IntegrationService extends Service {
 
     // todo, prevent if has one of type already
 
-    const integration = new Integration(type, req.ctx.state.game, pick(config, configKeys[type]))
+    const integration = new Integration(type, req.ctx.state.game, pick(config, configKeys[type]) as IntegrationConfig)
 
     createGameActivity(em, {
       user: req.ctx.state.user,

src/services/integration.service.ts

@@ -7,7 +7,7 @@ import sanitiseProps from '../lib/props/sanitiseProps'
 import { ClickhouseEvent, createEventFromClickhouse } from '../entities/event'
 import { EntityManager } from '@mikro-orm/mysql'
 import { QueryOrder } from '@mikro-orm/mysql'
-import uniqWith from 'lodash.uniqwith'
+import { uniqWith } from 'lodash'
 import createGameActivity from '../lib/logging/createGameActivity'
 import { GameActivityType } from '../entities/game-activity'
 import PlayerGameStat from '../entities/player-game-stat'

src/services/player.service.ts

@@ -11,7 +11,11 @@ describe('Player auth middleware', () => {
     const em: EntityManager = global.em
 
     const [apiKey, token] = await createAPIKeyAndToken([APIKeyScope.WRITE_GAME_STATS])
-    const stat = await new GameStatFactory([apiKey.game]).one()
+    const stat = await new GameStatFactory([apiKey.game]).state(() => ({
+      defaultValue: 0,
+      maxChange: 1,
+      maxValue: 1000
+    })).one()
     const player = await new PlayerFactory([apiKey.game]).withTaloAlias().one()
 
     await em.persistAndFlush([stat, player])