Remove test data related to EPR

jameslinnell · jameslinnell · commit db73dbee97a9 · 2025-02-27T16:46:37.000Z
diff --git a/archived_epr/src_old/layers/domain/request_models/__init__.py b/archived_epr/src_old/layers/domain/request_models/__init__.py
@@ -0,0 +1 @@
+from .v1 import *  # noqa
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-example-extra.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-example-extra.json
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-example.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-example.json
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-reference-data-example-extra.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-reference-data-example-extra.json
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-reference-data-example.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-device-reference-data-example.json
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example-extra.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example-extra.json
@@ -0,0 +1,4 @@
+{
+  "name": "FOOBAR Product",
+  "extra": "NOT ALLOWED"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example-no-name.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example-no-name.json
@@ -0,0 +1,3 @@
+{
+  "name": "  "
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-example.json
@@ -0,0 +1,3 @@
+{
+  "name": "FOOBAR Product"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-extra.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-extra.json
@@ -0,0 +1,11 @@
+{
+  "keys": [
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    }
+  ],
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team",
+  "extra": "NOT ALLOWED"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-id.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-id.json
@@ -0,0 +1,6 @@
+{
+  "id": "FOO",
+  "external_team_id": "BAR",
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-duped-keys.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-duped-keys.json
@@ -0,0 +1,22 @@
+{
+  "keys": [
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    },
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    },
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    },
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    }
+  ],
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-keys-not-allowed.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-keys-not-allowed.json
@@ -0,0 +1,14 @@
+{
+  "keys": [
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    },
+    {
+      "key_type": "product_team_alias",
+      "key_value": "FOO"
+    }
+  ],
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-no-keys.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id-no-keys.json
@@ -0,0 +1,4 @@
+{
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-id.json
@@ -0,0 +1,10 @@
+{
+  "keys": [
+    {
+      "key_type": "product_team_id_alias",
+      "key_value": "BAR"
+    }
+  ],
+  "ods_code": "F5H1R",
+  "name": "FOOBAR Product Team"
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-name.json b/archived_epr/src_old/layers/domain/request_models/tests/data/cpm-product-team-example-no-name.json
@@ -0,0 +1,3 @@
+{
+  "name": " "
+}
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/test_parse_cpm_product_params.py b/archived_epr/src_old/layers/domain/request_models/tests/test_parse_cpm_product_params.py
@@ -0,0 +1,29 @@
+import pytest
+from domain.request_models import CreateCpmProductIncomingParams
+from pydantic import ValidationError
+
+from test_helpers.sample_data import (
+    CPM_PRODUCT,
+    CPM_PRODUCT_EXTRA_PARAMS,
+    CPM_PRODUCT_NO_NAME,
+)
+
+
+def test_cpm_product():
+    product = CreateCpmProductIncomingParams(**CPM_PRODUCT)
+    assert isinstance(product, CreateCpmProductIncomingParams)
+    assert product.name == CPM_PRODUCT["name"]
+
+
+def test_validate_cpm_product_raises_no_extra_fields():
+    with pytest.raises(ValidationError) as exc:
+        CreateCpmProductIncomingParams(**CPM_PRODUCT_EXTRA_PARAMS)
+
+    assert exc.value.model is CreateCpmProductIncomingParams
+
+
+def test_validate_cpm_product_raises_no_name():
+    with pytest.raises(ValidationError) as exc:
+        CreateCpmProductIncomingParams(**CPM_PRODUCT_NO_NAME)
+
+    assert exc.value.model is CreateCpmProductIncomingParams
diff --git a/archived_epr/src_old/layers/domain/request_models/tests/test_parse_product_team_params.py b/archived_epr/src_old/layers/domain/request_models/tests/test_parse_product_team_params.py
@@ -0,0 +1,57 @@
+import pytest
+from domain.request_models import CreateProductTeamIncomingParams
+from pydantic import ValidationError
+
+from test_helpers.sample_data import (
+    CPM_PRODUCT_TEAM_EXTRA_PARAMS,
+    CPM_PRODUCT_TEAM_ID,
+    CPM_PRODUCT_TEAM_NO_ID,
+    CPM_PRODUCT_TEAM_NO_ID_DUPED_KEYS,
+    CPM_PRODUCT_TEAM_NO_ID_KEYS_NOT_ALLOWED,
+    CPM_PRODUCT_TEAM_NO_NAME,
+)
+
+
+def test_product_team():
+    product_team = CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_NO_ID)
+    assert isinstance(product_team, CreateProductTeamIncomingParams)
+    assert product_team.keys == CPM_PRODUCT_TEAM_NO_ID["keys"]
+    assert product_team.ods_code == CPM_PRODUCT_TEAM_NO_ID["ods_code"]
+    assert product_team.name == CPM_PRODUCT_TEAM_NO_ID["name"]
+
+
+def test_product_team_with_id_raises_error():
+    with pytest.raises(ValidationError) as exc:
+        CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_ID)
+
+    assert exc.value.model is CreateProductTeamIncomingParams
+
+
+def test_product_team_with_blank_name_raises_error():
+    with pytest.raises(ValidationError) as exc:
+        CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_NO_NAME)
+
+    assert exc.value.model is CreateProductTeamIncomingParams
+
+
+def test_validate_product_team_raises_no_extra_fields():
+    with pytest.raises(ValidationError) as exc:
+        CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_EXTRA_PARAMS)
+
+    assert exc.value.model is CreateProductTeamIncomingParams
+
+
+def test_validate_product_team_raises_no_extra_keys():
+    with pytest.raises(ValidationError) as exc:
+        CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_NO_ID_KEYS_NOT_ALLOWED)
+
+    assert exc.value.model is CreateProductTeamIncomingParams
+
+
+def test_product_team_duped_keys():
+    product_team = CreateProductTeamIncomingParams(**CPM_PRODUCT_TEAM_NO_ID_DUPED_KEYS)
+    assert isinstance(product_team, CreateProductTeamIncomingParams)
+    assert len(product_team.keys) == 1
+    assert product_team.keys[0] == CPM_PRODUCT_TEAM_NO_ID["keys"][0]
+    assert product_team.ods_code == CPM_PRODUCT_TEAM_NO_ID["ods_code"]
+    assert product_team.name == CPM_PRODUCT_TEAM_NO_ID["name"]
diff --git a/archived_epr/src_old/layers/domain/request_models/v1.py b/archived_epr/src_old/layers/domain/request_models/v1.py
@@ -0,0 +1,85 @@
+from domain.core.enum import Environment
+from domain.core.product_team_key import ProductTeamKey
+from pydantic import BaseModel, Extra, Field, root_validator, validator
+
+ALPHANUMERIC_SPACES_AND_UNDERSCORES = r"^[a-zA-Z0-9 _]*$"
+ALLOWED_PRODUCT_SEARCH_PARAMS = (
+    "product_team_id",
+    "organisation_code",
+)
+
+
+class ProductTeamPathParams(BaseModel, extra=Extra.forbid):
+    product_team_id: str = Field(...)
+
+    @root_validator(pre=True)
+    def ignore_env(cls, values):
+        values.pop("environment", None)
+        return values
+
+
+class CreateCpmProductIncomingParams(BaseModel, extra=Extra.forbid):
+    name: str = Field(...)
+
+    @validator("name")
+    def validate_name(cls, v: str) -> str:
+        if not v.strip():
+            raise ValueError("ensure this value has at least 1 characters")
+        return v
+
+
+class CpmProductPathParams(BaseModel, extra=Extra.forbid):
+    product_id: str = Field(...)
+    product_team_id: str = Field(...)
+
+    @root_validator(pre=True)
+    def ignore_env(cls, values):
+        values.pop("environment", None)
+        return values
+
+
+class SubCpmProductPathParams(BaseModel, extra=Extra.forbid):
+    product_id: str = Field(...)
+    product_team_id: str = Field(...)
+    environment: Environment
+
+
+class CreateProductTeamIncomingParams(BaseModel, extra=Extra.forbid):
+    ods_code: str = Field(...)
+    name: str = Field(...)
+    keys: list[ProductTeamKey] = Field(default_factory=list)
+
+    @validator("name")
+    def validate_name(cls, v: str) -> str:
+        if not v.strip():
+            raise ValueError("ensure this value has at least 1 characters")
+        return v
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        # Deduplicate the list of keys
+        self.keys = list(
+            {frozenset(key.dict().items()): key for key in self.keys}.values()
+        )
+
+
+class SearchProductQueryParams(BaseModel, extra=Extra.forbid):
+    product_team_id: str = None
+    organisation_code: str = None
+
+    @root_validator
+    def check_filters(cls, values: dict):
+        # Count the number of non-null parameters
+        non_empty_params = [
+            param for param in values.values() if param is not None and param != 0
+        ]
+
+        if len(non_empty_params) != 1:
+            raise ValueError(
+                f"Please provide exactly one valid query parameter: {ALLOWED_PRODUCT_SEARCH_PARAMS}."
+            )
+
+        return values
+
+    def get_non_null_params(self):
+        return self.dict(exclude_none=True)
diff --git a/src/test_helpers/sample_data.py b/src/test_helpers/sample_data.py
@@ -42,15 +42,3 @@ def _read_core_test_data(file_name: str) -> dict | list:
 CPM_PRODUCT_EXTRA_PARAMS = _read_core_test_data(
     f"{PATH_TO_CORE_CPM_TEST_DATA}/cpm-product-example-extra.json"
 )
-CPM_DEVICE = _read_core_test_data(
-    f"{PATH_TO_CORE_CPM_TEST_DATA}/cpm-device-example.json"
-)
-CPM_DEVICE_EXTRA_PARAMS = _read_core_test_data(
-    f"{PATH_TO_CORE_CPM_TEST_DATA}/cpm-device-example-extra.json"
-)
-CPM_DEVICE_REFERENCE_DATA = _read_core_test_data(
-    f"{PATH_TO_CORE_CPM_TEST_DATA}/cpm-device-reference-data-example.json"
-)
-CPM_DEVICE_REFERENCE_DATA_EXTRA_PARAMS = _read_core_test_data(
-    f"{PATH_TO_CORE_CPM_TEST_DATA}/cpm-device-reference-data-example-extra.json"
-)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "FOOBAR Product",
 +  "extra": "NOT ALLOWED"
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "FOOBAR Product"`
	`3`	`+}`