Startup Diagmostics 3

modules/schema/src/main/resources/lucuma/odb/graphql/OdbSchema.graphql

@@ -1,4 +1,4 @@
 # These "empty" enums (they must have at least one element) will be replaced at runtime with
 # definitions based on database tables.
 
 enum ConditionsMeasurementSource {
@@ -1456,7 +1456,7 @@
 """
 GCAL filter
 """
 enum GcalFilter {
   """
   GcalFilter None
   """
@@ -1467,11 +1467,6 @@
   """
   GMOS
 
-  """
-  GcalFilter Hros
-  """
-  HROS
-
   """
   GcalFilter Nir
   """
@@ -1482,11 +1477,6 @@
   """
   ND10
 
-  """
-  GcalFilter Nd16
-  """
-  ND16
-
   """
   GcalFilter Nd20
   """
@@ -1507,10 +1497,6 @@
   """
   ND45
 
-  """
-  GcalFilter Nd50
-  """
-  ND50
 }
 
 """
@@ -3915,15 +3901,6 @@
   SUPPORT_SECONDARY
 }
 
-"""
-The type of support role.
-"""
-enum ProgramUserSupportRoleType {
-  "Staff support"
-  STAFF
-  "Partner support"
-  PARTNER
-}
 
 """
 An assignment of a user to a program.
@@ -6631,7 +6608,7 @@
 """
 ObservingMode
 """
 enum ObservingModeType {
   """
   ObservingModeType GmosNorthLongSlit
   """
@@ -6645,7 +6622,7 @@
   """
   ObservingModeType Flamingos2LongSlit
   """
-  FLAMINGOS_2LONG_SLIT
+  FLAMINGOS_2_LONG_SLIT
 
   """
   ObservingModeType GmosNorthImaging
@@ -11497,6 +11474,8 @@
   LIBRARY
   SCIENCE
   SYSTEM
+  MONITORING
+  COMMISSIONING
 }
 
 """

modules/service/src/main/scala/lucuma/odb/Main.scala

@@ -309,8 +309,13 @@ object FMain extends MainParams {
   }
 
   def runStartupDiagnostics[F[_]: Async : Console : Network: Logger](config: Config.Database, fatal: Boolean): F[Unit] =
-    singleSession(config).map(StartupDiagnostics.apply(_)).use: sd =>
-      sd.runAllDiagnostics(fatal)
+    import lucuma.odb.graphql.util.SchemaSemigroup.*    
+    singleSession(config).use: db =>
+      for
+        es <- Enums.load(db)
+        s   = OdbMapping.unsafeLoadOdbSchema |+| es.schema
+        _  <- StartupDiagnostics(db, s, es).runAllDiagnostics(fatal)
+      yield ()
 
   implicit def kleisliLogger[F[_]: Logger, A]: Logger[Kleisli[F, A, *]] =
     Logger[F].mapK(Kleisli.liftK)

modules/service/src/main/scala/lucuma/odb/graphql/BaseMapping.scala

@@ -10,7 +10,7 @@ import lucuma.odb.graphql.util.SchemaSemigroup
 
 trait BaseMapping[F[_]]
   extends SkunkMapping[F]
-     with SchemaSemigroup[F]
+     with SchemaSemigroup
      with MappingExtras[F]
      with CirceMappingLike[F] {
 

modules/service/src/main/scala/lucuma/odb/graphql/OdbMapping.scala

@@ -76,13 +76,16 @@ object OdbMapping {
   }
 
   // Loads a GraphQL file from the classpath, relative to this Class.
-  def unsafeLoadSchema(fileName: String): Schema = {
+  private def unsafeLoadSchema(fileName: String): Schema = {
     val stream = getClass.getResourceAsStream(fileName)
     val src  = Source.fromInputStream(stream, "UTF-8")
     try Schema(src.getLines().mkString("\n")).toEither.fold(x => sys.error(s"Invalid schema: $fileName: ${x.toList.mkString(", ")}"), identity)
     finally src.close()
   }
 
+  def unsafeLoadOdbSchema: Schema =
+    unsafeLoadSchema("OdbSchema.graphql")
+
   private implicit def monoidPartialFunction[A, B]: Monoid[PartialFunction[A, B]] =
     Monoid.instance(PartialFunction.empty, _ orElse _)
 
@@ -295,7 +298,7 @@ object OdbMapping {
 
           // Our schema
           val schema: Schema =
-            schema0.getOrElse(unsafeLoadSchema("OdbSchema.graphql") |+| enums.schema)
+            schema0.getOrElse(unsafeLoadOdbSchema |+| enums.schema)
 
           // Our services and resources needed by various mappings.
           override val commitHash = commitHash0

modules/service/src/main/scala/lucuma/odb/graphql/util/SchemaSemigroup.scala

@@ -7,15 +7,14 @@ import cats.Semigroup
 import cats.syntax.all.*
 import grackle.DirectiveDef
 import grackle.EnumType
-import grackle.Mapping
 import grackle.NamedType
 import grackle.ObjectType
 import grackle.Schema
 import grackle.Type
 import org.tpolecat.sourcepos.SourcePos
 
 /** A mixin that provides Semigroup[Schema]. */
-trait SchemaSemigroup[F[_]] extends Mapping[F] {
+trait SchemaSemigroup {
 
   private implicit val SemigroupDirectiveDef: Semigroup[DirectiveDef] = (a, b) =>
     if (a.name != b.name) a
@@ -77,5 +76,5 @@ trait SchemaSemigroup[F[_]] extends Mapping[F] {
 
 }
 
-
+object SchemaSemigroup extends SchemaSemigroup
 

modules/service/src/test/scala/lucuma/odb/graphql/query/observation_configuration.scala

@@ -812,7 +812,7 @@ class observation_configuration extends OdbSuite with ObservingModeSetupOperatio
                       "target" : {
                         "coordinates" : {
                           "ra" : {
-                            "hms" : "08:09:46.797666"
+                            "hms" : "08:09:46.797665"
                           }
                         },
                         "region" : null

modules/service/src/test/scala/lucuma/odb/service/StartupDiagnosticsSuite.scala

@@ -3,15 +3,23 @@
 
 package lucuma.odb.service
 
+import cats.syntax.semigroup.*
 import lucuma.odb.StartupDiagnostics
+import lucuma.odb.graphql.OdbMapping
 import lucuma.odb.graphql.OdbSuite
+import lucuma.odb.graphql.enums.Enums
+import lucuma.odb.graphql.util.SchemaSemigroup
 
-class StartupDiagnosticsSuite extends OdbSuite:
+class StartupDiagnosticsSuite extends OdbSuite with SchemaSemigroup:
 
   val validUsers = Nil
 
   // This ensures that diagnostics must pass in CI
   test("run diagnostics"):
-    withSession: s =>
-      StartupDiagnostics(s).runAllDiagnostics(true)
+    withSession: db =>
+      for
+        es <- Enums.load(db)
+        s   = OdbMapping.unsafeLoadOdbSchema |+| es.schema
+        _  <- StartupDiagnostics(db, s, es).runAllDiagnostics(true)
+      yield ()