fix bug in consumer when starting from OffsetSpecification::Offset

Author: DanielePalaia

Dockerfile

@@ -1,6 +1,6 @@
-FROM rabbitmq:3.13-rc-management
+FROM rabbitmq:3.13-management
 
 COPY .ci/conf/rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
 COPY .ci/conf/enabled_plugins /etc/rabbitmq/enabled_plugins
 
-COPY .ci/certs /etc/rabbitmq/certs
+COPY .ci/certs /etc/rabbitmq/certs

protocol/src/commands/subscribe.rs

@@ -94,7 +94,7 @@ impl Command for SubscribeCommand {
 }
 
 #[cfg_attr(test, derive(fake::Dummy))]
-#[derive(PartialEq, Eq, Debug)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum OffsetSpecification {
     First,
     Last,

src/consumer.rs

@@ -40,6 +40,7 @@ pub struct Consumer {
 struct ConsumerInternal {
     client: Client,
     stream: String,
+    offset_specification: OffsetSpecification,
     subscription_id: u8,
     sender: Sender<Result<Delivery, ConsumerDeliveryError>>,
     closed: Arc<AtomicBool>,
@@ -95,6 +96,7 @@ impl ConsumerBuilder {
             subscription_id,
             stream: stream.to_string(),
             client: client.clone(),
+            offset_specification: self.offset_specification.clone(),
             sender: tx,
             closed: Arc::new(AtomicBool::new(false)),
             waker: AtomicWaker::new(),
@@ -229,6 +231,13 @@ impl MessageHandler for ConsumerMessageHandler {
                     let len = delivery.messages.len();
                     trace!("Got delivery with messages {}", len);
                     for message in delivery.messages {
+                        if let OffsetSpecification::Offset(offset_) = self.0.offset_specification {
+                            if offset_ > offset {
+                                offset += 1;
+                                continue;
+                            }
+                        }
+
                         let _ = self
                             .0
                             .sender

tests/integration/consumer_test.rs

@@ -53,6 +53,64 @@ async fn consumer_test() {
     producer.close().await.unwrap();
 }
 
+
+#[tokio::test(flavor = "multi_thread")]
+async fn consumer_test_offset_specification_offset() {
+    let env = TestEnvironment::create().await;
+    let reference: String = Faker.fake();
+    let mut messages_received = 0;
+    let mut first_offset = 0;
+
+    let message_count = 10;
+    let mut producer = env
+        .env
+        .producer()
+        .name(&reference)
+        .build(&env.stream)
+        .await
+        .unwrap();
+
+    let mut consumer = env
+        .env
+        .consumer()
+        .offset(OffsetSpecification::Offset(5))
+        .build(&env.stream)
+        .await
+        .unwrap();
+
+    for n in 0..message_count-1 {
+        let _ = producer
+            .send_with_confirm(Message::builder().body(format!("message{}", n)).build())
+            .await
+            .unwrap();
+    }
+
+    let _ = producer
+        .send_with_confirm(Message::builder().body(format!("marker{}", message_count-1)).build())
+        .await
+        .unwrap();
+
+    while let Some(delivery) = consumer.next().await {
+        let d = delivery.unwrap();
+        if first_offset == 0   {
+
+            first_offset = d.offset();
+        }
+        messages_received += 1;
+
+        if String::from_utf8_lossy(d.message().data().unwrap()).contains("marker")  {
+            break;
+        }
+    }
+
+    consumer.handle().close().await.unwrap();
+    producer.close().await.unwrap();
+
+    assert!(first_offset == 5);
+    assert!(messages_received == 5);
+}
+
+
 #[tokio::test(flavor = "multi_thread")]
 async fn consumer_close_test() {
     let env = TestEnvironment::create().await;