Merge pull request #45 from TaloDev/develop

Tech debt & bug fixes

Author: tudddorrr

README.md

@@ -5,6 +5,7 @@ Talo's backend is a set of self-hostable services that helps you build games fas
 ## Features
 - Event tracking
 - Player management (including identity and cross-session data)
+- Leaderboards
 
 ### In progress
 - Global stats (track unique or aggregated stats e.g. total quests completed)

__mocks__/bee-queue.ts

@@ -3,20 +3,32 @@ import { EventEmitter } from 'events'
 class Job<T> extends EventEmitter {
   data: T
   queue: Queue<T>
+  date: Date
 
   constructor(data: T, queue: Queue<T>)  {
     super()
     this.data = data
     this.queue = queue
+    this.date = new Date()
   }
 
-  async process(handler: (job: Job<T>) => Promise<T>): Promise<void> {
-    await handler(this)
+  delayUntil(date: Date): Job<T> {
+    this.date = date
+    return this
+  }
+
+  async save(): Promise<Job<T>> {
+    try {
+      await this.queue.handler(this)
+    } catch (err) {
+      this.emit('failed', err)
+    }
+
+    return this
   }
 }
 
-export default class Queue<T = any> extends EventEmitter {
-  job: Job<T>
+export default class Queue<T = unknown> extends EventEmitter {
   handler: (job: Job<T>) => Promise<T>
   name: string
 
@@ -29,22 +41,12 @@ export default class Queue<T = any> extends EventEmitter {
     this.handler = handler
   }
 
-  createJob(data: T): Queue<T> {
-    this.job = new Job(data, this)
-    return this
-  }
+  createJob(data: T): Job<T> {
+    const job = new Job<T>(data, this)
+    job.on('failed', (err: Error) => {
+      this.emit('failed', job, err)
+    })
 
-  delayUntil(date: Date): Queue<T> {
-    return this
-  }
-
-  async save(): Promise<Queue<T>> {
-    try {
-      await this.job.process(this.handler)
-    } catch (err) {
-      this.emit('failed', this.job, err)
-    }
-
-    return this
+    return job
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "game-services",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

src/entities/event.ts

@@ -1,4 +1,4 @@
-import { Entity, Embedded, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
+import { Entity, Embedded, ManyToOne, PrimaryKey, Property, Cascade } from '@mikro-orm/core'
 import Game from './game'
 import PlayerAlias from './player-alias'
 import Prop from './prop'
@@ -17,7 +17,7 @@ export default class Event {
   @ManyToOne(() => Game)
   game: Game
 
-  @ManyToOne(() => PlayerAlias)
+  @ManyToOne(() => PlayerAlias, { cascade: [Cascade.REMOVE] })
   playerAlias: PlayerAlias
 
   @Property()

src/services/leaderboards.service.ts

@@ -59,7 +59,7 @@ export default class LeaderboardsService implements Service {
       gameId: true,
       internalName: async (val: string, req: ServiceRequest): Promise<boolean> => {
         const em: EntityManager = req.ctx.em
-        const duplicateInternalName = await em.getRepository(Leaderboard).findOne({ internalName: val })
+        const duplicateInternalName = await em.getRepository(Leaderboard).findOne({ internalName: val, game: req.body.gameId })
 
         if (duplicateInternalName) throw new Error(`A leaderboard with the internalName ${val} already exists`)
 

tests/services/_api/events-api/post.test.ts

@@ -6,7 +6,6 @@ import Player from '../../../../src/entities/player'
 import Game from '../../../../src/entities/game'
 import APIKey, { APIKeyScope } from '../../../../src/entities/api-key'
 import { createToken } from '../../../../src/services/api-keys.service'
-import Event from '../../../../src/entities/event'
 import UserFactory from '../../../fixtures/UserFactory'
 import PlayerFactory from '../../../fixtures/PlayerFactory'
 import GameFactory from '../../../fixtures/GameFactory'
@@ -31,12 +30,6 @@ describe('Events API service - post', () => {
     await (<EntityManager>app.context.em).persistAndFlush([apiKey, validPlayer])
   })
 
-  beforeEach(async () => {
-    const repo = (<EntityManager>app.context.em).getRepository(Event)
-    const events = await repo.findAll()
-    await repo.removeAndFlush(events)
-  })
-
   afterAll(async () => {
     await (<EntityManager>app.context.em).getConnection().close()
   })
@@ -46,14 +39,15 @@ describe('Events API service - post', () => {
     await (<EntityManager>app.context.em).flush()
     token = await createToken(apiKey)
 
-    await request(app.callback())
+    const res = await request(app.callback())
       .post(`${baseUrl}`)
       .send({ events: [{ name: 'Craft bow', aliasId: validPlayer.aliases[0].id, timestamp: Date.now() }] })
       .auth(token, { type: 'bearer' })
       .expect(200)
 
-    const event = await (<EntityManager>app.context.em).getRepository(Event).findOne({ name: 'Craft bow' })
-    expect(event).toBeTruthy()
+    expect(res.body.events).toHaveLength(1)
+    expect(res.body.events[0].name).toBe('Craft bow')
+    expect(res.body.events[0].playerAlias.id).toBe(validPlayer.aliases[0].id)
   })
 
   it('should create multiple events if the scope is valid', async () => {

tests/services/leaderboards/post.test.ts

@@ -104,10 +104,22 @@ describe('Leaderboards service - post', () => {
 
     const res = await request(app.callback())
       .post(`${baseUrl}`)
-      .send({ gameId: validGame.id, internalName: 'highscores', name: 'Highscores', sortMode: 'blah', unique: true })
+      .send({ gameId: validGame.id, internalName: 'highscores', name: 'Highscores', sortMode: 'asc', unique: true })
       .auth(token, { type: 'bearer' })
       .expect(400)
 
     expect(res.body).toStrictEqual({ message: 'A leaderboard with the internalName highscores already exists' })
   })
+
+  it('should create a leaderboard with a duplicate internal name for another game', async () => {
+    const otherGame = await new GameFactory(user.organisation).one()
+    const otherLeaderboard = await new LeaderboardFactory([otherGame]).with(() => ({ internalName: 'time-survived' })).one()
+    await (<EntityManager>app.context.em).persistAndFlush(otherLeaderboard)
+
+    await request(app.callback())
+      .post(`${baseUrl}`)
+      .send({ gameId: validGame.id, internalName: 'time-survived', name: 'Time survived', sortMode: 'asc', unique: true })
+      .auth(token, { type: 'bearer' })
+      .expect(200)
+  })
 })