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/management/builder/mail.cpp |  4 ++--
 src/management/mail.cpp         |  2 +-
 src/management/settings.cpp     | 17 +++++++----------
 src/management/settings.hpp     |  3 +--
 4 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/management')

diff --git a/src/management/builder/mail.cpp b/src/management/builder/mail.cpp
index 3a87f8b..a301f5b 100644
--- a/src/management/builder/mail.cpp
+++ b/src/management/builder/mail.cpp
@@ -18,8 +18,8 @@ namespace smtp::manage::builder
 	checker::RegistratorMails Mail::BuildErrorRegistrator() const
 	{
 		checker::RegistratorMails result;
-		result.Add( std::make_shared < checker::errors::settings::Empty >());
-        result.Add( std::make_shared < checker::errors::settings::AtSign >());
+        result.Add( std::make_shared < checker::errors::mail::Empty >());
+        result.Add( std::make_shared < checker::errors::mail::AtSign >());
 		return result;
 	}
 
diff --git a/src/management/mail.cpp b/src/management/mail.cpp
index 738c150..ac8d58f 100644
--- a/src/management/mail.cpp
+++ b/src/management/mail.cpp
@@ -76,7 +76,7 @@ namespace smtp::manage
 	MailsSet Mail::GetMailsAfterDelete( MailsSet const& result_set_after_delete )
 	{
 		auto result = mMails;
-		for( const auto& element_to_delete: result_set_after_delete )
+        for( const auto& element_to_delete : result_set_after_delete )
 		{
 			result.remove( element_to_delete );
 		}
diff --git a/src/management/settings.cpp b/src/management/settings.cpp
index 65888aa..0f5b326 100644
--- a/src/management/settings.cpp
+++ b/src/management/settings.cpp
@@ -1,28 +1,25 @@
 #include "settings.hpp"
-#include "converter/string.hpp"
+#include "converter/struct_to_string.hpp"
 
 namespace smtp::manage
 {
     Settings::Settings( file::Settings const& file_reader )
         : mFileReader( file_reader )
     {
-        ReloadSettings();
+         mSettingsFields = mFileReader.Read();
     }
 
-    bool Settings::SetSettings( manage::SettingsFields const& settings_fields )const
+    bool Settings::SetSettings( manage::SettingsFields const& settings_fields )
     {
-        return mFileReader.Write( settings_fields );
+        auto result = mFileReader.Write( settings_fields );
+        mSettingsFields = mFileReader.Read();
+        return result;
     }
 
     std::string Settings::GetSettings()
-    {
-        ReloadSettings();
-        return converter::String{}.Convert(mSettingsFields);
-    }
-
-    void Settings::ReloadSettings()
     {
         mSettingsFields = mFileReader.Read();
+        return converter::StructToString{}.Convert(mSettingsFields);
     }
 
     bool Settings::IsNeedAuth() const noexcept
diff --git a/src/management/settings.hpp b/src/management/settings.hpp
index 650f966..f173d0b 100644
--- a/src/management/settings.hpp
+++ b/src/management/settings.hpp
@@ -13,9 +13,8 @@ namespace smtp::manage
         explicit Settings( file::Settings const& file_reader );
         ~Settings() = default;
 
-        bool SetSettings( manage::SettingsFields const& settings_fields ) const;
+        bool SetSettings( manage::SettingsFields const& settings_fields );
         std::string GetSettings();
-        void ReloadSettings();
 
         bool IsNeedAuth() const noexcept;
         bool IsNeedSsl() const noexcept;
-- 
cgit v1.2.3