7 files changed, 40 insertions, 37 deletions
diff --git a/src/file/mail/checker_decorator.cpp b/src/file/mail/checker_decorator.cpp
index 54da9da..3539bc7 100644
--- a/src/file/mail/checker_decorator.cpp
+++ b/src/file/mail/checker_decorator.cpp
@@ -17,9 +17,9 @@ namespace smtp::file::mail
     //Public methods
     //
 
-    manage::MailsSet CheckerDecorator::Read() const
+    general::MailsSet CheckerDecorator::Read() const
     {
-        manage::MailsSet result;
+        general::MailsSet result;
 
         if( !mBase )
         {
@@ -38,9 +38,9 @@ namespace smtp::file::mail
         return result;
     }
 
-    bool CheckerDecorator::Write( manage::MailsSet const& data ) const
+    bool CheckerDecorator::Write( general::MailsSet const& data ) const
     {
-        manage::MailsSet result;
+        general::MailsSet result;
 
         for( const auto& line : data )
         {
diff --git a/src/file/mail/checker_decorator.hpp b/src/file/mail/checker_decorator.hpp
index ed87fc5..612c07a 100644
--- a/src/file/mail/checker_decorator.hpp
+++ b/src/file/mail/checker_decorator.hpp
@@ -1,23 +1,23 @@
 #pragma once
 
-#include "management/general.hpp"
+#include "general/struct.hpp"
 #include "checker/registrator_mails.hpp"
-#include "message/builder/types/idecorator.hpp"
+#include "general/idecorator.hpp"
 #include "types/ifile_manipulator.hpp"
 
 namespace smtp::file::mail
 {
-    class CheckerDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator>
+    class CheckerDecorator : public general::IDecorator< types::IFileManipulator>
     {
     public:
         explicit CheckerDecorator( checker::RegistratorMails const& registrator_errors );
         ~CheckerDecorator() override = default;
 
-        manage::MailsSet Read() const override;
-        bool Write( manage::MailsSet const& data ) const override;
+        general::MailsSet Read() const override;
+        bool Write( general::MailsSet const& data ) const override;
     private:
-        manage::MailsSet ReadFile( std::ifstream& mail_file ) const;
-        bool WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const;
+        general::MailsSet ReadFile( std::ifstream& mail_file ) const;
+        bool WriteFile( std::ofstream& mail_file, general::MailsSet const& data ) const;
 
 		checker::RegistratorMails mRegistratorErrors;
     };
diff --git a/src/file/mail/file_decorator.cpp b/src/file/mail/file_decorator.cpp
index 82111ac..76da5a8 100644
--- a/src/file/mail/file_decorator.cpp
+++ b/src/file/mail/file_decorator.cpp
@@ -10,8 +10,9 @@ namespace smtp::file::mail
     //Constructors
     //
 
-    FileDecorator::FileDecorator( std::string const& path_file )
+    FileDecorator::FileDecorator( std::string const& path_file, file::errors::Registrator const& registrator_file_errors )
         : mPathFile( path_file )
+        , mRegistratorFileErrors( registrator_file_errors )
     {
     }
 
@@ -19,14 +20,14 @@ namespace smtp::file::mail
     //Public methods
     //
 
-    manage::MailsSet FileDecorator::Read() const
+    general::MailsSet FileDecorator::Read() const
     {
 		static const std::string METHOD_NAME = "Read mails";
 
         std::ifstream mail_file{ mPathFile, std::fstream::in };
         if ( !mail_file.is_open() )
         {
-			logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to read " + mPathFile );
+            mRegistratorFileErrors.Process( errors::types::SettingsType::Mail );
             return {};
         }
 
@@ -36,7 +37,7 @@ namespace smtp::file::mail
         return result;
     }
 
-    bool FileDecorator::Write( manage::MailsSet const& data ) const
+    bool FileDecorator::Write( general::MailsSet const& data ) const
     {
 		static const std::string METHOD_NAME = "Write mails";
 
@@ -59,10 +60,10 @@ namespace smtp::file::mail
     //Private methods
     //
 
-    manage::MailsSet FileDecorator::ReadFile( std::ifstream& mail_file ) const
+    general::MailsSet FileDecorator::ReadFile( std::ifstream& mail_file ) const
     {
         std::string line{};
-        manage::MailsSet result;
+        general::MailsSet result;
 
         while ( std::getline( mail_file, line ) )
         {
@@ -71,7 +72,7 @@ namespace smtp::file::mail
         return result;
     }
 
-    bool FileDecorator::WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const
+    bool FileDecorator::WriteFile( std::ofstream& mail_file, general::MailsSet const& data ) const
     {
         bool result = true;
 
diff --git a/src/file/mail/file_decorator.hpp b/src/file/mail/file_decorator.hpp
index 21dab10..a1767e6 100644
--- a/src/file/mail/file_decorator.hpp
+++ b/src/file/mail/file_decorator.hpp
@@ -1,24 +1,26 @@
 #pragma once
 
-#include "management/general.hpp"
-#include "message/builder/types/idecorator.hpp"
+#include "general/struct.hpp"
+#include "general/idecorator.hpp"
 #include "types/ifile_manipulator.hpp"
+#include "file/errors/registrator.hpp"
 
 namespace smtp::file::mail
 {
-    class FileDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator>
+    class FileDecorator : public general::IDecorator< types::IFileManipulator>
     {
     public:
-        explicit FileDecorator( std::string const& path_file );
+        explicit FileDecorator( std::string const& path_file, file::errors::Registrator const& registrator_file_errors );
         ~FileDecorator() override = default;
 
-        manage::MailsSet Read() const override;
-        bool Write( manage::MailsSet const& data ) const override;
+        general::MailsSet Read() const override;
+        bool Write( general::MailsSet const& data ) const override;
     private:
-        manage::MailsSet ReadFile( std::ifstream& mail_file ) const;
-        bool WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const;
+        general::MailsSet ReadFile( std::ifstream& mail_file ) const;
+        bool WriteFile( std::ofstream& mail_file, general::MailsSet const& data ) const;
 
         std::string mPathFile;
+        file::errors::Registrator mRegistratorFileErrors;
     };
 
 }
diff --git a/src/file/mail/sort_decorator.cpp b/src/file/mail/sort_decorator.cpp
index dca464f..ebfde97 100644
--- a/src/file/mail/sort_decorator.cpp
+++ b/src/file/mail/sort_decorator.cpp
@@ -7,9 +7,9 @@ namespace smtp::file::mail
     //Public methods
     //
 
-    manage::MailsSet SortDecorator::Read() const
+    general::MailsSet SortDecorator::Read() const
     {
-        manage::MailsSet result;
+        general::MailsSet result;
 
         if(!mBase)
         {
@@ -22,7 +22,7 @@ namespace smtp::file::mail
         return result;
     }
 
-    bool SortDecorator::Write( manage::MailsSet const& data ) const
+    bool SortDecorator::Write( general::MailsSet const& data ) const
     {
         if( mBase )
         {
diff --git a/src/file/mail/sort_decorator.hpp b/src/file/mail/sort_decorator.hpp
index 80edf1d..142159b 100644
--- a/src/file/mail/sort_decorator.hpp
+++ b/src/file/mail/sort_decorator.hpp
@@ -1,19 +1,19 @@
 #pragma once
 
-#include "management/general.hpp"
-#include "message/builder/types/idecorator.hpp"
+#include "general/struct.hpp"
+#include "general/idecorator.hpp"
 #include "types/ifile_manipulator.hpp"
 
 namespace smtp::file::mail
 {
-    class SortDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator>
+    class SortDecorator : public general::IDecorator< types::IFileManipulator>
     {
     public:
         SortDecorator() = default;
         ~SortDecorator() = default;
 
-        manage::MailsSet Read() const;
-        bool Write( manage::MailsSet const& data ) const;
+        general::MailsSet Read() const;
+        bool Write( general::MailsSet const& data ) const;
     };
 
 }
diff --git a/src/file/mail/types/ifile_manipulator.hpp b/src/file/mail/types/ifile_manipulator.hpp
index 62965e7..0841c16 100644
--- a/src/file/mail/types/ifile_manipulator.hpp
+++ b/src/file/mail/types/ifile_manipulator.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "management/general.hpp"
+#include "general/struct.hpp"
 
 namespace smtp::file::mail::types
 {
@@ -11,8 +11,8 @@ namespace smtp::file::mail::types
     public:
         virtual ~IFileManipulator() = default;
 
-        virtual manage::MailsSet Read() const = 0;
-        virtual bool Write( manage::MailsSet const& data ) const = 0;
+        virtual general::MailsSet Read() const = 0;
+        virtual bool Write( general::MailsSet const& data ) const = 0;
     };
     using IFileManipulatorPtr = std::shared_ptr<IFileManipulator>;
 }