WIP: empty strings and remove http url.

Author: ayeshalshukri1-nhs

src/eligibility_signposting_api/views/eligibility.py

@@ -140,8 +140,8 @@ def build_actions(condition: Condition) -> list[eligibility.Action] | None:
                 description=eligibility.Description(action.action_description)
                 if action.action_description is not None
                 else None,
-                urlLink=eligibility.HttpUrl(action.url_link) if action.url_link is not None else None,
-                urlLabel=eligibility.UrlLabel(action.url_label) if action.url_label is not None else None,
+                urlLink=eligibility.UrlLink(action.url_link),
+                urlLabel=eligibility.UrlLabel(action.url_label),
             )
             for action in condition.actions
         ]

src/eligibility_signposting_api/views/response_model/eligibility.py

@@ -16,6 +16,7 @@
 CohortCode = NewType("CohortCode", str)
 CohortText = NewType("CohortText", str)
 UrlLabel = NewType("UrlLabel", str)
+UrlLink = NewType("UrlLink", str)
 
 
 class Status(StrEnum):
@@ -49,9 +50,9 @@ class SuitabilityRule(BaseModel):
 class Action(BaseModel):
     action_type: ActionType = Field(..., alias="actionType")
     action_code: ActionCode = Field(..., alias="actionCode")
-    description: Description | None
-    url_link: HttpUrl | None = Field(..., alias="urlLink")
-    url_label: UrlLabel | None = Field(..., alias="urlLabel")
+    description: Description = Field(default="")
+    url_link: UrlLink = Field(default="", alias="urlLink" )
+    url_label: UrlLabel = Field(default="", alias="urlLabel")
 
     model_config = {"populate_by_name": True}
 

tests/fixtures/builders/model/eligibility.py

@@ -10,7 +10,7 @@
 
 
 class SuggestedActionFactory(DataclassFactory[eligibility.SuggestedAction]):
-    url_link = UrlLink(HttpUrl("https://test-example.com"))
+    url_link = UrlLink("https://test-example.com")
 
 
 class ConditionFactory(DataclassFactory[eligibility.Condition]):

tests/unit/views/test_eligibility.py

@@ -398,7 +398,7 @@ def test_no_suitability_rules_for_actionable():
                     action_type=ActionType("TYPE_A"),
                     action_code=ActionCode("CODE123"),
                     action_description=ActionDescription("Some description"),
-                    url_link=UrlLink(HttpUrl("https://example.com")),
+                    url_link=UrlLink("https://example.com"),
                     url_label=UrlLabel("Learn more"),
                 )
             ],
@@ -407,7 +407,7 @@ def test_no_suitability_rules_for_actionable():
                     actionType=eligibility.ActionType("TYPE_A"),
                     actionCode=eligibility.ActionCode("CODE123"),
                     description=eligibility.Description("Some description"),
-                    urlLink=eligibility.HttpUrl("https://example.com"),
+                    urlLink=eligibility.UrlLink("https://example.com"),
                     urlLabel=eligibility.UrlLabel("Learn more"),
                 )
             ],
@@ -426,9 +426,9 @@ def test_no_suitability_rules_for_actionable():
                 eligibility.Action(
                     actionType=eligibility.ActionType("TYPE_B"),
                     actionCode=eligibility.ActionCode("CODE123"),
-                    description=None,
-                    urlLink=None,
-                    urlLabel=None,
+                    description="",
+                    urlLink="",
+                    urlLabel="",
                 )
             ],
         ),
@@ -654,7 +654,7 @@ def test_build_response_include_values_that_are_not_null(client: FlaskClient):
                         actionType=eligibility.ActionType("TYPE_A"),
                         actionCode=eligibility.ActionCode("CODE123"),
                         description=eligibility.Description("Contact GP"),
-                        urlLink=eligibility.HttpUrl(HttpUrl("https://example.dummy/")),
+                        urlLink=eligibility.UrlLink("https://example.dummy/"),
                         urlLabel=eligibility.UrlLabel("GP contact"),
                     )
                 ],