Merge branch 'feature/PI-788-ui_delete_and_search' into release/2025-02-24

Author: megan-bower4

infrastructure/swagger/05_paths.yaml

@@ -16,6 +16,15 @@ tags:
     description: Create, Read and Delete Product IDs
   - name: Options
     description: These exist for CORS
+  - name: Core EPR Creation Endpoints
+    description: Core EPR API creation endpoints
+  - name: Core EPR Read Endpoints
+    description: Core EPR API read endpoints
+  - name: Core EPR Deletion Endpoints
+    description: Core EPR API deletion endpoints
+  - name: SDS Search Endpoints
+    description: Search Results provided for the SDS FHIR API
+
 paths:
   /_status:
     get:
@@ -298,6 +307,48 @@ paths:
         - app-level0: []
 
   /ProductTeam/{product_team_id}/Product/{product_id}:
+    options:
+      operationId: productactions
+      summary: Product actions (OPTIONS)
+      parameters:
+        - $ref: "#/components/parameters/ProductTeamId"
+        - $ref: "#/components/parameters/ProductId"
+      tags:
+        - Core Product ID Endpoints
+      responses:
+        "400":
+          $ref: "#/components/responses/BadRequest"
+        "200":
+          description: "200 response"
+          headers:
+            Access-Control-Allow-Origin:
+              schema:
+                type: "string"
+            Access-Control-Allow-Methods:
+              schema:
+                type: "string"
+            Access-Control-Allow-Headers:
+              schema:
+                type: "string"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Empty"
+      x-amazon-apigateway-integration:
+        responses:
+          default:
+            statusCode: "200"
+            responseParameters:
+              method.response.header.Access-Control-Allow-Methods: "'GET,OPTIONS,POST,DELETE'"
+              method.response.header.Access-Control-Allow-Headers: "'apikey,authorization,content-type,version'"
+              method.response.header.Access-Control-Allow-Origin: "'*'"
+        requestTemplates:
+          application/json: '{"statusCode": 200}'
+        passthroughBehavior: "never"
+        type: "mock"
+      security:
+        - ${authoriser_name}: []
+        - app-level0: []
     get:
       operationId: readproductendpoint
       summary: Read a Product resource (GET)

infrastructure/swagger/12_components--responses.yaml

@@ -86,8 +86,18 @@ components:
       headers:
         Access-Control-Allow-Origin:
           schema:
-            type: string
-          example: "*"
+            $ref: "#/components/schemas/ErrorResponse"
+          examples:
+            ValidationErrorExtraFields:
+              value:
+                errors:
+                  - code: "VALIDATION_ERROR"
+                    message: "SearchSDSEndpointQueryParams.foo: extra fields not permitted"
+            ValidationError:
+              value:
+                errors:
+                  - code: "VALIDATION_ERROR"
+                    message: "SearchSDSEndpointQueryParams.__root__: At least 2 query parameters should be provided of type, nhs_id_code, nhs_mhs_svc_ia and nhs_mhs_party_key"
     UnprocessableContent:
       description: Unprocessable Content
       content:

src/api/tests/smoke_tests/test_smoke.py

@@ -83,6 +83,25 @@ def _request(base_url: str, headers: dict, path: str, method: str):
                 "SearchProductQueryParams.__root__: Please provide exactly one valid query parameter: ('product_team_id', 'organisation_code')."
             ],
         ],
+        [
+            "/ProductTeam/123/Product/abc",
+            "DELETE",
+            404,
+        ],
+        [
+            "/ProductTeam/123",
+            "DELETE",
+            404,
+        ],
+        [
+            "/Product",
+            "GET",
+            400,
+            ["VALIDATION_ERROR"],
+            [
+                "SearchProductQueryParams.__root__: Please provide exactly one valid query parameter: ('product_team_id', 'organisation_code')."
+            ],
+        ],
     ],
 )
 def test_smoke_tests(request_details):

test_ui/product_id_flow/.gitignore

@@ -22,3 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+tsconfig.tsbuildinfo
+tsconfig.*.tsbuildinfo