Merge branch 'feature/PI-730-update_accredited_system_base_model' into release/2025-01-17

Author: megan-bower4

src/conftest.py

@@ -59,7 +59,7 @@ def _transact_write_items_with_sleep(*args, **kwargs):
         return response
 
     def _query_with_sleep(*args, **kwargs):
-        time.sleep(0.5)
+        time.sleep(0.2)
         response = unpatched_query(*args, **kwargs)
         return response
 

src/layers/domain/repository/questionnaire_repository/v1/tests/test_spine_questionnaires.py

@@ -97,7 +97,7 @@ def test_spine_mhs_questionnaires_pass(nhs_mhs: NhsMhs):
     mhs_interactions_questionnaire = QuestionnaireRepository().read(
         QuestionnaireInstance.SPINE_MHS_MESSAGE_SETS
     )
-    _mhs_data = nhs_mhs.export()
+    _mhs_data = nhs_mhs.dict()
     mhs_data = _apply_field_mapping(
         name=QuestionnaireInstance.SPINE_MHS, data=_mhs_data
     )

src/layers/sds/domain/nhs_accredited_system.py

@@ -21,17 +21,15 @@ class NhsAccreditedSystem(SdsBaseModel):
     nhs_requestor_urp: str = Field(alias="nhsrequestorurp")
     nhs_date_requested: str = Field(alias="nhsdaterequested")
     nhs_id_code: str = Field(alias="nhsidcode")
-    nhs_mhs_manufacturer_org: Optional[str] = Field(alias="nhsmhsmanufacturerorg")
+    nhs_mhs_manufacturer_org: str = Field(alias="nhsmhsmanufacturerorg")
     nhs_mhs_party_key: str = Field(alias="nhsmhspartykey")
     nhs_product_key: str = Field(alias="nhsproductkey")
-    nhs_product_name: Optional[str] = Field(alias="nhsproductname")
-    nhs_product_version: Optional[str] = Field(
-        alias="nhsproductversion"
-    )  # shouldn't be optional?
+    nhs_product_name: str = Field(alias="nhsproductname", default=None)
+    nhs_product_version: str = Field(alias="nhsproductversion", default=None)
     nhs_as_acf: Optional[set[str]] = Field(alias="nhsasacf")
-    nhs_as_client: Optional[set[str]] = Field(alias="nhsasclient", default_factory=set)
+    nhs_as_client: set[str] = Field(alias="nhsasclient", default_factory=set)
     nhs_as_svc_ia: set[str] = Field(alias="nhsassvcia")
-    nhs_temp_uid: Optional[str] = Field(alias="nhstempuid")
+    nhs_temp_uid: str = Field(alias="nhstempuid", default=None)
     description: Optional[str] = Field(alias="description")
     nhs_as_category_bag: Optional[set[str]] = Field(alias="nhsascategorybag")
 

src/layers/sds/domain/nhs_mhs.py

@@ -26,7 +26,7 @@ class NhsMhs(SdsBaseModel):
         alias="nhscontractpropertytemplatekey"
     )
     nhs_date_approved: str = Field(alias="nhsdateapproved")
-    nhs_date_dns_approved: str = Field(alias="nhsdatednsapproved")
+    nhs_date_dns_approved: str = Field(alias="nhsdatednsapproved", default=None)
     nhs_date_requested: str = Field(alias="nhsdaterequested")
     nhs_dns_approver: str = Field(alias="nhsdnsapprover")
     nhs_ep_interaction_type: InteractionType = Field(alias="nhsepinteractiontype")
@@ -41,7 +41,7 @@ class NhsMhs(SdsBaseModel):
     nhs_mhs_in: str = Field(alias="nhsmhsin")
     nhs_mhs_ip_address: Optional[str] = Field(alias="nhsmhsipaddress")
     nhs_mhs_is_authenticated: Authentication = Field(alias="nhsmhsisauthenticated")
-    nhs_mhs_manufacturer_org: Optional[str] = Field(alias="nhsmhsmanufacturerorg")
+    nhs_mhs_manufacturer_org: str = Field(alias="nhsmhsmanufacturerorg")
     nhs_mhs_party_key: str = Field(alias="nhsmhspartykey")
     nhs_mhs_sn: str = Field(alias="nhsmhssn")
     nhs_mhs_svc_ia: str = Field(alias="nhsmhssvcia")

src/layers/sds/epr/bulk_create/tests/conftest.py

@@ -83,11 +83,9 @@ def accredited_system_1() -> NhsMhs:
         nhsmhspartykey="AAA-123456",
         nhsproductname="My EPR Product",
         nhsproductkey="key-123",
-        nhsproductversion=None,
         nhsasclient={"ABC", "CDE", "EFG"},
         nhsassvcia={"interaction-id-1", "interaction-id-2"},
         nhsmhsmanufacturerorg="AAA",
-        nhstempuid=None,
     )
 
 
@@ -106,7 +104,6 @@ def accredited_system_2() -> NhsMhs:
         nhsidcode="BBB",
         nhsmhspartykey="AAA-456789",
         nhsproductkey="key-123",
-        nhsproductversion=None,
         nhsasclient={"ABC", "JKL", "LMN"},
         nhsassvcia={"interaction-id-3", "interaction-id-4"},
         nhsmhsmanufacturerorg="AAA",