Skip to content

Commit

Permalink
fix: Uses columns x and e instead of coordinates
Browse files Browse the repository at this point in the history
  • Loading branch information
cyaiox committed Nov 4, 2024
1 parent ca1d398 commit c0b18e5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/entities/Event/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ export default class EventModel extends Model<DeprecatedEventAttributes> {
}

// Prioritizes "x" && "y" options params over positions
let coordinatesFilter = ""
let positionsFilter = ""
if (
!Number.isFinite(options.x) &&
!Number.isFinite(options.y) &&
options.positions &&
options.positions.length > 0
) {
coordinatesFilter = options.positions
.map((position) => `ARRAY[${position.join(",")}]`)
positionsFilter = options.positions
.map((position) => `(${position.join(",")})`)
.join(",")
}

Expand Down Expand Up @@ -290,8 +290,8 @@ export default class EventModel extends Model<DeprecatedEventAttributes> {
SQL`AND e.x = ${options.x} AND e.y = ${options.y}`
)}
${conditional(
!!coordinatesFilter,
SQL`AND e.coordinates IN (${SQL.raw(coordinatesFilter)})`
!!positionsFilter,
SQL`AND (e.x, e.y) = ANY(Array[${SQL.raw(positionsFilter)}])`
)}
${conditional(
!!options.estate_id,
Expand Down

0 comments on commit c0b18e5

Please sign in to comment.