From e41b247e61ce4d4cc96badab3a14bf413e4f46f2 Mon Sep 17 00:00:00 2001
From: eportnov <eportnov@ibs.ru>
Date: Mon, 3 Oct 2022 11:37:47 +0300
Subject: refactoring

---
 src/file/settings.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/file/settings.cpp')

diff --git a/src/file/settings.cpp b/src/file/settings.cpp
index 70f3cf7..eb8ed5d 100644
--- a/src/file/settings.cpp
+++ b/src/file/settings.cpp
@@ -2,12 +2,17 @@
 
 #include "settings.hpp"
 #include "logger/logger_set.hpp"
+#include "converter/file_to_struct.hpp"
+#include "converter/struct_to_file.hpp"
+#include "parser/settings.hpp"
 
 namespace smtp::file
 {
+
 	//
 	//Constructors
 	//
+
 	Settings::Settings( std::string const& path_file, checker::RegistratorSettings const& registrator_errors )
 			: mPathFile( path_file )
 			, mRegistratorErrors( registrator_errors )
@@ -18,27 +23,29 @@ namespace smtp::file
 	//
 	//Public methods
 	//
+
 	manage::SettingsFields Settings::Read() const
 	{
 		auto parsed_store = GetParsedStore();
-		return converter::Full{}.Convert( parsed_store );
+        return converter::FileToStruct{}.Convert( parsed_store );
 	}
 
 	bool Settings::Write( manage::SettingsFields const& settings_fields ) const
 	{
-		auto parsed_data = converter::Full{}.Convert( settings_fields );
+        auto parsed_data = converter::StructToFile{}.Convert( settings_fields );
 		return mRegistratorErrors.Check( parsed_data ) && SetParsedData( parsed_data );
 	}
 
 	//
 	//Private methods
 	//
+
 	manage::SettingsFileDataType Settings::GetParsedStore() const
 	{
 		static const std::string METHOD_NAME = "Read settings";
 
 		std::ifstream settings_file{mPathFile, std::fstream::in};
-		if( !settings_file.is_open())
+        if( !settings_file.is_open() )
 		{
 			logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to read " + mPathFile );
 			return {};
@@ -72,7 +79,7 @@ namespace smtp::file
 			logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to write " + mPathFile );
 			return false;
 		}
-		for( const auto& data: parsed_data )
+        for( const auto& data : parsed_data )
 		{
 			auto line = BuildParam( data );
 			settings_file << line << "\n";
-- 
cgit v1.2.3