Merge pull request #11 from stone-payments/feature/add-expiration-to-…

…message add expiration when publishing message
stone-payments · Sep 11, 2018 · 14a0da1 · 14a0da1
2 parents 265fdc6 + 5196ec3
commit 14a0da1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/RabbitMQ.Abstraction/Messaging/Interfaces/IQueueClient.cs b/RabbitMQ.Abstraction/Messaging/Interfaces/IQueueClient.cs
@@ -8,8 +8,8 @@ namespace RabbitMQ.Abstraction.Messaging.Interfaces
 {
     public interface IQueueClient : IDisposable
     {
-        Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null);
-        Task PublishAsync<T>(IModel model, string exchangeName, string routingKey, T content, byte? priority = null);
+        Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null, TimeSpan? delay = null);
+        Task PublishAsync<T>(IModel model, string exchangeName, string routingKey, T content, byte? priority = null, TimeSpan? delay = null);
         Task BatchPublishAsync<T>(string exchangeName, string routingKey, IEnumerable<T> contentList, byte? priority = null);
         Task BatchPublishAsync<T>(IModel model, string exchangeName, string routingKey, IEnumerable<T> contentList, byte? priority = null);
         Task BatchPublishTransactionalAsync<T>(string exchangeName, string routingKey, IEnumerable<T> contentList, byte? priority = null);

diff --git a/RabbitMQ.Abstraction/Messaging/RabbitMQClient.cs b/RabbitMQ.Abstraction/Messaging/RabbitMQClient.cs
@@ -125,7 +125,7 @@ private static HttpClient GetHttpClient(string username, string password, string
             };
         }
 
-        public Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null)
+        public Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null, TimeSpan? delay = null)
         {
             return Task.Factory.StartNew(() =>
             {
@@ -141,13 +141,18 @@ public Task PublishAsync<T>(string exchangeName, string routingKey, T content, b
                         props.Priority = priority.Value;
                     }
 
+                    if (delay.HasValue)
+                    {
+                        props.Expiration = delay.Value.TotalMilliseconds.ToString(CultureInfo.InvariantCulture);
+                    }
+
                     var payload = Encoding.UTF8.GetBytes(serializedContent);
                     _modelPublisher.BasicPublish(exchangeName, routingKey, props, payload);
                 }
             });
         }
 
-        public Task PublishAsync<T>(IModel model, string exchangeName, string routingKey, T content, byte? priority = null)
+        public Task PublishAsync<T>(IModel model, string exchangeName, string routingKey, T content, byte? priority = null, TimeSpan? delay = null)
         {
             return Task.Factory.StartNew(() =>
             {
@@ -161,6 +166,11 @@ public Task PublishAsync<T>(IModel model, string exchangeName, string routingKey
                     props.Priority = priority.Value;
                 }
 
+                if (delay.HasValue)
+                {
+                    props.Expiration = delay.Value.TotalMilliseconds.ToString(CultureInfo.InvariantCulture);
+                }
+
                 var payload = Encoding.UTF8.GetBytes(serializedContent);
                 model.BasicPublish(exchangeName, routingKey, props, payload);
             });

diff --git a/RabbitMQ.Abstraction/Messaging/RabbitMQConsumerContext.cs b/RabbitMQ.Abstraction/Messaging/RabbitMQConsumerContext.cs
@@ -1,5 +1,6 @@
 using RabbitMQ.Abstraction.Messaging.Interfaces;
 using RabbitMQ.Client;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -16,9 +17,9 @@ public RabbitMQConsumerContext(IQueueClient queueClient, IModel model)
             _queueClient = queueClient;
         }
 
-        public Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null)
+        public Task PublishAsync<T>(string exchangeName, string routingKey, T content, byte? priority = null, TimeSpan? delay = null)
         {
-            return _queueClient.PublishAsync(_model, exchangeName, routingKey, content, priority);
+            return _queueClient.PublishAsync(_model, exchangeName, routingKey, content, priority, delay);
         }
 
         public Task BatchPublishAsync<T>(string exchangeName, string routingKey, IEnumerable<T> contentList,

diff --git a/RabbitMQ.Abstraction/RabbitMQ.Abstraction.csproj b/RabbitMQ.Abstraction/RabbitMQ.Abstraction.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Stone.RabbitMQ.Abstraction</PackageId>
-    <PackageVersion>2.0.1-beta3</PackageVersion>
+    <PackageVersion>2.0.1-beta5</PackageVersion>
     <Title>RabbitMQ Abstraction</Title>
     <Authors>Stone Pagamentos</Authors>
     <Description>RabbitMQ Abstraction for messaging workflow and infrastructure management</Description>