Skip to content

Support MAD Layer Column #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Support MAD Layer Column #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions server/src/models/Pokestop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ module.exports = class Pokestop extends Model {
hasMultiInvasions,
multiInvasionMs,
hasRewardAmount,
hasLayerColumn,
},
) {
const {
Expand Down Expand Up @@ -110,6 +111,9 @@ module.exports = class Pokestop extends Model {
'incident_expire_timestamp',
),
])
if (hasLayerColumn) {
query.select('layer AS with_ar')
}
if (hideOldPokestops) {
query.whereRaw(
`UNIX_TIMESTAMP(last_updated) > ${
Expand Down
6 changes: 6 additions & 0 deletions server/src/services/DbCheck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ module.exports = class DbCheck {
'quest_reward_amount' in columns || isMad,
'alternative_quest_type' in columns,
])
const [hasLayerColumn] = isMad
? await schema('trs_quest')
.columnInfo()
.then((columns) => ['layer' in columns])
: [false]
const [hasMultiInvasions, multiInvasionMs] = await schema('incident')
.columnInfo()
.then((columns) => [
Expand All @@ -108,6 +113,7 @@ module.exports = class DbCheck {
this.models[category][j].hasMultiInvasions = hasMultiInvasions
this.models[category][j].multiInvasionMs = multiInvasionMs
this.models[category][j].availableSlotsCol = availableSlotsCol
this.models[category][j].hasLayerColumn = hasLayerColumn
}
})
})
Expand Down