Unit and integration tests

jameslinnell · jameslinnell · commit 5d7b9c8a327b · 2025-03-05T09:43:32.000Z
diff --git a/src/api/createCpmProduct/tests/data.py b/src/api/createCpmProduct/tests/data.py
@@ -1,5 +1,10 @@
 product_team_payload = {
-    "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+    "keys": [
+        {
+            "key_type": "product_team_id",
+            "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+        }
+    ],
     "ods_code": "F5H1R",
     "name": "FOOBAR Product Team",
 }
diff --git a/src/api/createCpmProduct/tests/test_index.py b/src/api/createCpmProduct/tests/test_index.py
@@ -61,7 +61,7 @@ def test_index(version):
     expected_body = json.dumps(
         {
             "id": product["id"],
-            "product_team_id": product["product_team_id"],
+            "cpm_product_team_id": product["cpm_product_team_id"],
             "name": "Foobar product",
             "ods_code": "F5H1R",
             "status": "active",
@@ -127,15 +127,17 @@ def test_index_no_such_product_team(version):
             event={
                 "headers": {"version": version},
                 "body": json.dumps(product_payload),
-                "pathParameters": {"product_team_id": "FOOBAR"},
+                "pathParameters": {
+                    "product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"
+                },
             }
         )
     expected_result = json.dumps(
         {
             "errors": [
                 {
                     "code": "RESOURCE_NOT_FOUND",
-                    "message": "Could not find ProductTeam for key ('FOOBAR')",
+                    "message": "Could not find ProductTeam for key ('808a36db-a52a-4130-b71e-d9cbcbaed15b')",
                 }
             ],
         }
diff --git a/src/api/createProductTeam/tests/v1/test_index_v1.py b/src/api/createProductTeam/tests/v1/test_index_v1.py
@@ -48,7 +48,12 @@ def test_index(version):
             "created_on": result_body["created_on"],
             "updated_on": None,
             "deleted_on": None,
-            "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+            "keys": [
+                {
+                    "key_type": "product_team_id",
+                    "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+                }
+            ],
         }
     )
     expected = {
@@ -146,7 +151,12 @@ def test_index(version):
             "created_on": result_body["created_on"],
             "updated_on": None,
             "deleted_on": None,
-            "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+            "keys": [
+                {
+                    "key_type": "product_team_id",
+                    "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+                }
+            ],
         }
     )
     expected = {
diff --git a/src/api/deleteCpmProduct/tests/test_index.py b/src/api/deleteCpmProduct/tests/test_index.py
@@ -101,7 +101,7 @@ def test_index():
     assert deleted_product == {
         "name": PRODUCT_NAME,
         "ods_code": ODS_CODE,
-        "product_team_id": product_team.id,
+        "cpm_product_team_id": product_team.id,
         "status": Status.INACTIVE,
         "keys": [],
     }
diff --git a/src/api/deleteProductTeam/tests/test_index.py b/src/api/deleteProductTeam/tests/test_index.py
@@ -152,7 +152,9 @@ def test_index_by_alias(version):
         result = handler(
             event={
                 "headers": {"version": version},
-                "pathParameters": {"product_team_id": "BAR"},
+                "pathParameters": {
+                    "product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"
+                },
             }
         )
     expected_result = json.dumps(
diff --git a/src/api/readCpmProduct/tests/test_index.py b/src/api/readCpmProduct/tests/test_index.py
@@ -17,7 +17,9 @@
 PRODUCT_TEAM_NAME = "product-team-name"
 PRODUCT_ID = "P.XXX-YYY"
 PRODUCT_NAME = "cpm-product-name"
-PRODUCT_TEAM_KEYS = [{"key_type": "product_team_id_alias", "key_value": "BAR"}]
+PRODUCT_TEAM_KEYS = [
+    {"key_type": "product_team_id", "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b"}
+]
 
 
 @pytest.mark.parametrize(
@@ -67,14 +69,14 @@ def test_index(version):
 
     # Assertions for fields that must exactly match
     assert response_body["id"] == PRODUCT_ID
-    assert response_body["product_team_id"] == product_team.id
+    assert response_body["cpm_product_team_id"] == product_team.id
     assert response_body["name"] == PRODUCT_NAME
     assert response_body["ods_code"] == ODS_CODE
     assert response_body["updated_on"] is None
     assert response_body["deleted_on"] is None
 
     # Assertions for fields that only need to be included
-    assert "product_team_id" in response_body
+    assert "cpm_product_team_id" in response_body
     assert "created_on" in response_body
 
     expected_headers = {
diff --git a/src/api/readProductTeam/tests/test_index.py b/src/api/readProductTeam/tests/test_index.py
@@ -60,7 +60,12 @@ def test_index(version):
             "created_on": result_body["created_on"],
             "updated_on": None,
             "deleted_on": None,
-            "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+            "keys": [
+                {
+                    "key_type": "product_team_id",
+                    "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+                }
+            ],
         }
     )
 
@@ -159,7 +164,9 @@ def test_index_by_alias(version):
         result = handler(
             event={
                 "headers": {"version": version},
-                "pathParameters": {"product_team_id": "BAR"},
+                "pathParameters": {
+                    "product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"
+                },
             }
         )
     result_body = json_loads(result["body"])
@@ -172,7 +179,12 @@ def test_index_by_alias(version):
             "created_on": result_body["created_on"],
             "updated_on": None,
             "deleted_on": None,
-            "keys": [{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+            "keys": [
+                {
+                    "key_type": "product_team_id",
+                    "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+                }
+            ],
         }
     )
 
diff --git a/src/api/searchProduct/tests/test_index.py b/src/api/searchProduct/tests/test_index.py
@@ -17,7 +17,9 @@
 ODS_CODE = "F5H1R"
 PRODUCT_TEAM_NAME = "product-team-name"
 PRODUCT_TEAM_ID = "sample_product_team_id"
-PRODUCT_TEAM_KEYS = [{"key_type": "product_team_id_alias", "key_value": "FOOBAR"}]
+PRODUCT_TEAM_KEYS = [
+    {"key_type": "product_team_id", "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b"}
+]
 PRODUCT_NAME = "product-name"
 PRODUCT_ID = "P.AAA-367"
 
@@ -191,7 +193,7 @@ def test_search_by_product_team_alias():
         )
         product_repo.write(cpm_product)
 
-        params = {"product_team_id": "FOOBAR"}
+        params = {"product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"}
         result = handler(
             event={
                 "headers": {"version": VERSION},
diff --git a/src/layers/domain/api/common_steps/tests/test_create_cpm_product.py b/src/layers/domain/api/common_steps/tests/test_create_cpm_product.py
@@ -81,5 +81,5 @@ def test_create_product_steps_good_input():
         step_chain.run(init=event, cache=mocked_cache)
 
     assert isinstance(step_chain.result, CpmProduct)
-    assert step_chain.result.product_team_id == product_team.id
+    assert step_chain.result.cpm_product_team_id == product_team.id
     assert step_chain.result.ods_code == ods_code
diff --git a/src/layers/domain/api/common_steps/tests/test_read_cpm_product.py b/src/layers/domain/api/common_steps/tests/test_read_cpm_product.py
@@ -75,5 +75,5 @@ def test_read_product_steps_good_input():
         )
 
     assert isinstance(step_chain.result, CpmProduct)
-    assert step_chain.result.product_team_id == product_team.id
+    assert step_chain.result.cpm_product_team_id == product_team.id
     assert step_chain.result.ods_code == ods_code
diff --git a/src/layers/domain/core/cpm_product/tests/test_cpm_product_v1.py b/src/layers/domain/core/cpm_product/tests/test_cpm_product_v1.py
@@ -10,7 +10,7 @@ def cpm_product():
     product = CpmProduct(
         name="Foo",
         ods_code="ABC123",
-        product_team_id="ABC123.18934119-5780-4d28-b9be-0e6dff3908ba",
+        cpm_product_team_id="18934119-5780-4d28-b9be-0e6dff3908ba",
     )
     return product
 
@@ -20,7 +20,7 @@ def test_cpm_product_created(cpm_product: CpmProduct):
     assert isinstance(cpm_product.id, ProductId)
     assert isinstance(cpm_product.name, str)
     assert isinstance(cpm_product.ods_code, str)
-    assert isinstance(cpm_product.product_team_id, str)
+    assert isinstance(cpm_product.cpm_product_team_id, str)
     assert isinstance(cpm_product.created_on, datetime)
 
 
@@ -39,5 +39,5 @@ def test_invalid_product_id(invalid_product_id):
             id=invalid_product_id,
             name="Foo",
             ods_code="ABC123",
-            product_team_id="ABC123.18934119-5780-4d28-b9be-0e6dff3908ba",
+            cpm_product_team_id="18934119-5780-4d28-b9be-0e6dff3908ba",
         )
diff --git a/src/layers/domain/core/product_team/tests/test_product_team_v1.py b/src/layers/domain/core/product_team/tests/test_product_team_v1.py
@@ -13,7 +13,7 @@
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -34,7 +34,7 @@ def test__create_product_team_bad_name(keys: list, name: str):
         [
             [
                 {
-                    "key_type": "product_team_id",
+                    "key_type": "product_team_id_alias",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -55,7 +55,7 @@ def test__create_product_team_bad_key_type(keys: list, name: str):
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -65,7 +65,7 @@ def test__create_product_team_bad_key_type(keys: list, name: str):
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "edf90c3a-f865-4dd9-9ab9-400e6ebc02e0",
                 }
             ],
@@ -75,18 +75,13 @@ def test__create_product_team_bad_key_type(keys: list, name: str):
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "f9518c12-6c83-4544-97db-d9dd1d64da97",
                 }
             ],
             "Third",
             "AB123",
         ],
