Anchor batch action dtstart to midnight (#663)

Author: skomorokh

broker/patron_request/service/statemodels/state-models.json

@@ -700,7 +700,7 @@
       "actionName": "email-pullslips",
       "title": "Email pull slips ready to ship",
       "batchQuery": "side = lending and state = WILL_SUPPLY",
-      "schedule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR;BYHOUR=6;BYMINUTE=0;BYSECOND=0",
+      "schedule": "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR;BYHOUR=6;BYMINUTE=0",
       "actionParams": {
         "to": [
           "staff@example.com"
@@ -724,7 +724,7 @@
       "actionName": "request-aging",
       "title": "Request aging of rush requests",
       "batchQuery": "(state = VALIDATED or state = WILL_SUPPLY or state = CONDITION_PENDING or state = NEEDS_REVIEW) and service_level = Rush",
-      "schedule": "FREQ=HOURLY;BYMINUTE=0;BYSECOND=0",
+      "schedule": "FREQ=HOURLY;BYMINUTE=0",
       "actionParams": {
         "interval": "24h"
       }
@@ -733,7 +733,7 @@
       "actionName": "request-aging",
       "title": "Request aging of all requests",
       "batchQuery": "state = VALIDATED or state = WILL_SUPPLY or state = CONDITION_PENDING or state = NEEDS_REVIEW",
-      "schedule": "FREQ=DAILY;BYHOUR=5;BYMINUTE=0;BYSECOND=0",
+      "schedule": "FREQ=DAILY;BYHOUR=5;BYMINUTE=0",
       "actionParams": {
         "interval": "72h"
       }

broker/scheduler/api/api_handler_test.go

@@ -233,15 +233,17 @@ func TestPostBatchActions_OK(t *testing.T) {
 	repo.AssertExpectations(t)
 }
 
-func TestPostBatchActions_ValidDailySchedule_ComputesDynamicRunAt(t *testing.T) {
+func TestPostBatchActions_ValidDailySchedule_ComputesMidnightRunAt(t *testing.T) {
 	repo := new(MockSchedRepo)
 	before := time.Now().UTC()
 
 	repo.On("SaveScheduledTask", mock.MatchedBy(func(p sched_db.SaveScheduledTaskParams) bool {
+		runAt := p.RunAt.Time
 		return p.Schedule == "FREQ=DAILY" &&
 			p.RunAt.Valid &&
-			p.RunAt.Time.After(before.Add(23*time.Hour)) &&
-			p.RunAt.Time.Before(before.Add(25*time.Hour))
+			runAt.After(before) &&
+			!runAt.After(before.Add(24*time.Hour+time.Second)) &&
+			runAt.Equal(runAt.UTC().Truncate(24*time.Hour))
 	})).Return(saveScheduledTaskReturn, nil)
 
 	h := newHandler(repo)

broker/scheduler/service/scheduler.go

@@ -286,7 +286,9 @@ func nextScheduleTimeAt(schedule string, now time.Time) (pgtype.Timestamptz, err
 	if err != nil {
 		return pgtype.Timestamptz{}, fmt.Errorf("invalid rrule string %q: %w", schedule, err)
 	}
-	options.Dtstart = now
+	// Anchor at today's UTC midnight so omitted time components inherit zero and
+	// interval rules have a deterministic daily phase.
+	options.Dtstart = now.Truncate(24 * time.Hour)
 
 	rule, err := rrule.NewRRule(*options)
 	if err != nil {

broker/scheduler/service/scheduler_test.go

@@ -117,30 +117,55 @@ func TestNextScheduleTime_SpecificSchedule(t *testing.T) {
 	assert.True(t, ts.Time.After(time.Now()))
 }
 
-func TestNextScheduleTime_UsesDynamicDTStartDefaults(t *testing.T) {
+func TestNextScheduleTime_MidnightAnchoredDefaults(t *testing.T) {
 	tests := []struct {
 		name     string
 		schedule string
 		now      time.Time
 		expected time.Time
 	}{
 		{
-			name:     "daily defaults to current time of day",
+			name:     "daily defaults to midnight",
 			schedule: "FREQ=DAILY",
 			now:      time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC),
-			expected: time.Date(2026, 1, 3, 3, 4, 5, 0, time.UTC),
+			expected: time.Date(2026, 1, 3, 0, 0, 0, 0, time.UTC),
 		},
 		{
-			name:     "weekly defaults to current weekday and time",
+			name:     "weekly defaults to anchor weekday at midnight",
 			schedule: "FREQ=WEEKLY",
 			now:      time.Date(2026, 1, 7, 10, 11, 12, 0, time.UTC),
-			expected: time.Date(2026, 1, 14, 10, 11, 12, 0, time.UTC),
+			expected: time.Date(2026, 1, 14, 0, 0, 0, 0, time.UTC),
 		},
 		{
-			name:     "monthly defaults to current day of month and time",
+			name:     "monthly defaults to anchor day at midnight",
 			schedule: "FREQ=MONTHLY",
 			now:      time.Date(2026, 1, 15, 8, 30, 0, 0, time.UTC),
-			expected: time.Date(2026, 2, 15, 8, 30, 0, 0, time.UTC),
+			expected: time.Date(2026, 2, 15, 0, 0, 0, 0, time.UTC),
+		},
+		{
+			name:     "minutely interval has a midnight-aligned phase",
+			schedule: "FREQ=MINUTELY;INTERVAL=15",
+			now:      time.Date(2026, 1, 2, 10, 7, 44, 0, time.UTC),
+			expected: time.Date(2026, 1, 2, 10, 15, 0, 0, time.UTC),
+		},
+		{
+			name:     "hourly defaults minute and second to zero",
+			schedule: "FREQ=HOURLY",
+			now:      time.Date(2026, 1, 2, 10, 7, 44, 0, time.UTC),
+			expected: time.Date(2026, 1, 2, 11, 0, 0, 0, time.UTC),
+		},
+		{
+			name:     "explicit minute overrides the anchor default",
+			schedule: "FREQ=HOURLY;BYMINUTE=30",
+			now:      time.Date(2026, 1, 2, 10, 7, 44, 0, time.UTC),
+			expected: time.Date(2026, 1, 2, 10, 30, 0, 0, time.UTC),
+		},
+		{
+			name:     "calendar rule inherits a zero second",
+			schedule: "FREQ=WEEKLY;BYDAY=MO;BYHOUR=9;BYMINUTE=0",
+			// Monday 08:59:45 — next run is 09:00:00 sharp, not 09:00:45.
+			now:      time.Date(2026, 1, 12, 8, 59, 45, 0, time.UTC),
+			expected: time.Date(2026, 1, 12, 9, 0, 0, 0, time.UTC),
 		},
 	}
 

misc/state-models.yaml

@@ -476,7 +476,7 @@ batchActionDefaults:
   - actionName: email-pullslips
     title: Email pull slips ready to ship
     batchQuery: side = lending and state = WILL_SUPPLY
-    schedule: "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR;BYHOUR=6;BYMINUTE=0;BYSECOND=0"
+    schedule: "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR;BYHOUR=6;BYMINUTE=0"
     actionParams:
       to:
         - staff@example.com
@@ -495,14 +495,14 @@ batchActionDefaults:
   - actionName: request-aging
     title: Request aging of rush requests
     batchQuery: "(state = VALIDATED or state = WILL_SUPPLY or state = CONDITION_PENDING or state = NEEDS_REVIEW) and service_level = Rush"
-    schedule: "FREQ=HOURLY;BYMINUTE=0;BYSECOND=0"
+    schedule: "FREQ=HOURLY;BYMINUTE=0"
     actionParams:
       interval: 24h
 
   - actionName: request-aging
     title: Request aging of all requests
     batchQuery: state = VALIDATED or state = WILL_SUPPLY or state = CONDITION_PENDING or state = NEEDS_REVIEW
-    schedule: "FREQ=DAILY;BYHOUR=5;BYMINUTE=0;BYSECOND=0"
+    schedule: "FREQ=DAILY;BYHOUR=5;BYMINUTE=0"
     actionParams:
       interval: 72h