NPA-4474 Fix Rebase

Author: JackPlowman

sandbox/api/app.py

@@ -125,7 +125,7 @@ def get_consent() -> Union[dict, tuple]:
     Returns:
         Union[dict, tuple]: Response for GET /Consent
     """
-    get_consent_response()
+    return get_consent_response()
 
 @app.route(f"/{COMMON_PATH}/Consent", methods=["POST"])
 def post_consent() -> Union[dict, tuple]:

sandbox/api/tests/test_app.py

@@ -21,7 +21,7 @@
 
 UTILS_FILE_PATH = "sandbox.api.utils"
 APP_FILE_PATH = "sandbox.api.app"
-CONSENT_FILE_PATH = "sandbox.api.get_consent"
+GET_CONSENT_FILE_PATH = "sandbox.api.get_consent"
 
 
 @pytest.mark.parametrize("endpoint", ["/_status", "/_ping", "/health"])
@@ -164,7 +164,7 @@ def test_questionnaire_response(
         ),
     ],
 )
-@patch(f"{APP_FILE_PATH}.generate_response_from_example")
+@patch(f"{GET_CONSENT_FILE_PATH}.generate_response_from_example")
 def test_get_consent(
     mock_generate_response_from_example: MagicMock,
     request_args: str,
@@ -242,8 +242,8 @@ def test_post_consent_when_valid_returns_success(
     assert response.json == loads(mocked_response.get_data(as_text=True))
 
 
-@patch(f"{CONSENT_FILE_PATH}.remove_system")
-@patch(f"{CONSENT_FILE_PATH}.generate_response_from_example")
+@patch(f"{GET_CONSENT_FILE_PATH}.remove_system")
+@patch(f"{GET_CONSENT_FILE_PATH}.generate_response_from_example")
 def test_consent__500_internal_server_error(
     mock_generate_response_from_example: MagicMock,
     mock_remove_system: MagicMock,

sandbox/api/utils.py

@@ -20,7 +20,6 @@
     INTERNAL_SERVER_ERROR_EXAMPLE,
     GET_CONSENT__STATUS_PARAM_INVALID,
     BAD_REQUEST_INCLUDE_PARAM_INVALID,
-    CONSENT__STATUS_PARAM_INVALID,
 )
 
 FHIR_MIMETYPE = "application/fhir+json"
@@ -63,7 +62,7 @@ def check_for_related_person_errors(request: Request) -> Optional[tuple]:
 
 
 def check_for_consent_errors(request: Request) -> Optional[tuple]:
-    """Check for errors in the request headers and arguments for a Get /Consent
+    """Check for errors in the request headers and arguments for a GET /Consent request
 
     Args:
         request (Request): Flask request object