Skip to content

fix: add ability to strictly enforce date format in conformatteddate #70

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

Merged
stevenhsd merged 3 commits into from
Mar 12, 2026
Merged

fix: add ability to strictly enforce date format in conformatteddate #70

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f59d8c
fix: add ability to strictly enforce date format in conformatteddate
stevenhsd Mar 11, 2026
0d3b6c2
Merge branch 'release_v070' of https://github.com/NHSDigital/data-val…
stevenhsd Mar 12, 2026
d45428a
refactor: tweaks to sort review comments
stevenhsd Mar 12, 2026
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
9 changes: 9 additions & 0 deletions src/dve/metadata_parser/domain_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@

DATE_FORMAT: ClassVar[Optional[str]] = None
"""The specific format of the date as a Python 'strptime' string."""
strict: ClassVar[Optional[bool]] = False
"""Add additional check to ensure that date supplied meets the date format exactly."""
ge: ClassVar[Optional[dt.date]] = None
"""The earliest date allowed."""
le: ClassVar[Optional[dt.date]] = None
Expand All @@ -280,12 +282,17 @@
elif cls.DATE_FORMAT is not None:
try:
date = dt.datetime.strptime(value, cls.DATE_FORMAT).date()
if cls.strict and not (date.strftime(cls.DATE_FORMAT) == value):

Check warning on line 285 in src/dve/metadata_parser/domain_types.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use the opposite operator ("!=") instead. 


See more on https://sonarcloud.io/project/issues?id=NHSDigital_data-validation-engine&issues=AZze6PEXPx0CsSSXVh45&open=AZze6PEXPx0CsSSXVh45&pullRequest=70
raise ValueError
except ValueError as err:
raise ValueError(
f"Unable to parse provided datetime in format {cls.DATE_FORMAT}"
) from err # pylint: disable=line-too-long
else:
raise ValueError("No date format provided")




return date

Expand Down Expand Up @@ -317,6 +324,7 @@
@validate_arguments
def conformatteddate(
date_format: Optional[str] = None,
strict: Optional[bool] = False,
ge: Optional[dt.date] = None, # pylint: disable=invalid-name
le: Optional[dt.date] = None, # pylint: disable=invalid-name
gt: Optional[dt.date] = None, # pylint: disable=invalid-name
Expand All @@ -331,6 +339,7 @@

dict_ = ConFormattedDate.__dict__.copy()
dict_["DATE_FORMAT"] = date_format
dict_["strict"] = strict
dict_["ge"] = ge
dict_["le"] = le
dict_["gt"] = gt
Expand Down
Loading