.dockerignore

@@ -0,0 +1,8 @@
+node_modules
+dist
+Dockerfile
+docker-compose*.yml
+*.log
+.git
+.coverage
+buildspec*.yml

Dockerfile

@@ -1,23 +1,28 @@
-FROM node:16-alpine
-ENV AWS_CLI_VERSION 1.15.47
+FROM node:16-alpine AS base
+
+ENV AWS_CLI_VERSION=1.15.47
+
 WORKDIR /app
 
-#copy all the app files
-COPY . .
+# Install packages for aws-env
+RUN apk add --no-cache build-base rsync git python3 py-pip py-setuptools groff less openssl ca-certificates bash \
+  && pip --no-cache-dir install awscli==${AWS_CLI_VERSION} \
+  && wget https://github.com/Droplr/aws-env/raw/master/bin/aws-env-linux-amd64 -O /bin/aws-env \
+  && chmod +x /bin/aws-env \
+  && rm -rf /var/cache/apk/*
 
-RUN apk --no-cache update
+FROM base AS build
 
-RUN apk add --no-cache build-base rsync git
+# Copy only package.json and package-lock.json first to cache npm install step
+COPY package*.json ./
 
-#install packages for aws-env
-RUN apk add --no-cache python3 py-pip py-setuptools groff less openssl ca-certificates bash && \
-  pip --no-cache-dir install awscli==${AWS_CLI_VERSION} && \
-  rm -rf /var/cache/apk/*
+# Install dependencies
+RUN npm install
 
-#Download aws-env
-RUN wget https://github.com/Droplr/aws-env/raw/master/bin/aws-env-linux-amd64 -O /bin/aws-env && chmod +x /bin/aws-env
+# Copy the rest of the app files
+COPY . .
 
-#Install dependencies and build
-RUN npm install && npm run build
+# Build the app
+RUN npm run build
 
-CMD eval $(aws-env) && npm start
+CMD eval $(aws-env) && npm start

src/games/tower/repositories/tower/engine/helpers/evaluate-hunt-raiders.ts

@@ -106,6 +106,7 @@ export async function huntRaiders(
             await updateLastHealth(
               towerFloor?._towerGameId ?? ZERO,
               randomTargetRaider._userId,
+              towerFloor?.number ?? ZERO,
               lastHealth,
               transaction
             );

src/migrations/20230321205429-TowerStatistics-new-field-lastFloorVisited.ts

@@ -0,0 +1,31 @@
+import type { QueryInterface, Sequelize } from 'sequelize';
+import { DataTypes } from 'sequelize';
+
+interface SequelizeContext {
+  context: {
+    queryInterface: QueryInterface;
+    Sequelize: Sequelize;
+  };
+}
+
+module.exports = {
+  async up({ context: { queryInterface } }: SequelizeContext) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn(
+        'TowerStatistics',
+        'lastFloorVisited',
+        {
+          type: DataTypes.INTEGER,
+          defaultValue: 0,
+        },
+        { transaction }
+      );
+    });
+  },
+
+  async down({ context: { queryInterface } }: SequelizeContext) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.removeColumn('TowerStatistics', 'lastFloorVisited', { transaction });
+    });
+  },
+};

src/migrations/20230321233247-TowerStatistics-new-fields-lastHealth-perks.ts

@@ -0,0 +1,41 @@
+import type { QueryInterface, Sequelize } from 'sequelize';
+import { DataTypes } from 'sequelize';
+
+interface SequelizeContext {
+  context: {
+    queryInterface: QueryInterface;
+    Sequelize: Sequelize;
+  };
+}
+
+module.exports = {
+  async up({ context: { queryInterface } }: SequelizeContext) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn(
+        'TowerStatistics',
+        'lastHealth',
+        {
+          type: DataTypes.INTEGER,
+          defaultValue: 100,
+        },
+        { transaction }
+      );
+      await queryInterface.addColumn(
+        'TowerStatistics',
+        'perks',
+        {
+          type: DataTypes.INTEGER,
+          defaultValue: 0,
+        },
+        { transaction }
+      );
+    });
+  },
+
+  async down({ context: { queryInterface } }: SequelizeContext) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.removeColumn('TowerStatistics', 'lastHealth', { transaction });
+      await queryInterface.removeColumn('TowerStatistics', 'perks', { transaction });
+    });
+  },
+};

src/models/TowerRoundAction.ts

@@ -258,7 +258,7 @@ export async function findRoundAction(
   { raiderId = null, enemyId = null, roundId }: RoundActionKey,
   transaction?: Transaction
 ) {
-  let mutableWhereQuery: OptionalWhereParams = {
+  const mutableWhereQuery: OptionalWhereParams = {
     _towerRoundId: roundId,
   };
   if (raiderId) {

src/models/TowerStatistics.ts

@@ -11,7 +11,8 @@ import {
 
 import { ONE, ZERO } from '../games/consts/global';
 
-import { User, TowerGame, Perk, PerkInventory } from '.';
+import type { Perk, PerkInventory } from '.';
+import { User, TowerGame } from '.';
 
 interface TowerStatisticsAttributes {
   attempts: number;
@@ -142,7 +143,9 @@ export async function updateTowerAsCompleted(
   if (towerStats) {
     const perksNumber = calculatePerkNumber(perks);
     await towerStats.increment({ completed: 1 }, { transaction });
-    towerStats.lastFloorVisited = lastFloorVisited;
+    if (lastFloorVisited >= towerStats.lastFloorVisited) {
+      towerStats.lastFloorVisited = lastFloorVisited;
+    }
     towerStats.perks = perksNumber;
     await towerStats.save({ transaction });
   }
@@ -186,7 +189,9 @@ export async function updateTowerAttempts(
   if (towerStats) {
     const perksNumber = calculatePerkNumber(perks);
     await towerStats.increment({ attempts: 1 }, { transaction });
-    towerStats.lastFloorVisited = lastFloorVisited;
+    if (lastFloorVisited >= towerStats.lastFloorVisited) {
+      towerStats.lastFloorVisited = lastFloorVisited;
+    }
     towerStats.perks = perksNumber;
     await towerStats.save({ transaction });
   }
@@ -195,6 +200,7 @@ export async function updateTowerAttempts(
 export async function updateLastHealth(
   gameId: number,
   userId: number,
+  lastFloorVisited: number,
   lastHealth: number,
   transaction?: Transaction
 ) {
@@ -205,9 +211,7 @@ export async function updateLastHealth(
     },
     transaction,
   });
-  if (towerStats) {
-    console.log('============================================');
-    console.log('Here ', lastHealth);
+  if (towerStats && lastFloorVisited >= towerStats.lastFloorVisited) {
     towerStats.lastHealth = lastHealth;
     await towerStats.save({ transaction });
   }

src/modules/dashboard/admin/adminHandlers/towerAdminHandlers.ts

@@ -77,11 +77,11 @@ type IAddFloorPayload = {
 };
 
 export const addEnemyToFloorHandler: Lifecycle.Method = async (_request, h) => {
-  const floorId = parseInt(_request.params.floorId);
+  const floorNumber = parseInt(_request.params.floorNumber);
   const { payload } = _request;
   const { enemyIds } = payload as IAddEnemiesPayload;
 
-  await addEnemies(floorId, enemyIds);
+  await addEnemies(floorNumber, enemyIds);
 
   return h.response({ success: true }).code(200);
 };

src/modules/dashboard/admin/adminRoutes/towerAdminRoutes.ts

@@ -96,7 +96,7 @@ export const openOrCloseCurrentTowerRoute = {
 
 export const addEnemyToFloorRoute = {
   method: 'POST',
-  path: '/dashboard/admin/floors/{floorId}/addEnemies',
+  path: '/dashboard/admin/floors/{floorNumber}/addEnemies',
   options: {
     description: 'Add ',
     tags: ['api'],

src/modules/slack/slackHandlers.ts

@@ -13,6 +13,7 @@ import { handleTowerBlockAction } from '../../games/tower/actions';
 import { handleTowerAction } from '../../games/tower/actions/towerAction';
 import { theTowerUnfurlLink } from '../../games/tower/utils';
 import { blockKitCompositionImage } from '../../games/utils/generators/slack';
+import { acknowledgeSlackResponse } from '../../utils/slack';
 
 import { slackCommandSwitcher } from './utils';
 
@@ -25,6 +26,10 @@ export const testRouteHandler: Lifecycle.Method = async () => {
 };
 
 export const slackCommandHandler: Lifecycle.Method = async (request, _h) => {
+  // We need to respond to Slack within 3000ms or the action will fail.
+  // So we acknowledge the request and then handle the command asynchronously.
+  void acknowledgeSlackResponse();
+
   const slashCommandPayload: SlackSlashCommandPayload = request.pre.slashCommandPayload;
   slashCommandPayload.command = slashCommandPayload.command?.replace(
     SLACK_COMMAND_STAGING_PREFIX,
@@ -44,6 +49,10 @@ export const slackCommandHandler: Lifecycle.Method = async (request, _h) => {
 };
 
 export const arenaSlackActionHandler: Lifecycle.Method = async (request, _h) => {
+  // We need to respond to Slack within 3000ms or the action will fail.
+  // So we acknowledge the request and then handle the command asynchronously.
+  void acknowledgeSlackResponse();
+
   const slackActionPayload = request.pre.slackActionPayload;
 
   try {
@@ -60,6 +69,10 @@ export const arenaSlackActionHandler: Lifecycle.Method = async (request, _h) =>
 };
 
 export const towerSlackActionHandler: Lifecycle.Method = async (request, _h) => {
+  // We need to respond to Slack within 3000ms or the action will fail.
+  // So we acknowledge the request and then handle the command asynchronously.
+  void acknowledgeSlackResponse();
+
   const slackActionPayload = request.pre.slackActionPayload;
   try {
     switch (slackActionPayload.type) {

src/utils/slack.ts

@@ -33,3 +33,10 @@ export function parseEscapedSlackId(slackUser: string) {
     return slackUser.replace('@', '');
   }
 }
+
+// We need to acknowledge the request to Slack within 3 seconds
+export function acknowledgeSlackResponse() {
+  process.nextTick(() => {
+    return {};
+  });
+}