adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row;

This commit is contained in:
Johann Hoffmann
2026-04-20 11:06:06 +02:00
parent 98a10a2f55
commit 3a646ffe77
@@ -79,10 +79,16 @@ class Paabgabe_model extends DB_Model
JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
JOIN public.tbl_person USING (person_id)
WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
WHERE (
(campus.tbl_paabgabe.insertamum >= CURRENT_DATE - INTERVAL ?
AND campus.tbl_paabgabe.insertamum < CURRENT_DATE
)
OR
(campus.tbl_paabgabe.updateamum >= CURRENT_DATE - INTERVAL ?
AND campus.tbl_paabgabe.updateamum < CURRENT_DATE
)
AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
}
@@ -108,7 +114,8 @@ class Paabgabe_model extends DB_Model
JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL
AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
AND campus.tbl_paabgabe.abgabedatum >= CURRENT_DATE - INTERVAL ?
AND campus.tbl_paabgabe.abgabedatum < CURRENT_DATE";
if($relevantTypes !== null) {
$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";