fix select to avoid getting all events as upcoming/recent
All checks were successful
rvr-nextgen/pipeline/pr-master This commit looks good
All checks were successful
rvr-nextgen/pipeline/pr-master This commit looks good
This commit is contained in:
parent
0d6d152b82
commit
aed4548c7b
@ -102,7 +102,11 @@ class EventRepository
|
|||||||
{
|
{
|
||||||
$select->where(function (Select $select) use ($from, $days) {
|
$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->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'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user