Skip to content

actions urllink accepts empty strings #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Karthikeyannhs wants to merge 1 commit into from
Closed

actions urllink accepts empty strings #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/eligibility_signposting_api/model/eligibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from functools import total_ordering
from typing import NewType, Self

from pydantic import HttpUrl

NHSNumber = NewType("NHSNumber", str)
DateOfBirth = NewType("DateOfBirth", date)
Postcode = NewType("Postcode", str)
Expand All @@ -19,7 +17,7 @@
ActionType = NewType("ActionType", str)
ActionCode = NewType("ActionCode", str)
ActionDescription = NewType("ActionDescription", str)
UrlLink = NewType("UrlLink", HttpUrl)
UrlLink = NewType("UrlLink", str)
UrlLabel = NewType("UrlLabel", str)


Expand Down
4 changes: 2 additions & 2 deletions src/eligibility_signposting_api/model/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from operator import attrgetter
from typing import Literal, NewType

from pydantic import BaseModel, Field, HttpUrl, RootModel, field_serializer, field_validator, model_validator
from pydantic import BaseModel, Field, RootModel, field_serializer, field_validator, model_validator

from eligibility_signposting_api.config.contants import MAGIC_COHORT_LABEL, RULE_STOP_DEFAULT

Expand Down Expand Up @@ -132,7 +132,7 @@ class AvailableAction(BaseModel):
action_type: str = Field(..., alias="ActionType")
action_code: str = Field(..., alias="ExternalRoutingCode")
action_description: str | None = Field(None, alias="ActionDescription")
url_link: HttpUrl | None = Field(None, alias="UrlLink")
url_link: str | None = Field(None, alias="UrlLink")
url_label: str | None = Field(None, alias="UrlLabel")

model_config = {"populate_by_name": True}
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/services/calculators/test_eligibility_calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from faker import Faker
from freezegun import freeze_time
from hamcrest import assert_that, contains_exactly, contains_inanyorder, equal_to, has_item, has_items, is_in
from pydantic import HttpUrl, ValidationError
from pydantic import ValidationError

from eligibility_signposting_api.model import rules
from eligibility_signposting_api.model import rules as rules_model
Expand Down Expand Up @@ -50,14 +50,14 @@ def test_get_redirect_rules():
ActionType="ActionType1",
ExternalRoutingCode="ActionCode1",
ActionDescription="ActionDescription1",
UrlLink=HttpUrl("https://www.ActionUrl1.com"),
UrlLink="https://www.ActionUrl1.com",
UrlLabel="ActionLabel1",
),
"defaultcomms": AvailableAction(
ActionType="ActionType2",
ExternalRoutingCode="defaultcomms",
ActionDescription="ActionDescription2",
UrlLink=HttpUrl("https://www.ActionUrl2.com"),
UrlLink="https://www.ActionUrl2.com",
UrlLabel="ActionLabel2",
),
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/views/test_eligibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,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"),
)
],
Expand Down
Loading