Merge pull request #43 from x-team/develop

Updating Firebase protcol & Type-safe models
x-team · Jun 17, 2022 · 6eaa17e · 6eaa17e
2 parents 0fb93cf + 8d0f7e3
commit 6eaa17e
Show file tree

Hide file tree

Showing 49 changed files with 409 additions and 162 deletions.
diff --git a/.env.test b/.env.test
@@ -7,4 +7,10 @@ DB_USERNAME=postgres
 DB_PASSWORD=*games-2021
 DB_NAME=gameshq_api_test
 DB_HOSTNAME=127.0.0.1
-DB_PORT=5435
+DB_PORT=5435
+
+# FIREBASE
+GOOGLE_APPLICATION_CREDENTIALS={"type": "fake", "project_id": "fake", "private_key": "fake", "client_email": "fake"}
+
+# SLACK
+FRONT_END_APP_BOT_TOKEN=fake
diff --git a/buildspec.yml b/buildspec.yml
@@ -1,6 +1,7 @@
 version: 0.2
 
 env:
+  shell: bash
   git-credential-helper: yes
   parameter-store:
     DOCKER_HUB_USER: '/devops/shared/DOCKER_HUB_USER'
@@ -19,17 +20,19 @@ phases:
       - sentry-cli --version
   pre_build:
     commands:
+      - eval $(./aws-env --recursive)
       - export APP_BUILD_VERSION=${CODEBUILD_RESOLVED_SOURCE_VERSION}__$(date -u '+%Y-%m-%dT%T+00:00')
       - export PKG_VERSION=$(node -p "require('./package.json').version")
       - export SENTRY_VERSION=${ENV}-${PKG_VERSION}_BUILD_${CODEBUILD_RESOLVED_SOURCE_VERSION}
       - echo $APP_BUILD_VERSION > ./src/.version
       - cat ./src/.version
       - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $DOCKER_REPOSITORY_URI
       - IMAGE_TAG=$(echo $CODEBUILD_RESOLVED_SOURCE_VERSION | cut -c 1-7)
+
   build:
     commands:
-      #- chmod +x ./codebuild-git-wrapper.sh
-      #- ./codebuild-git-wrapper.sh "$REPO_URL" "$REPO_BRANCH"
+      - aws s3 cp s3://gameshq-build-pipeline-artifact-bucket/gameshq/google_credentials_games_api_staging.json ./google_credentials_games_api_staging.json
+      - aws s3 cp s3://gameshq-build-pipeline-artifact-bucket/gameshq/google_credentials_games_api_prod.json ./google_credentials_games_api_prod.json
       - echo $DOCKER_HUB_PASSWORD | docker login --username $DOCKER_HUB_USER --password-stdin
       - docker build -t $DOCKER_REPOSITORY_URI:latest .
       - docker tag $DOCKER_REPOSITORY_URI:latest $DOCKER_REPOSITORY_URI:$IMAGE_TAG

diff --git a/src/games/general/commands/register.ts b/src/games/general/commands/register.ts
@@ -2,11 +2,13 @@ import Boom from '@hapi/boom';
 
 import { USER_ROLE_LEVEL } from '../../../consts/model';
 import { findOrganizationByName } from '../../../models/Organization';
