NRL-2100 Attempting to get 1DSync tests more realistic and working in public mode pls

Author: anjalitrace2-nhs

scripts/get_s3_permissions.py

@@ -191,7 +191,7 @@ def add_smoke_test_files(local_path):
     org_permissions = {
         "consumer": [
             (
-                "X26-NRL-6981ad7d-cff4-4613-93d0-df60e5e2fc52",  # nrl_app_id
+                "X26-NRL-6981ad7d-cff4-4613-93d0-df60e5e2fc52",
                 "SMOKETEST",  # ods_code
                 [
                     PointerTypes.MENTAL_HEALTH_PLAN.value
@@ -201,19 +201,20 @@ def add_smoke_test_files(local_path):
         ],
         "producer": [
             (
-                "SMOKETEST_1DSYNC",
-                "SMOKETEST",
-                [],
-                [AccessControls.ALLOW_ALL_TYPES.value],
-            ),
-            (
-                "X26-NRL-6981ad7d-cff4-4613-93d0-df60e5e2fc52",  # nrl_app_id
+                "X26-NRL-6981ad7d-cff4-4613-93d0-df60e5e2fc52",
                 "SMOKETEST",  # ods_code
                 [
                     PointerTypes.MENTAL_HEALTH_PLAN.value
                 ],  # http://snomed.info/sct|736253002
                 [],
             ),
+            (
+                # For public tests - don't have a separate apigee app for 1DSync
+                "X26-NRL-6981ad7d-cff4-4613-93d0-df60e5e2fc52",
+                "SMOKETEST1DSYNC",
+                [],
+                [AccessControls.ALLOW_ALL_TYPES.value],
+            ),
         ],
     }
     [
@@ -227,11 +228,12 @@ def add_smoke_test_files(local_path):
         for app_id, ods_code, pointer_types, access_controls in entries
     ]
     app_permissions = {
-        "consumer": [
-            ("app-t001", [PointerTypes.MENTAL_HEALTH_PLAN.value], []),
-        ],
         "producer": [
-            ("app-t001", [PointerTypes.EOL_COORDINATION_SUMMARY.value], []),
+            (
+                "SMOKETEST1DSYNC",
+                [],
+                [AccessControls.ALLOW_ALL_TYPES.value],
+            ),
         ],
     }
     [
@@ -248,7 +250,7 @@ def add_smoke_test_files(local_path):
     print("Adding smoke test v1 permissions to temporary directory...")
     v1_permissions = [
         (
-            "SMOKETEST_1DSYNC_V1",
+            "SMOKETEST1DSYNCV1",
             "SMOKETEST",
             [],  # not needed, won't hit this file
         ),

tests/smoke/scenarios/1dsync_upsert_delete.py

@@ -16,7 +16,11 @@ def producer_client_1dsync(
         client_config.connection_metadata["nrl.permissions"] = [
             PERMISSION_ALLOW_ALL_POINTER_TYPES
         ]
-        client_config.connection_metadata["nrl.app-id"] = "SMOKETEST_1DSYNC"
+        client_config.connection_metadata["nrl.app-id"] = "SMOKETEST1DSYNC"
+    else:
+        client_config.custom_headers["NHSD-End-User-Organisation-ODS"] = (
+            "SMOKETEST1DSYNC"
+        )
 
     return ProducerTestClient(config=client_config)
 

tests/smoke/scenarios/1dsync_upsert_delete_v1.py

@@ -1,10 +1,12 @@
 import pytest
 
-from nrlf.core.constants import PERMISSION_ALLOW_ALL_POINTER_TYPES
+from nrlf.core.constants import PERMISSION_ALLOW_ALL_POINTER_TYPES, V2Headers
 from tests.smoke.environment import ConnectMode, EnvironmentConfig, SmokeTestParameters
 from tests.smoke.setup import build_document_reference
 from tests.utilities.api_clients import ProducerTestClient
 
+v1_1dsync_app_id = "SMOKETEST_1DSYNC_V1"
+
 
 @pytest.fixture
 def producer_client_1dsync_v1(
@@ -16,7 +18,10 @@ def producer_client_1dsync_v1(
         client_config.connection_metadata["nrl.permissions"] = [
             PERMISSION_ALLOW_ALL_POINTER_TYPES
         ]
-        client_config.connection_metadata["nrl.app-id"] = "SMOKETEST_1DSYNC_V1"
+        client_config.connection_metadata["nrl.app-id"] = v1_1dsync_app_id
+        client_config.custom_headers[V2Headers.X_PROXYGEN_APP_NRL_APP_ID] = (
+            v1_1dsync_app_id
+        )
 
     return ProducerTestClient(config=client_config)
 

tests/smoke/scenarios/consumer_search_read_v1.py

@@ -40,7 +40,7 @@ def test_smoke_consumer_search_read(
     consumer_client: ConsumerTestClient, test_data_v1: dict
 ):
     """
-    Smoke test scenario for a consumer search and read behavior
+    Smoke test scenario for a consumer search and read behaviour
     """
     patient_id = test_data_v1["patient_nhs_number"]
     test_pointers = test_data_v1["pointers"]

tests/smoke/scenarios/producer_crud_v1.py

@@ -9,7 +9,7 @@ def test_smoke_producer_crud_v1(
     smoke_test_parameters: SmokeTestParameters,
 ):
     """
-    Smoke test scenario for producer CRUD behavior
+    Smoke test scenario for producer CRUD behaviour
     """
     test_ods_code = smoke_test_parameters.v1_ods_code
     test_docref = build_document_reference(

tests/smoke/scenarios/producer_search_read_v1.py

@@ -40,7 +40,7 @@ def test_smoke_producer_search_read(
     producer_client_v1: ProducerTestClient, test_data: dict
 ):
     """
-    Smoke test scenario for a producer search and read behavior
+    Smoke test scenario for a producer search and read behaviour
     """
     patient_id = test_data["patient_nhs_number"]
     test_pointers = test_data["pointers"]