From 7e156f58e74baaf4f1d7ccb4df629e6e1a26a32e Mon Sep 17 00:00:00 2001
From: claiff <claiff@mail.ru>
Date: Fri, 16 Sep 2022 12:13:55 +0300
Subject: fix problem with delete mails

---
 src/managment/mail.cpp | 8 ++++----
 src/managment/mail.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/managment/mail.cpp b/src/managment/mail.cpp
index 70c5375..ccde362 100644
--- a/src/managment/mail.cpp
+++ b/src/managment/mail.cpp
@@ -8,7 +8,6 @@ namespace smtp::manage
         : mFileReader( file_reader )
     {
         mMails = mFileReader.Read();
-        mMails.sort();
     }
 
     MailsSet Mail::GetMailToSend() const
@@ -31,7 +30,7 @@ namespace smtp::manage
     bool Mail::DeleteMailToSend( MailsSet const& mail_to_send )
     {
         auto mails_to_delete = GetItersectionMails( mail_to_send );
-        auto result_set_after_delete = GetSetAfterDelete( mails_to_delete );
+        auto result_set_after_delete = GetMailsAfterDelete( mails_to_delete );
         auto result_of_delete = mFileReader.Write( result_set_after_delete );
         if(result_of_delete)
         {
@@ -47,19 +46,20 @@ namespace smtp::manage
         return result;
     }
 
-    MailsSet Mail::GetItersectionMails( MailsSet const& mail_to_send ) const
+    MailsSet Mail::GetItersectionMails( MailsSet const& mail_to_send )
     {
         MailsSet result;
 
         auto sorted_mail_to_send = mail_to_send;
         sorted_mail_to_send.sort();
+        mMails.sort();
         std::set_intersection( mMails.cbegin(), mMails.cend(),
                                sorted_mail_to_send.cbegin(), sorted_mail_to_send.cend(),
                                std::back_inserter( result ));
         return result;
     }
 
-    MailsSet Mail::GetSetAfterDelete( MailsSet const& result_set_after_delete)
+    MailsSet Mail::GetMailsAfterDelete( MailsSet const& result_set_after_delete)
     {
         auto result = mMails;
         for(const auto& element_to_delete : result_set_after_delete)
diff --git a/src/managment/mail.hpp b/src/managment/mail.hpp
index 644a477..d6dfeef 100644
--- a/src/managment/mail.hpp
+++ b/src/managment/mail.hpp
@@ -19,8 +19,8 @@ namespace smtp::manage
         bool DeleteMailToSend(MailsSet const&mail_to_send );
     private:
         MailsSet GetMergedMails( MailsSet const& mails_to_add );
-        MailsSet GetItersectionMails( MailsSet const& mail_to_send ) const;
-        MailsSet GetSetAfterDelete( MailsSet const& result_set_after_delete);
+        MailsSet GetItersectionMails( MailsSet const& mail_to_send );
+        MailsSet GetMailsAfterDelete( MailsSet const& result_set_after_delete);
         MailsSet mMails;
         file::Mail mFileReader;
     };
-- 
cgit v1.2.3