Merge pull request #69 from TaloDev/develop

Release 0.6.2

Author: tudddorrr

package.json

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

src/lib/props/sanitiseProps.ts

@@ -5,7 +5,7 @@ const sanitiseProps = (props: Prop[], deleteNull = false): Prop[] => {
 
   if (deleteNull) props = props.filter((prop) => prop.value !== null)
 
-  return props.map((prop) => new Prop(String(prop.key), prop.value ? String(prop.value) : null))
+  return props.filter((prop) => Boolean(prop.key)).map((prop) => new Prop(String(prop.key), prop.value ? String(prop.value) : null))
 }
 
 export default sanitiseProps

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

@@ -130,13 +130,17 @@ export default class PlayerAPIService extends APIService<PlayerService> {
       game: key.game
     })
 
+    if (!player1) req.ctx.throw(404, `Player with alias ${alias1} does not exist`)
+
     const player2 = await em.getRepository(Player).findOne({
       aliases: {
         id: alias2
       },
       game: key.game
     })
 
+    if (!player2) req.ctx.throw(404, `Player with alias ${alias2} does not exist`)
+
     const player2Aliases = await em.getRepository(PlayerAlias).find({
       player: {
         id: player2.id

src/services/player.service.ts

@@ -157,7 +157,7 @@ export default class PlayerService implements Service {
           playerId: player.id,
           display: {
             'Player': player.id,
-            'Updated props': props.map((prop) => `${prop.key}: ${prop.value ?? '[deleted]'}`).join(', ')
+            'Updated props': sanitiseProps(props).map((prop) => `${prop.key}: ${prop.value ?? '[deleted]'}`).join(', ')
           }
         }
       })

tests/services/_api/player-api/merge.test.ts

@@ -49,7 +49,6 @@ describe('Player API service - merge', () => {
     expect(res.body).toStrictEqual({ message: 'Missing access key scope(s): read:players, write:players' })
   })
 
-
   it('should not merge without the write scope', async () => {
     apiKey.scopes = [APIKeyScope.READ_PLAYERS]
     await (<EntityManager>app.context.em).flush()
@@ -64,7 +63,6 @@ describe('Player API service - merge', () => {
     expect(res.body).toStrictEqual({ message: 'Missing access key scope(s): write:players' })
   })
 
-
   it('should not merge without the read scope', async () => {
     apiKey.scopes = [APIKeyScope.WRITE_PLAYERS]
     await (<EntityManager>app.context.em).flush()
@@ -183,4 +181,38 @@ describe('Player API service - merge', () => {
       }
     ])
   })
+
+  it('should not merge players if alias1 does not exist', async () => {
+    apiKey.scopes = [APIKeyScope.READ_PLAYERS, APIKeyScope.WRITE_PLAYERS]
+    token = await createToken(apiKey)
+
+    const player2 = await new PlayerFactory([apiKey.game]).one()
+
+    await (<EntityManager>app.context.em).persistAndFlush(player2)
+
+    const res = await request(app.callback())
+      .post(`${baseUrl}`)
+      .send({ alias1: 2321, alias2: player2.aliases[0].id })
+      .auth(token, { type: 'bearer' })
+      .expect(404)
+
+    expect(res.body).toStrictEqual({ message: 'Player with alias 2321 does not exist' })
+  })
+
+  it('should not merge players if alias2 does not exist', async () => {
+    apiKey.scopes = [APIKeyScope.READ_PLAYERS, APIKeyScope.WRITE_PLAYERS]
+    token = await createToken(apiKey)
+
+    const player1 = await new PlayerFactory([apiKey.game]).one()
+
+    await (<EntityManager>app.context.em).persistAndFlush(player1)
+
+    const res = await request(app.callback())
+      .post(`${baseUrl}`)
+      .send({ alias1: player1.aliases[0].id, alias2: 2456 })
+      .auth(token, { type: 'bearer' })
+      .expect(404)
+
+    expect(res.body).toStrictEqual({ message: 'Player with alias 2456 does not exist' })
+  })
 })

tests/services/player/patch.test.ts

@@ -207,4 +207,34 @@ describe('Player service - patch', () => {
 
     expect(res.body).toStrictEqual({ message: 'Demo accounts cannot update player properties' })
   })
+
+  it('should filter out props with no keys', async () => {
+    const player = await new PlayerFactory([validGame]).with(() => ({ props: [] })).one()
+
+    await (<EntityManager>app.context.em).persistAndFlush(player)
+
+    const res = await request(app.callback())
+      .patch(`${baseUrl}/${player.id}`)
+      .send({
+        props: [
+          {
+            key: '',
+            value: ''
+          },
+          {
+            key: 'zonesExplored',
+            value: '3'
+          }
+        ]
+      })
+      .auth(token, { type: 'bearer' })
+      .expect(200)
+
+    expect(res.body.player.props).toStrictEqual([
+      {
+        key: 'zonesExplored',
+        value: '3'
+      }
+    ])
+  })
 })