Edc improvements for HALO project

Softeq.NetKit.Components.EventBus.Service.Tests/Samples/Events/AccountRegisteredEvent.cs

@@ -7,13 +7,13 @@ namespace Softeq.NetKit.Components.EventBus.Service.Tests.Samples.Events
 {
     public class AccountRegisteredEvent : IntegrationEvent
     {
-        public string UserId { get; }
-        public string Email { get; }
-
         public AccountRegisteredEvent(string userId, string email)
         {
             UserId = userId;
             Email = email;
         }
+
+        public string UserId { get; }
+        public string Email { get; }
     }
-}
+}

Softeq.NetKit.Components.EventBus.Service.Tests/Samples/Handlers/AccountRegisteredEventHandler.cs

@@ -3,18 +3,19 @@
 
 using System.Threading.Tasks;
 using Softeq.NetKit.Components.EventBus.Abstract;
+using Softeq.NetKit.Components.EventBus.Events;
 using Softeq.NetKit.Components.EventBus.Service.Tests.Samples.Events;
 
 namespace Softeq.NetKit.Components.EventBus.Service.Tests.Samples.Handlers
 {
-    public class AccountRegisteredEventHandler : IEventHandler<AccountRegisteredEvent>
+    public class AccountRegisteredEventHandler : IEventEnvelopeHandler<AccountRegisteredEvent>
     {
         // Inject your app service
 
-        // TODO: Need to change this action according to requirments
-        public async Task Handle(AccountRegisteredEvent @event)
+        // TODO: Need to change this action according to requirements
+        public Task HandleAsync(IntegrationEventEnvelope<AccountRegisteredEvent> eventEnvelope)
         {
-            await Task.CompletedTask;
+            throw new System.NotImplementedException();
         }
     }
 }

Softeq.NetKit.Components.EventBus/Abstract/IEventBusPublisher.cs

@@ -8,7 +8,7 @@ namespace Softeq.NetKit.Components.EventBus.Abstract
 {
     public interface IEventBusPublisher
     {
-        Task PublishToTopicAsync(IntegrationEvent @event, int? delayInSeconds = null);
-        Task PublishToQueueAsync(IntegrationEvent @event, int? delayInSeconds = null);
+        Task PublishToTopicAsync(IntegrationEventEnvelope eventEnvelope);
+        Task PublishToQueueAsync(IntegrationEventEnvelope eventEnvelope);
     }
 }

Softeq.NetKit.Components.EventBus/Abstract/IEventBusSubscriber.cs

@@ -8,22 +8,9 @@ namespace Softeq.NetKit.Components.EventBus.Abstract
 {
     public interface IEventBusSubscriber
     {
-        void RegisterQueueListener(QueueListenerConfiguration configuration = null);
-
-        Task RegisterSubscriptionListenerAsync();
-
-        Task SubscribeAsync<TEvent, TEventHandler>()
-            where TEvent : IntegrationEvent
-            where TEventHandler : IEventHandler<TEvent>;
-
-        Task UnsubscribeAsync<TEvent, TEventHandler>()
-            where TEvent : IntegrationEvent
-            where TEventHandler : IEventHandler<TEvent>;
-
-        void SubscribeDynamic<TEventHandler>(string eventName)
-            where TEventHandler : IDynamicEventHandler;
-
-        void UnsubscribeDynamic<TEventHandler>(string eventName)
-            where TEventHandler : IDynamicEventHandler;
+        Task RegisterTopicEventListenerAsync();
+        void RegisterQueueEventListener(QueueListenerConfiguration configuration = null);
+        Task RegisterEventAsync<TEvent>() where TEvent : IntegrationEvent;
+        Task RemoveEventRegistrationAsync<TEvent>() where TEvent : IntegrationEvent;
     }
 }

Softeq.NetKit.Components.EventBus/Abstract/IEventHandler.cs → Softeq.NetKit.Components.EventBus/Abstract/IEventEnvelopeHandler.cs

@@ -6,8 +6,8 @@
 
 namespace Softeq.NetKit.Components.EventBus.Abstract
 {
-    public interface IEventHandler<in TIntegrationEvent> where TIntegrationEvent : IntegrationEvent
+    public interface IEventEnvelopeHandler<TEvent> where TEvent : IntegrationEvent
     {
-        Task Handle(TIntegrationEvent @event);
+        Task HandleAsync(IntegrationEventEnvelope<TEvent> eventEnvelope);
     }
 }

Softeq.NetKit.Components.EventBus/EventPublishConfiguration.cs

