Skip to content

Commit 486bf79

Browse files
fix bugs
1 parent f596960 commit 486bf79

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

ted_sws/core/model/notice.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,14 +482,19 @@ def update_status_to(self, new_status: NoticeStatus):
482482
self._status = new_status
483483
if new_status < NoticeStatus.INDEXED:
484484
self.remove_lazy_field(Notice.xml_metadata)
485+
self._xml_metadata = None
485486
if new_status < NoticeStatus.NORMALISED_METADATA:
486487
self.remove_lazy_field(Notice.normalised_metadata)
488+
self._normalised_metadata = None
487489
#TODO: preprocessed_xml_manifestation is the same as xml_manifestation
488490
# if delete preprocessed xml manifestation will delete xml_manifestation
489491
# in future remove _preprocessed_xml_manifestation field from model
490492
self._preprocessed_xml_manifestation = None
491493
if new_status < NoticeStatus.TRANSFORMED:
492494
self.remove_lazy_field(Notice.rdf_manifestation)
493495
self.remove_lazy_field(Notice.distilled_rdf_manifestation)
496+
self._rdf_manifestation = None
497+
self._distilled_rdf_manifestation = None
494498
if new_status < NoticeStatus.PACKAGED:
495499
self.remove_lazy_field(Notice.mets_manifestation)
500+
self._mets_manifestation = None

tests/unit/core/model/conftest.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,23 @@ def publicly_available_notice(fetched_notice_data, normalised_metadata_dict) ->
4242
notice = Notice(ted_id=ted_id)
4343
notice.set_xml_manifestation(xml_manifestation)
4444
notice.set_original_metadata(original_metadata)
45-
notice._rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
45+
notice._status = NoticeStatus.INDEXED
46+
notice.set_normalised_metadata(NormalisedMetadata(**normalised_metadata_dict))
47+
notice._status = NoticeStatus.ELIGIBLE_FOR_TRANSFORMATION
48+
notice.set_preprocessed_xml_manifestation(xml_manifestation)
49+
notice._status = NoticeStatus.DISTILLED
50+
notice.set_rdf_manifestation(RDFManifestation(object_data="RDF manifestation content",
4651
shacl_validations=[shacl_validation],
4752
sparql_validations=[sparql_validation],
4853
xpath_coverage_validation=xpath_coverage_validation
49-
)
50-
notice._distilled_rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
54+
))
55+
notice.set_distilled_rdf_manifestation(RDFManifestation(object_data="RDF manifestation content",
5156
shacl_validations=[shacl_validation],
5257
sparql_validations=[sparql_validation],
5358
xpath_coverage_validation=xpath_coverage_validation
54-
)
55-
notice._mets_manifestation = METSManifestation(object_data="METS manifestation content")
56-
notice._normalised_metadata = NormalisedMetadata(**normalised_metadata_dict)
57-
notice._preprocessed_xml_manifestation = xml_manifestation
59+
))
60+
notice._status = NoticeStatus.ELIGIBLE_FOR_PACKAGING
61+
notice.set_mets_manifestation(METSManifestation(object_data="METS manifestation content"))
5862
notice._status = NoticeStatus.PUBLICLY_AVAILABLE
5963
return notice
6064

0 commit comments

Comments
 (0)