From aed4548c7b7a76a4a548c90d3242eb3322fced4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Mon, 24 Jul 2023 02:07:37 +0200 Subject: [PATCH] fix select to avoid getting all events as upcoming/recent --- src/Repository/EventRepository.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Repository/EventRepository.php b/src/Repository/EventRepository.php index e1aa287..7e31398 100644 --- a/src/Repository/EventRepository.php +++ b/src/Repository/EventRepository.php @@ -102,7 +102,11 @@ class EventRepository { $select->where(function (Select $select) use ($from, $days) { $select->where('start', '<', (clone $from)->add(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s')); - $select->orWhere('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s')); + $select->where('end', '>', $from->format('Y-m-d H:i:s')); + }); + $select->orWhere(function (Select $select) use ($from, $days) { + $select->where('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s')); + $select->where('start', '<', $from->format('Y-m-d H:i:s')); }); } }