initial commit

Author: BJSS-russell-pollock

gateway-api/openapi.yaml

@@ -238,6 +238,30 @@ paths:
                         diagnostics:
                           type: string
                           example: "Patient not found"
+        '415':
+          description: Unsupported Media Type"
+          content:
+            application/fhir+json:
+              schema:
+                type: object
+                properties:
+                  resourceType:
+                    type: string
+                    example: "OperationOutcome"
+                  issue:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        severity:
+                          type: string
+                          example: "error"
+                        code:
+                          type: string
+                          example: "invalid"
+                        diagnostics:
+                          type: string
+                          example: 'Unsupported "Content-Type". Expected "application/fhir+json".'
         '500':
           description: Internal server error
           content:

gateway-api/src/gateway_api/common/error.py

@@ -1,5 +1,11 @@
 from dataclasses import dataclass
-from http.client import BAD_GATEWAY, BAD_REQUEST, INTERNAL_SERVER_ERROR, NOT_FOUND
+from http.client import (
+    BAD_GATEWAY,
+    BAD_REQUEST,
+    INTERNAL_SERVER_ERROR,
+    NOT_FOUND,
+    UNSUPPORTED_MEDIA_TYPE,
+)
 
 from fhir.stu3 import Issue, IssueCode, IssueSeverity, OperationOutcome
 
@@ -114,3 +120,10 @@ class UnexpectedError(AbstractCDGError):
     status_code = INTERNAL_SERVER_ERROR
     severity = IssueSeverity.ERROR
     error_code = IssueCode.EXCEPTION
+
+
+class UnsupportedMediaTypeError(AbstractCDGError):
+    _message = "Unsupported Media Type"
+    status_code = UNSUPPORTED_MEDIA_TYPE
+    severity = IssueSeverity.ERROR
+    error_code = IssueCode.INVALID

gateway-api/src/gateway_api/get_structured_record/request.py

@@ -10,8 +10,11 @@
 from gateway_api.common.error import (
     InvalidRequestJSONError,
     MissingOrEmptyHeaderError,
+    UnsupportedMediaTypeError,
 )
 
+ACCEPTED_CONTENT_TYPE = "application/fhir+json"
+
 # Access record structured interaction ID from
 # https://developer.nhs.uk/apis/gpconnect/accessrecord_structured_development.html#spine-interactions
 ACCESS_RECORD_STRUCTURED_INTERACTION_ID = (
@@ -32,6 +35,7 @@ class GetStructuredRecordRequest:
     def __init__(self, request: Request) -> None:
         self._http_request = request
         self._headers = CaseInsensitiveDict(request.headers)
+        self._validate_content_type()
         try:
             self.parameters = Parameters.model_validate(request.get_json())
         except (BadRequest, ValidationError) as error:
@@ -41,6 +45,13 @@ def __init__(self, request: Request) -> None:
 
         self._validate_headers()
 
+    def _validate_content_type(self) -> None:
+        content_type = self._headers.get("Content-Type")
+        if content_type is None:
+            return  # if not provided, that's not invalid
+        if content_type.split(";")[0].strip().lower() != ACCEPTED_CONTENT_TYPE:
+            raise UnsupportedMediaTypeError()
+
     @property
     def trace_id(self) -> str:
         trace_id: str = self._headers["Ssp-TraceID"]

gateway-api/tests/schema/test_openapi_schema.py

@@ -53,7 +53,7 @@ def test_api_schema_compliance(case: Case, base_url: str) -> None:
             # GPCAPIM-421
             schemathesis.checks.not_a_server_error,
             # GPCAPIM-419
-            schemathesis.checks.missing_required_header,
+            # schemathesis.checks.missing_required_header,
             # GPCAPIM-422
             schemathesis.checks.unsupported_method,
         ],

schemathesis.toml

@@ -1,2 +1,5 @@
 [generation]
 mode = "all"
+
+[checks.missing_required_header]
+expected-statuses = [400]