Merge pull request #69 from x-team/develop

Merge Hotfix
x-team · Mar 17, 2023 · cb60747 · cb60747
2 parents d420e5e + 8b525ed
commit cb60747
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/models/TowerRoundAction.ts b/src/models/TowerRoundAction.ts
@@ -248,16 +248,29 @@ export async function findAllActionsByRound(roundId: number, transaction: Transa
   });
 }
 
+interface OptionalWhereParams {
+  _towerRaiderId?: number;
+  _towerFloorBattlefieldEnemyId?: number;
+  _towerRoundId: number;
+}
+
 export async function findRoundAction(
   { raiderId = null, enemyId = null, roundId }: RoundActionKey,
   transaction?: Transaction
 ) {
+  let mutableWhereQuery: OptionalWhereParams = {
+    _towerRoundId: roundId,
+  };
+  if (raiderId) {
+    mutableWhereQuery['_towerRaiderId'] = raiderId;
+  }
+
+  if (enemyId) {
+    mutableWhereQuery['_towerFloorBattlefieldEnemyId'] = enemyId;
+  }
+
   return TowerRoundAction.findOne({
-    where: {
-      _towerRaiderId: raiderId ?? undefined,
-      _towerFloorBattlefieldEnemyId: enemyId ?? undefined,
-      _towerRoundId: roundId ?? undefined,
-    },
+    where: mutableWhereQuery as WhereOptions<TowerRoundActionAttributes>,
     transaction,
   });
 }