Merge pull request #905 from gemini-hlsw/daytime-optional

Make dayTimeMode optional
gemini-hlsw · Jun 10, 2024 · 5ba572d · 5ba572d
2 parents 3a9e9c7 + 16a83db
commit 5ba572d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / tlBaseVersion                         := "0.98"
+ThisBuild / tlBaseVersion                         := "0.99"
 ThisBuild / tlCiReleaseBranches                   := Seq("master")
 ThisBuild / githubWorkflowEnv += "MUNIT_FLAKY_OK" -> "true"
 

diff --git a/modules/core/shared/src/main/scala/lucuma/core/model/GuideConfig.scala b/modules/core/shared/src/main/scala/lucuma/core/model/GuideConfig.scala
@@ -59,7 +59,7 @@ object GuideConfig {
         MountGuideOption.MountGuideOff,
         M1GuideOff,
         M2GuideOff,
-        false,
+        None,
         None),
       None,
     )
@@ -230,7 +230,7 @@ object GuideConfig {
   given Encoder[ProbeGuide] = Encoder.forProduct2("from", "to")(x => (x.from, x.to))
 
   given Decoder[TelescopeGuideConfig] =
-    Decoder.forProduct5[TelescopeGuideConfig, MountGuideOption, M1GuideConfig, M2GuideConfig, Boolean, Option[ProbeGuide]](
+    Decoder.forProduct5[TelescopeGuideConfig, MountGuideOption, M1GuideConfig, M2GuideConfig, Option[Boolean], Option[ProbeGuide]](
       "mountGuideOn",
       "m1Guide",
       "m2Guide",

diff --git a/modules/core/shared/src/main/scala/lucuma/core/model/TelescopeGuideConfig.scala b/modules/core/shared/src/main/scala/lucuma/core/model/TelescopeGuideConfig.scala
@@ -14,7 +14,7 @@ case class TelescopeGuideConfig(
   mountGuide:  MountGuideOption,
   m1Guide:     M1GuideConfig,
   m2Guide:     M2GuideConfig,
-  dayTimeMode: Boolean,
+  dayTimeMode: Option[Boolean], // This should not be an Option but we make it optional for backward compatibility with TCC
   probeGuide:  Option[ProbeGuide]
 ) derives Eq
 
@@ -28,7 +28,7 @@ object TelescopeGuideConfig {
   val m2Guide: Lens[TelescopeGuideConfig, M2GuideConfig] =
     Focus[TelescopeGuideConfig](_.m2Guide)
 
-  val dayTimeMode: Lens[TelescopeGuideConfig, Boolean] =
+  val dayTimeMode: Lens[TelescopeGuideConfig, Option[Boolean]] =
     Focus[TelescopeGuideConfig](_.dayTimeMode)
 
   val probeGuide: Lens[TelescopeGuideConfig, Option[ProbeGuide]] =

diff --git a/modules/testkit/src/main/scala/lucuma/core/model/arb/ArbTelescopeGuideConfig.scala b/modules/testkit/src/main/scala/lucuma/core/model/arb/ArbTelescopeGuideConfig.scala
@@ -27,13 +27,13 @@ trait ArbTelescopeGuideConfig {
         mo <- arbitrary[MountGuideOption]
         m1 <- arbitrary[M1GuideConfig]
         m2 <- arbitrary[M2GuideConfig]
-        m  <- arbitrary[Boolean]
+        m  <- arbitrary[Option[Boolean]]
         pg <- arbitrary[Option[ProbeGuide]]
       } yield TelescopeGuideConfig(mo, m1, m2, m, pg)
     }
 
   given Cogen[TelescopeGuideConfig] =
-    Cogen[(Boolean, M1GuideConfig, M2GuideConfig, Boolean, Option[ProbeGuide])]
+    Cogen[(Boolean, M1GuideConfig, M2GuideConfig, Option[Boolean], Option[ProbeGuide])]
       .contramap(x => (x.mountGuide.value, x.m1Guide, x.m2Guide, x.dayTimeMode, x.probeGuide))
 }