Use builder for rules test.

Author: acerathereinspirative-nhs-nvir

poetry.lock

@@ -48,7 +48,7 @@ aiohttp = "^3.11.12"
 awscli = "^1.37.24"
 awscli-local = "^0.22.0"
 pyhamcrest = "^2.1.0"
-factory-boy = "^3.3.3"
+polyfactory = "^2.20.0"
 pyright = "^1.1.394"
 brunns-matchers = "^2.9.0"
 localstack = "^4.1.1"

pyproject.toml

@@ -12,6 +12,8 @@ class IterationCohort(BaseModel):
     cohort_label: str | None = Field(None, alias="CohortLabel")
     priority: int | None = Field(None, alias="Priority")
 
+    model_config = {"populate_by_name": True}
+
 
 class IterationRule(BaseModel):
     type: str | None = Field(None, alias="Type")
@@ -25,6 +27,8 @@ class IterationRule(BaseModel):
     attribute_target: str | None = Field(None, alias="AttributeTarget")
     comms_routing: str | None = Field(None, alias="CommsRouting")
 
+    model_config = {"populate_by_name": True}
+
 
 class Iteration(BaseModel):
     id: str = Field(..., alias="ID")
@@ -40,6 +44,8 @@ class Iteration(BaseModel):
     iteration_cohorts: list[IterationCohort] | None = Field(None, alias="IterationCohorts")
     iteration_rules: list[IterationRule] | None = Field(None, alias="IterationRules")
 
+    model_config = {"populate_by_name": True}
+
 
 class CampaignConfig(BaseModel):
     id: str = Field(..., alias="ID")
@@ -60,6 +66,10 @@ class CampaignConfig(BaseModel):
     approval_maximum: int | None = Field(None, alias="ApprovalMaximum")
     iterations: list[Iteration] | None = Field(None, alias="Iterations")
 
+    model_config = {"populate_by_name": True}
+
 
 class Rules(BaseModel):
     campaign_config: CampaignConfig = Field(..., alias="CampaignConfig")
+
+    model_config = {"populate_by_name": True}

src/eligibility_signposting_api/model/rules.py

@@ -1,15 +1,14 @@
 import json
-import uuid
 from collections.abc import Generator
 
 import pytest
 from botocore.client import BaseClient
 from hamcrest import assert_that
 
-from eligibility_signposting_api.model.rules import BucketName, Campaign
+from eligibility_signposting_api.model.rules import BucketName, CampaignConfig
 from eligibility_signposting_api.repos.rules_repo import RulesRepo
 from tests.integration.conftest import AWS_REGION
-from tests.utils.builders import random_int, random_str
+from tests.utils.builders import CampaignConfigFactory, random_str
 from tests.utils.rules.campaign import is_campaign_config
 
 
@@ -22,25 +21,22 @@ def bucket(s3_client: BaseClient) -> Generator[BucketName]:
 
 
 @pytest.fixture
-def campaign(s3_client: BaseClient, bucket: BucketName) -> Generator[tuple[Campaign, str, str]]:
-    campaign_name = Campaign(random_str(10))
-    id_ = f"{uuid.uuid4()}"
-    version = random_int(maximum=10)
-    campaign_data = {"CampaignConfig": {"ID": id_, "Version": version, "Name": campaign_name}}
+def campaign(s3_client: BaseClient, bucket: BucketName) -> Generator[CampaignConfig]:
+    campaign: CampaignConfig = CampaignConfigFactory.build()
+    campaign_data = {"CampaignConfig": campaign.model_dump(by_alias=True)}
     s3_client.put_object(
-        Bucket=bucket, Key=f"{campaign_name}.json", Body=json.dumps(campaign_data), ContentType="application/json"
+        Bucket=bucket, Key=f"{campaign.name}.json", Body=json.dumps(campaign_data), ContentType="application/json"
     )
-    yield campaign_name, id_, version
-    s3_client.delete_object(Bucket=bucket, Key=f"{campaign_name}.json")
+    yield campaign
+    s3_client.delete_object(Bucket=bucket, Key=f"{campaign.name}.json")
 
 
-def test_get_campaign_config(s3_client: BaseClient, bucket: BucketName, campaign: tuple[Campaign, str, str]):
+def test_get_campaign_config(s3_client: BaseClient, bucket: BucketName, campaign: CampaignConfig):
     # Given
-    campaign_name, id_, version = campaign
     repo = RulesRepo(s3_client, bucket)
 
     # When
-    actual = repo.get_campaign_config(campaign_name)
+    actual = repo.get_campaign_config(campaign.name)
 
     # Then
-    assert_that(actual, is_campaign_config().with_id(id_).and_name(campaign_name).and_version(version))
+    assert_that(actual, is_campaign_config().with_id(campaign.id).and_name(campaign.name).and_version(campaign.version))

tests/integration/repo/test_rules_repo.py

@@ -1,10 +1,30 @@
 import random
 import string
 
+from polyfactory import Use
+from polyfactory.factories.pydantic_factory import ModelFactory
 
-def random_str(length: int) -> str:
-    return "".join(random.choice(string.ascii_lowercase + string.digits) for _ in range(length))  # noqa: S311
+from eligibility_signposting_api.model.rules import CampaignConfig, Iteration, IterationCohort, IterationRule
+
+
+class IterationCohortFactory(ModelFactory[IterationCohort]):
+    __model__ = IterationCohort
+
+
+class IterationRuleFactory(ModelFactory[IterationRule]):
+    __model__ = IterationRule
 
 
-def random_int(minimum: int = 1, maximum: int = 10) -> int:
-    return random.randint(minimum, maximum)  # noqa: S311
+class IterationFactory(ModelFactory[Iteration]):
+    __model__ = Iteration
+    iteration_cohorts: Use(IterationCohortFactory.batch, size=2)
+    iteration_rules: Use(IterationRuleFactory.batch, size=2)
+
+
+class CampaignConfigFactory(ModelFactory[CampaignConfig]):
+    __model__ = CampaignConfig
+    iterations = Use(IterationFactory.batch, size=2)
+
+
+def random_str(length: int) -> str:
+    return "".join(random.choice(string.ascii_lowercase + string.digits) for _ in range(length))  # noqa: S311