cleanup

Author: swalker2m

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

@@ -3656,6 +3656,13 @@ input OffsetInput {
   q: OffsetComponentInput!
 }
 
+"""
+An offset generator produces a series of offsets according to generator-specific
+parameters.  Only (at most) one of `enumerated`, `grid`, `random` or `spiral`
+will be defined.  All others will be `null`.  The `generatorType` corresponds to
+the entry (if any) that is defined.  If the generator type of `NONE`, then none
+of the entries will be defined.
+"""
 type OffsetGenerator {
   generatorType: OffsetGeneratorType!
 
@@ -3665,6 +3672,11 @@ type OffsetGenerator {
   spiral:     SpiralOffsetGenerator
 }
 
+"""
+An offset generator is specified by defining one of the `enumerated`, `grid`,
+`random` or `spiral` options.  If none are defined, the generator type will be
+`NONE`.
+"""
 input OffsetGeneratorInput {
   enumerated: EnumeratedOffsetGeneratorInput
   grid:       GridOffsetGeneratorInput
@@ -3701,6 +3713,10 @@ type GridOffsetGenerator {
   cornerB: Offset!
 }
 
+"""
+Defines the region over which the grid pattern of offsets will be distributed.
+The number of points is determined by integration time calculator results.
+"""
 input GridOffsetGeneratorInput {
   cornerA: OffsetInput!
   cornerB: OffsetInput!

modules/service/src/main/scala/lucuma/odb/graphql/mapping/TelescopeConfigMapping.scala

@@ -14,31 +14,31 @@ trait TelescopeConfigMapping[F[_]] extends EnumeratedOffsetView[F] with StepReco
   private def telescopeConfigMappingAtPath(
     path:          Path,
     guidingColumn: ColumnRef,
-    idColumns:     ColumnRef*
+    idColumns:     (String, ColumnRef)*
   ): ObjectMapping =
     ObjectMapping(path)(
       (
-        idColumns.toList.map: ref =>
-          SqlField(ref.column, ref, key = true, hidden = true)
+        idColumns.toList.map: (name, ref) =>
+          SqlField(name, ref, key = true, hidden = true)
       ) ++ List(
         SqlObject("offset"),
         SqlField("guiding", guidingColumn)
       )*
     )
 
-  private def enumeratedTelescopeConfigMapping: ObjectMapping =
-    ObjectMapping(TelescopeConfigType)(
-      SqlField("observationId", EnumeratedOffsetView.ObservationId, key = true, hidden = true),
-      SqlField("role",          EnumeratedOffsetView.OffsetGeneratorRole, key = true, hidden = true),
-      SqlField("index",         EnumeratedOffsetView.Index, key = true, hidden = true),
-      SqlObject("offset"),
-      SqlField("guiding",       EnumeratedOffsetView.GuideState)
-    )
-
-
   lazy val TelescopeConfigMappings: List[ObjectMapping] =
     List(
-//      telescopeConfigMappingAtPath(EnumeratedOffsetGeneratorType / "values", EnumeratedOffsetTable.GuideState, EnumeratedOffsetTable.ObservationId, EnumeratedOffsetTable.OffsetGeneratorRole, EnumeratedOffsetTable.Index),
-      enumeratedTelescopeConfigMapping,
-      telescopeConfigMappingAtPath(StepRecordType / "telescopeConfig", StepRecordView.GuideState, StepRecordView.Id)
+      telescopeConfigMappingAtPath(
+        EnumeratedOffsetGeneratorType / "values",
+        EnumeratedOffsetView.GuideState,
+        "observationId" -> EnumeratedOffsetView.ObservationId,
+        "role"          -> EnumeratedOffsetView.OffsetGeneratorRole,
+        "index"         -> EnumeratedOffsetView.Index
+      ),
+
+      telescopeConfigMappingAtPath(
+        StepRecordType / "telescopeConfig",
+        StepRecordView.GuideState,
+        "id" -> StepRecordView.Id
+      )
     )