remove all references to external_source_type_allowed_event_types.sql

NASA-AMMOS · Nov 18, 2024 · c4e5e1d · c4e5e1d
1 parent 0067b56
commit c4e5e1d
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 230 deletions.
diff --git a/...ent/hasura/metadata/databases/tables/merlin/external_source_type_allowed_event_types.yaml b/...ent/hasura/metadata/databases/tables/merlin/external_source_type_allowed_event_types.yaml
diff --git a/deployment/hasura/metadata/databases/tables/tables.yaml b/deployment/hasura/metadata/databases/tables/tables.yaml
@@ -104,7 +104,6 @@
 - "!include merlin/external_event_type.yaml"
 - "!include merlin/external_source.yaml"
 - "!include merlin/external_source_type.yaml"
-- "!include merlin/external_source_type_allowed_event_types.yaml"
 - "!include merlin/plan_derivation_group.yaml"
 
 # Constraints

diff --git a/deployment/postgres-init-db/sql/init_merlin.sql b/deployment/postgres-init-db/sql/init_merlin.sql
@@ -75,7 +75,6 @@ begin;
   -- External Events
   \ir tables/merlin/external_events/external_source_type.sql
   \ir tables/merlin/external_events/external_event_type.sql
-  \ir tables/merlin/external_events/external_source_type_allowed_event_types.sql
   \ir tables/merlin/external_events/derivation_group.sql
   \ir tables/merlin/external_events/external_source.sql
   \ir tables/merlin/external_events/external_event.sql

diff --git a/...es-init-db/sql/tables/merlin/external_events/external_source_type_allowed_event_types.sql b/...es-init-db/sql/tables/merlin/external_events/external_source_type_allowed_event_types.sql
diff --git a/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/ExternalEventsTests.java b/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/ExternalEventsTests.java
diff --git a/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/utils/GQL.java b/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/utils/GQL.java
@@ -212,19 +212,6 @@ mutation DeleteExternalEventsBySource($externalSourceKey: String!, $derivationGr
        }
      }
    }"""),
-  DELETE_EXTERNAL_SOURCE_TYPE_ALLOWED_EVENT_TYPES("""
-    mutation DeleteExternalSourceTypeAllowedEventType(
-      $externalSourceType: String!,
-      $externalEventType: String!
-    ) {
-      deleteExternalSourceTypeAllowedEventTypes: delete_external_source_type_allowed_event_types_by_pk(
-                  external_source_type: $externalSourceType,
-                  external_event_type: $externalEventType
-      ) {
-        external_source_type
-        external_event_type
-      }
-    }"""),
   DELETE_EXTERNAL_SOURCE_TYPE("""
     mutation DeleteExternalSourceType($name: String!) {
       deleteExternalSourceType: delete_external_source_type_by_pk(name: $name) {

diff --git a/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/utils/HasuraRequests.java b/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/utils/HasuraRequests.java
@@ -1090,19 +1090,6 @@ public String insertPlanDerivationGroupAssociation(
         .getString("derivation_group_name");
   }
 
-  public String deleteExternalSourceTypeAllowedEventType(
-    String externalSourceType,
-    String externalEventType
-  ) throws IOException {
-    final var variables = Json.createObjectBuilder()
-                              .add("externalSourceType", externalSourceType)
-                              .add("externalEventType", externalEventType)
-                              .build();
-    var result = makeRequest(GQL.DELETE_EXTERNAL_SOURCE_TYPE_ALLOWED_EVENT_TYPES, variables)
-        .getJsonObject("deleteExternalSourceTypeAllowedEventTypes");
-    return result.getString("external_event_type") + ", " + result.getString("external_source_type");
-  }
-
   public String deleteExternalSourceType(
     String name
   ) throws IOException {