Return Violation messages from Procedural Constraints

Author: Mythicaeda

constraints/src/main/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsers.java

@@ -313,9 +313,12 @@ static JsonParser<KeepTrueSegment> keepTrueSegmentP(JsonParser<Expression<Window
       productP
           .field("windows", listP(intervalP))
           .field("activityInstanceIds", listP(longP))
+          .optionalField("message", stringP)
           .map(
-              untuple(Violation::new),
-              $ -> tuple($.windows(), $.activityInstanceIds())
+              untuple((windows, aids, message) -> message
+                  .map(s -> new Violation(windows, aids, s))
+                  .orElseGet(() -> new Violation(windows, aids))),
+              $ -> tuple($.windows(), $.activityInstanceIds(), $.message())
           );
 
   public static final JsonParser<EDSLConstraintResult> edslConstraintResultP =

constraints/src/main/java/gov/nasa/jpl/aerie/constraints/model/Violation.java

@@ -7,10 +7,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-public record Violation(List<Interval> windows, ArrayList<Long> activityInstanceIds) {
+public record Violation(List<Interval> windows, ArrayList<Long> activityInstanceIds, Optional<String> message) {
   public Violation(List<Interval> windows, List<Long> activityInstanceIds) {
-    this(windows, new ArrayList<>(activityInstanceIds));
+    this(windows, new ArrayList<>(activityInstanceIds), Optional.empty());
+  }
+
+  public Violation(List<Interval> windows, List<Long> activityInstanceIds, String message) {
+    this(windows, new ArrayList<>(activityInstanceIds), Optional.ofNullable(message));
   }
 
   public static List<Violation> fromProceduralViolations(Violations violations, gov.nasa.jpl.aerie.merlin.driver.SimulationResults simResults) {
@@ -42,7 +47,10 @@ public static List<Violation> fromProceduralViolations(Violations violations, go
         }
       }
 
-      constraintViolations.add(new Violation(List.of(Interval.fromProceduralInterval(v.getInterval())), activityInstanceIds));
+      constraintViolations.add(new Violation(
+          List.of(Interval.fromProceduralInterval(v.getInterval())),
+          activityInstanceIds,
+          v.getMessage()));
     }
     return constraintViolations;
   }

deployment/hasura/metadata/actions.graphql

@@ -343,6 +343,7 @@ type ConstraintResult {
 }
 
 type ConstraintViolation {
+  message: String,
   windows: [Interval!]!,
   activityInstanceIds: [Int!]!
 }