BW-681 #comment code suggestions

milansar · Jan 30, 2020 · 998df4b · 998df4b
1 parent 55f55b4
commit 998df4b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/functions/controllers/scheduler.controller.ts b/functions/controllers/scheduler.controller.ts
@@ -142,12 +142,12 @@ export class SchedulerController {
         }
     }
 
-    /* checkGameInvitationExpire
+    /* checkGameInvitationIsExpired
     * return status
     */
-   static async checkGameInvitationExpire(req, res) {
+   static async checkGameInvitationIsExpired(req, res) {
         try {
-            await GameMechanics.checkGameInvitationExpire();
+            await GameMechanics.checkGameInvitationIsExpired();
             Utils.sendResponse(res, interceptorConstants.SUCCESS,
                 ResponseMessagesConstants.SCHEDULER_CHECK_GAME_INVITATION_EXPIRE_IS_COMPLETED);
         } catch (error) {

diff --git a/functions/routes/scheduler-routes.ts b/functions/routes/scheduler-routes.ts
@@ -39,7 +39,7 @@ class SchedulerRoutes {
 
         //  '/game-invitation-expire'
         this.schedulerRoutes.post(`/${RoutesConstants.GAME_DASH_INVITATION_DASH_EXPIRE}`,
-        AuthMiddleware.authTokenOnly, SchedulerController.checkGameInvitationExpire);
+        AuthMiddleware.authTokenOnly, SchedulerController.checkGameInvitationIsExpired);
 
     }
 }

diff --git a/functions/services/game.service.ts b/functions/services/game.service.ts
@@ -167,10 +167,10 @@ export class GameService {
     }
 
     /**
-     * GetAllLaggedGames
+     * getAllGameForReminder
      * return status
      */
-    static async getAllLaggedGames(timeStamp: number, type: string, gameStatus = []): Promise<any> {
+    static async getAllGameForReminder(timeStamp: number, type: string, gameStatus = []): Promise<any> {
         try {
             if (gameStatus.length > 0) {
                 return GameService.getGames(
@@ -202,13 +202,13 @@ export class GameService {
      * GetAllExpiredGames
      * return status
      */
-    static async getAllExpiredGames(timeStamp: number, type: string[]): Promise<any> {
+    static async getAllExpiredGames(timeStamp: number, gameStatus: string[]): Promise<any> {
         try {
             return GameService.getGames(
                 await GameService.gameFireStoreClient
                     .collection(`/${CollectionConstants.GAMES}`)
                     .where(GameConstants.GAME_OVER, GeneralConstants.DOUBLE_EQUAL, false)
-                    .where(GameConstants.GAME_STATUS , GeneralConstants.IN , type)
+                    .where(GameConstants.GAME_STATUS , GeneralConstants.IN , gameStatus)
                     .where(GameConstants.TURN_AT, GeneralConstants.LESS_THAN_OR_EQUAL, timeStamp)
                     .get()
                 );

diff --git a/functions/utils/game-mechanics.ts b/functions/utils/game-mechanics.ts
@@ -97,7 +97,7 @@ export class GameMechanics {
     }
 
 
-    static async checkGameInvitationExpire(): Promise<boolean> {
+    static async checkGameInvitationIsExpired(): Promise<boolean> {
         try {
             const millis = Utils.getUTCTimeStamp();
             const noPlayTime = (CalenderConstants.HOURS_CALCULATIONS * schedulerConstants.gameInvitationDuration);
@@ -139,7 +139,7 @@ export class GameMechanics {
             const millis = Utils.getUTCTimeStamp();
             const noPlayTime = (CalenderConstants.HOURS_CALCULATIONS * schedulerConstants.gamePlayLagDuration);
             const notificationDuration = millis - ( noPlayTime -  (timeBefore * 60 * 1000));
-            const games: Game[] = await GameService.getAllLaggedGames(notificationDuration, type, gameStatus);
+            const games: Game[] = await GameService.getAllGameForReminder(notificationDuration, type, gameStatus);
             for (const game of games) {
                 if (game.gameId) {
                     PushNotification.sendGamePlayPushNotifications(game,