Feature/channel dictionary hookup

deployment/hasura/metadata/databases/AerieSequencing/tables/public_channel_dictionary.yaml

@@ -0,0 +1,28 @@
+table:
+  name: channel_dictionary
+  schema: public
+insert_permissions:
+  - role: aerie_admin
+    permission:
+      columns: "*"
+      check: {}
+select_permissions:
+  - role: aerie_admin
+    permission:
+      columns: "*"
+      filter: {}
+      allow_aggregations: true
+  - role: user
+    permission:
+      columns: "*"
+      filter: {}
+      allow_aggregations: true
+  - role: viewer
+    permission:
+      columns: "*"
+      filter: {}
+      allow_aggregations: true
+delete_permissions:
+  - role: aerie_admin
+    permission:
+      filter: {}

deployment/hasura/metadata/databases/AerieSequencing/tables/public_parcel.yaml

@@ -2,12 +2,12 @@ table:
   name: parcel
   schema: public
 object_relationships:
+  - name: channel_dictionary
+    using:
+      foreign_key_constraint_on: channel_dictionary_id
   - name: command_dictionary
     using:
       foreign_key_constraint_on: command_dictionary_id
-  - name: parameter_dictionary
-    using:
-      foreign_key_constraint_on: parameter_dictionary_id
   - name: sequence_adaptation
     using:
       foreign_key_constraint_on: sequence_adaptation_id
@@ -47,5 +47,5 @@ delete_permissions:
 update_permissions:
   - role: aerie_admin
     permission:
-      columns: [command_dictionary_id, name, parameter_dictionary_id, sequence_adaptation_id]
+      columns: [channel_dictionary_id, command_dictionary_id, name, sequence_adaptation_id]
       filter: {}

deployment/hasura/metadata/databases/AerieSequencing/tables/tables.yaml

@@ -1,4 +1,5 @@
 - "!include public_activity_instance_commands.yaml"
+- "!include public_channel_dictionary.yaml"
 - "!include public_command_dictionary.yaml"
 - "!include public_expansion_rule.yaml"
 - "!include public_expansion_run.yaml"

docker-compose.yml

@@ -17,7 +17,7 @@ services:
       POSTGRES_PASSWORD: "${AERIE_PASSWORD}"
       POSTGRES_PORT: 5432
       POSTGRES_USER: "${AERIE_USERNAME}"
-    image: "ghcr.io/nasa-ammos/aerie-gateway:develop"
+    image: "ghcr.io/nasa-ammos/aerie-gateway:v2.6.2"
     ports: ["9000:9000"]
     restart: always
     volumes:
@@ -94,7 +94,7 @@ services:
       SEQUENCING_LOCAL_STORE: /usr/src/app/sequencing_file_store
       SEQUENCING_WORKER_NUM: 8
       SEQUENCING_MAX_WORKER_HEAP_MB: 1000
-      TRANSPILER_ENABLED : "true"
+      TRANSPILER_ENABLED: "true"
     image: aerie_sequencing
     ports: ["27184:27184"]
     restart: always

sequencing-server/package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@js-temporal/polyfill": "~0.4.3",
-    "@nasa-jpl/aerie-ampcs": "~1.0.4",
+    "@nasa-jpl/aerie-ampcs": "~1.0.5",
     "@nasa-jpl/aerie-ts-user-code-runner": "~0.6.0",
     "@nasa-jpl/seq-json-schema": "1.0.19",
     "body-parser": "~1.20.1",

sequencing-server/sql/sequencing/init.sql

@@ -9,6 +9,7 @@ begin;
   \ir applied_migrations.sql
 
   -- Command Expansion Tables.
+  \ir tables/channel_dictionary.sql
   \ir tables/command_dictionary.sql
   \ir tables/parameter_dictionary.sql
   \ir tables/sequence_adaptation.sql

sequencing-server/sql/sequencing/tables/channel_dictionary.sql

@@ -0,0 +1,27 @@
+create table channel_dictionary (
+  id integer generated always as identity,
+
+  mission text not null,
+  version text not null,
+  parsed_json jsonb not null default '{}',
+
+  created_at timestamptz not null default now(),
+
+  constraint channel_dictionary_synthetic_key
+      primary key (id),
+  constraint channel_dictionary_natural_key
+    unique (mission,version)
+);
+
+comment on table channel_dictionary is e''
+  'A Channel Dictionary for a mission.';
+comment on column channel_dictionary.id is e''
+  'The synthetic identifier for this channel dictionary.';
+comment on column channel_dictionary.mission is e''
+  'A human-meaningful identifier for the mission described by the channel dictionary';
+comment on column channel_dictionary.version is e''
+  'A human-meaningful version qualifier.';
+comment on column channel_dictionary.parsed_json is e''
+  'The XML that has been parsed and converted to JSON';
+comment on constraint channel_dictionary_natural_key on channel_dictionary is e''
+  'There can only be one channel dictionary of a given version for a given mission.';

sequencing-server/sql/sequencing/tables/parcel.sql

@@ -3,8 +3,8 @@ create table parcel (
 
   name text not null,
 
+  channel_dictionary_id integer default null,
   command_dictionary_id integer not null,
-  parameter_dictionary_id integer not null,
   sequence_adaptation_id integer default null,
 
   created_at timestamptz not null default now(),
@@ -14,10 +14,10 @@ create table parcel (
   constraint parcel_synthetic_key
     primary key (id),
 
+  foreign key (channel_dictionary_id)
+    references channel_dictionary (id),
   foreign key (command_dictionary_id)
     references command_dictionary (id),
-  foreign key (parameter_dictionary_id)
-    references parameter_dictionary (id),
   foreign key (sequence_adaptation_id)
     references sequence_adaptation (id)
 );

sequencing-server/sql/sequencing/tables/parcel_to_parameter_dictionary.sql

@@ -1,9 +1,11 @@
 create table parcel_to_parameter_dictionary (
+  id integer generated always as identity,
+
   parcel_id integer not null,
   parameter_dictionary_id integer not null,
 
   constraint parcel_to_parameter_dictionary_synthetic_key
-    primary key (parcel_id, parameter_dictionary_id),
+    primary key (id),
 
   foreign key (parcel_id)
     references parcel (id)