From b7c81f50e6fdf1a90e56bda850ef839dbf45953c Mon Sep 17 00:00:00 2001
From: JoelCourtney <joel.e.courtney@gmail.com>
Date: Tue, 22 Oct 2024 12:18:01 -0700
Subject: [PATCH] Remove properties from Event payload

---
 .../aerie/procedural/timeline/payloads/ExternalEvent.kt     | 4 +---
 .../server/services/GraphQLMerlinDatabaseService.java       | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt b/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt
index e863c8beff..cef92fefd0 100644
--- a/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/ExternalEvent.kt
+++ b/procedural/timeline/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/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java b/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java
index 54ca88f2eb..1b1ca72a2b 100644
--- a/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java
+++ b/scheduler-server/src/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;