From 3286f504179751a57b36befcf6b5527b5e0f70bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Sat, 4 Nov 2023 18:41:49 +0100 Subject: [PATCH] Fix: Exclude already selected availabilities from selectable list --- src/Repository/AvailabilityRepository.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Repository/AvailabilityRepository.php b/src/Repository/AvailabilityRepository.php index 7666551..eb25923 100644 --- a/src/Repository/AvailabilityRepository.php +++ b/src/Repository/AvailabilityRepository.php @@ -47,19 +47,16 @@ class AvailabilityRepository extends ServiceEntityRepository ->leftJoin('availability.teamers', 'teamer') ->where($qb->expr()->andX( $qb->expr()->gt('availability.dateFrom', ':today'), - $qb->expr()->orX( - $qb->expr()->isNull('teamer'), - $qb->expr()->neq('teamer', ':teamer') - ), + $qb->expr()->notIn('availability', ':availabilities'), $qb->expr()->orX( $qb->expr()->isNull('availability.owner'), - $qb->expr()->eq('availability.owner', ':owner') + $qb->expr()->eq('availability.owner', ':teamer') ), $qb->expr()->isNull('availability.deletedAt') )) ->orderBy('availability.dateFrom', 'ASC') ->setParameter('teamer', $teamer) - ->setParameter('owner', $teamer) + ->setParameter('availabilities', $teamer->getAvailabilities()) ->setParameter('today', new \DateTimeImmutable()) ->getQuery() ->getResult()