Save activity names in db

NASA-AMMOS · Sep 25, 2024 · a844340 · a844340
1 parent b4cc768
commit a844340
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/model/SchedulingActivity.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/model/SchedulingActivity.java
@@ -41,7 +41,8 @@ public record SchedulingActivity(
     ActivityDirectiveId topParent,
     ActivityDirectiveId anchorId,
     boolean anchoredToStart,
-    boolean isNew
+    boolean isNew,
+    String name
 ) {
 
   public static SchedulingActivity of(
@@ -62,7 +63,8 @@ public static SchedulingActivity of(
         null,
         anchorId,
         anchoredToStart,
-        isNew
+        isNew,
+        null
     );
   }
 
@@ -86,12 +88,13 @@ public static SchedulingActivity of(
         topParent,
         anchorId,
         anchoredToStart,
-        isNew
+        isNew,
+        null
     );
   }
 
   public SchedulingActivity withNewDuration(Duration duration){
-    return SchedulingActivity.of(
+    return new SchedulingActivity(
         this.id,
         this.type,
         this.startOffset,
@@ -100,12 +103,13 @@ public SchedulingActivity withNewDuration(Duration duration){
         this.topParent,
         this.anchorId,
         this.anchoredToStart,
-        this.isNew()
+        this.isNew(),
+        this.name
     );
   }
 
   public SchedulingActivity withNewAnchor(ActivityDirectiveId anchorId, boolean anchoredToStart, Duration startOffset) {
-    return SchedulingActivity.of(
+    return new SchedulingActivity(
         this.id,
         this.type,
         startOffset,
@@ -114,12 +118,13 @@ public SchedulingActivity withNewAnchor(ActivityDirectiveId anchorId, boolean an
         this.topParent,
         anchorId,
         anchoredToStart,
-        this.isNew
+        this.isNew,
+        this.name
     );
   }
 
   public SchedulingActivity withNewDirectiveId(ActivityDirectiveId id) {
-    return SchedulingActivity.of(
+    return new SchedulingActivity(
         id,
         this.type,
         startOffset,
@@ -128,12 +133,13 @@ public SchedulingActivity withNewDirectiveId(ActivityDirectiveId id) {
         this.topParent,
         this.anchorId,
         this.anchoredToStart,
-        this.isNew
+        this.isNew,
+        this.name
     );
   }
 
   public SchedulingActivity withNewTopParent(ActivityDirectiveId topParent) {
-    return SchedulingActivity.of(
+    return new SchedulingActivity(
         this.id,
         this.type,
         startOffset,
@@ -142,12 +148,13 @@ public SchedulingActivity withNewTopParent(ActivityDirectiveId topParent) {
         topParent,
         this.anchorId,
         this.anchoredToStart,
-        this.isNew
+        this.isNew,
+        this.name
     );
   }
 
   public static SchedulingActivity fromExistingActivityDirective(ActivityDirectiveId id, ActivityDirective activity, ActivityType type, Duration duration){
-    return SchedulingActivity.of(
+    return new SchedulingActivity(
         id,
         type,
         activity.startOffset(),
@@ -156,7 +163,8 @@ public static SchedulingActivity fromExistingActivityDirective(ActivityDirective
         null,
         activity.anchorId(),
         activity.anchoredToStart(),
-        false
+        false,
+        null
     );
   }
 

diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java
@@ -1230,7 +1230,8 @@ public Duration valueAt(Duration start, final EquationSolvingAlgorithms.History<
               null,
               null,
               true,
-              true
+              true,
+              null
           );
           Duration computedDuration = null;
           try {

diff --git a/scheduler-driver/src/main/kotlin/gov/nasa/jpl/aerie/scheduler/plan/InMemoryEditablePlan.kt b/scheduler-driver/src/main/kotlin/gov/nasa/jpl/aerie/scheduler/plan/InMemoryEditablePlan.kt
@@ -122,7 +122,8 @@ data class InMemoryEditablePlan(
         is DirectiveStart.Absolute -> true
         is DirectiveStart.Anchor -> s.anchorPoint == DirectiveStart.Anchor.AnchorPoint.Start
       },
-      isNew
+      isNew,
+      name
     )
   }
 }
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
@@ -582,6 +582,8 @@ mutation createAllPlanActivityDirectives($activities: [activity_directive_insert
           .add("start_offset", act.startOffset().toString())
           .add("anchored_to_start", act.anchoredToStart());
 
+      if (act.name() != null) insertionObject = insertionObject.add("name", act.name());
+
       //add duration to parameters if controllable
       final var insertionObjectArguments = Json.createObjectBuilder();
       if(act.getType().getDurationType() instanceof DurationType.Controllable durationType){
-Original file line number
+Diff line change
@@ Expand Up @@
                   null,
                   null,
                   true,
-                  true
+                  true,
+                  null
               );
               Duration computedDuration = null;
               try {
@@ Expand Down @@