release/2024-10-22 Merge conflict fixes

Author: megan-bower4

docs/public_swagger/swagger.yaml

@@ -680,6 +680,38 @@ paths:
             application/fhir+json:
               schema:
                 $ref: "#/components/schemas/OperationOutcome"
+  /Questionnaire/{questionnaire_id}:
+    get:
+      operationId: readQuestionnaire
+      summary: readQuestionnaire endpoint for APIGEE integration
+      parameters:
+        - name: questionnaire_id
+          in: path
+          required: true
+          description: logical identifier
+          schema:
+            type: string
+        - in: header
+          name: version
+          schema:
+            $ref: "#/components/schemas/Version"
+        - in: header
+          name: x-request-id
+          schema:
+            $ref: "#/components/schemas/RequestId"
+        - in: header
+          name: x-correlation-id
+          schema:
+            $ref: "#/components/schemas/CorrelationId"
+      responses:
+        "200":
+          $ref: "#/components/responses/Questionnaire"
+        "4XX":
+          description: "Client Error"
+          content:
+            application/fhir+json:
+              schema:
+                $ref: "#/components/schemas/OperationOutcome"
 components:
   requestBodies:
     Device:
@@ -2754,6 +2786,15 @@ components:
     app-level0:
       $ref: https://proxygen.prod.api.platform.nhs.uk/components/securitySchemes/app-level0
   responses:
+    Questionnaire:
+      description: Questionnaire response body
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              tbc:
+                type: string
     ProductTeamResponse:
       description: Read Product Team operation successful
       content:
@@ -2817,5 +2858,3 @@ components:
                 type: string
               updated_on:
                 type: string
-              deleted_on:
-                type: string

infrastructure/swagger/swagger-fhir-generator-definitions/endpoints.yaml

@@ -9,5 +9,5 @@
 # RESTful API "Instance Level" or "Type Level" interactions
 # described in https://hl7.org/fhir/r4b/http.html
 
-Device: [create, read, search]
+Device: [create, read]
 Product: [read]

src/api/tests/feature_tests/steps/endpoint_lambda_mapping.py

@@ -49,6 +49,7 @@ def get_endpoint_lambda_mapping() -> ENDPOINT_LAMBDA_MAPPING:
             "ProductTeam/{product_team_id}/Product/{product_id}": api.readCpmProduct.index,
             "ProductTeam/{product_team_id}/Product/{product_id}/DeviceReferenceData/{device_reference_data_id}": api.readDeviceReferenceData.index,
             "Device/{id}": api.readDevice.index,
+            "Questionnaire/{questionnaire_id}": api.readQuestionnaire.index,
             "_status": api.status.index,
         },
         "DELETE": {