Update Station.js

Author: kamieniarz

server/src/models/Station.js

@@ -55,14 +55,14 @@ class Station extends Model {
         maxLon: args.maxLon,
       },
     })
-    if (!(onlyAllStations && onlyInactiveStations)) {
+    if (!onlyAllStations || !onlyInactiveStations) {
       query.andWhere('end_time', onlyInactiveStations ? '<' : '>', ts)
     }
     if (!onlyInactiveStations && !onlyAllStations) {
       query.andWhere(
         'updated',
         '>',
-        Date.now() / 1000 - stationUpdateLimit * 60 * 60,
+        Date.now() / 1000 - stationUpdateLimit * 60 * 60
       )
     }
     // .where('is_inactive', false)
@@ -81,17 +81,19 @@ class Station extends Model {
         'battle_pokemon_bread_mode',
         'battle_pokemon_move_1',
         'battle_pokemon_move_2',
-        'total_stationed_pokemon',
+        'total_stationed_pokemon'
       )
       select.push(
-        hasStationedGmax ? 'total_stationed_gmax' : 'stationed_pokemon',
+        hasStationedGmax ? 'total_stationed_gmax' : 'stationed_pokemon'
       )
 
       if (!onlyAllStations) {
-        query.whereNotNull('battle_pokemon_id').andWhere('battle_end', '>', ts)
+        query
+          .whereNotNull('battle_pokemon_id')
+          .andWhere('battle_end', '>', ts)
 
         query.andWhere((station) => {
-          if (hasStationedGmax || !onlyGmaxStationed)
+          if (hasStationedGmax || !onlyGmaxStationed) {
             station.where((battle) => {
               if (onlyBattleTier === 'all') {
                 const battleBosses = new Set()
@@ -105,13 +107,11 @@ class Station extends Model {
                     case 'j':
                       battleLevels.add(key.slice(1))
                       break
-                    default:
-                      {
-                        const [id, form] = key.split('-')
-                        if (id) battleBosses.add(id)
-                        if (form) battleForms.add(form)
-                      }
-                      break
+                    default: {
+                      const [id, form] = key.split('-')
+                      if (id) battleBosses.add(id)
+                      if (form) battleForms.add(form)
+                    }
                   }
                 })
                 if (battleBosses.size) {
@@ -127,8 +127,10 @@ class Station extends Model {
                 battle.andWhere('battle_level', onlyBattleTier)
               }
             })
-          if (hasStationedGmax && onlyGmaxStationed)
+          }
+          if (hasStationedGmax && onlyGmaxStationed) {
             station.orWhere('total_stationed_gmax', '>', 0)
+          }
         })
       }
     }
@@ -176,7 +178,7 @@ class Station extends Model {
                     `${station.battle_pokemon_id}-${station.battle_pokemon_form}`
                   ]
                 : onlyBattleTier === station.battle_level)) ||
-              (onlyGmaxStationed && station.total_stationed_gmax))),
+              (onlyGmaxStationed && station.total_stationed_gmax)))
       )
   }
 
@@ -219,9 +221,9 @@ class Station extends Model {
       .andWhere(
         'updated',
         '>',
-        Date.now() / 1000 - stationUpdateLimit * 60 * 60,
+        Date.now() / 1000 - stationUpdateLimit * 60 * 60
       )
-      .groupBy(['battle_pokemon_id', 'battle_pokemon_form', 'battle_level'])
+    .groupBy(['battle_pokemon_id', 'battle_pokemon_form', 'battle_level'])
       .orderBy('battle_pokemon_id', 'asc')
     return {
       available: [
@@ -231,7 +233,7 @@ class Station extends Model {
             .flatMap((station) => [
               `${station.battle_pokemon_id}-${station.battle_pokemon_form}`,
               `j${station.battle_level}`,
-            ]),
+            ])
         ),
       ],
     }
@@ -281,7 +283,7 @@ class Station extends Model {
       .andWhere(
         'updated',
         '>',
-        Date.now() / 1000 - stationUpdateLimit * 60 * 60,
+        Date.now() / 1000 - stationUpdateLimit * 60 * 60
       )
       .andWhere('end_time', '>', ts)
       .andWhere((builder) => {