NRL-1933 fix merge conflicts

Author: katebobyn-nhs

scripts/get_s3_permissions.py

@@ -85,7 +85,7 @@ def add_feature_test_files(local_path):
                 [PointerTypes.EOL_CARE_PLAN.value],
                 [],
             ),  # http://snomed.info/sct|736373009
-            ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN]),
+            ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN], []),
             (
                 "z00z-y11y-x22x",
                 "4LLTYP35P",
@@ -106,16 +106,17 @@ def add_feature_test_files(local_path):
     ]
     app_permissions = {
         "consumer": [
-            ("app-t001", [PointerTypes.MENTAL_HEALTH_PLAN]),
+            ("app-t001", [PointerTypes.MENTAL_HEALTH_PLAN], []),
             (
                 "app-t002",
                 [
                     PointerTypes.ADVANCE_CARE_PLAN,
                     PointerTypes.EMERGENCY_HEALTHCARE_PLAN,
                     PointerTypes.NEWS2_CHART,
                 ],
+                [],
             ),
-            ("app-t004", [PointerTypes.APPOINTMENT]),
+            ("app-t004", [PointerTypes.APPOINTMENT], []),
         ],
         "producer": [
             ("app-t001", [PointerTypes.EOL_COORDINATION_SUMMARY]),
@@ -126,16 +127,17 @@ def add_feature_test_files(local_path):
                     PointerTypes.EMERGENCY_HEALTHCARE_PLAN,
                     PointerTypes.NEWS2_CHART,
                 ],
+                [],
             ),
-            ("app-t004", [PointerTypes.APPOINTMENT]),
+            ("app-t004", [PointerTypes.APPOINTMENT], []),
         ],
     }
     [
         _write_permission_file(
             Path.joinpath(local_path, actor_type), app_id, pointer_types
         )
         for actor_type, entries in app_permissions.items()
-        for app_id, pointer_types in entries
+        for app_id, pointer_types, access_controls in entries
     ]
 
 

tests/features/producer/v2-permissions-app-level

@@ -118,11 +118,11 @@ Feature: Producer v2 permissions by pointer type - Success and Failure Scenarios
 
   Scenario: V2 Permissions with org-level permissions for requested type but app level permissions for other types
     Given the application 'ProducerTest004' (ID 'app-t004') is registered to access the API
-    When producer v2 'ORGA' creates a DocumentReference with values:
+    When producer v2 'ODS1' creates a DocumentReference with values:
       | property        | value                          |
       | subject         | 9278693472                     |
       | status          | current                        |
-      | type            | 749001000000101                |
+      | type            | 2181441000000107               |
       | category        | 734163000                      |
       | custodian       | ODS1                           |
       | author          | HAR1                           |