add source support finished

procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt

@@ -6,10 +6,13 @@ import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue
 /** An external event instance. */
 data class ExternalEvent(
   /** The string name of this event. */
+  @JvmField
   val key: String,
   /** The type of the event. */
+  @JvmField
   val type: String,
   /** The source this event comes from. */
+  @JvmField
   val source: ExternalSource,
   override val interval: Interval,
 ): IntervalLike<ExternalEvent> {

procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalSource.kt

@@ -1,15 +1,14 @@
 package gov.nasa.ammos.aerie.procedural.timeline.payloads
 
-import gov.nasa.ammos.aerie.procedural.timeline.Interval
-import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue
-
 /**
  * An external source instance. Used for querying purposes - see EventQuery.kt.
  * The included fields represent the primary key used to identify External Sources.
  */
 data class ExternalSource(
   /** The string name of this source. */
+  @JvmField
   val key: String,
   /** The derivation group that this source is a member of. */
+  @JvmField
   val derivationGroup: String,
 )

scheduler-driver/src/main/kotlin/gov/nasa/jpl/aerie/scheduler/plan/SchedulerToProcedurePlanAdapter.kt

@@ -66,9 +66,7 @@ data class SchedulerToProcedurePlanAdapter(
     }
     else eventsByDerivationGroup.values.flatten()
     if (query.eventTypes != null) result = result.filter { it.type in query.eventTypes!! }
-    if (query.sources != null) result = result.filter { event ->
-      query.sources!!.map { it.key }.contains(event.source.key) && query.sources!!.map { it.derivationGroup }.contains(event.source.key)
-    }
+    if (query.sources != null) result = result.filter { it.source in query.sources!! }
     return ExternalEvents(result)
   }
   override fun <V : Any, TL : SerialSegmentOps<V, TL>> resource(

scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java

@@ -1045,7 +1045,7 @@ public Map<String, List<ExternalEvent>> getExternalEvents(final PlanId planId, f
     final var unorganized =  parseExternalEvents(data, horizonStart);
     final var result = new HashMap<String, List<ExternalEvent>>();
     for (final var event: unorganized) {
-      final var list = result.computeIfAbsent(event.getDerivationGroup(), $ -> new ArrayList<>());
+      final var list = result.computeIfAbsent(event.source.derivationGroup, $ -> new ArrayList<>());
       list.add(event);
     }
     return result;