Merge pull request #24 from x-team/feature/XTG-248-change-gametypeid

Feature/xtg 248 change gametypeid to Int

Author: ccmoralesj

.env.test

@@ -0,0 +1,10 @@
+# API
+HOST=0.0.0.0
+PORT=3000
+
+# DATABASE
+DB_USERNAME=postgres
+DB_PASSWORD=*games-2021
+DB_NAME=gameshq_api_test
+DB_HOSTNAME=127.0.0.1
+DB_PORT=5435

docker-compose-test.yml

@@ -0,0 +1,20 @@
+version: '3.7'
+
+services:
+  gameshq_api_db_test:
+    image: postgres:10-alpine
+    ports:
+      - '5435:5432'
+    environment:
+      POSTGRES_USER: 'postgres'
+      POSTGRES_DB: 'gameshq_api_test'
+      POSTGRES_PASSWORD: '*games-2021'
+    volumes:
+      - postgres:/var/lib/postgresql/data
+    networks:
+      - gameshq_api_db_test_network
+volumes:
+  postgres:
+
+networks:
+  gameshq_api_db_test_network:

migrate.ts

@@ -1,7 +1,9 @@
 #!/usr/bin/env ts-node-script
 
 import { Sequelize } from 'sequelize';
-import { Umzug, SequelizeStorage, MigrationMeta } from 'umzug';
+import type { MigrationMeta } from 'umzug';
+import { Umzug, SequelizeStorage } from 'umzug';
+
 import { sequelizeConfig } from './src/db';
 
 const sequelize = new Sequelize({ ...sequelizeConfig, logging: undefined });

package.json

@@ -10,7 +10,7 @@
     "test": "cross-env NODE_ENV=test ENV=test npm run test:all",
     "test:integration": "cross-env NODE_ENV=test ENV=test npm run test:_integration",
     "test:integration:single": "cross-env NODE_ENV=test ENV=test npm run test:prepare:integration && npm run mocha",
-    "test:unit": "cross-env NODE_ENV=test ENV=test npm run mocha \"src/**/*.test.ts\" --exclude \"src/**/*.integration.test.ts\"",
+    "test:unit": "cross-env NODE_ENV=test ENV=test npm run mocha \"test/**/*.test.ts\" --exclude \"test/**/*.integration.test.ts\"",
     "test:unit:single": "cross-env NODE_ENV=test ENV=test npm run mocha",
     "mocha": "cross-env ENV=test mocha --unhandled-rejections=strict",
     "eslint": "eslint src --fix",
@@ -25,13 +25,12 @@
     "//1": "/*****************************************************************************",
     "//2": "* Rest of those commands are used internally and should not be used directly!",
     "//3": "*****************************************************************************/",
-    "prepare-db": "npm run db:seed:up && npm run db:migrate:up",
+    "prepare-db": "echo preparing db for $NODE_ENV env && npm run db:seed:up && npm run db:migrate:up",
     "clean": "rm -rf dist",
-    "db:test:create": "cross-env NODE_ENV=test ENV=test sequelize --config='src/config/database.ci.js' db:create || true",
-    "db:test:drop": "cross-env NODE_ENV=test ENV=test sequelize --config='src/config/database.ci.js' db:drop || true",
+    "db:test:create": "docker-compose -p gameshq-api-test-project -f 'docker-compose-test.yml' up -d",
     "test:all": "concurrently --kill-others-on-fail --names *typescript,*****eslint,*tests:unit,integration --prefix-colors blue.inverse,blue,yellow,green 'npm run tsc' 'npm run eslint --quiet' 'npm run test:unit' 'npm run test:integration'",
-    "test:prepare:integration": "npm run db:test:drop && npm run db:test:create && npm run prepare-db",
-    "test:_integration": "npm run test:prepare:integration && npm run mocha \"src/**/*.integration.test.ts\"",
+    "test:prepare:integration": "npm run db:test:create &&  cross-env NODE_ENV=test ENV=test npm run prepare-db",
+    "test:_integration": "npm run test:prepare:integration && npm run mocha \"test/**/*.integration.test.ts\"",
     "prepare": "husky install"
   },
   "author": "X-Team Community",

