#39: Change arrival to rxmqarrival to distinquish lib data

by-pinja · Jan 9, 2023 · 7fbc01e · 7fbc01e
1 parent 63346b5
commit 7fbc01e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Protacon.RxMq.AzureServiceBus.Tests/AzureBusTopicIntegrationTests.cs b/Protacon.RxMq.AzureServiceBus.Tests/AzureBusTopicIntegrationTests.cs
@@ -139,7 +139,7 @@ await publisher.SendAsync(new TestMessageForTopic
                 .Timeout(TimeSpan.FromSeconds(10))
                 .FirstAsync();
 
-            Assert.Null(receivedMessage.Arrival);
+            Assert.Null(receivedMessage.RxMqArrival);
         }
         [Fact]
         public async void WhenSettingTrue_MessagesContainArrivalTimeStamp()
@@ -163,7 +163,9 @@ await publisher.SendAsync(new TestMessageForTopic
                 .Timeout(TimeSpan.FromSeconds(10))
                 .FirstAsync();
 
-            Assert.NotNull(receivedMessage.Arrival);
+            var yesterday = DateTimeOffset.UtcNow.AddDays(-1).ToUnixTimeMilliseconds();
+            Assert.NotNull(receivedMessage.RxMqArrival);
+            Assert.True(receivedMessage.RxMqArrival > yesterday);
         }
     }
 }
diff --git a/Protacon.RxMq.AzureServiceBus.Tests/Messages/TestMessageForTopic.cs b/Protacon.RxMq.AzureServiceBus.Tests/Messages/TestMessageForTopic.cs
@@ -1,5 +1,5 @@
 using System;
-using Protacon.RxMq.Abstractions;
+using Newtonsoft.Json;
 using Protacon.RxMq.Abstractions.DefaultMessageRouting;
 
 namespace Protacon.RxMq.AzureServiceBus.Tests.Messages
@@ -10,6 +10,8 @@ public class TestMessageForTopic: ITopicItem
         public string Something { get; set; }
         public string TenantId { get; set; }
         public string TopicName => "v1.testtopic";
-        public long? Arrival { get; set; }
+
+        [JsonProperty("rxmqarrival")]
+        public long? RxMqArrival { get; set; }
     }
 }
diff --git a/Protacon.RxMq.AzureServiceBus/Topic/AzureTopicSubscriber.cs b/Protacon.RxMq.AzureServiceBus/Topic/AzureTopicSubscriber.cs
@@ -102,7 +102,7 @@ private static T AsObject(string body, long arrival, bool addArrival = false)
                     throw new InvalidOperationException("Library expects data wrapped as { data: { ... } }");
 
                 if (addArrival) {
-                    parsed["data"]["arrival"] = arrival;
+                    parsed["data"]["rxmqarrival"] = arrival;
                 }
 
                 return parsed["data"].ToObject<T>();