Remove properties from Event payload

NASA-AMMOS · Nov 4, 2024 · b7c81f5 · b7c81f5
1 parent 02dc287
commit b7c81f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...meline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt b/...meline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt
@@ -14,8 +14,6 @@ data class ExternalEvent(
   /** The derivation group that this event comes from. */
   val derivationGroup: String,
   override val interval: Interval,
-  /** The properties associated with this event. */
-  val properties: Map<String, SerializedValue>
 ): IntervalLike<ExternalEvent> {
-  override fun withNewInterval(i: Interval) = ExternalEvent(key, type, source, derivationGroup, i, properties)
+  override fun withNewInterval(i: Interval) = ExternalEvent(key, type, source, derivationGroup, i)
 }
diff --git a/.../main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java b/.../main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java
@@ -1036,9 +1036,6 @@ public Map<String, List<ExternalEvent>> getExternalEvents(final PlanId planId, f
             source_range
             start_time
             valid_at
-            external_event {
-              properties
-            }
           }
         }""".formatted(derivationGroups);
     final JsonObject eventsResponse = postRequest(eventsRequest).get();
@@ -1190,8 +1187,7 @@ private List<ExternalEvent> parseExternalEvents(final JsonArray eventsJson, fina
           e.getString("event_type_name"),
           e.getString("source_key"),
           e.getString("derivation_group_name"),
-          Interval.between(start, end),
-          serializedValueP.parse(e.getJsonObject("external_event").getJsonObject("properties")).getSuccessOrThrow().asMap().get()
+          Interval.between(start, end)
       ));
     }
     return result;