Rollback edits in reverse

NASA-AMMOS · Jan 24, 2025 · c805d3e · c805d3e
1 parent ea5a811
commit c805d3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...in/java/gov/nasa/jpl/aerie/e2e/procedural/scheduling/procedures/ActivityDeletionGoal.java b/...in/java/gov/nasa/jpl/aerie/e2e/procedural/scheduling/procedures/ActivityDeletionGoal.java
@@ -39,6 +39,8 @@ public void run(@NotNull final EditablePlan plan) {
         Map.of("biteSize", SerializedValue.of(2))
     );
 
+    plan.commit();
+
     if (whichToDelete >= 0) {
       plan.delete(ids[whichToDelete], anchorStrategy);
     }

diff --git a/...main/kotlin/gov/nasa/ammos/aerie/procedural/scheduling/utils/DefaultEditablePlanDriver.kt b/...main/kotlin/gov/nasa/ammos/aerie/procedural/scheduling/utils/DefaultEditablePlanDriver.kt
@@ -291,7 +291,7 @@ class DefaultEditablePlanDriver(
 
     val result = uncommittedChanges
     uncommittedChanges = mutableListOf()
-    for (edit in result) {
+    for (edit in result.reversed()) {
       when (edit) {
         is Edit.Create -> adapter.delete(edit.directive.id)
         is Edit.Delete -> adapter.create(edit.directive)