NRL-1933 fix merge conflicts

katebobyn-nhs · katebobyn-nhs · commit 00475f477472 · 2026-03-12T13:14:13.000Z
diff --git a/scripts/get_s3_permissions.py b/scripts/get_s3_permissions.py
@@ -70,7 +70,7 @@ def add_feature_test_files(local_path):
                 [PointerTypes.MENTAL_HEALTH_PLAN.value],
                 [],
             ),  # http://snomed.info/sct|736253002
-            ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN]),
+            ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN], []),
             (
                 "z00z-y11y-x22x",
                 "4LLTYP35C",
@@ -134,7 +134,10 @@ def add_feature_test_files(local_path):
     }
     [
         _write_permission_file(
-            Path.joinpath(local_path, actor_type), app_id, pointer_types
+            Path.joinpath(local_path, actor_type),
+            app_id,
+            pointer_types,
+            access_controls,
         )
         for actor_type, entries in app_permissions.items()
         for app_id, pointer_types, access_controls in entries

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ def add_feature_test_files(local_path):`
`70`	`70`	`[PointerTypes.MENTAL_HEALTH_PLAN.value],`
`71`	`71`	`[],`
`72`	`72`	`), # http://snomed.info/sct\|736253002`
`73`		`- ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN]),`
	`73`	`+ ("app-t004", "ODS1", [PointerTypes.PERSONALISED_CARE_AND_SUPPORT_PLAN], []),`
`74`	`74`	`(`
`75`	`75`	`"z00z-y11y-x22x",`
`76`	`76`	`"4LLTYP35C",`
`@@ -134,7 +134,10 @@ def add_feature_test_files(local_path):`
`134`	`134`	`}`
`135`	`135`	`[`
`136`	`136`	`_write_permission_file(`
`137`		`- Path.joinpath(local_path, actor_type), app_id, pointer_types`
	`137`	`+ Path.joinpath(local_path, actor_type),`
	`138`	`+ app_id,`
	`139`	`+ pointer_types,`
	`140`	`+ access_controls,`
`138`	`141`	`)`
`139`	`142`	`for actor_type, entries in app_permissions.items()`
`140`	`143`	`for app_id, pointer_types, access_controls in entries`