Drtii 1557 min staff

client/src/main/scala/drt/client/components/MonthlyStaffing.scala

@@ -8,6 +8,7 @@ import drt.client.logger.{Logger, LoggerFactory}
 import drt.client.modules.GoogleEventTracker
 import drt.client.services.JSDateConversions.SDate
 import drt.client.services.{JSDateConversions, SPACircuit}
+import drt.client.util.DateRange
 import drt.shared._
 import io.kinoplan.scalajs.react.material.ui.core.MuiButton.Color
 import io.kinoplan.scalajs.react.material.ui.core.system.SxProps
@@ -26,7 +27,7 @@ import org.scalajs.dom.html.{Div, Select}
 import org.scalajs.dom.window.confirm
 import uk.gov.homeoffice.drt.ports.AirportConfig
 import uk.gov.homeoffice.drt.ports.Terminals.Terminal
-import uk.gov.homeoffice.drt.time.SDateLike
+import uk.gov.homeoffice.drt.time.{LocalDate, SDateLike}
 
 import scala.collection.mutable
 import scala.scalajs.js
@@ -331,15 +332,7 @@ object MonthlyStaffing {
                   ustd = IUpdateStaffForTimeRangeData(startDayAt = Moment.utc(), startTimeAt = Moment.utc(), endTimeAt = Moment.utc(), endDayAt = Moment.utc(), actualStaff = "0"),
                   interval = props.timeSlotMinutes,
                   handleSubmit = (ssf: IUpdateStaffForTimeRangeData) => {
-                    val dayInMilliseconds = 1000 * 60 * 60 * 24
-                    val startDay = ssf.startDayAt.utc().toDate().getTime().toLong / dayInMilliseconds // Convert to days
-                    val endDay = ssf.endDayAt.utc().toDate().getTime().toLong / dayInMilliseconds // Convert to days
-                    val staffAssignments: Seq[StaffAssignment] = (startDay to endDay).map { day =>
-                      val dayAt = Moment(day * dayInMilliseconds) // Convert back to milliseconds
-                      val ssfDay = IUpdateStaffForTimeRangeData(dayAt, ssf.startTimeAt, ssf.endTimeAt, dayAt, ssf.actualStaff)
-                      IUpdateStaffForTimeRangeData.toStaffAssignment(ssfDay, props.terminalPageTab.terminal)
-                    }
-                    SPACircuit.dispatch(UpdateShifts(staffAssignments))
+                    SPACircuit.dispatch(UpdateShifts(staffAssignmentsFromForm(ssf, props.terminalPageTab.terminal)))
                     scope.modState(state => {
                       val newState = state.copy(showEditStaffForm = false, showStaffSuccess = true)
                       newState
@@ -375,6 +368,23 @@ object MonthlyStaffing {
     }
   }
 
+  private def staffAssignmentsFromForm(ssf: IUpdateStaffForTimeRangeData, terminal: Terminal): Seq[StaffAssignment] = {
+    val startDayLocal = LocalDate(ssf.startDayAt.year(), ssf.startDayAt.month() + 1, ssf.startDayAt.date())
+    val endDayLocal = LocalDate(ssf.endDayAt.year(), ssf.endDayAt.month() + 1, ssf.endDayAt.date())
+
+    val startHour = ssf.startTimeAt.hour()
+    val startMinute = ssf.startTimeAt.minute()
+
+    val endHour = ssf.endTimeAt.hour()
+    val endMinute = ssf.endTimeAt.minute()
+
+    DateRange(startDayLocal, endDayLocal).map { date =>
+      val startDateTime = SDate(date.year, date.month, date.day, startHour, startMinute)
+      val endDateTime = SDate(date.year, date.month, date.day, endHour, endMinute)
+      StaffAssignment(startDateTime.toISOString, terminal, startDateTime.millisSinceEpoch, endDateTime.millisSinceEpoch, ssf.actualStaff.toInt, None)
+    }
+  }
+
   private def navigationArrows(props: Props, previousWeekDate: SDateLike, nextWeekDate: SDateLike) = {
     <.div(
       MuiButton(color = Color.primary, variant = "outlined",

client/src/main/scala/drt/client/components/UpdateStaffForTimeRangeForm.scala

@@ -27,34 +27,6 @@ object IUpdateStaffForTimeRangeData {
     p.actualStaff = actualStaff
     p
   }
-
-  def toStaffAssignment(obj: IUpdateStaffForTimeRangeData, terminal: Terminal): StaffAssignment = {
-
-    val combinedStartTime: Double = new Date(
-      obj.startDayAt.year(),
-      obj.startDayAt.month(),
-      obj.startDayAt.date,
-      obj.startTimeAt.utc.toDate().getUTCHours.toInt,
-      obj.startTimeAt.utc.toDate().getUTCMinutes.toInt,
-      obj.startTimeAt.utc.toDate().getUTCSeconds.toInt
-    ).getTime()
-
-    val combinedEndTime: UndefOr[Double] = new Date(
-      obj.startDayAt.year(),
-      obj.startDayAt.month(),
-      obj.startDayAt.date(),
-      obj.endTimeAt.utc.toDate().getUTCHours.toInt,
-      obj.endTimeAt.utc.toDate().getUTCMinutes.toInt,
-      obj.endTimeAt.utc.toDate().getUTCSeconds.toInt
-    ).getTime()
-
-    StaffAssignment(obj.startDayAt.toISOString,
-      terminal,
-      combinedStartTime.toLong,
-      combinedEndTime.map(a => a.toLong).getOrElse(combinedStartTime.toLong),
-      obj.actualStaff.toInt,
-      None)
-  }
 }
 
 @js.native
@@ -66,7 +38,7 @@ trait IUpdateStaffForTimeRangeForm extends js.Object {
 }
 
 object IUpdateStaffForTimeRangeForm {
-  def apply(ustd: IUpdateStaffForTimeRangeData, interval:Int, handleSubmit: js.Function1[IUpdateStaffForTimeRangeData, Unit], cancelHandler: js.Function0[Unit]): IUpdateStaffForTimeRangeForm = {
+  def apply(ustd: IUpdateStaffForTimeRangeData, interval: Int, handleSubmit: js.Function1[IUpdateStaffForTimeRangeData, Unit], cancelHandler: js.Function0[Unit]): IUpdateStaffForTimeRangeForm = {
     val p = (new js.Object).asInstanceOf[IUpdateStaffForTimeRangeForm]
     p.ustd = ustd
     p.handleSubmit = handleSubmit

client/src/main/scala/drt/client/util/DateRange.scala

@@ -0,0 +1,18 @@
+package drt.client.util
+
+import drt.client.services.JSDateConversions.SDate
+import uk.gov.homeoffice.drt.time.{LocalDate, UtcDate}
+
+object DateRange {
+  def apply(start: LocalDate, end: LocalDate): Seq[LocalDate] =
+    LazyList
+      .iterate(SDate(start))(_.addDays(1))
+      .takeWhile(_.toLocalDate <= end)
+      .map(_.toLocalDate)
+
+  def apply(start: UtcDate, end: UtcDate): Seq[UtcDate] =
+    LazyList
+      .iterate(SDate(start))(_.addDays(1))
+      .takeWhile(_.toUtcDate <= end)
+      .map(_.toUtcDate)
+}

project/Settings.scala

@@ -25,7 +25,7 @@ object Settings {
   /** Declare global dependency versions here to avoid mismatches in multi part dependencies */
   //noinspection ScalaStyle
   object versions {
-    val drtLib = "v936"
+    val drtLib = "v942"
 
     val scala = "2.13.12"
     val scalaDom = "2.8.0"
@@ -99,7 +99,7 @@ object Settings {
     "react-markdown" -> "9.0.1",
     "@types/react-dom" -> react,
     "css-loader" -> "6.7.2",
-    "@drt/drt-react"-> "https://github.com/UKHomeOffice/drt-react/tree/1.5.5",
+    "@drt/drt-react"-> "https://github.com/UKHomeOffice/drt-react.git#23eec837a3ef9e8d2b289bac54f610ae353398d7",
   )
 
   /** Dependencies only used by the JS project (note the use of %%% instead of %%) */

server/src/test/scala/drt/shared/ShiftAssignmentsTest.scala

@@ -33,6 +33,28 @@ object ShiftAssignmentsTest extends Specification {
     }
   }
 
+  "Given a shift that spans 24 hours from midnight" >> {
+    "Then it should correctly handle the shift" >> {
+      val startTime = SDate("2024-11-05T00:00:00Z").millisSinceEpoch
+      val endTime = SDate("2024-11-06T00:00:00Z").millisSinceEpoch
+      val shift = StaffAssignment("24HourShift", T1, startTime, endTime, 5, None)
+      val service = ShiftAssignments(Seq(shift))
+      val msToSdate: MillisSinceEpoch => SDateLike = millis => SDate(millis)
+
+      "I should see the shift apply at the start time" >> {
+        service.terminalStaffAt(T1, SDate("2024-11-05T00:00"), msToSdate) === 5
+      }
+      "I should see the shift apply at the 23:30 time" >> {
+        service.terminalStaffAt(T1, SDate("2024-11-05T23:30"), msToSdate) === 5
+      }
+      "I should see the shift apply at the end time" >> {
+        service.terminalStaffAt(T1, SDate("2024-11-06T00:00"), msToSdate) === 5
+      }
+      "I should see the shift apply throughout the 24 hours" >> {
+        service.terminalStaffAt(T1, SDate("2024-11-05T12:00"), msToSdate) === 5
+      }
+    }
+  }
 
   "Give shift with start and end date" >> {
     "Then split a shift into 15 minutes interval shifts" >> {