Revert "rename message parser configs (#3017)"

This reverts commit a2ef121.
CDCgov · Dec 11, 2024 · 1c4987e · 1c4987e
1 parent bc6cf1e
commit 1c4987e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 25 deletions.
diff --git a/containers/ecr-viewer/seed-scripts/create-seed-data.py b/containers/ecr-viewer/seed-scripts/create-seed-data.py
@@ -35,11 +35,6 @@ def _process_files(args):
     # Holds all of the rquests we are going to make
     requests = []
     folder_paths = []
-    configName = "integrated.json"
-    if os.getenv("METADATA_DATABASE_SCHEMA") == "extended":
-        configName = "non-integrated-extended.json"
-    elif os.getenv("METADATA_DATABASE_SCHEMA") == "core":
-        configName = "non-integrated-core.json"
 
     def _process_eicrs(subfolder, folder, folder_path, payload):
         r = grequests.post(f"{URL}/process-message", json=payload)
@@ -87,7 +82,7 @@ def _process_eicrs(subfolder, folder, folder_path, payload):
                     payload = {
                         "message_type": "ecr",
                         "data_type": "ecr",
-                        "config_file_name": configName,
+                        "config_file_name": "save-eicr-to-ecr-viewer-config.json",
                         "message": eicr_file.read(),
                         "rr_data": rr_file.read(),
                     }
@@ -115,18 +110,17 @@ def _process_eicrs(subfolder, folder, folder_path, payload):
             print(f"Failed to convert {folder_path}.\nResponse:\n{responses_json}")
             continue
 
-        if "responses" in responses_json.get("processed_values", {}):
-            for response in responses_json["processed_values"]["responses"]:
-                if "stamped_ecr" in response:
-                    with open(
-                        os.path.join(folder_path, "bundle.json"),
-                        "w",
-                    ) as fhir_file:
-                        json.dump(
-                            response["stamped_ecr"]["extended_bundle"],
-                            fhir_file,
-                            indent=4,
-                        )
+        for response in responses_json["processed_values"]["responses"]:
+            if "stamped_ecr" in response:
+                with open(
+                    os.path.join(folder_path, "bundle.json"),
+                    "w",
+                ) as fhir_file:
+                    json.dump(
+                        response["stamped_ecr"]["extended_bundle"],
+                        fhir_file,
+                        indent=4,
+                    )
         print(f"Converted {folder_path} successfully.")
 
     print(

diff --git a/containers/ecr-viewer/seed-scripts/docker-compose-create-sql.yml b/containers/ecr-viewer/seed-scripts/docker-compose-create-sql.yml
@@ -63,8 +63,6 @@ services:
         condition: service_healthy
     ports:
       - "8081:8081"
-    environment:
-      - METADATA_DATABASE_TYPE=${METADATA_DATABASE_TYPE}
     env_file:
       - ../../ecr-viewer/.env.local
     volumes:

diff --git a/...sage-parser/app/default_schemas/core.json → .../default_schemas/ecr_viewer_metadata.json b/...sage-parser/app/default_schemas/core.json → .../default_schemas/ecr_viewer_metadata.json
diff --git a/...-parser/app/default_schemas/extended.json → ...arser/app/default_schemas/philly_ecr.json b/...-parser/app/default_schemas/extended.json → ...arser/app/default_schemas/philly_ecr.json
diff --git a/containers/orchestration/app/custom_configs/create-seed-sql.json b/containers/orchestration/app/custom_configs/create-seed-sql.json
@@ -31,7 +31,7 @@
       "endpoint": "/parse_message",
       "params": {
         "message_format": "fhir",
-        "parsing_schema_name": "core.json",
+        "parsing_schema_name": "ecr_viewer_metadata.json",
         "credential_manager": "azure"
       }
     }

diff --git a/...stom_configs/non-integrated-extended.json → ...stom_configs/philadelphia-ecr-viewer.json b/...stom_configs/non-integrated-extended.json → ...stom_configs/philadelphia-ecr-viewer.json
@@ -31,7 +31,7 @@
       "endpoint": "/parse_message",
       "params": {
         "message_format": "fhir",
-        "parsing_schema_name": "extended.json",
+        "parsing_schema_name": "philly_ecr.json",
         "credential_manager": "azure"
       }
     },

diff --git a/containers/orchestration/app/custom_configs/save-bundle-to-ecr-viewer.json b/containers/orchestration/app/custom_configs/save-bundle-to-ecr-viewer.json
@@ -6,7 +6,7 @@
       "endpoint": "/parse_message",
       "params": {
         "message_format": "fhir",
-        "parsing_schema_name": "core.json"
+        "parsing_schema_name": "ecr_viewer_metadata.json"
       }
     },
     {

diff --git a/...p/custom_configs/non-integrated-core.json → ...nfigs/save-eicr-to-ecr-viewer-config.json b/...p/custom_configs/non-integrated-core.json → ...nfigs/save-eicr-to-ecr-viewer-config.json
@@ -31,7 +31,7 @@
       "endpoint": "/parse_message",
       "params": {
         "message_format": "fhir",
-        "parsing_schema_name": "core.json",
+        "parsing_schema_name": "ecr_viewer_metadata.json",
         "credential_manager": "azure"
       }
     },

diff --git a/containers/orchestration/tests/integration/test_orchestration.py b/containers/orchestration/tests/integration/test_orchestration.py
@@ -189,7 +189,7 @@ def test_previous_response_mapping_for_ecr_viewer(setup, clean_up_db):
         form_data = {
             "message_type": "ecr",
             "data_type": "zip",
-            "config_file_name": "non-integrated-core.json",
+            "config_file_name": "save-eicr-to-ecr-viewer-config.json",
         }
         files = {"upload_file": ("file.zip", file)}
         orchestration_response = httpx.post(