fix: add expire to raid battle and pokemon search

Author: Mygod

server/src/graphql/typeDefs/map.graphql

@@ -64,19 +64,22 @@ type Search {
   raid_pokemon_costume: Int
   raid_pokemon_evolution: Int
   raid_pokemon_alignment: Int
+  raid_end_timestamp: Int
   pokemon_id: Int
   form: Int
   gender: Int
   costume: Int
   shiny: Int
   iv: Float
+  expire_timestamp: Int
   battle_pokemon_id: Int
   battle_pokemon_form: Int
   battle_pokemon_gender: Int
   battle_pokemon_costume: Int
   # battle_pokemon_evolution: Int
   battle_pokemon_alignment: Int
   battle_pokemon_bread_mode: Int
+  battle_end: Int
 }
 
 type SearchLure {

server/src/models/Gym.js

@@ -528,6 +528,7 @@ class Gym extends Model {
         isMad
           ? 'evolution AS raid_pokemon_evolution'
           : 'raid_pokemon_evolution',
+        isMad ? 'end AS raid_end_timestamp' : 'raid_end_timestamp',
         distance,
       ])
       .whereBetween(isMad ? 'latitude' : 'lat', [bbox.minLat, bbox.maxLat])
@@ -536,11 +537,7 @@ class Gym extends Model {
       .limit(config.getSafe('api.searchResultsLimit'))
       .orderBy('distance')
       .andWhere('raid_pokemon_id', '>', 0)
-      .andWhere(
-        isMad ? 'end' : 'raid_end_timestamp',
-        '>=',
-        isMad ? this.knex().fn.now() : ts,
-      )
+      .andWhere('raid_end_timestamp', '>=', isMad ? this.knex().fn.now() : ts)
     if (isMad) {
       query
         .leftJoin('gymdetails', 'gym.gym_id', 'gymdetails.gym_id')

server/src/models/Pokemon.js

@@ -617,6 +617,7 @@ class Pokemon extends Model {
         'gender',
         'costume',
         raw(IV_CALC).as('iv'),
+        'disappear_time AS expire_timestamp',
       ])
     } else {
       query.select([
@@ -628,6 +629,7 @@ class Pokemon extends Model {
         'gender',
         'iv',
         'shiny',
+        'expire_timestamp',
       ])
     }
     if (!getAreaSql(query, perms.areaRestrictions, onlyAreas, isMad)) {

server/src/models/Station.js

@@ -254,6 +254,7 @@ class Station extends Model {
         'battle_pokemon_gender',
         'battle_pokemon_alignment',
         'battle_pokemon_bread_mode',
+        'battle_end',
       )
     }
 

src/features/search/renderOption.jsx

@@ -162,6 +162,12 @@ export const renderOption = ({ key, ...props }, option) => {
             <Timer expireTime={option.incident_expire_timestamp} />
           ) : searchTab === 'lures' ? (
             <Timer expireTime={option.lure_expire_timestamp} />
+          ) : searchTab === 'raids' ? (
+            <Timer expireTime={option.raid_end_timestamp} />
+          ) : searchTab === 'pokemon' ? (
+            <Timer expireTime={option.expire_timestamp} />
+          ) : searchTab === 'stations' ? (
+            <Timer expireTime={option.battle_end} />
           ) : (
             ''
           )

src/services/queries/search.js

@@ -133,12 +133,12 @@ export const POKEMON = gql`
     ) {
       ...CoreSearch
       pokemon_id
-      pokemon_id
       form
       gender
       costume
       shiny
       iv
+      expire_timestamp
     }
   }
 `
@@ -213,6 +213,7 @@ export const RAIDS = gql`
       raid_pokemon_costume
       raid_pokemon_evolution
       raid_pokemon_alignment
+      raid_end_timestamp
     }
   }
 `
@@ -278,6 +279,7 @@ export const MAX_BATTLES = gql`
       # battle_pokemon_evolution
       battle_pokemon_alignment
       battle_pokemon_bread_mode
+      battle_end
     }
   }
 `