-        [
-            [{"key_type": "product_team_id_alias", "key_value": "foobar"}],
-            "Fourth",
-            "AB123",
-        ],
     ],
 )
 def test__create_product_team(
@@ -110,7 +105,7 @@ def test__create_product_team(
             None,
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -121,7 +116,7 @@ def test__create_product_team(
             None,
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "edf90c3a-f865-4dd9-9ab9-400e6ebc02e0",
                 }
             ],
@@ -132,19 +127,13 @@ def test__create_product_team(
             None,
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "f9518c12-6c83-4544-97db-d9dd1d64da97",
                 }
             ],
             "Third",
             "AB123",
         ],
-        [
-            None,
-            [{"key_type": "product_team_id_alias", "key_value": "foobar"}],
-            "Fourth",
-            "AB123",
-        ],
     ],
 )
 def test__create_product_team_provided_id_equals_none_is_ignored(
@@ -168,7 +157,7 @@ def test__create_product_team_provided_id_equals_none_is_ignored(
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -177,7 +166,7 @@ def test__create_product_team_provided_id_equals_none_is_ignored(
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "edf90c3a-f865-4dd9-9ab9-400e6ebc02e0",
                 }
             ],
@@ -186,13 +175,12 @@ def test__create_product_team_provided_id_equals_none_is_ignored(
         [
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "f9518c12-6c83-4544-97db-d9dd1d64da97",
                 }
             ],
             "Third",
         ],
