From 90febac049f8e61f73e883a8e8a0cc7a32bdcc7c Mon Sep 17 00:00:00 2001 From: Philipp Halle Date: Mon, 28 Oct 2024 11:08:02 +0100 Subject: [PATCH 1/2] [BUGFIX] Fix constraints to hide completed projects --- Classes/Domain/Repository/ProjectRepository.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Classes/Domain/Repository/ProjectRepository.php b/Classes/Domain/Repository/ProjectRepository.php index 2024d1e..5dd4e26 100644 --- a/Classes/Domain/Repository/ProjectRepository.php +++ b/Classes/Domain/Repository/ProjectRepository.php @@ -42,7 +42,10 @@ public function findByDemand(ProjectDemand $demand): QueryResult } if ($demand->getHideCompletedProjects() === true) { - $constraints[] = $query->lessThan('txAcademicprojectsEndDate', new DateTime()); + $constraints[] = $query->logicalOr( + $query->equals('txAcademicprojectsEndDate', 0), + $query->greaterThan('txAcademicprojectsEndDate', new DateTime()) + ); } $query->matching( From b887ead18db890b93e59a1cf0ca654ce3300725c Mon Sep 17 00:00:00 2001 From: Philipp Halle Date: Tue, 29 Oct 2024 13:37:34 +0100 Subject: [PATCH 2/2] [TASK] Fix PHPStan error in query constraints --- Classes/Domain/Repository/ProjectRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/Domain/Repository/ProjectRepository.php b/Classes/Domain/Repository/ProjectRepository.php index 5dd4e26..1332882 100644 --- a/Classes/Domain/Repository/ProjectRepository.php +++ b/Classes/Domain/Repository/ProjectRepository.php @@ -42,10 +42,10 @@ public function findByDemand(ProjectDemand $demand): QueryResult } if ($demand->getHideCompletedProjects() === true) { - $constraints[] = $query->logicalOr( + $constraints[] = $query->logicalOr([ $query->equals('txAcademicprojectsEndDate', 0), $query->greaterThan('txAcademicprojectsEndDate', new DateTime()) - ); + ]); } $query->matching(