Merge pull request #835 from NASA-AMMOS/fix/scheduling-sim-results-ch…

…ild-activities Use simulated id rather than directive id as key for simulatedActivityRecords
NASA-AMMOS · Apr 3, 2023 · dd87466 · dd87466
2 parents cc591d1 + cde58eb
commit dd87466
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/...rver/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinService.java b/...rver/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinService.java
@@ -1116,11 +1116,11 @@ private void postActivities(
   {
       final var simulatedActivityRecords = simulatedActivities.entrySet().stream()
                                                               .collect(Collectors.toMap(
-                                                                  e -> simulationActivityDirectiveIdToMerlinActivityDirectiveId.get(e.getValue().directiveId().get()).id(),
+                                                                  e -> e.getKey().id(),
                                                                   e -> simulatedActivityToRecord(e.getValue(), simulationActivityDirectiveIdToMerlinActivityDirectiveId)));
       final var allActivityRecords = unfinishedActivities.entrySet().stream()
                                                          .collect(Collectors.toMap(
-                                                             e -> simulationActivityDirectiveIdToMerlinActivityDirectiveId.get(e.getValue().directiveId().get()).id(),
+                                                             e -> e.getKey().id(),
                                                              e -> unfinishedActivityToRecord(e.getValue(), simulationActivityDirectiveIdToMerlinActivityDirectiveId)));
       allActivityRecords.putAll(simulatedActivityRecords);
       final var simIdToPgId = postSpans(
@@ -1166,10 +1166,18 @@ public void updateSimulatedActivityParentsAction(
 
   final JsonObject response;
   response = postRequest(req, arguments).get();
-  final var affected_rows = response.getJsonObject("data").getJsonObject("update_span_many").getInt("affected_rows");
-  if(affected_rows != updateCounter) {
-    throw new PlanServiceException("not the same size");
-  }
+    final var jsonValue = response.getJsonObject("data").get("update_span_many");
+    var affected_rows = 0;
+    if (jsonValue.getValueType() == JsonValue.ValueType.ARRAY) {
+      for (final var jsonObject : response.getJsonObject("data").getJsonArray("update_span_many").getValuesAs(JsonObject.class)) {
+        affected_rows += jsonObject.getInt("affected_rows");
+      }
+    } else {
+      affected_rows = response.getJsonObject("data").getJsonObject("update_span_many").getInt("affected_rows");
+    }
+    if(affected_rows != updateCounter) {
+      throw new PlanServiceException("not the same size");
+    }
 }
 
   private static SpanRecord simulatedActivityToRecord(final SimulatedActivity activity,