-        [[{"key_type": "product_team_id_alias", "key_value": "foobar"}], "Fourth"],
     ],
 )
 def test__create_product_team_from_org_no_id(
@@ -227,7 +215,7 @@ def test__create_product_team_from_org_no_id(
             None,
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "ae28e872-843d-4e2e-9f0b-b5d3c42d441f",
                 }
             ],
@@ -237,7 +225,7 @@ def test__create_product_team_from_org_no_id(
             "FOOBAR",
             [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "edf90c3a-f865-4dd9-9ab9-400e6ebc02e0",
                 }
             ],
@@ -262,7 +250,7 @@ def test__create_product_team_from_org_id_raises_error(
         {
             "keys": [
                 {
-                    "key_type": "product_team_id_alias",
+                    "key_type": "product_team_id",
                     "key_value": "edf90c3a-f865-4dd9-9ab9-400e6ebc02e0",
                 }
             ],
diff --git a/src/layers/domain/repository/cpm_product_repository/tests/v1/conftest.py b/src/layers/domain/repository/cpm_product_repository/tests/v1/conftest.py
@@ -19,6 +19,11 @@ def product():
     org = Root.create_ods_organisation(ods_code="ABC")
     product_team = org.create_product_team(
         name="product-team-name",
-        keys=[{"key_type": "product_team_id_alias", "key_value": "BAR"}],
+        keys=[
+            {
+                "key_type": "product_team_id",
+                "key_value": "808a36db-a52a-4130-b71e-d9cbcbaed15b",
+            }
+        ],
     )
     return product_team.create_cpm_product(name="cpm-product-name")
diff --git a/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_keys_v1.py b/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_keys_v1.py
@@ -14,6 +14,6 @@ def test__product_repository__add_key(
     product.add_key(**party_key.dict())
     repository.write(product)
     product_by_id = repository.read(
-        product_team_id=product.product_team_id, id=product.id
+        product_team_id=product.cpm_product_team_id, id=product.id
     )
     assert product_by_id.keys == [party_key]
diff --git a/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_v1.py b/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_v1.py
diff --git a/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_v1_delete.py b/src/layers/domain/repository/cpm_product_repository/tests/v1/test_cpm_product_repository_v1_delete.py
diff --git a/src/layers/domain/request_models/tests/data/cpm-product-team-example-extra.json b/src/layers/domain/request_models/tests/data/cpm-product-team-example-extra.json
diff --git a/src/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-duped-keys.json b/src/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-duped-keys.json
diff --git a/src/layers/domain/request_models/tests/data/cpm-product-team-example-no-id.json b/src/layers/domain/request_models/tests/data/cpm-product-team-example-no-id.json

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ def test_index(version):`
`61`	`61`	`expected_body = json.dumps(`
`62`	`62`	`{`
`63`	`63`	`"id": product["id"],`
`64`		`- "product_team_id": product["product_team_id"],`
	`64`	`+ "cpm_product_team_id": product["cpm_product_team_id"],`
`65`	`65`	`"name": "Foobar product",`
`66`	`66`	`"ods_code": "F5H1R",`
`67`	`67`	`"status": "active",`
`@@ -127,15 +127,17 @@ def test_index_no_such_product_team(version):`
`127`	`127`	`event={`
`128`	`128`	`"headers": {"version": version},`
`129`	`129`	`"body": json.dumps(product_payload),`
`130`		`- "pathParameters": {"product_team_id": "FOOBAR"},`
	`130`	`+ "pathParameters": {`
	`131`	`+ "product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"`
	`132`	`+ },`
`131`	`133`	`}`
`132`	`134`	`)`
`133`	`135`	`expected_result = json.dumps(`
`134`	`136`	`{`
`135`	`137`	`"errors": [`
`136`	`138`	`{`
`137`	`139`	`"code": "RESOURCE_NOT_FOUND",`
`138`		`- "message": "Could not find ProductTeam for key ('FOOBAR')",`
	`140`	`+ "message": "Could not find ProductTeam for key ('808a36db-a52a-4130-b71e-d9cbcbaed15b')",`
`139`	`141`	`}`
`140`	`142`	`],`
`141`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ def test_index():`
`101`	`101`	`assert deleted_product == {`
`102`	`102`	`"name": PRODUCT_NAME,`
`103`	`103`	`"ods_code": ODS_CODE,`
`104`		`- "product_team_id": product_team.id,`
	`104`	`+ "cpm_product_team_id": product_team.id,`
`105`	`105`	`"status": Status.INACTIVE,`
`106`	`106`	`"keys": [],`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,9 @@ def test_index_by_alias(version):`
`152`	`152`	`result = handler(`
`153`	`153`	`event={`
`154`	`154`	`"headers": {"version": version},`
`155`		`- "pathParameters": {"product_team_id": "BAR"},`
	`155`	`+ "pathParameters": {`
	`156`	`+ "product_team_id": "808a36db-a52a-4130-b71e-d9cbcbaed15b"`
	`157`	`+ },`
`156`	`158`	`}`
`157`	`159`	`)`
`158`	`160`	`expected_result = json.dumps(`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,5 @@ def test_read_product_steps_good_input():`
`75`	`75`	`)`
`76`	`76`
`77`	`77`	`assert isinstance(step_chain.result, CpmProduct)`
`78`		`- assert step_chain.result.product_team_id == product_team.id`
	`78`	`+ assert step_chain.result.cpm_product_team_id == product_team.id`
`79`	`79`	`assert step_chain.result.ods_code == ods_code`