Merge merlin.status_t and scheduer.status_t into util_functions.reque…

…st_status

[Hasura is currently unable to properly use custom types not in the public schema] (hasura/graphql-engine#4630). While this can be partially circumvented by specifying a search_path in the connection string (see change to Docker Compose), because these two types share a name, Hasura would always match to the type specified in the first listed schema in the search path. Because these types are identical sans the originating DB, they were combined into a singular type, `request_status`, rather than renaming each one.

deployment/postgres-init-db/sql/init.sql

@@ -15,6 +15,7 @@ begin;
 
   -- Util Functions
   \ir functions/util_functions/shared_update_functions.sql
+  \ir types/util_functions/request_status.sql
 
   -- Permissions
   \ir init_permissions.sql

deployment/postgres-init-db/sql/tables/merlin/simulation/simulation_dataset.sql

@@ -1,5 +1,3 @@
-create type merlin.status_t as enum('pending', 'incomplete', 'failed', 'success');
-
 create table merlin.simulation_dataset (
   id integer generated always as identity,
   simulation_id integer not null,
@@ -23,7 +21,7 @@ create table merlin.simulation_dataset (
   simulation_end_time timestamptz not null,
 
   -- Simulation state
-  status merlin.status_t not null default 'pending',
+  status util_functions.request_status not null default 'pending',
   reason jsonb null,
   canceled boolean not null default false,
 

deployment/postgres-init-db/sql/tables/scheduler/scheduling_run/scheduling_request.sql

@@ -1,5 +1,3 @@
-create type scheduler.status_t as enum('pending', 'incomplete', 'failed', 'success');
-
 create table scheduler.scheduling_request (
   analysis_id integer generated always as identity,
   specification_id integer not null,
@@ -9,7 +7,7 @@ create table scheduler.scheduling_request (
   plan_revision integer not null,
 
   -- Scheduling State
-  status scheduler.status_t not null default 'pending',
+  status util_functions.request_status not null default 'pending',
   reason jsonb null,
   canceled boolean not null default false,
 

deployment/postgres-init-db/sql/types/util_functions/request_status.sql

@@ -0,0 +1 @@
+create type util_functions.request_status as enum('pending', 'incomplete', 'failed', 'success');

docker-compose.yml

@@ -224,7 +224,7 @@ services:
     container_name: aerie_hasura
     depends_on: ["postgres"]
     environment:
-      AERIE_DATABASE_URL: "postgres://${AERIE_USERNAME}:${AERIE_PASSWORD}@postgres:5432/aerie"
+      AERIE_DATABASE_URL: "postgres://${AERIE_USERNAME}:${AERIE_PASSWORD}@postgres:5432/aerie?options=-c%20search_path%3Dutil_functions%2Chasura%2Cpermissions%2Ctags%2Cmerlin%2Cscheduler%2Csequencing%2Cpublic"
       AERIE_MERLIN_URL: "http://aerie_merlin:27183"
       AERIE_SCHEDULER_URL: "http://aerie_scheduler:27185"
       AERIE_SEQUENCING_URL: "http://aerie_sequencing:27184"

merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/SetSimulationStateAction.java

@@ -10,7 +10,7 @@
   private final @Language("SQL") String sql = """
         update merlin.simulation_dataset
           set
-            status = ?::status_t,
+            status = ?::util_functions.request_status,
             reason = ?::json
           where dataset_id = ?
         """;

scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/remotes/postgres/SetRequestStateAction.java

@@ -14,7 +14,7 @@
   private static final @Language("SQL") String sql = """
     update scheduler.scheduling_request
       set
-        status = ?::status_t,
+        status = ?::util_functions.request_status,
         reason = ?::json,
         dataset_id = ?
       where