WIP

Author: CaptainOfHacks

ted_sws/core/model/lazy_object.py

@@ -14,30 +14,30 @@ def load_lazy_field(self, source_object: Any, property_field: property) -> Any:
         """
 
 
-class LazyObject:
-    _lazy_object_fields_loader: LazyObjectFieldsLoaderABC = None
+class LazyObjectABC(abc.ABC):
 
+    @abc.abstractmethod
     def set_lazy_object_fields_loader(self, lazy_object_fields_loader: LazyObjectFieldsLoaderABC):
         """
 
         :param lazy_object_fields_loader:
         :return:
         """
-        self._lazy_object_fields_loader = lazy_object_fields_loader
 
+    @abc.abstractmethod
     def get_lazy_object_fields_loader(self) -> Optional[LazyObjectFieldsLoaderABC]:
         """
 
         :return:
         """
-        return self._lazy_object_fields_loader
 
     def load_lazy_field(self, property_field: property):
         """
 
         :param property_field:
         :return:
         """
-        if self._lazy_object_fields_loader:
-            return self._lazy_object_fields_loader.load_lazy_field(source_object=self, property_field=property_field)
+        if self.get_lazy_object_fields_loader():
+            return self.get_lazy_object_fields_loader().load_lazy_field(source_object=self,
+                                                                        property_field=property_field)
         return None

ted_sws/core/model/notice.py

@@ -13,6 +13,7 @@
 from __future__ import annotations
 
 import abc
+from abc import ABC
 from datetime import datetime
 from enum import IntEnum
 from functools import total_ordering
@@ -21,7 +22,7 @@
 from pydantic import Field
 
 from ted_sws.core.model import PropertyBaseModel
-from ted_sws.core.model.lazy_object import LazyObject
+from ted_sws.core.model.lazy_object import LazyObjectABC, LazyObjectFieldsLoaderABC
 from ted_sws.core.model.manifestation import METSManifestation, RDFManifestation, XMLManifestation, \
     RDFValidationManifestation, SPARQLTestSuiteValidationReport, SHACLTestSuiteValidationReport, \
     XPATHCoverageValidationReport, XMLValidationManifestation, ValidationSummaryReport
@@ -143,7 +144,26 @@ def update_status_to(self, new_status):
         """
 
 
-class Notice(WorkExpression, LazyObject):
+class LazyWorkExpression(WorkExpression, LazyObjectABC, ABC):
+    _lazy_object_fields_loader: LazyObjectFieldsLoaderABC = None
+
+    def set_lazy_object_fields_loader(self, lazy_object_fields_loader: LazyObjectFieldsLoaderABC):
+        """
+
+        :param lazy_object_fields_loader:
+        :return:
+        """
+        self._lazy_object_fields_loader = lazy_object_fields_loader
+
+    def get_lazy_object_fields_loader(self) -> Optional[LazyObjectFieldsLoaderABC]:
+        """
+
+        :return:
+        """
+        return self._lazy_object_fields_loader
+
+
+class Notice(LazyWorkExpression):
     """
         A TED notice in any of its forms across the TED-SWS pipeline. This class is conceptualised as a merger of Work
         and Expression in the FRBR class hierarchy and is connected to some of its Manifestations.

ted_sws/data_manager/adapters/notice_repository.py

@@ -41,7 +41,6 @@
 
 METADATA_PUBLICATION_DATE = "publication_date"
 METADATA_DOCUMENT_SENT_DATE = "document_sent_date"
-FILE_STORAGE_COLLECTION_NAME = "fs.files"
 
 
 class NoticeRepositoryInFileSystem(NoticeRepositoryABC):
@@ -200,20 +199,20 @@ def _write_lazy_fields(self, notice: Notice):
             if notice_field is not None:
                 repository.add(notice.ted_id, notice_field)
 
-    @staticmethod
-    def _create_notice_from_repository_result(notice_dict: dict) -> Union[Notice, None]:
+    def _create_notice_from_repository_result(self, notice_dict: dict) -> Union[Notice, None]:
         """
             This method allows you to create a Notice from the dictionary extracted from the repository.
         :param notice_dict:
         :return:
         """
         if notice_dict:
             del notice_dict[MONGODB_COLLECTION_ID]
-            notice_dict.pop(NOTICE_NORMALISED_METADATA)
+            notice_dict.pop(NOTICE_NORMALISED_METADATA,None)
             remove_date_string_fields(data=notice_dict, date_field_name=NOTICE_CREATED_AT)
             notice_dict[NOTICE_CREATED_AT] = notice_dict[NOTICE_CREATED_AT].isoformat()
             notice = Notice(**notice_dict)
             notice._status = NoticeStatus[notice_dict[NOTICE_STATUS]]
+            notice.set_lazy_object_fields_loader(lazy_object_fields_loader=self)
             return notice
         return None
 
@@ -225,7 +224,7 @@ def _create_dict_from_notice(notice: Notice) -> dict:
         :return:
         """
 
