NPA-4831: Updated sandbox to account for new includes scenarios

Author: ellie-bound1-NHSD

sandbox/api/constants.py

@@ -49,6 +49,12 @@
 GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT = (
     f"{GET_CONSENT__DIRECTORY}multiple-relationships-single-patient.yaml"
 )
+GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_PATIENT = (
+    f"{GET_CONSENT__DIRECTORY}multiple-relationships-single-patient-include-patient.yaml"
+)
+GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_BOTH = (
+    f"{GET_CONSENT__DIRECTORY}multiple-relationships-single-patient-include-performer-patient.yaml"
+)
 # POST Consent
 POST_CONSENT__DIRECTORY = "./api/examples/POST_Consent/"
 POST_CONSENT__SUCCESS = f"{POST_CONSENT__DIRECTORY}success.yaml"

sandbox/api/get_consent.py

@@ -8,6 +8,8 @@
     GET_CONSENT__FILTERED_RELATIONSHIPS_STATUS_INACTIVE,
     GET_CONSENT__FILTERED_RELATIONSHIPS_STATUS_PROPOSED_ACTIVE,
     GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT,
+    GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_PATIENT,
+    GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_BOTH,
     GET_CONSENT__MULTIPLE_RELATIONSHIPS,
     GET_CONSENT__MULTIPLE_RELATIONSHIPS_INCLUDE_BOTH,
     GET_CONSENT__MULTIPLE_RELATIONSHIPS_INCLUDE_PATIENT,
@@ -63,7 +65,12 @@ def get_consent_response() -> Union[dict, tuple]:
                 GET_CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP_INCLUDE_BOTH,
             )
         elif patient_identifier == "9000000100":
-            return generate_response_from_example(GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT, 200)
+            return check_for_consent_include_params(
+                _include,
+                GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT,
+                GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_BOTH,
+                GET_CONSENT__MULTIPLE_RELATIONSHIPS_SINGLE_PATIENT_INCLUDE_PATIENT,
+            )
         # Filtering
         elif performer_identifier == "9000000017":
             return check_for_consent_filtering(

sandbox/api/tests/test_get_consent.py

@@ -21,11 +21,6 @@
             "./api/examples/errors/invalidated-resource.yaml",
             404,
         ),
-        (
-            "patient:identifier=9000000100",  # Multiple relationships single patient
-            "./api/examples/GET_Consent/multiple-relationships-single-patient.yaml",
-            200,
-        ),
     ],
 )
 @patch("sandbox.api.get_consent.generate_response_from_example")
@@ -153,6 +148,21 @@ def test_get_consent_returns_expected_responses__mocked_get_consent(
             "./api/examples/GET_Consent/single-mother-child-relationship-include-performer-patient.yaml",
             200,
         ),
+        (
+            "patient:identifier=9000000100",  # Multiple relationships single patient
+            "./api/examples/GET_Consent/multiple-relationships-single-patient.yaml",
+            200,
+        ),
+        (
+            "patient:identifier=9000000100&_include=Consent:patient",
+            "./api/examples/GET_Consent/multiple-relationships-single-patient-include-patient.yaml",
+            200,
+        ),
+        (
+            "patient:identifier=9000000100&_include=Consent:performer&_include=Consent:patient",
+            "./api/examples/GET_Consent/multiple-relationships-single-patient-include-performer-patient.yaml",
+            200,
+        ),
         (
             "performer:identifier=9000000017&status=test",  # Invalid status parameter error
             "./api/examples/GET_Consent/errors/invalid-status-parameter.yaml",

sandbox/api/utils.py

@@ -248,7 +248,7 @@ def check_for_consent_include_params(
             logger.error("No consent performer example provided")
             return generate_response_from_example(INTERNAL_SERVER_ERROR_EXAMPLE, 500)
     elif _include == [CONSENT_PATIENT]:
-        if include_performer_response_yaml:
+        if include_patient_response_yaml:
             return generate_response_from_example(include_patient_response_yaml, 200)
         else:
             logger.error("No consent:patient example provided")