Move all log formatting responsibility to LogFormatter

alvarogzp · May 30, 2018 · dd01887 · dd01887
1 parent 688e2e8
commit dd01887
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/poll/presentation/telegram/bot/formatter/log.py b/poll/presentation/telegram/bot/formatter/log.py
@@ -2,31 +2,41 @@
 
 
 class LogFormatter:
+    def repository_component_migration(self, component: str, migration_type: str, old_version: int, new_version: int,
+                                       about_to_migrate_to_version: int):
+        return self._message(
+            self._about_to_migrate_to_version(about_to_migrate_to_version),
+            self._component(component),
+            self._migration_type(migration_type),
+            self._migration_old_version(old_version),
+            self._migration_new_version(new_version)
+        )
+
     @staticmethod
-    def about_to_migrate_to_version(version: int):
+    def _about_to_migrate_to_version(version: int):
         return FormattedText().normal("Migrating to version {version}").start_format()\
             .bold(version=version).end_format()
 
     @staticmethod
-    def component(component: str):
+    def _component(component: str):
         return FormattedText().normal("Component: {name}").start_format()\
             .bold(name=component).end_format()
 
     @staticmethod
-    def migration_type(migration_type: str):
+    def _migration_type(migration_type: str):
         return FormattedText().normal("Type: {type}").start_format()\
             .bold(type=migration_type).end_format()
 
     @staticmethod
-    def migration_old_version(old_version: int):
+    def _migration_old_version(old_version: int):
         return FormattedText().normal("From version: {version}").start_format()\
             .bold(version=old_version).end_format()
 
     @staticmethod
-    def migration_new_version(new_version: int):
+    def _migration_new_version(new_version: int):
         return FormattedText().normal("To version: {version}").start_format()\
             .bold(version=new_version).end_format()
 
     @staticmethod
-    def message(*message_parts: FormattedText):
+    def _message(*message_parts: FormattedText):
         return FormattedText().newline().join(message_parts)
diff --git a/poll/presentation/telegram/bot/view/logger.py b/poll/presentation/telegram/bot/view/logger.py
@@ -15,10 +15,6 @@ def __init__(self, logger: Logger, log_formatter: LogFormatter):
 
     def repository_component_migration(self, component: str, migration_type: str, old_version: int, new_version: int,
                                        about_to_migrate_to_version: int):
-        self.logger.log(LOG_TAG_MIGRATION, self.log_formatter.message(
-            self.log_formatter.about_to_migrate_to_version(about_to_migrate_to_version),
-            self.log_formatter.component(component),
-            self.log_formatter.migration_type(migration_type),
-            self.log_formatter.migration_old_version(old_version),
-            self.log_formatter.migration_new_version(new_version)
+        self.logger.log(LOG_TAG_MIGRATION, self.log_formatter.repository_component_migration(
+            component, migration_type, old_version, new_version, about_to_migrate_to_version
         ))