Merge pull request #11 from x-team/main

Merging main

Author: ccmoralesj

.env.example

@@ -0,0 +1,33 @@
+# API
+HOST=0.0.0.0
+PORT=3010
+
+# DATABASE
+DB_USERNAME=postgres
+DB_PASSWORD=*games-2021
+DB_NAME=gameshq_api
+DB_HOSTNAME=127.0.0.1
+DB_PORT=5434
+
+# THE ARENA APP
+SLACK_ARENA_TOKEN=
+SLACK_ARENA_SIGNING_SECRET=
+# Private Channel
+SLACK_ARENA_XHQ_CHANNEL=
+
+# CAMPAIGN APP
+SLACK_CAMPAIGN_SIGNING_SECRET=
+SLACK_CAMPAIGN_TOKEN=
+SLACK_NEUTRAL_ZONE_CHANNEL=
+
+# THE TOWER APP
+SLACK_TOWER_SIGNING_SECRET=
+SLACK_TOWER_TOKEN=
+SLACK_THE_TOWER_CHANNEL=
+
+# FRONT-END-APP
+FRONT_END_SIGNING_SECRET=
+FRONT_END_APP_BOT_TOKEN=
+
+# FIREBASE
+GOOGLE_APPLICATION_CREDENTIALS="/path/to/yours/service/account/file/service-account-file.json"

.nvmrc

@@ -0,0 +1 @@
+v16.10.0

package.json

