Merge pull request #375 from NHSDigital/release/2024-10-25

Release/2024 10 25

Author: jameslinnell

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2024-10-25
+- [PI-551] Remove FHIR from Read CPM Product flow
+- [PI-553] Remove FHIR from Delete CPM Product flow
+
 ## 2024-10-22
 - [PI-552] Remove FHIR from search CPMProduct
 - [PI-557] Remove search Device

VERSION

@@ -1 +1 @@
-2024.10.22
+2024.10.25

changelog/2024-10-25.md

@@ -0,0 +1,2 @@
+- [PI-551] Remove FHIR from Read CPM Product flow
+- [PI-553] Remove FHIR from Delete CPM Product flow

infrastructure/swagger/05_paths.yaml

@@ -199,11 +199,7 @@ paths:
       responses:
         responses:
         "200":
-          description: Read Product operation successful
-          content:
-            application/fhir+json:
-              schema:
-                $ref: "#/components/schemas/Bundle"
+          $ref: "#/components/responses/ProductResponse"
         "4XX":
           <<: *Response4XX
       x-amazon-apigateway-integration:

infrastructure/swagger/12_components--responses.yaml

@@ -76,6 +76,47 @@ components:
               keys:
                 - key_type: "product_team_id_alias"
                   key_value: "FOOBAR"
+    ProductResponse:
+      description: Read Product operation successful
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              id:
+                type: string
+              name:
+                type: string
+              ods_code:
+                type: string
+              status:
+                type: string
+              created_on:
+                type: string
+              updated_on:
+                type: string
+              deleted_on:
+                type: string
+              keys:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    key_type:
+                      type: string
+                    key_value:
+                      type: string
+            example:
+              id: "123-XXX"
+              name: "Sample Product Team"
+              ods_code: "F5H1R"
+              status: "active"
+              created_on: "2024-10-15T10:00:00Z"
+              updated_on: "2024-10-15T10:00:00Z"
+              deleted_on: "null"
+              keys:
+                - key_type: "product_team_id_alias"
+                  key_value: "FOOBAR"
     DeviceReferenceDataResponse:
       description: Read Device Reference Data operation successful
       content:

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

@@ -10,4 +10,3 @@
 # described in https://hl7.org/fhir/r4b/http.html
 
 Device: [create, read]
-Product: [read]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2024.10.22"
+version = "2024.10.25"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"

src/api/deleteCpmProduct/index.py

@@ -1,4 +1,4 @@
-from api_utils.api_step_chain import execute_step_chain_fhir as execute_step_chain
+from api_utils.api_step_chain import execute_step_chain
 from domain.logging.step_decorators import logging_step_decorators
 from event.aws.client import dynamodb_client
 from event.environment import BaseEnvironment

src/api/readCpmProduct/index.py

@@ -1,4 +1,4 @@
-from api_utils.api_step_chain import execute_step_chain_fhir as execute_step_chain
+from api_utils.api_step_chain import execute_step_chain
 from event.aws.client import dynamodb_client
 from event.environment import BaseEnvironment
 from event.logging.logger import setup_logger

src/layers/domain/api/common_steps/read_product.py

@@ -1,3 +1,5 @@
+from http import HTTPStatus
+
 from aws_lambda_powertools.utilities.data_classes import APIGatewayProxyEvent
 from domain.core.cpm_product.v1 import CpmProduct
 from domain.core.product_team.v3 import ProductTeam
@@ -33,9 +35,9 @@ def read_product(data, cache) -> CpmProduct:
     return cpm_product
 
 
-def product_to_dict(data, cache) -> dict:
+def product_to_dict(data, cache) -> tuple[str, dict]:
     product: CpmProduct = data[read_product]
-    return product.state()
+    return HTTPStatus.OK, product.state()
 
 
 before_steps = [