hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle events with no physical location

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2022-10-03 19:26:35 +02:00
parent 4f1465e84d
commit f0c8fa2525
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mobilizon/events/events.ex
View File

@@ -1691,11 +1691,12 @@ defmodule Mobilizon.Events do
def related_events(%Event{
id: event_id,
tags: tags,
physical_address: %Address{geom: geom},
physical_address: physical_address,
category: category,
language: language
}) do
event_tags_ids = Enum.map(tags, & &1.id)
geom = if is_nil(physical_address), do: nil, else: physical_address.geom
Event
|> distinct([e], e.id)
@@ -1704,14 +1705,14 @@ defmodule Mobilizon.Events do
|> where(
[e, et, a],
fragment(
"(? = ?)::int * 5 + (? = ALL(?))::int * 2 + (? = ?)::int + (? is null or ST_DWithin(?::geography, ?::geography, ?::float))::int * 2 > ?",
"(? = ?)::int * 5 + (? = ALL(?))::int * 2 + (? = ?)::int + (?::geography is null or ST_DWithin(?::geography, ?::geography, ?::float))::int * 2 > ?",
e.language,
^language,
et.tag_id,
^event_tags_ids,
e.category,
^category,
a.geom,
^geom,
^geom,
a.geom,
5000,
@@ -1723,14 +1724,14 @@ defmodule Mobilizon.Events do
|> order_by(
[e, et, a],
fragment(
"(? = ?)::int * 5 + (? = ALL(?))::int * 2 + (? = ?)::int + (? is null or ST_DWithin(?::geography, ?::geography, ?::float))::int * 2 DESC",
"(? = ?)::int * 5 + (? = ALL(?))::int * 2 + (? = ?)::int + (?::geography is null or ST_DWithin(?::geography, ?::geography, ?::float))::int * 2 DESC",
e.language,
^language,
et.tag_id,
^event_tags_ids,
e.category,
^category,
a.geom,
^geom,
^geom,
a.geom,
5000