-import { createUser, userExists } from '../../../models/User';
+import { upsertUser, userExists, getUserByEmail } from '../../../models/User';
+import { createUserInFirebase } from '../../../plugins/firebasePlugin';
 import { getGameResponse, getSlackUserInfo } from '../../utils';
 
 export const register = async (slackUserId: string) => {
   const exists = await userExists(slackUserId);
+
   if (exists) {
     return getGameResponse(`Your user is already registered.`);
   }
@@ -19,14 +21,23 @@ export const register = async (slackUserId: string) => {
   }
   const { email, image_512 } = profile;
 
-  await createUser({
-    email: email,
-    displayName: real_name,
-    firebaseUserUid: null,
+  const userInDb = await getUserByEmail(email);
+  let firebaseUserUid = userInDb?.firebaseUserUid;
+
+  if (!firebaseUserUid) {
+    const firebaseUser = await createUserInFirebase(email, real_name);
+    firebaseUserUid = firebaseUser.uid;
+  }
+
+  await upsertUser({
+    id: userInDb?.id,
+    _roleId: userInDb?._roleId || USER_ROLE_LEVEL.USER,
+    email,
+    displayName: userInDb?.displayName || real_name,
     profilePictureUrl: image_512,
     slackId: id,
-    _roleId: USER_ROLE_LEVEL.USER,
     _organizationId: xteamOrganization?.id,
+    firebaseUserUid,
   });
 
   return getGameResponse(

diff --git a/src/games/utils/index.ts b/src/games/utils/index.ts
@@ -178,7 +178,8 @@ export async function getSlackUserInfo(slackId: string): Promise<SlackUser> {
         user: slackId,
       }),
     };
-    const response = await (await fetch(url, options)).json();
+    const rslt = await fetch(url, options);
+    const response = await rslt.json();
     const responseUser: SlackUser = response as SlackUser;
     return responseUser;
   } catch (error) {

diff --git a/src/models/AchievementUnlocked.ts b/src/models/AchievementUnlocked.ts
@@ -73,14 +73,14 @@ export class AchievementUnlocked
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _user?: User;
+  declare _user?: User;
 
   @BelongsTo(() => Achievement, {
     foreignKey: '_achievementId',
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _achievement?: Achievement;
+  declare _achievement?: Achievement;
 
   static associations: {
     _user: Association<AchievementUnlocked, User>;

diff --git a/src/models/Achievements.ts b/src/models/Achievements.ts
@@ -81,7 +81,7 @@ export class Achievement
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _gameType?: GameType;
+  declare _gameType?: GameType;
 
   static associations: {
     _gameType: Association<Achievement, GameType>;

diff --git a/src/models/ArenaGame.ts b/src/models/ArenaGame.ts
@@ -88,10 +88,10 @@ export class ArenaGame
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _game?: Game;
+  declare _game?: Game;
 
   @HasMany(() => ArenaRound, '_gameId')
-  _rounds?: ArenaRound[];
+  declare _rounds?: ArenaRound[];
 
   static associations: {
     _rounds: Association<ArenaGame, ArenaRound>;

diff --git a/src/models/ArenaItemInventory.ts b/src/models/ArenaItemInventory.ts
@@ -49,7 +49,7 @@ export class ArenaItemInventory
   declare _arenaPlayerId: number;
 
   @BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
-  _player?: ArenaPlayer;
+  declare _player: ArenaPlayer;
 
   @ForeignKey(() => Item)
   @Column(DataType.INTEGER)
@@ -60,7 +60,7 @@ export class ArenaItemInventory
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _item?: Item;
+  declare _item?: Item;
 
   @Column(DataType.INTEGER)
   declare remainingUses: number | null;

diff --git a/src/models/ArenaPlayer.ts b/src/models/ArenaPlayer.ts
@@ -178,7 +178,7 @@ export class ArenaPlayer
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _user?: User;
+  declare _user?: User;
 
   @AllowNull(true)
   @ForeignKey(() => Team)
@@ -190,7 +190,7 @@ export class ArenaPlayer
     onUpdate: 'CASCADE',
     onDelete: 'SET NULL',
   })
-  _team?: Team | null;
+  declare _team?: Team | null;
 
   @ForeignKey(() => Game)
   @Column(DataType.INTEGER)
@@ -201,39 +201,39 @@ export class ArenaPlayer
     onUpdate: 'CASCADE',
     onDelete: 'SET NULL',
   })
-  _game?: Game;
+  declare _game?: Game;
 
   @AllowNull(true)
   @ForeignKey(() => ArenaZone)
   @Column(DataType.INTEGER)
   declare _arenaZoneId: number | null;
 
   @BelongsTo(() => ArenaZone)
-  _zone?: ArenaZone;
+  declare _zone?: ArenaZone;
 
   @BelongsToMany(() => Item, {
     through: () => ArenaItemInventory,
     foreignKey: '_arenaPlayerId',
     otherKey: '_itemId',
     as: '_weapons',
   })
-  _weapons?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
+  declare _weapons?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
 
   @BelongsToMany(() => Item, {
     through: () => ArenaItemInventory,
     foreignKey: '_arenaPlayerId',
     otherKey: '_itemId',
     as: '_armors',
   })
-  _armors?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
+  declare _armors?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
 
   @BelongsToMany(() => Item, {
     through: () => ArenaItemInventory,
     foreignKey: '_arenaPlayerId',
     otherKey: '_itemId',
     as: '_healthkits',
   })
-  _healthkits?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
+  declare _healthkits?: Array<Item & { ArenaItemInventory: ArenaItemInventory }>;
 
   static associations: {
     _user: Association<ArenaPlayer, User>;

diff --git a/src/models/ArenaPlayerPerformance.ts b/src/models/ArenaPlayerPerformance.ts
@@ -51,15 +51,15 @@ export class ArenaPlayerPerformance
   declare _arenaPlayerId: number;
 
   @BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
-  _player?: ArenaPlayer;
+  declare _player?: ArenaPlayer;
 
   @PrimaryKey
   @ForeignKey(() => Game)
   @Column(DataType.INTEGER)
   declare _gameId: number;
 
   @BelongsTo(() => Game, '_gameId')
-  _game?: Game;
+  declare _game?: Game;
 
   @Default(ZERO)
   @Column(DataType.INTEGER)

diff --git a/src/models/ArenaRound.ts b/src/models/ArenaRound.ts
@@ -110,17 +110,17 @@ export class ArenaRound
   declare _gameId: number;
 
   @BelongsTo(() => Game, '_gameId')
-  _game?: Game;
+  declare _game?: Game;
 
   @ForeignKey(() => User)
   @Column(DataType.INTEGER)
   declare _createdById: number;
 
   @BelongsTo(() => User, '_createdById')
-  _createdBy?: User;
+  declare _createdBy?: User;
 
   @HasMany(() => ArenaRoundAction, '_arenaRoundId')
-  _actions?: ArenaRoundAction[];
+  declare _actions?: ArenaRoundAction[];
 
   static associations: {
     _game: Association<ArenaRound, Game>; // TBD association with ArenaGame?

diff --git a/src/models/ArenaRoundAction.ts b/src/models/ArenaRoundAction.ts
@@ -54,15 +54,15 @@ export class ArenaRoundAction
   declare _arenaPlayerId: number;
 
   @BelongsTo(() => ArenaPlayer, '_arenaPlayerId')
-  _player?: ArenaPlayer;
+  declare _player?: ArenaPlayer;
 
   @PrimaryKey
   @ForeignKey(() => ArenaRound)
   @Column(DataType.INTEGER)
   declare _arenaRoundId: number;
 
   @BelongsTo(() => ArenaRound, '_arenaRoundId')
-  _round?: ArenaRound;
+  declare _round?: ArenaRound;
 
   @Default(false)
   @Column(DataType.BOOLEAN)
@@ -84,7 +84,7 @@ export class ArenaRoundAction
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _action?: AvailableAction;
+  declare _action?: AvailableAction;
 
   @Column(DataType.JSONB)
   declare actionJSON: ArenaAction;

diff --git a/src/models/ArenaZone.ts b/src/models/ArenaZone.ts
@@ -88,10 +88,10 @@ export class ArenaZone
     onUpdate: 'CASCADE',
     as: '_organization',
   })
-  _organization?: Organization;
+  declare _organization?: Organization;
 
   @HasMany(() => ArenaPlayer, '_arenaZoneId')
-  _players?: ArenaPlayer[];
+  declare _players?: ArenaPlayer[];
 
   static associations: {
     _players: Association<ArenaZone, ArenaPlayer>;

diff --git a/src/models/Enemy.ts b/src/models/Enemy.ts
@@ -95,7 +95,7 @@ export class Enemy
 
   @AllowNull(true)
   @Column(DataType.TEXT)
-  gifUrl?: string;
+  declare gifUrl?: string;
 
   @Default(Ability.defaultProps())
   @Column(DataType.JSONB)
@@ -110,7 +110,7 @@ export class Enemy
     onUpdate: 'CASCADE',
     onDelete: 'SET NULL',
   })
-  _enemyPattern?: EnemyPattern;
+  declare _enemyPattern?: EnemyPattern;
 
   @ForeignKey(() => Organization)
   @Column(DataType.INTEGER)
@@ -122,15 +122,15 @@ export class Enemy
     onUpdate: 'CASCADE',
     as: '_organization',
   })
