Fix reminders select query statement; closes #1614

galette · Dec 2, 2023 · 0c856ed · 0c856ed
1 parent 402e9e7
commit 0c856ed
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/galette/lib/Galette/Repository/Reminders.php b/galette/lib/Galette/Repository/Reminders.php
@@ -119,8 +119,8 @@ private function loadToRemind(Db $zdb, $type, $nomail = false)
             array('r' => PREFIX_DB . self::TABLE),
             'a.' . Members::PK . '=r.reminder_dest',
             array(
-                'last_reminder' => new Expression('MAX(reminder_date)'),
-                'reminder_type' => new Expression('MAX(reminder_type)')
+                'last_reminder' => 'reminder_date',
+                'reminder_type' => 'reminder_type'
             ),
             $select::JOIN_LEFT
         )->join(
@@ -142,7 +142,8 @@ private function loadToRemind(Db $zdb, $type, $nomail = false)
         }
 
         $select->where('a.activite_adh=true')
-            ->where('a.bool_exempt_adh=false');
+            ->where('a.bool_exempt_adh=false')
+            ->where('a.date_echeance IS NOT NULL');
 
         $now = new \DateTime();
         $due_date = clone $now;
@@ -152,6 +153,7 @@ private function loadToRemind(Db $zdb, $type, $nomail = false)
                 'a.date_echeance',
                 $now->format('Y-m-d')
             );
+            $select->where('r.reminder_date = (SELECT MAX(reminder_date) FROM devel_reminders WHERE reminder_dest = a.id_adh AND reminder_type = 2)');
         } else {
             $select->where->greaterThanOrEqualTo(
                 'a.date_echeance',
@@ -160,6 +162,7 @@ private function loadToRemind(Db $zdb, $type, $nomail = false)
                 'a.date_echeance',
                 $due_date->format('Y-m-d')
             );
+            $select->where('r.reminder_date = (SELECT MAX(reminder_date) FROM devel_reminders WHERE reminder_dest = a.id_adh AND reminder_type = 1)');
         }
 
         $select->group('a.id_adh');