System Admin: ensure users with no End Date and no recent timestamp a…

…re not scrubbed in Data Retention
GibbonEdu · Feb 5, 2025 · 2b099a1 · 2b099a1
1 parent 948fbfd
commit 2b099a1
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Domain/Traits/ScrubByPerson.php b/src/Domain/Traits/ScrubByPerson.php
@@ -53,8 +53,7 @@ public function getScrubbableRecords(string $cutoffDate, array $context = []) :
 
         // Only get users whose dateEnd is before the cutoff, falling back to using the lastTimestamp
         $query->where('((gibbonPerson.dateEnd IS NOT NULL AND gibbonPerson.dateEnd < :cutoffDate) 
-            OR (gibbonPerson.dateEnd IS NULL AND gibbonPerson.lastTimestamp IS NOT NULL AND gibbonPerson.lastTimestamp < :cutoffDate) 
-            OR (gibbonPerson.dateEnd IS NULL AND gibbonPerson.lastTimestamp IS NULL))')
+            OR (gibbonPerson.dateEnd IS NULL AND gibbonPerson.lastTimestamp IS NOT NULL AND gibbonPerson.lastTimestamp < :cutoffDate))')
             ->bindValue('cutoffDate', $cutoffDate);
 
         return $this->runSelect($query)->fetchGroupedUnique();