src/api-utils/responseSchemas/gamedev.ts

@@ -1,8 +1,8 @@
 import Joi from 'joi';
 
 const gameItemSchema = Joi.object({
-  // Pending due to new table design
-  id: Joi.string(),
+  id: Joi.number(),
+  name: Joi.string(),
   clientSecret: Joi.string(),
   signingSecret: Joi.string(),
   _createdById: Joi.number(),

src/api-utils/responseSchemas/user.ts

@@ -12,14 +12,14 @@ const sessionTokenSchema = Joi.object({
 const userSessionSchema = Joi.object({
   displayName: Joi.string().required(),
   email: Joi.string().email().required(),
-  slackId: Joi.string().optional(),
-  firebaseUserUid: Joi.string().optional(),
-  profilePictureUrl: Joi.string().optional(),
+  slackId: Joi.string().allow(null).optional(),
+  firebaseUserUid: Joi.string().allow(null).optional(),
+  profilePictureUrl: Joi.string().allow(null).optional(),
   role: Joi.number().required(),
   isAdmin: Joi.boolean().required(),
 }).options({ stripUnknown: true });
 
-const sessionSchema = Joi.object({
+export const sessionSchema = Joi.object({
   success: sessionStateSchema,
   session: sessionTokenSchema,
   user: userSessionSchema,

src/config/database.js

@@ -1,7 +1,9 @@
 const dotenv = require('dotenv');
 const { getConfig } = require('./index');
 
-if (getConfig('NODE_ENV') !== 'production') {
+if (getConfig('NODE_ENV') === 'test') {
+  dotenv.config({ path: '.env.test' });
+} else if (getConfig('NODE_ENV') !== 'production') {
   dotenv.config({ path: '.env.dev' });
 }
 
@@ -19,7 +21,6 @@ module.exports = {
   development: config,
   test: {
     ...config,
-    database: `${config.database}_test`,
     seederStorage: 'none',
   },
   production: config,

src/games/arena/repositories/arena/actions/admin/create-or-finish-game.ts

@@ -1,4 +1,4 @@
-import { User } from '../../../../../../models';
+import type { User } from '../../../../../../models';
 import { findActiveArenaGame, startArenaGame } from '../../../../../../models/ArenaGame';
 import { activateAllArenaZones } from '../../../../../../models/ArenaZone';
 import { enableAllItems } from '../../../../../../models/GameItemAvailability';
@@ -38,7 +38,7 @@ export async function newGame(commandText: string, userRequesting: User) {
       transaction
     );
 
-    await enableAllItems(GAME_TYPE.ARENA, transaction);
+    await enableAllItems(game._gameTypeId, transaction);
     return getGameResponse(arenaCommandReply.adminCreatedGame(game));
   });
 }
@@ -68,7 +68,7 @@ export async function endGame(userRequesting: User) {
     if (!game) {
       return getGameError(arenaCommandReply.noActiveGame());
     }
-    await enableAllItems(GAME_TYPE.ARENA, transaction);
+    await enableAllItems(game._gameTypeId, transaction);
     await game.endGame(transaction);
     await activateAllArenaZones(transaction);
     await publishArenaMessage(arenaCommandReply.channelEndGame(game), true);

src/games/arena/repositories/arena/actions/admin/revive-boss.ts

@@ -1,4 +1,4 @@
-import { User } from '../../../../../../models';
+import type { User } from '../../../../../../models';
 import { findPlayerByUser } from '../../../../../../models/ArenaPlayer';
 import { findActiveRound } from '../../../../../../models/ArenaRound';
 import { getUserBySlackId } from '../../../../../../models/User';

src/games/arena/repositories/arena/actions/admin/start-round.ts

@@ -1,4 +1,4 @@
-import { User } from '../../../../../../models';
+import type { User } from '../../../../../../models';
 import { findLivingPlayersByGame } from '../../../../../../models/ArenaPlayer';
 import {
   countRoundsCompleted,