refactor: formatting updated

Author: ClarksonAdam

sandbox/api/constants.py

@@ -66,13 +66,11 @@
 CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP = (
     f"{CONSENT__DIRECTORY}single-consenting-adult-relationship.yaml"
 )
-CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP_INCLUDE_BOTH = (
-    f"{CONSENT__DIRECTORY}single-consenting-adult-relationship-include-performer-patient.yaml"
-)
+CONSENT__SINGLE_CONSENTING_ADULT_RELATIONSHIP_INCLUDE_BOTH = f"{CONSENT__DIRECTORY}single-consenting-adult-relationship-include-performer-patient.yaml"
 CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP = (
     f"{CONSENT__DIRECTORY}single-mother-child-relationship.yaml"
 )
-CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP_INCLUDE_BOTH = (
-    f"{CONSENT__DIRECTORY}single-mother-child-relationship-include-performer-patient.yaml"
+CONSENT__SINGLE_MOTHER_CHILD_RELATIONSHIP_INCLUDE_BOTH = f"{CONSENT__DIRECTORY}single-mother-child-relationship-include-performer-patient.yaml"
+CONSENT__STATUS_PARAM_INVALID = (
+    f"{CONSENT__DIRECTORY}errors/invalid-status-parameter.yaml"
 )
-CONSENT__STATUS_PARAM_INVALID = f"{CONSENT__DIRECTORY}errors/invalid-status-parameter.yaml"

sandbox/api/tests/test_utils.py

@@ -163,17 +163,17 @@ def test_get_response(mock_open: MagicMock) -> None:
     "request_args,response_file_name",
     [
         (
-            "", # identifier is missing
+            "",  # identifier is missing
             "./api/responses/GET_RelatedPerson/bad_request_identifier_missing.json",
         ),
         (
-            "identifier=123456789", # identifier length is less than 10
+            "identifier=123456789",  # identifier length is less than 10
             "./api/responses/GET_RelatedPerson/bad_request_identifier_invalid.json",
         ),
         (
             "identifier=https://fhir.nhs.uk/Id/nhs-number|A730675929",  # identifier system invalid
             "./api/responses/GET_RelatedPerson/bad_request_identifier_invalid_system.json",
-        )
+        ),
     ],
 )
 @patch(f"{FILE_PATH}.load_json_file")
@@ -196,21 +196,21 @@ def test_check_for_related_person_errors(
     "request_args,response_file_name,status_code",
     [
         (
-            "performer:identifier=90000009990", # Invalid performer identifier
+            "performer:identifier=90000009990",  # Invalid performer identifier
             "./api/examples/GET_Consent/errors/invalid-identifier.yaml",
             400,
         ),
         (
-            "", # missing performer identifier
+            "",  # missing performer identifier
             "./api/examples/GET_Consent/errors/missing-identifier.yaml",
             400,
         ),
         (
-            "performer:identifier=https://fhir.nhs.uk/Id/nhs-number|A730675929", # identifier system invalid
+            "performer:identifier=https://fhir.nhs.uk/Id/nhs-number|A730675929",  # identifier system invalid
             "./api/examples/GET_Consent/errors/invalid-identifier-system.yaml",
             400,
         ),
-    ]
+    ],
 )
 @patch(f"{FILE_PATH}.generate_response_from_example")
 def test_check_for_consent_errors(

sandbox/api/utils.py

@@ -42,32 +42,32 @@ def check_for_related_person_errors(request: Request) -> Optional[tuple]:
     identifier_without_system = remove_system(request.args.get("identifier"))
 
     if not identifier:
-        return (
-            generate_response(load_json_file(
+        return generate_response(
+            load_json_file(
                 "./api/responses/GET_RelatedPerson/bad_request_identifier_missing.json"
             ),
             400,
-        ))
+        )
     elif identifier and len(identifier_without_system) != 10:
         # invalid identifier
-        return (
-            generate_response(load_json_file(
+        return generate_response(
+            load_json_file(
                 "./api/responses/GET_RelatedPerson/bad_request_identifier_invalid.json"
             ),
             400,
-        ))
+        )
     elif (
         isinstance(identifier, str)
         and "|" in identifier
         and "https://fhir.nhs.uk/Id/nhs-number" == identifier.split("|", maxsplit=2)[0]
     ):
         # invalid identifier system
-        return (
-            generate_response(load_json_file(
+        return generate_response(
+            load_json_file(
                 "./api/responses/GET_RelatedPerson/bad_request_identifier_invalid_system.json"
             ),
             400,
-        ))
+        )
 
 
 def check_for_consent_errors(request: Request) -> Optional[tuple]:
@@ -287,22 +287,20 @@ def check_for_consent_filtering(
     """
     if status == [] or status is None:
         return generate_response_from_example(INVALIDATED_RESOURCE, 404)
-    if  status == ["active"]:
+    if status == ["active"]:
         if (
             len(_include) == 2
             and CONSENT_PERFORMER in _include
             and CONSENT_PERFORMER in _include
         ):
-            return generate_response_from_example(status_active_with_details_response_yaml, 200)
+            return generate_response_from_example(
+                status_active_with_details_response_yaml, 200
+            )
         else:
             return generate_response_from_example(INVALIDATED_RESOURCE, 404)
     elif status == ["inactive"]:
         return generate_response_from_example(status_inactive_response_yaml, 200)
-    elif (
-        len(status) == 2
-        and "active" in status
-        and "proposed" in status
-    ):
+    elif len(status) == 2 and "active" in status and "proposed" in status:
         return generate_response_from_example(
             status_proposed_and_active_response_yaml, 200
         )