Add Subscription Trigger notification handler + cleanup subscriptions (…

…#323)

Co-authored-by: Louis-Axel Ambroise <ambroise.la@gmail.com>

src/FasTnT.Domain/Messaging/Notifications/TriggerSubscriptionNotification.cs

@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace FasTnT.Domain.Commands.Requests
+namespace FasTnT.Domain.Notifications
 {
     public class TriggerSubscriptionNotification : INotification
     {

src/FasTnT.Host/Controllers/v1_2/SubscriptionController.cs

@@ -1,4 +1,4 @@
-using FasTnT.Domain.Commands.Requests;
+using FasTnT.Domain.Notifications;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/FasTnT.Subscriptions/Handlers/SubscriptionTriggerHandler.cs

@@ -0,0 +1,24 @@
+using FasTnT.Domain.Notifications;
+using MediatR;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FasTnT.Subscriptions.Handlers
+{
+    public class SubscriptionTriggerHandler : INotificationHandler<TriggerSubscriptionNotification>
+    {
+        private readonly SubscriptionBackgroundService _service;
+
+        public SubscriptionTriggerHandler(SubscriptionBackgroundService service)
+        {
+            _service = service;
+        }
+
+        public Task Handle(TriggerSubscriptionNotification notification, CancellationToken cancellationToken)
+        {
+            _service.Trigger(notification.Name);
+
+            return Task.CompletedTask;
+        }
+    }
+}

src/FasTnT.Subscriptions/HttpSubscriptionResultSender.cs

@@ -9,7 +9,6 @@
 
 namespace FasTnT.Subscriptions
 {
-
     public class HttpSubscriptionResultSender : ISubscriptionResultSender
     {
         public async Task<bool> Send(string destination, IEpcisResponse epcisResponse, CancellationToken cancellationToken)
@@ -23,7 +22,7 @@ public async Task<bool> Send(string destination, IEpcisResponse epcisResponse, C
             return await SendRequestAsync(request, cancellationToken);
         }
 
-        private async Task<bool> SendRequestAsync(HttpWebRequest request, CancellationToken cancellationToken)
+        private static async Task<bool> SendRequestAsync(HttpWebRequest request, CancellationToken cancellationToken)
         {
             var requestWasSent = default(bool);
 
@@ -43,7 +42,7 @@ private async Task<bool> SendRequestAsync(HttpWebRequest request, CancellationTo
             return requestWasSent;
         }
 
-        private async Task WriteRequestPayload(HttpWebRequest request, IEpcisResponse epcisResponse, CancellationToken cancellationToken)
+        private static async Task WriteRequestPayload(HttpWebRequest request, IEpcisResponse epcisResponse, CancellationToken cancellationToken)
         {
             using var stream = await request.GetRequestStreamAsync();
             var formatter = new XmlCommandFormatter();
@@ -52,7 +51,7 @@ private async Task WriteRequestPayload(HttpWebRequest request, IEpcisResponse ep
             await formatter.WriteResponse(epcisResponse, stream, cancellationToken);
         }
 
-        private void TrySetBasicAuthorization(HttpWebRequest request)
+        private static void TrySetBasicAuthorization(HttpWebRequest request)
         {
             if (!string.IsNullOrEmpty(request.RequestUri.UserInfo))
             {

src/FasTnT.Subscriptions/SubscriptionBackgroundService.cs

@@ -56,7 +56,7 @@ protected override Task ExecuteAsync(CancellationToken cancellationToken)
                         WaitTillNextExecutionOrNotification();
                     }
                 }
-            });
+            }, cancellationToken);
         }
 
         private async Task Execute(IEnumerable<Subscription> subscriptions, CancellationToken cancellationToken)
@@ -154,7 +154,7 @@ private void WaitTillNextExecutionOrNotification()
             }
         }
 
-        private TimeSpan GetNextExecutionWaitTime(DateTime executionTime)
+        private static TimeSpan GetNextExecutionWaitTime(DateTime executionTime)
             => executionTime < DateTime.UtcNow ? TimeSpan.Zero : executionTime - DateTime.UtcNow;
     }
 }

test/FasTnT.UnitTest/Controllers/WhenSendingACustomSubscriptionTrigger.cs

@@ -1,4 +1,4 @@
-using FasTnT.Domain.Commands.Requests;
+using FasTnT.Domain.Notifications;
 using FasTnT.Host.Controllers.v1_2;
 using MediatR;
 using Microsoft.VisualStudio.TestTools.UnitTesting;