-        notice_dict = notice.dict(include=[NOTICE_TED_ID, NOTICE_STATUS, NOTICE_CREATED_AT])
+        notice_dict = notice.dict(include={NOTICE_TED_ID: True, NOTICE_STATUS: True, NOTICE_CREATED_AT: True})
         notice_dict[MONGODB_COLLECTION_ID] = notice_dict[NOTICE_TED_ID]
         notice_dict[NOTICE_STATUS] = str(notice_dict[NOTICE_STATUS])
         notice_dict[NOTICE_CREATED_AT] = datetime.fromisoformat(notice_dict[NOTICE_CREATED_AT])
@@ -278,7 +277,7 @@ def get(self, reference) -> Optional[Notice]:
         """
         result_dict = self.collection.find_one({MONGODB_COLLECTION_ID: reference})
         if result_dict is not None:
-            notice = NoticeRepository._create_notice_from_repository_result(result_dict)
+            notice = self._create_notice_from_repository_result(result_dict)
             return notice
         return None
 
@@ -289,7 +288,7 @@ def get_notices_by_status(self, notice_status: NoticeStatus) -> Iterator[Notice]
         :return:
         """
         for result_dict in self.collection.find({NOTICE_STATUS: str(notice_status)}):
-            notice = NoticeRepository._create_notice_from_repository_result(result_dict)
+            notice = self._create_notice_from_repository_result(result_dict)
             yield notice
 
     def get_notice_ids_by_status(self, notice_status: NoticeStatus) -> Iterator[str]:
@@ -307,5 +306,5 @@ def list(self) -> Iterator[Notice]:
         :return: list of notices
         """
         for result_dict in self.collection.find():
-            notice = NoticeRepository._create_notice_from_repository_result(result_dict)
+            notice = self._create_notice_from_repository_result(result_dict)
             yield notice

tests/unit/core/model/test_new_notice_model.py

@@ -83,15 +83,22 @@ class BigString(str):
     gridfs_id: str = None
 
 
-class NoticeModel(WorkExpression):
+class LazyWorkExpression(WorkExpression):
+
+    _test_field :str = None
+
+class NoticeModel(LazyWorkExpression):
     """
 
     """
 
-    _x: Optional[int] = Field(alias="x", default=None)
+    _x: Optional[int] = 10
 
     object_data : BigString = None
 
+    def __init__(self, *args, **kvargs):
+        super().__init__(**kvargs)
+
     @property
     def x(self):
         print("HELLO")
@@ -110,12 +117,7 @@ def print_property_name(property_field: property):
 
 
 def test_new_notice_model():
-    # notice  = NoticeModel(x=10)
-    # loader_map = {NoticeModel.x : 10,
-    #               NoticeModel.y : 6
-    #               }
-    # print(loader_map[NoticeModel.x])
-    # print(loader_map[NoticeModel.y])
-
-    a = None
-    print([x for x in a])
+    notice  = NoticeModel(x=10)
+    notice._test_field = "ha"
+    print(notice)
+