-  _organization?: Organization;
+  declare _organization?: Organization;
 
   @BelongsToMany(() => Trait, {
     through: () => EnemyTrait,
     foreignKey: '_enemyId',
     otherKey: '_traitId',
     as: '_traits',
   })
-  _traits?: Array<Trait & { EnemyTrait: EnemyTrait }>;
+  declare _traits?: Array<Trait & { EnemyTrait: EnemyTrait }>;
 
   static associations: {
     _enemyPattern: Association<Enemy, EnemyPattern>;

diff --git a/src/models/EnemyTrait.ts b/src/models/EnemyTrait.ts
@@ -34,7 +34,7 @@ export class EnemyTrait
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _enemy?: Enemy;
+  declare _enemy?: Enemy;
 
   @ForeignKey(() => Trait)
   @Column(DataType.TEXT)
@@ -45,7 +45,7 @@ export class EnemyTrait
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _trait?: Trait;
+  declare _trait?: Trait;
 
   static associations: {
     _enemy: Association<EnemyTrait, Enemy>;

diff --git a/src/models/Game.ts b/src/models/Game.ts
@@ -118,13 +118,13 @@ export class Game extends Model<GameAttributes, GameCreationAttributes> implemen
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _createdBy?: User;
+  declare _createdBy?: User;
 
   @HasOne(() => ArenaGame)
-  _arena?: ArenaGame;
+  declare _arena?: ArenaGame;
 
   @HasOne(() => TowerGame)
-  _tower?: TowerGame;
+  declare _tower?: TowerGame;
 
   static associations: {
     _arena: Association<Game, ArenaGame>;

diff --git a/src/models/GameItemAvailability.ts b/src/models/GameItemAvailability.ts
@@ -55,7 +55,7 @@ export class GameItemAvailability
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _gameType?: GameType;
+  declare _gameType?: GameType;
 
   @PrimaryKey
   @ForeignKey(() => Item)
@@ -67,7 +67,7 @@ export class GameItemAvailability
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
-  _item?: Item;
+  declare _item?: Item;
 
   @Default(true)
   @Column(DataType.BOOLEAN)