1 files changed, 14 insertions, 6 deletions
diff --git a/src/management/builder/mail.cpp b/src/management/builder/mail.cpp
index a301f5b..a96fd33 100644
--- a/src/management/builder/mail.cpp
+++ b/src/management/builder/mail.cpp
@@ -1,19 +1,27 @@
 #include "mail.hpp"
-#include "file/mail.hpp"
 
 #include "checker/errors/mail/empty.hpp"
 #include "checker/errors/mail/at_sign.hpp"
 
+#include "file/mail/file_decorator.hpp"
+#include "file/mail/checker_decorator.hpp"
+#include "file/mail/sort_decorator.hpp"
+
 namespace smtp::manage::builder
 {
 	smtp::manage::Mail Mail::Build() const
 	{
-        static const std::string PATH = {"/var/lib/smtp/mails.txt"};
+        return smtp::manage::Mail{BuildFileManipulator()};
+    }
 
-		auto registrator = BuildErrorRegistrator();
-		file::Mail file_manipulator{PATH, registrator};
-		return smtp::manage::Mail{file_manipulator};
-	}
+    file::mail::types::IFileManipulatorPtr Mail::BuildFileManipulator() const
+    {
+        static const std::string PATH = {"/var/lib/smtp/mails.txt"};
+        auto result = std::make_shared<file::mail::SortDecorator>() ;
+        result->Apply(std::make_shared<file::mail::CheckerDecorator>( BuildErrorRegistrator() ))
+               .Apply(std::make_shared<file::mail::FileDecorator>( PATH ));
+        return result;
+    }
 
 	checker::RegistratorMails Mail::BuildErrorRegistrator() const
 	{