added test package and refactored logic for eligibility checker #516
Conversation
| constraint_max_xsd_version = constraints[MAX_XSD_VERSION_KEY][0] | ||
| if notice_metadata.is_eform: | ||
| notice_xsd_version = notice_metadata.eform_sdk_version | ||
| eforms_sdk_version = notice_xsd_version.rsplit('-', 1)[1] |
There was a problem hiding this comment.
this split need to be explained, maybe we need to use a template or regex selector instead of unclear split.
| eform_subtype_constraint_values = [str(eforms_subtype_value) for eforms_subtype_value in | ||
| constraints[E_FORMS_SUBTYPE_KEY]] | ||
|
|
||
| in_date_range = constraint_start_date <= notice_publication_date <= constraint_end_date | ||
| in_version_range = constraint_min_xsd_version <= notice_xsd_version <= constraint_max_xsd_version | ||
| covered_eform_type = eform_subtype in eform_subtype_constraint_values | ||
|
|
||
| return True if in_date_range and in_version_range and covered_eform_type else False |
There was a problem hiding this comment.
replace:
return True if in_date_range and in_version_range and covered_eform_type else False
with:
return in_date_range and in_version_range and covered_eform_type
There was a problem hiding this comment.
I think we need to remove reports from test package
There was a problem hiding this comment.
I think we need to remove reports from test package
There was a problem hiding this comment.
I think we need to remove reports from test package
There was a problem hiding this comment.
I think we need to remove reports from test package
There was a problem hiding this comment.
I think we need to remove reports from test package
There was a problem hiding this comment.
I think we need to remove reports from test package
ted_sws/core/model/metadata.py
Outdated
| @@ -79,9 +79,10 @@ class NormalisedMetadata(Metadata): | |||
| legal_basis_directive: str | |||
| form_number: str | |||
| eforms_subtype: str | |||
| xsd_version: str | |||
| xsd_version: Optional[str] | |||
| published_in_cellar_counter: int = Field(default=0) | |||
| is_eform: Optional[bool] = False | |||
There was a problem hiding this comment.
We need to change this flag to a field:
notice_source: Optional[NoticeSource] = NoticeSource.STANDART_FORMS
and for NoticeSource as example:
`class NoticeSource(str, Enum):
STANDART_FORMS = "standart_forms"
ELECTRONIC_FORMS = "eforms"
def __str__(self):
return self.value
`
No description provided.