Merge branch 'devtool' into refactor/3009refactor/3009

1 files changed, 15 insertions, 12 deletions

diff --git a/src/management/builder/settings.cpp b/src/management/builder/settings.cpp
index 0b27bef..b682c49 100644
--- a/src/management/builder/settings.cpp
+++ b/src/management/builder/settings.cpp
@@ -1,23 +1,26 @@
 #include "settings.hpp"
 #include "checker/errors/settings/port_number.hpp"
 #include "checker/errors/settings/server.hpp"
+#include "file/settings/settings.hpp"
+#include "file/settings/checker_decorator.hpp"
+#include "file/settings/file_decorator.hpp"
 
 namespace smtp::manage::builder
 {
-
 	smtp::manage::Settings Settings::Build() const
 	{
-		auto file_manipulator = GetFileSettings();
-		return smtp::manage::Settings{file_manipulator};
-	}
-
-	file::Settings Settings::GetFileSettings() const
-	{
-		static const std::string PATH = "/var/lib/smtp/settings.txt";
-
-		auto registrator = BuildErrorRegistrator();
-		return file::Settings{PATH, registrator};
-	}
+        file::settings::Settings settings{ BuildFileManipulator() };
+        return smtp::manage::Settings{settings};
+    }
+
+    file::settings::types::IFileManipulatorPtr Settings::BuildFileManipulator() const
+    {
+        static const std::string PATH = "/var/lib/smtp/settings.txt";
+
+        auto result = std::make_shared<file::settings::CheckerDecorator>(BuildErrorRegistrator());
+        result->Apply(std::make_shared<file::settings::FileDecorator>(PATH));
+        return result;
+    }
 
 	checker::RegistratorSettings Settings::BuildErrorRegistrator() const
 	{