Merge branch 'bugfix/queue_empty_recipients'

2 files changed, 24 insertions, 4 deletions

diff --git a/src/management/mail.cpp b/src/management/mail.cpp
index eefb666..e3ef9f6 100644
--- a/src/management/mail.cpp
+++ b/src/management/mail.cpp
@@ -11,8 +11,14 @@ namespace smtp::manage
     Mail::Mail( file::mail::types::IFileManipulatorPtr const& file_reader )
             : mFileReader( file_reader )
             , mMails( mFileReader->Read() )
-	{
-	}
+    {
+    }
+
+    Mail::Mail(const Mail &mails)
+    {
+        mMails = mails.mMails;
+        mFileReader = mails.mFileReader;
+    }
 
 
     //
@@ -28,7 +34,9 @@ namespace smtp::manage
 	{
         auto merged_mails = GetMergedMails( mails_to_add );
 
-        return RefreshMails( merged_mails );
+        auto result = RefreshMails( merged_mails );
+        mCondition.notify_one();
+        return result;
 	}
 
     bool Mail::DeleteMailToSend( general::MailsSet const& mail_to_delete )
@@ -38,7 +46,13 @@ namespace smtp::manage
 		auto result_set_after_delete = GetMailsAfterDelete( mails_to_delete );
 
         return RefreshMails( result_set_after_delete );
-	}
+    }
+
+    void Mail::WaitWhileEmptyMails()
+    {
+        std::unique_lock<std::mutex> lock{mMutex};
+        mCondition.wait(lock, [this](){return !mMails.empty();});
+    }
 
     //
     //Private methods
diff --git a/src/management/mail.hpp b/src/management/mail.hpp
index 39d4048..0a5c890 100644
--- a/src/management/mail.hpp
+++ b/src/management/mail.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <string>
+#include <mutex>
+#include <condition_variable>
 
 #include "file/mail/types/ifile_manipulator.hpp"
 #include "checker/registrator_mails.hpp"
@@ -11,11 +13,13 @@ namespace smtp::manage
 	{
 	public:
         explicit Mail( file::mail::types::IFileManipulatorPtr const& file_reader );
+        Mail(Mail const& mails);
 		~Mail() = default;
 
         general::MailsSet GetMailToSend() const;
         bool AddMailsToSend( general::MailsSet const& mails );
         bool DeleteMailToSend( general::MailsSet const& mail_to_delete );
+        void WaitWhileEmptyMails();
 	private:
         general::MailsSet GetMergedMails( general::MailsSet const& mails_to_add );
         general::MailsSet GetItersectionMails( general::MailsSet const& mail_to_delete ) const;
@@ -24,6 +28,8 @@ namespace smtp::manage
 
         file::mail::types::IFileManipulatorPtr mFileReader;
         general::MailsSet mMails;
+        mutable std::mutex mMutex;
+        std::condition_variable mCondition;
 	};
 
 }