1 files changed, 31 insertions, 14 deletions

diff --git a/src/file/settings.cpp b/src/file/settings.cpp
index 83c1037..710b67f 100644
--- a/src/file/settings.cpp
+++ b/src/file/settings.cpp
@@ -1,16 +1,23 @@
 #include <fstream>
 
 #include "settings.hpp"
-#include "managment/logger.hpp"
+#include "management/logger.hpp"
 
 namespace smtp::file
 {
-    Settings::Settings( std::string const& path_file)
+	//
+	//Constructors
+	//
+    Settings::Settings( std::string const& path_file, checker::RegistratorSettings const& registrator_errors )
         : mPathFile( path_file )
+		, mRegistratorErrors( registrator_errors )
     {
 
     }
 
+	//
+	//Public methods
+	//
     manage::SettingsFields Settings::Read() const
     {
         auto parsed_store = GetParsedStore();
@@ -20,10 +27,13 @@ namespace smtp::file
     bool Settings::Write( manage::SettingsFields const& settings_fields ) const
     {
         auto parsed_data = converter::Full{}.Convert( settings_fields );
-        return SetParsedData( parsed_data );
+		return mRegistratorErrors.Check( parsed_data ) && SetParsedData( parsed_data );
     }
 
-    ParsedStoreType Settings::GetParsedStore() const
+	//
+	//Private methods
+	//
+	manage::SettingsFileDataType Settings::GetParsedStore() const
     {
         std::ifstream settings_file{ mPathFile, std::fstream::in };
         if ( !settings_file.is_open() )
@@ -31,19 +41,26 @@ namespace smtp::file
             manage::Logger::LogError( "Unable to open file to read " + mPathFile );
             return {};
         }
-        std::string line{};
-        ParsedStoreType result;
+		auto result = GetDataFromFile( settings_file );
 
-        while ( std::getline( settings_file, line ) )
-        {
-            auto parsed_data = parser::Settings{}.Parse(line);
-            result.insert( parsed_data );
-        }
-        settings_file.close();
-        return result;
+		settings_file.close();
+		return mRegistratorErrors.Check(result) ? result : manage::SettingsFileDataType{};
     }
 
-    bool Settings::SetParsedData( ParsedStoreType const& parsed_data ) const
+	manage::SettingsFileDataType Settings::GetDataFromFile( std::ifstream& settings_file ) const
+	{
+		std::string line{};
+		manage::SettingsFileDataType result;
+
+		while ( std::getline( settings_file, line ) )
+		{
+			auto parsed_data = parser::Settings{}.Parse( line );
+			result.insert( parsed_data );
+		}
+		return result;
+	}
+
+	bool Settings::SetParsedData( manage::SettingsFileDataType const& parsed_data ) const
     {
         std::ofstream settings_file{ mPathFile, std::fstream::out | std::fstream::trunc };
         if ( !settings_file.is_open() )