Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/types/lib/scanner.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@ export interface PokemonDisplay {
location_card: number
}

export interface Defender extends PokemonDisplay {
pokemon_id: number
deployed_ms: number
deployed_time: number
battles_won: number
battles_lost: number
times_fed: number
motivation_now: number
cp_when_deployed: number
cp_now: number
}

export interface Gym {
id: string
lat: number
Expand All @@ -54,6 +66,7 @@ export interface Gym {
updated: number
guarding_pokemon_id: number
guarding_pokemon_display: PokemonDisplay
defenders: Defender[]
available_slots: number
team_id: number
raid_level: number
Expand Down
1 change: 1 addition & 0 deletions server/src/graphql/typeDefs/scanner.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type Gym {
updated: Int
guarding_pokemon_id: Int
guarding_pokemon_display: JSON
defenders: JSON
available_slots: Int
team_id: Int
raid_level: Int
Expand Down
4 changes: 4 additions & 0 deletions server/src/models/Gym.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const gymFields = [
'in_battle',
'guarding_pokemon_id',
'guarding_pokemon_display',
'defenders',
'total_cp',
'power_up_points',
'power_up_level',
Expand Down Expand Up @@ -309,6 +310,9 @@ class Gym extends Model {
gym.guarding_pokemon_display,
)
}
if (typeof gym.defenders === 'string' && gym.defenders) {
newGym.defenders = JSON.parse(gym.defenders)
}
}
if (
onlyRaids &&
Expand Down
Loading
Loading