From 84a7beee7bd88df18dbf506f4db1d6b16666fae9 Mon Sep 17 00:00:00 2001
From: mohammad_hoseinzadehashraf_geeksltd
 <mohammad.hoseinzadehashraf@geeks.ltd.uk>
Date: Tue, 13 Feb 2024 12:47:38 +0000
Subject: [PATCH] fix

---
 Olive.Aws.EventBus/EventBusQueue.cs                           | 4 ++--
 Olive.Aws.EventBus/Olive.Aws.EventBus.csproj                  | 2 +-
 .../Olive.Entities.Data.EF.Replication.csproj                 | 2 +-
 Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs     | 1 -
 .../Olive.Entities.Data.Replication.csproj                    | 2 +-
 Olive.Entities.Data.Replication/Sync/RefreshMessage.cs        | 1 -
 Olive.EventBus/Message/IEventBusMessage.cs                    | 1 -
 Olive.EventBus/Olive.EventBus.csproj                          | 2 +-
 8 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Olive.Aws.EventBus/EventBusQueue.cs b/Olive.Aws.EventBus/EventBusQueue.cs
index 333139da7..25e821593 100644
--- a/Olive.Aws.EventBus/EventBusQueue.cs
+++ b/Olive.Aws.EventBus/EventBusQueue.cs
@@ -64,7 +64,7 @@ public async Task<string> Publish(string message)
 
             if (IsFifo)
             {
-                var eventBusMessage = JsonConvert.DeserializeObject<IEventBusMessage>(message);
+                var eventBusMessage = JsonConvert.DeserializeObject<EventBusMessage>(message);
                 request.MessageDeduplicationId =eventBusMessage.DeduplicationId.Or(Guid.NewGuid().ToString("N"));
                 request.MessageGroupId = eventBusMessage.MessageGroupId.Or("Default");
             }
@@ -103,7 +103,7 @@ public async Task<IEnumerable<string>> PublishBatch(IEnumerable<string> messages
                 request.Entries
                     .ForEach(message =>
                 {
-                    var eventBusMessage = JsonConvert.DeserializeObject<IEventBusMessage>(message.MessageBody);
+                    var eventBusMessage = JsonConvert.DeserializeObject<EventBusMessage>(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 c8ba1b6a0..0086dc9ba 100644
--- a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj
+++ b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.155</Version>
+    <Version>2.1.156</Version>
   </PropertyGroup>
 
   <ItemGroup>
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 3dad51dfa..d356dc06c 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 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>1.1.102</Version>
+	<Version>1.1.103</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs b/Olive.Entities.Data.EF.Replication/Sync/RefreshMessage.cs
index 352a81a0f..fdc0b795e 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 09ed9a493..00ba3d288 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.198</Version>
+    <Version>2.1.199</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs b/Olive.Entities.Data.Replication/Sync/RefreshMessage.cs
index 3adf74708..4fcfa9e05 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 b7bbc0dfe..6e05cbbee 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).
         /// </summary>
         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 4912bd6bf..16445a9a0 100644
--- a/Olive.EventBus/Olive.EventBus.csproj
+++ b/Olive.EventBus/Olive.EventBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.140</Version>
+    <Version>2.1.141</Version>
   </PropertyGroup>
 
   <ItemGroup>