LP#1823983: repeat_delay check removes event definition id filter

This bug has existed since the repeat_delay feature was added, but likely only
rarely was triggered because most events don't have a repeat_delay, and those
that do don't interact with the same target.  However, as more repeatable event
definitions are created, inappropriate interaction becomes more likely.

In this commit we avoid overwriting the whole join condition clause, which
already contains an event definition id filter and needs to retain it.

Included is an unrelated change that uses the new-ish form of
interval_to_seconds that avoids DST boundary shifting issues by passing a
context DateTime object as the second parameter.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger.pm
index 9027beb..0d9586e 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger.pm
@@ -479,9 +479,9 @@ sub create_batch_events {
             }
         }};
         if ($def->repeat_delay) {
-            $join->{'join'}{atev}{filter} = { start_time => {
-                '>' => DateTime->now->subtract( seconds => interval_to_seconds($def->repeat_delay) )->strftime( '%F %T%z' )
-            } };
+            $join->{'join'}{atev}{filter}{start_time} = {
+                '>' => DateTime->now->subtract( seconds => interval_to_seconds($def->repeat_delay, DateTime->now) )->strftime( '%F %T%z' )
+            };
         }
 
         push @{ $filter->{'-and'} }, { '+atev' => { id => undef } };