From e6f9e94b08a1691720b8f2d3e29a394234609c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 26 Feb 2025 16:43:01 +0100 Subject: [PATCH] fix: ignore called off and deleted assignments when sending reminders --- src/Service/Cron/DispositionReminderService.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Service/Cron/DispositionReminderService.php b/src/Service/Cron/DispositionReminderService.php index 55d7d3b..c553cef 100644 --- a/src/Service/Cron/DispositionReminderService.php +++ b/src/Service/Cron/DispositionReminderService.php @@ -3,6 +3,7 @@ namespace App\Service\Cron; use App\Email\Mailer; +use App\Entity\Assignment; use App\Entity\Disposition; use App\Entity\Upload; use App\Repository\DispositionRepository; @@ -30,12 +31,14 @@ class DispositionReminderService ->innerJoin('assignment.destination', 'destination') ->innerJoin('disposition.documents', 'document', Join::WITH, 'document.type = :documentType') ->where($qb->expr()->andX( + $qb->expr()->notIn('assignment.status', ':statusAssignment'), $qb->expr()->eq('destination.dateFrom', ':dateFrom'), - $qb->expr()->eq('document.status', ':status') + $qb->expr()->eq('document.status', ':statusContract'), )) ->setParameter('documentType', Upload::TYPE_CONTRACT) + ->setParameter('statusAssignment', [Assignment::STATUS_DELETED, Assignment::STATUS_CALLED_OFF]) ->setParameter('dateFrom', $dateFrom->format('Y-m-d')) - ->setParameter('status', Upload::STATUS_CHECKED) + ->setParameter('statusContract', Upload::STATUS_CHECKED) ->getQuery() ->getResult() ; @@ -68,4 +71,4 @@ class DispositionReminderService return $message; } -} \ No newline at end of file +}