Allow auto-schedule for different times on different days

Author: Eddasol

backend/api.test/Database/DatabaseUtilities.cs

@@ -167,8 +167,7 @@ public async Task<MissionDefinition> NewMissionDefinition(
                 LastSuccessfulRun = lastSuccessfulRun,
                 AutoScheduleFrequency = new AutoScheduleFrequency
                 {
-                    TimesOfDayCET = [timeOfDay],
-                    DaysOfWeek = [dateNow.DayOfWeek],
+                    SchedulingTimesCETperWeek = [new TimeAndDay(dateNow.DayOfWeek, timeOfDay)],
                 },
             };
 

backend/api/Controllers/MissionDefinitionController.cs

@@ -162,23 +162,20 @@ [FromBody] UpdateMissionDefinitionQuery missionDefinitionQuery
                 return BadRequest("Name cannot be null.");
             }
 
-            try
-            {
-                missionDefinitionQuery.AutoScheduleFrequency?.ValidateAutoScheduleFrequency();
-            }
-            catch (ArgumentException e)
-            {
-                return BadRequest(e.Message);
-            }
-
             missionDefinition.Name = missionDefinitionQuery.Name;
             missionDefinition.Comment = missionDefinitionQuery.Comment;
             missionDefinition.InspectionFrequency = missionDefinitionQuery.InspectionFrequency;
-            missionDefinition.AutoScheduleFrequency =
-                await autoScheduleService.UpdateAutoScheduleFrequency(
-                    missionDefinition,
-                    missionDefinitionQuery.AutoScheduleFrequency
-                );
+            if (missionDefinitionQuery.SchedulingTimesCETperWeek != null)
+            {
+                var schedulingTimesCETperWeek = missionDefinitionQuery
+                    .SchedulingTimesCETperWeek.Select(s => new TimeAndDay(s.DayOfWeek, s.TimeOfDay))
+                    .ToList();
+                missionDefinition.AutoScheduleFrequency =
+                    await autoScheduleService.UpdateAutoScheduleFrequency(
+                        missionDefinition,
+                        schedulingTimesCETperWeek
+                    );
+            }
 
             var newMissionDefinition = await missionDefinitionService.Update(missionDefinition);
             return new MissionDefinitionResponse(newMissionDefinition);

backend/api/Controllers/Models/UpdateMissionDefinitionQuery.cs

@@ -21,8 +21,22 @@ public struct UpdateMissionDefinitionQuery
 
         /// <summary>
         /// Change the time and day in the automated scheduling frequency
+        /// Will be unchanged if null. Use an empty list to remove all scheduled times.
         /// </summary>
-        public AutoScheduleFrequency? AutoScheduleFrequency { get; set; }
+        public IList<TimeAndDayQuery>? SchedulingTimesCETperWeek { get; set; }
+    }
+
+    public struct TimeAndDayQuery
+    {
+        /// <summary>
+        /// The day of the week to schedule the mission
+        /// </summary>
+        public DayOfWeek DayOfWeek { get; set; }
+
+        /// <summary>
+        /// The time of day to schedule the mission
+        /// </summary>
+        public TimeOnly TimeOfDay { get; set; }
     }
 
     public struct SkipAutoMissionQuery

backend/api/Database/Context/FlotillaDbContext.cs

@@ -69,8 +69,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .Entity<MissionDefinition>()
                 .Property(m => m.InspectionFrequency)
                 .HasConversion(new TimeSpanToTicksConverter());
-
-            modelBuilder.Entity<MissionDefinition>().OwnsOne(m => m.AutoScheduleFrequency);
             modelBuilder
                 .Entity<MissionDefinition>()
                 .HasOne(m => m.InspectionArea)

backend/api/Database/Models/AutoScheduleFrequency.cs

@@ -6,38 +6,20 @@
 #pragma warning disable CS8618
 namespace Api.Database.Models
 {
-    [Owned]
     public class AutoScheduleFrequency
     {
-        [Required]
-        // In Central European Time
-        public IList<TimeOnly> TimesOfDayCET { get; set; } = new List<TimeOnly>();
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public string Id { get; set; }
 
         [Required]
-        public IList<DayOfWeek> DaysOfWeek { get; set; } = new List<DayOfWeek>();
+        public IList<TimeAndDay> SchedulingTimesCETperWeek { get; set; } = new List<TimeAndDay>();
 
         public string? AutoScheduledJobs { get; set; }
 
         public bool HasValidValue()
         {
-            return TimesOfDayCET.Count != 0 && DaysOfWeek.Count != 0;
-        }
-
-        public void ValidateAutoScheduleFrequency()
-        {
-            if (TimesOfDayCET.Count == 0)
-            {
-                throw new ArgumentException(
-                    "AutoScheduleFrequency must have at least one time of day"
-                );
-            }
-
-            if (DaysOfWeek.Count == 0)
-            {
-                throw new ArgumentException(
-                    "AutoScheduleFrequency must have at least one day of week"
-                );
-            }
+            return SchedulingTimesCETperWeek.Count != 0;
         }
 
         public IList<(TimeSpan, TimeOnly)>? GetSchedulingTimesUntilMidnight()
@@ -51,15 +33,31 @@ public void ValidateAutoScheduleFrequency()
 
             var autoScheduleNext = new List<(TimeSpan, TimeOnly)>();
 
-            if (DaysOfWeek.Contains(nowLocal.DayOfWeek))
-            {
-                autoScheduleNext.AddRange(
-                    TimesOfDayCET
-                        .Where(time => time >= nowLocalTimeOnly)
-                        .Select(time => (time - nowLocalTimeOnly, time))
-                );
-            }
+            autoScheduleNext.AddRange(
+                SchedulingTimesCETperWeek
+                    .Where(schedulingTime => schedulingTime.DayOfWeek == nowLocal.DayOfWeek)
+                    .Where(schedulingTime => schedulingTime.TimeOfDay > nowLocalTimeOnly)
+                    .Select(schedulingTime =>
+                        (schedulingTime.TimeOfDay - nowLocalTimeOnly, schedulingTime.TimeOfDay)
+                    )
+            );
             return autoScheduleNext.Count > 0 ? autoScheduleNext : null;
         }
     }
+
+    [Owned]
+    public class TimeAndDay
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public string Id { get; set; }
+        public DayOfWeek DayOfWeek { get; set; }
+        public TimeOnly TimeOfDay { get; set; }
+
+        public TimeAndDay(DayOfWeek dayOfWeek, TimeOnly timeOfDay)
+        {
+            DayOfWeek = dayOfWeek;
+            TimeOfDay = timeOfDay;
+        }
+    }
 }