diff --git a/Olive.Aws.EventBus/EventBusQueue.cs b/Olive.Aws.EventBus/EventBusQueue.cs index 333139da..25e82159 100644 --- a/Olive.Aws.EventBus/EventBusQueue.cs +++ b/Olive.Aws.EventBus/EventBusQueue.cs @@ -64,7 +64,7 @@ public async Task Publish(string message) if (IsFifo) { - var eventBusMessage = JsonConvert.DeserializeObject(message); + var eventBusMessage = JsonConvert.DeserializeObject(message); request.MessageDeduplicationId =eventBusMessage.DeduplicationId.Or(Guid.NewGuid().ToString("N")); request.MessageGroupId = eventBusMessage.MessageGroupId.Or("Default"); } @@ -103,7 +103,7 @@ public async Task> PublishBatch(IEnumerable messages request.Entries .ForEach(message => { - var eventBusMessage = JsonConvert.DeserializeObject(message.MessageBody); + var eventBusMessage = JsonConvert.DeserializeObject(message.MessageBody); message.MessageDeduplicationId =eventBusMessage.DeduplicationId.Or(Guid.NewGuid().ToString("N")); message.MessageGroupId = eventBusMessage.MessageGroupId.Or("Default"); }); diff --git a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj index c8ba1b6a..0086dc9b 100644 --- a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj +++ b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 2.1.155 + 2.1.156 diff --git a/Olive.Entities.Data.EF.Replication/Olive.Entities.Data.EF.Replication.csproj b/Olive.Entities.Data.EF.Replication/Olive.Entities.Data.EF.Replication.csproj index 3dad51df..d356dc06 100644 --- a/Olive.Entities.Data.EF.Replication/Olive.Entities.Data.EF.Replication.csproj +++ b/Olive.Entities.Data.EF.Replication/Olive.Entities.Data.EF.Replication.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 1.1.102 + 1.1.103 diff --git a/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs b/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs index 352a81a0..fdc0b795 100644 --- a/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs +++ b/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs @@ -7,7 +7,6 @@ class RefreshMessage : IEventBusMessage public string TypeName { get; set; } public string DeduplicationId => TypeName; - public string MessageGroupId => "Default"; public DateTime RequestUtc { get; set; } } diff --git a/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj b/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj index 09ed9a49..00ba3d28 100644 --- a/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj +++ b/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 2.1.198 + 2.1.199 diff --git a/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs b/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs index 3adf7470..4fcfa9e0 100644 --- a/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs +++ b/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs @@ -7,7 +7,6 @@ class RefreshMessage : IEventBusMessage public string TypeName { get; set; } public string DeduplicationId => TypeName; - public string MessageGroupId => "Default"; public DateTime RequestUtc { get; set; } } diff --git a/Olive.EventBus/Message/IEventBusMessage.cs b/Olive.EventBus/Message/IEventBusMessage.cs index b7bbc0df..6e05cbbe 100644 --- a/Olive.EventBus/Message/IEventBusMessage.cs +++ b/Olive.EventBus/Message/IEventBusMessage.cs @@ -12,6 +12,5 @@ public interface IEventBusMessage /// The ID used by queue systems to deduplicate a message in a FIFO (first-in-first-out) queue. (in cases of double delivery). /// string DeduplicationId { get; } - string MessageGroupId { get; } } } \ No newline at end of file diff --git a/Olive.EventBus/Olive.EventBus.csproj b/Olive.EventBus/Olive.EventBus.csproj index 4912bd6b..16445a9a 100644 --- a/Olive.EventBus/Olive.EventBus.csproj +++ b/Olive.EventBus/Olive.EventBus.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 2.1.140 + 2.1.141