Merge pull request #1156 from NASA-AMMOS/fix/schema-mismatch-constraints

Standardize the cached Constraint results to match action results

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

@@ -299,7 +299,7 @@ static JsonParser<SpansSelectWhenTrue> spansSelectWhenTrueF(JsonParser<Expressio
 
   public static final JsonParser<Violation> violationP =
       productP
-          .field("violationWindows", listP(intervalP))
+          .field("windows", listP(intervalP))
           .field("activityInstanceIds", listP(longP))
           .map(
               untuple(Violation::new),
@@ -310,8 +310,8 @@ static JsonParser<SpansSelectWhenTrue> spansSelectWhenTrueF(JsonParser<Expressio
       productP
           .field("violations", listP(violationP))
           .field("gaps", listP(intervalP))
-          .field("constraintType", enumP(ConstraintType.class, Enum::name))
-          .field("resourceNames", listP(stringP))
+          .field("type", enumP(ConstraintType.class, Enum::name))
+          .field("resourceIds", listP(stringP))
           .field("constraintId", longP)
           .field("constraintName", stringP)
           .map(

deployment/hasura/migrations/AerieMerlin/29_synchronize_cache_schema/down.sql

@@ -0,0 +1,4 @@
+-- The JSON schema of the constraint violations in constraint_run is changed.
+-- Because the table is a cache it is safer to clear it than to attempt to transform it using SQL
+truncate constraint_run;
+call migrations.mark_migration_rolled_back('29');

deployment/hasura/migrations/AerieMerlin/29_synchronize_cache_schema/up.sql

@@ -0,0 +1,4 @@
+-- The JSON schema of the constraint violations in constraint_run is changed.
+-- Because the table is a cache it is safer to clear it than to attempt to transform it using SQL
+truncate constraint_run;
+call migrations.mark_migration_applied('29');

merlin-server/sql/merlin/applied_migrations.sql

@@ -31,3 +31,4 @@ call migrations.mark_migration_applied('25');
 call migrations.mark_migration_applied('26');
 call migrations.mark_migration_applied('27');
 call migrations.mark_migration_applied('28');
+call migrations.mark_migration_applied('29');