Merge pull request #218 from OP-TED/feature/TED-588

Feature/ted 588
OP-TED · Aug 30, 2022 · 5ecd456 · 5ecd456
2 parents 12719ca + af01801
commit 5ecd456
Show file tree

Hide file tree

Showing 40 changed files with 1,145 additions and 729 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,6 @@ apache-airflow==2.2.5
 hvac==0.11.2
 SPARQLWrapper==1.8.5
 pandas==1.3.5
-pymessagebus~=1.2
 click~=8.1.0
 openpyxl==3.0.9
 colorama~=0.4

diff --git a/ted_sws/__init__.py b/ted_sws/__init__.py
@@ -144,6 +144,11 @@ def ID_MANAGER_API_HOST(self) -> str:
         v: str = EnvConfigResolver().config_resolve()
         return v if v else "localhost"
 
+    @property
+    def ID_MANAGER_OLD_API_HOST(self) -> str:
+        v: str = EnvConfigResolver().config_resolve()
+        return v if v else "localhost"
+
     @property
     def ID_MANAGER_API_PORT(self) -> int:
         v: str = EnvConfigResolver().config_resolve()

diff --git a/ted_sws/core/adapters/cmd_runner.py b/ted_sws/core/adapters/cmd_runner.py
@@ -8,8 +8,7 @@
     EventWriterToMongoDBHandler
 from ted_sws.event_manager.adapters.event_handler_config import CLILoggerConfig
 from ted_sws.event_manager.adapters.event_logger import EventLogger
-from ted_sws.event_manager.adapters.log import SeverityLevelType
-from ted_sws.event_manager.adapters.logger import LOG_ERROR_TEXT, LOG_SUCCESS_TEXT
+from ted_sws.event_manager.adapters.log import SeverityLevelType, LOG_ERROR_TEXT, LOG_SUCCESS_TEXT
 from ted_sws.event_manager.model.event_message import EventMessage, EventMessageLogSettings
 from ted_sws.event_manager.services.logger_from_context import get_env_logger
 

diff --git a/ted_sws/data_manager/entrypoints/cli/cmd_generate_mapping_resources.py b/ted_sws/data_manager/entrypoints/cli/cmd_generate_mapping_resources.py
@@ -7,7 +7,7 @@
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH
 from ted_sws.data_manager.adapters.mapping_suite_repository import TRANSFORM_PACKAGE_NAME, RESOURCES_PACKAGE_NAME
 from ted_sws.data_manager.adapters.sparql_endpoint import SPARQLTripleStoreEndpoint, TripleStoreEndpointABC
-from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
+from ted_sws.event_manager.adapters.log import LOG_INFO_TEXT
 from ted_sws.resources import QUERIES_PATH, MAPPING_FILES_PATH
 
 CELLAR_SPARQL_ENDPOINT_URL = "http://publications.europa.eu/webapi/rdf/sparql"

diff --git a/ted_sws/event_manager/adapters/log/__init__.py b/ted_sws/event_manager/adapters/log/__init__.py
@@ -4,6 +4,14 @@
 
 from ted_sws import RUN_ENV_NAME, RUN_TEST_ENV_VAL
 
+from colorama import Fore
+
+LOG_ERROR_TEXT = Fore.RED + "{}" + Fore.RESET
+LOG_SUCCESS_TEXT = Fore.GREEN + "{}" + Fore.RESET
+LOG_INFO_TEXT = Fore.CYAN + "{}" + Fore.RESET
+LOG_WARN_TEXT = Fore.YELLOW + "{}" + Fore.RESET
+
+
 EVENT_LOGGER_CONTEXT_KEY = '__event_logger__'
 
 
@@ -21,10 +29,5 @@ class ConfigHandlerType(Enum):
     MongoDBHandler = "MongoDBHandler"
 
 
-class LoggedBy(Enum):
-    DECORATOR = "decorator"
-    WRITER = "writer"
-
-
 def is_env_logging_enabled() -> bool:
     return os.environ[RUN_ENV_NAME] not in [RUN_TEST_ENV_VAL]
diff --git a/ted_sws/event_manager/adapters/log/log_decorator.py b/ted_sws/event_manager/adapters/log/log_decorator.py
diff --git a/ted_sws/event_manager/adapters/log/log_writer.py b/ted_sws/event_manager/adapters/log/log_writer.py
diff --git a/ted_sws/event_manager/adapters/log_repository.py b/ted_sws/event_manager/adapters/log_repository.py
diff --git a/ted_sws/event_manager/adapters/logger.py b/ted_sws/event_manager/adapters/logger.py