From f071f70d1f16dd21bc087372a8237ae6e2abcd27 Mon Sep 17 00:00:00 2001 From: setop Date: Mon, 2 May 2022 06:48:15 +0000 Subject: [PATCH] include ongoing events in search --- lib/mobilizon/events/events.ex | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index ba01ed23a..333a94b09 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -1296,7 +1296,12 @@ defmodule Mobilizon.Events do if is_nil(begins_on) do query else - where(query, [q], q.begins_on >= ^begins_on) + where( + query, + [q], + (not is_nil(q.ends_on) and q.ends_on > ^begins_on) or + (is_nil(q.ends_on) and q.begins_on >= ^begins_on) + ) end end