From 177e445e4ea15b23b145dff6065989bd1fdf6125 Mon Sep 17 00:00:00 2001
From: mohammad_hoseinzadehashraf_geeksltd
 <mohammad.hoseinzadehashraf@geeks.ltd.uk>
Date: Wed, 14 Feb 2024 16:19:41 +0000
Subject: [PATCH] fix

---
 Olive.Aws.EventBus/EventBusQueue.cs          | 16 ++++++++--------
 Olive.Aws.EventBus/Olive.Aws.EventBus.csproj |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Olive.Aws.EventBus/EventBusQueue.cs b/Olive.Aws.EventBus/EventBusQueue.cs
index 25e82159..2a2fd353 100644
--- a/Olive.Aws.EventBus/EventBusQueue.cs
+++ b/Olive.Aws.EventBus/EventBusQueue.cs
@@ -64,9 +64,9 @@ public async Task<string> Publish(string message)
 
             if (IsFifo)
             {
-                var eventBusMessage = JsonConvert.DeserializeObject<EventBusMessage>(message);
-                request.MessageDeduplicationId =eventBusMessage.DeduplicationId.Or(Guid.NewGuid().ToString("N"));
-                request.MessageGroupId = eventBusMessage.MessageGroupId.Or("Default");
+                var eventBusMessage = JsonConvert.DeserializeObject<JObject>(message);
+                request.MessageDeduplicationId = eventBusMessage["DeduplicationId"]?.ToString().Or(Guid.NewGuid().ToString("N"));
+                request.MessageGroupId = eventBusMessage["MessageGroupId"]?.ToString().Or("Default");
             }
 
             try
@@ -102,11 +102,11 @@ public async Task<IEnumerable<string>> PublishBatch(IEnumerable<string> messages
             {
                 request.Entries
                     .ForEach(message =>
-                {
-                    var eventBusMessage = JsonConvert.DeserializeObject<EventBusMessage>(message.MessageBody);
-                    message.MessageDeduplicationId =eventBusMessage.DeduplicationId.Or(Guid.NewGuid().ToString("N"));
-                    message.MessageGroupId = eventBusMessage.MessageGroupId.Or("Default");
-                });
+                    {
+                        var eventBusMessage = JsonConvert.DeserializeObject<JObject>(message.MessageBody);
+                        message.MessageDeduplicationId = eventBusMessage["DeduplicationId"]?.ToString().Or(Guid.NewGuid().ToString("N"));
+                        message.MessageGroupId = eventBusMessage["MessageGroupId"]?.ToString().Or("Default");
+                    });
             }
 
             await Limiter.Add(request.Entries.Count);
diff --git a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj
index 0086dc9b..c25728f2 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.156</Version>
+    <Version>2.1.157</Version>
   </PropertyGroup>
 
   <ItemGroup>