Merge pull request #357 from NHSDigital/release/2024-10-15

Release/2024-10-15

Author: jaklinger

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2024-10-15
+- [PI-533] Create Product Team without FHIR
+
 ## 2024-10-14
 - [PI-534] Errors without FHIR
 

VERSION

@@ -1 +1 @@
-2024.10.14
+2024.10.15

changelog/2024-10-15.md

@@ -0,0 +1 @@
+- [PI-533] Create Product Team without FHIR

docs/public_swagger/swagger.yaml

@@ -256,38 +256,6 @@ paths:
             application/fhir+json:
               schema:
                 $ref: "#/components/schemas/OperationOutcome"
-  /Organization:
-    post:
-      summary: Create an Organization resource
-      operationId: createOrganization
-      responses:
-        "201":
-          description: Create operation successful
-          content:
-            application/fhir+json:
-              schema:
-                $ref: "#/components/schemas/OperationOutcome"
-        "4XX":
-          description: "Client Error"
-          content:
-            application/fhir+json:
-              schema:
-                $ref: "#/components/schemas/OperationOutcome"
-      requestBody:
-        $ref: "#/components/requestBodies/Organization"
-      parameters:
-        - 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"
   /Organization/{id}:
     get:
       summary: Read an Organization resource

infrastructure/swagger/05_paths.yaml

@@ -67,21 +67,6 @@ paths:
         - ${authoriser_name}: []
         - app-level0: []
 
-  /Organization:
-    post:
-      responses:
-        "201":
-          <<: *Response201
-        "4XX":
-          <<: *Response4XX
-      <<: *RequestHeaders
-      x-amazon-apigateway-integration:
-        <<: *ApiGatewayIntegration
-        uri: ${method_createProductTeam}
-      security:
-        - ${authoriser_name}: []
-        - app-level0: []
-
   /Organization/{id}:
     get:
       parameters:

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

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

pyproject.toml

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

src/api/createCpmProduct/tests/data.py

@@ -1,7 +1,7 @@
 product_team_payload = {
-    "id": "641be376-3954-4339-822c-54071c9ff1a0",
-    "name": "123",
-    "ods_code": "AAA",
+    "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+    "ods_code": "F5H1R",
+    "name": "FOOBAR Product Team",
 }
 
 product_payload = {"product_name": "Foobar product"}

src/api/createCpmProduct/tests/test_index.py

@@ -19,7 +19,7 @@ def _mock_test(version, params):
     org = Root.create_ods_organisation(ods_code=product_team_payload["ods_code"])
 
     product_team = org.create_product_team(
-        id=product_team_payload["id"], name=product_team_payload["name"]
+        name=product_team_payload["name"], keys=product_team_payload["keys"]
     )
 
     with mock_table(table_name=TABLE_NAME) as client, mock.patch.dict(
@@ -41,7 +41,7 @@ def _mock_test(version, params):
             event={
                 "headers": {"version": version},
                 "body": params,
-                "pathParameters": {"product_team_id": product_team_payload["id"]},
+                "pathParameters": {"product_team_id": product_team.id},
             }
         )
 

src/api/createCpmProductForEpr/tests/test_index.py

@@ -3,25 +3,25 @@
 from contextlib import contextmanager
 from datetime import datetime
 from unittest import mock
-from uuid import UUID
 
 import pytest
 from domain.core.cpm_system_id.v1 import PartyKeyId, ProductId
 from domain.core.enum import Status
-from domain.core.root import Root
+from domain.core.root.v3 import Root
 from domain.repository.cpm_product_repository.v3 import CpmProductRepository
 from domain.repository.product_team_repository.v2 import ProductTeamRepository
 from event.json import json_loads
 from nhs_context_logging import app_logger
 
 from test_helpers.dynamodb import mock_table
+from test_helpers.sample_data import CPM_PRODUCT_TEAM_NO_ID
 from test_helpers.uuid import consistent_uuid
 
 TABLE_NAME = "hiya"
-
-ODS_CODE = "AAA"
+ODS_CODE = "F5H1R"
 PRODUCT_TEAM_ID = consistent_uuid(1)
 PRODUCT_NAME = "My Product"
+PRODUCT_TEAM_KEYS = CPM_PRODUCT_TEAM_NO_ID["keys"]
 VERSION = 1
 RESOURCE_CREATED = {
     "resourceType": "OperationOutcome",
@@ -51,8 +51,10 @@
 
 @contextmanager
 def mock_lambda():
-    org = Root.create_ods_organisation(ods_code=ODS_CODE)
-    product_team = org.create_product_team(id=PRODUCT_TEAM_ID, name=PRODUCT_NAME)
+    org = Root.create_ods_organisation(ods_code=CPM_PRODUCT_TEAM_NO_ID["ods_code"])
+    product_team = org.create_product_team(
+        name=CPM_PRODUCT_TEAM_NO_ID["name"], keys=CPM_PRODUCT_TEAM_NO_ID["keys"]
+    )
 
     with mock_table(table_name=TABLE_NAME) as client, mock.patch.dict(
         os.environ,
@@ -68,20 +70,19 @@ def mock_lambda():
 
         index.cache["DYNAMODB_CLIENT"] = client
 
-        yield index
+        yield index, product_team
 
 
 def test_index():
-    with mock_lambda() as index:
+    with mock_lambda() as (index, product_team):
         # Execute the lambda
         response = index.handler(
             event={
                 "headers": {"version": VERSION},
                 "body": json.dumps({"product_name": PRODUCT_NAME}),
-                "pathParameters": {"product_team_id": PRODUCT_TEAM_ID},
+                "pathParameters": {"product_team_id": product_team.id},
             }
         )
-
         # Validate that the response indicates that a resource was created
         assert response["statusCode"] == 201
         assert json_loads(response["body"]) == {
@@ -94,7 +95,7 @@ def test_index():
             table_name=TABLE_NAME, dynamodb_client=index.cache["DYNAMODB_CLIENT"]
         )
         created_product = repo.read(
-            product_team_id=PRODUCT_TEAM_ID, product_id=response["headers"]["Location"]
+            product_team_id=product_team.id, product_id=response["headers"]["Location"]
         ).dict()
 
     # Sense checks on the created resource
@@ -108,7 +109,7 @@ def test_index():
         "deleted_on": None,
         "name": PRODUCT_NAME,
         "ods_code": ODS_CODE,
-        "product_team_id": UUID(PRODUCT_TEAM_ID),
+        "product_team_id": product_team.id,
         "status": Status.ACTIVE,
     }
 
@@ -143,7 +144,7 @@ def test_index():
     ],
 )
 def test_incoming_errors(body, path_parameters, error_code, status_code):
-    with mock_lambda() as index:
+    with mock_lambda() as (index, product_team):
         # Execute the lambda
         response = index.handler(
             event={