@@ -1,17 +1,24 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
+using System;
+
 namespace Softeq.NetKit.Components.EventBus
 {
     public class EventPublishConfiguration
     {
-        public EventPublishConfiguration(string eventPublisherId)
+        public EventPublishConfiguration(
+            string eventPublisherId,
+            bool sendCompletionEvent = true,
+            TimeSpan? eventTimeToLive = null)
         {
             EventPublisherId = eventPublisherId;
-            SendCompletionEvent = true;
+            SendCompletionEvent = sendCompletionEvent;
+            EventTimeToLive = eventTimeToLive;
         }
 
         public string EventPublisherId { get; }
-        public bool SendCompletionEvent { get; set; }
+        public bool SendCompletionEvent { get; }
+        public TimeSpan? EventTimeToLive { get; }
     }
 }

Softeq.NetKit.Components.EventBus/Events/IntegrationEvent.cs

@@ -1,25 +1,9 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
-using System;
-using Newtonsoft.Json;
-
 namespace Softeq.NetKit.Components.EventBus.Events
 {
     public abstract class IntegrationEvent
     {
-        protected IntegrationEvent()
-        {
-            Id = Guid.NewGuid();
-            CreationDate = DateTimeOffset.UtcNow;
-        }
-
-        [JsonProperty]
-        public Guid Id { get; private set; } //Do not remove 'private set' so compiler won't drop backing field setter
-        [JsonProperty]
-        public DateTimeOffset CreationDate { get; private set; } //Do not remove 'private set' so compiler won't drop backing field setter
-        public string PublisherId { get; set; }
-        public string CorrelationId { get; set; }
-        public string SessionId { get; set; }
     }
 }

Softeq.NetKit.Components.EventBus/Events/IntegrationEventEnvelope.cs

@@ -0,0 +1,42 @@
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+using System;
+
+namespace Softeq.NetKit.Components.EventBus.Events
+{
+    public sealed class IntegrationEventEnvelope
+    {
+        public IntegrationEventEnvelope(
+            IntegrationEvent @event,
+            string publisherId,
+            string sequenceId = null,
+            string correlationId = null)
+            : this(Guid.NewGuid(), @event, publisherId, sequenceId, correlationId)
+        {
+        }
+
+        private IntegrationEventEnvelope(
+            Guid id,
+            IntegrationEvent @event,
+            string publisherId,
+            string sequenceId = null,
+            string correlationId = null)
+        {
+            Id = id;
+            Event = @event ?? throw new ArgumentNullException(nameof(@event));
+            PublisherId = publisherId ?? throw new ArgumentNullException(nameof(publisherId));
+            Created = DateTimeOffset.UtcNow;
+            SequenceId = sequenceId;
+            CorrelationId = correlationId;
+        }
+
+        public Guid Id { get; private set; }
+        public DateTimeOffset Created { get; private set; }
+        public string PublisherId { get; private set; }
+        public string SequenceId { get; private set; }
+        public string CorrelationId { get; private set; }
+        public IntegrationEvent Event { get; private set; }
+        public bool IsSequential => !string.IsNullOrEmpty(SequenceId);
+    }
+}

Softeq.NetKit.Components.EventBus/Events/IntegrationEventEnvelope`1.cs

@@ -0,0 +1,50 @@
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+using Newtonsoft.Json;
+using System;
+
+namespace Softeq.NetKit.Components.EventBus.Events
+{
+    public class IntegrationEventEnvelope<TEvent> where TEvent : IntegrationEvent
+    {
+        [JsonConstructor]
+        private IntegrationEventEnvelope(
+            Guid id, 
+            DateTimeOffset created, 
+            string publisherId, 
+            string sequenceId, 
+            string correlationId,
+            TEvent @event)
+        {
+            Id = id;
+            Created = created;
+            PublisherId = publisherId;
+            SequenceId = sequenceId;
+            CorrelationId = correlationId;
+            Event = @event;
+        }
+
+        public IntegrationEventEnvelope(IntegrationEventEnvelope eventEnvelope)
+        {
+            if (eventEnvelope == null)
+            {
+                throw new ArgumentNullException(nameof(eventEnvelope));
+            }
+
+            Event = eventEnvelope.Event as TEvent ?? throw new ArgumentException(nameof(eventEnvelope.Event));
+            Id = eventEnvelope.Id;
+            Created = eventEnvelope.Created;
+            PublisherId = eventEnvelope.PublisherId;
+            SequenceId = eventEnvelope.SequenceId;
+            CorrelationId = eventEnvelope.CorrelationId;
+        }
+
+        public Guid Id { get; private set; }
+        public DateTimeOffset Created { get; private set; }
+        public string PublisherId { get; private set; }
+        public string SequenceId { get; private set; }
+        public string CorrelationId { get; private set; }
+        public TEvent Event { get; }
+    }
+}