From a4de26d092a85467ccfccad54a8d18a4e157390c Mon Sep 17 00:00:00 2001
From: amigin <amigin@gmail.com>
Date: Fri, 21 Feb 2025 20:01:13 +0200
Subject: [PATCH] Optimizations

---
 .../src/subscriber/delivered_message.rs                       | 4 +---
 my-service-bus-abstractions/src/subscriber/messages_reader.rs | 3 +--
 .../src/subscriber/messages_reader_inner.rs                   | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/my-service-bus-abstractions/src/subscriber/delivered_message.rs b/my-service-bus-abstractions/src/subscriber/delivered_message.rs
index a27100b..4fa925d 100644
--- a/my-service-bus-abstractions/src/subscriber/delivered_message.rs
+++ b/my-service-bus-abstractions/src/subscriber/delivered_message.rs
@@ -40,9 +40,7 @@ impl<TMessageModel: MySbMessageDeserializer<Item = TMessageModel>>
         let inner = self.inner.as_ref().unwrap();
         let mut inner = inner.lock().await;
 
-        if let Some(message_id) = inner.current_message_id.take() {
-            inner.not_delivered.enqueue(message_id.get_value());
-        }
+        inner.current_message_id.take();
     }
 
     pub async fn mark_as_delivered(&self) {
diff --git a/my-service-bus-abstractions/src/subscriber/messages_reader.rs b/my-service-bus-abstractions/src/subscriber/messages_reader.rs
index 546f788..7f24c9f 100644
--- a/my-service-bus-abstractions/src/subscriber/messages_reader.rs
+++ b/my-service-bus-abstractions/src/subscriber/messages_reader.rs
@@ -113,12 +113,11 @@ impl<TMessageModel: MySbMessageDeserializer<Item = TMessageModel> + Send + Sync
 
             if debug {
                 println!(
-                    "Confirmation: Topic: {}, Queue:{}, Total Amount: {}, Delivered Amount: {},  Not Delivered amount: {}",
+                    "Confirmation: Topic: {}, Queue:{}, Total Amount: {}, Delivered Amount: {}",
                     data.topic_id.as_str(),
                     data.queue_id.as_str(),
                     total_messages_amount,
                     inner.delivered.queue_size(),
-                    inner.not_delivered.queue_size()
                 );
             }
 
diff --git a/my-service-bus-abstractions/src/subscriber/messages_reader_inner.rs b/my-service-bus-abstractions/src/subscriber/messages_reader_inner.rs
index 206e8d1..9d72355 100644
--- a/my-service-bus-abstractions/src/subscriber/messages_reader_inner.rs
+++ b/my-service-bus-abstractions/src/subscriber/messages_reader_inner.rs
@@ -8,7 +8,6 @@ use super::{MySbDeliveredMessage, MySbMessageDeserializer};
 
 pub struct MessagesReaderInner<TMessageModel: MySbMessageDeserializer<Item = TMessageModel>> {
     pub delivered: QueueWithIntervals,
-    pub not_delivered: QueueWithIntervals,
     pub prev_intermediary_confirmation_queue: QueueWithIntervals,
     pub last_time_confirmation: DateTimeAsMicroseconds,
     pub current_message_id: Option<MessageId>,
@@ -23,7 +22,6 @@ impl<TMessageModel: MySbMessageDeserializer<Item = TMessageModel>>
     pub fn new(messages: VecDeque<MySbDeliveredMessage<TMessageModel>>) -> Self {
         Self {
             delivered: QueueWithIntervals::new(),
-            not_delivered: QueueWithIntervals::new(),
             last_time_confirmation: DateTimeAsMicroseconds::now(),
             prev_intermediary_confirmation_queue: QueueWithIntervals::new(),
             current_message_id: None,