@@ -38,12 +38,17 @@
   "license": "ISC",
   "dependencies": {
     "@hapi/boom": "9.1.2",
+    "@hapi/catbox": "11.1.1",
+    "@hapi/catbox-memory": "5.0.1",
     "@hapi/hapi": "20.1.5",
     "@hapi/inert": "6.0.3",
     "@hapi/vision": "6.1.0",
     "@slack/client": "5.0.2",
+    "@types/catbox": "10.0.7",
+    "@types/catbox-memory": "4.0.0",
     "dotenv": "10.0.0",
     "fast-safe-stringify": "2.0.7",
+    "firebase-admin": "10.0.0",
     "hapi-swagger": "14.2.1",
     "indefinite": "2.4.1",
     "joi": "17.4.0",
@@ -59,6 +64,7 @@
   "devDependencies": {
     "@types/boom": "7.3.1",
     "@types/chai": "4.2.19",
+    "@types/hapi__catbox-memory": "4.1.3",
     "@types/hapi__hapi": "20.0.9",
     "@types/hapi__inert": "5.2.3",
     "@types/hapi__vision": "5.5.3",

src/config/index.ts

@@ -25,6 +25,9 @@ interface NameToType {
   SLACK_TOWER_SIGNING_SECRET: string;
   SLACK_CAMPAIGN_SIGNING_SECRET: string;
   SLACK_THE_TOWER_CHANNEL: string;
+  FRONT_END_APP_BOT_TOKEN: string;
+  FRONT_END_SIGNING_SECRET: string;
+  GOOGLE_APPLICATION_CREDENTIALS: string;
 }
 
 export function getConfig<T extends keyof NameToType>(name: T): NameToType[T];

src/games/arena/consts.ts

@@ -110,6 +110,8 @@ export enum ARENA_HEALTHKITS {
 // REPOSITORIEs
 export const ARENA_REPOSITORY_NAME = 'arena-repository';
 export const ZONE_REPOSITORY_NAME = 'zone-repository';
+export const WEAPON_REPOSITORY_NAME = 'weapon-repository';
+export const ENEMY_REPOSITORY_NAME = 'enemy-repository';
 
 // GAME
 export const SEARCH_WEAPONS_SUCCESS_RATE = 0.8;

src/games/arena/utils/index.ts

@@ -35,6 +35,8 @@ import {
   ARENA_PLAYER_PERFORMANCE,
   ARENA_SECONDARY_ACTIONS,
   ChangeLocationParams,
+  ENEMY_REPOSITORY_NAME,
+  WEAPON_REPOSITORY_NAME,
   ZONE_REPOSITORY_NAME,
 } from '../consts';
 import {
@@ -243,6 +245,28 @@ export function withArenaTransaction<T>(fn: (transaction: Transaction) => Promis
   });
 }
 
+export function withWeaponTransaction<T>(fn: (transaction: Transaction) => Promise<T>) {
+  return withTransaction((transaction) => {
+    return fn(transaction).catch(async (error) => {
+      if (error instanceof GameError) {
+        error.addRepository(WEAPON_REPOSITORY_NAME);
+      }
+      throw error;
+    });
+  });
+}
+
+export function withEnemyTransaction<T>(fn: (transaction: Transaction) => Promise<T>) {
+  return withTransaction((transaction) => {
+    return fn(transaction).catch(async (error) => {
+      if (error instanceof GameError) {
+        error.addRepository(ENEMY_REPOSITORY_NAME);
+      }
+      throw error;
+    });
+  });
+}
+
 export function withZoneTransaction<T>(fn: (transaction: Transaction) => Promise<T>) {
   return withTransaction((transaction) => {
     return fn(transaction).catch(async (error) => {

src/games/general/commands/index.ts

@@ -0,0 +1,23 @@
+import { getGameResponse } from '../../utils';
+import { GAMES_SLACK_COMMANDS } from '../consts';
+
+import { register } from './register';
+
+interface GamesHQSwitchCommandOptions {
+  command: string;
+  commandText: string;
+  slackId: string;
+  channelId: string;
+  triggerId: string;
+}
+
+export function gamesSwitchCommand({ command, slackId }: GamesHQSwitchCommandOptions) {
+  switch (command) {
+    // ADMIN
+    case GAMES_SLACK_COMMANDS.REGISTER:
+      return register(slackId);
+
+    default:
+      return getGameResponse('Invalid command.');
+  }
+}

src/games/general/commands/register.ts

@@ -0,0 +1,37 @@
+import Boom from '@hapi/boom';
+
+import { USER_ROLE_LEVEL } from '../../../consts/model';
+import { findOrganizationByName } from '../../../models/Organization';
+import { createUser, userExists } from '../../../models/User';
+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.`);
+  }
+
+  const xteamOrganization = await findOrganizationByName('x-team');
+  const { user } = await getSlackUserInfo(slackUserId);
+
+  if (!user || !user.profile || !xteamOrganization) {
+    throw Boom.badRequest(`Failed to create new user on GamesHQ.`);
+  }
+  const { profile } = user;
+  const { email, image_512 } = profile;
+
+  await createUser({
+    email: email,
+    displayName: user.real_name,
+    firebaseUserUid: null,
+    profilePictureUrl: image_512,
+    slackId: user.id,
+    _teamId: null,
+    _roleId: USER_ROLE_LEVEL.USER,
+    _organizationId: xteamOrganization?.id,
+  });
+
+  return getGameResponse(
+    `Your e-mail _${email}_ is now registered to all our games :partyparrot: `
+  );
+};

src/games/general/consts.ts

@@ -0,0 +1,4 @@
+export enum GAMES_SLACK_COMMANDS {
+  // USER COMMANDS
+  REGISTER = '/games-register',
+}

src/games/tower/repositories/arena/zonesRepository.ts

@@ -0,0 +1,31 @@
+import { createOrUpdateArenaZone, deleteZoneById } from '../../../../models/ArenaZone';
+import { ARENA_ZONE_RING } from '../../../arena/consts';
+import { withZoneTransaction } from '../../../arena/utils';
+
+export interface IZoneEditorData {
+  id?: number;
+  name: string;
+  emoji: string;
+  ring: string;
+  isArchived: boolean;
+}
+
+export const upsertZone = async (data: IZoneEditorData) => {
+  return withZoneTransaction(async () => {
+    const values = {
+      ...(data.id && { id: data.id }),
+      name: data.name,
+      emoji: data.emoji,
+      isArchived: data.isArchived,
+      ring: data.ring as ARENA_ZONE_RING,
+      isActive: data.isArchived,
+    };
+    return createOrUpdateArenaZone(values);
+  });
+};
+
+export const deleteZone = async (zoneId: number) => {
+  return withZoneTransaction(async (transaction) => {
+    return deleteZoneById(zoneId, transaction);
+  });
+};