Merge pull request #75 from x-team/develop

Merge TowerStatistics updates

Author: ccmoralesj

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/models/TowerStatistics.ts

@@ -142,7 +142,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 +188,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 +199,7 @@ export async function updateTowerAttempts(
 export async function updateLastHealth(
   gameId: number,
   userId: number,
+  lastFloorVisited: number,
   lastHealth: number,
   transaction?: Transaction
 ) {
@@ -205,9 +210,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'],