Merge branch 'main' into feature/TED-407

Author: Dragos0000

ted_sws/data_manager/adapters/mapping_suite_repository.py

@@ -4,7 +4,7 @@
 import shutil
 from typing import Iterator, List, Optional
 
-from pymongo import MongoClient
+from pymongo import MongoClient, ASCENDING
 
 from ted_sws import config
 from ted_sws.core.model.transform import MappingSuite, FileResource, TransformationRuleSet, SHACLTestSuite, \
@@ -66,7 +66,7 @@ def get(self, reference) -> MappingSuite:
         :param reference:
         :return: MappingSuite
         """
-        result_dict = self.collection.find_one({"identifier": reference})
+        result_dict = self.collection.find_one({"_id": reference})
         return MappingSuite(**result_dict) if result_dict else None
 
     def list(self) -> Iterator[MappingSuite]:

ted_sws/data_manager/adapters/notice_repository.py

@@ -3,7 +3,7 @@
 from typing import Iterator, Union, Optional
 
 import gridfs
-from pymongo import MongoClient
+from pymongo import MongoClient, ASCENDING
 from bson import ObjectId
 from ted_sws import config
 from ted_sws.core.model.manifestation import XMLManifestation, RDFManifestation, METSManifestation, Manifestation
@@ -28,6 +28,8 @@ def __init__(self, mongodb_client: MongoClient, database_name: str = _database_n
         notice_db = mongodb_client[self._database_name]
         self.file_storage = gridfs.GridFS(notice_db)
         self.collection = notice_db[self._collection_name]
+        self.file_storage_collection = notice_db["fs.files"]
+        self.file_storage_collection.create_index([("notice_id", ASCENDING)])
 
     def get_file_content_from_grid_fs(self, file_id: str) -> str:
         """
@@ -188,7 +190,7 @@ def get(self, reference) -> Optional[Notice]:
         :param reference:
         :return: Notice
         """
-        result_dict = self.collection.find_one({"ted_id": reference})
+        result_dict = self.collection.find_one({"_id": reference})
         if result_dict is not None:
             notice = NoticeRepository._create_notice_from_repository_result(result_dict)
             notice = self.load_notice_fields_from_grid_fs(notice)

ted_sws/mapping_suite_processor/services/conceptual_mapping_processor.py

@@ -56,6 +56,7 @@ def mapping_suite_processor_zip_package(mapping_suite_package_path: pathlib.Path
 def mapping_suite_processor_expand_package(mapping_suite_package_path: pathlib.Path):
     """
         This function reads data from conceptual_mappings.xlsx and expand provided package.
+                Note: we don't use this at  the moment
     :param mapping_suite_package_path:
     :return:
     """
@@ -149,7 +150,6 @@ def mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db(mapp
         mapping_suite_package_downloader.download(mapping_suite_package_name=mapping_suite_package_name,
                                                   output_mapping_suite_package_path=tmp_dir_path)
         mapping_suite_package_path = tmp_dir_path / mapping_suite_package_name
-        mapping_suite_processor_expand_package(mapping_suite_package_path=mapping_suite_package_path)
         mapping_suite_processor_load_package_in_mongo_db(mapping_suite_package_path=mapping_suite_package_path,
                                                          mongodb_client=mongodb_client,
                                                          load_test_data=load_test_data

tests/unit/mapping_suite_processor/test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db.py

@@ -3,7 +3,7 @@
     mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db
 
 MAPPING_SUITE_PACKAGE_NAME = "package_F03_test"
-MAPPING_SUITE_PACKAGE_ID = "test_package"
+MAPPING_SUITE_PACKAGE_ID = "package_F03_test"
 
 
 def test_mapping_suite_processor_from_github_expand_and_load_package_in_mongo_db(mongodb_client):