Keep Type of MotorCloudEvent after serialization (#273)

* Keep Type of MotorCloudEvent after serialization * Dotnet Format * Use simpler constructor for MotorCloudEvent
GDATASoftwareAG · Jul 29, 2021 · db45639 · db45639
1 parent 6d0031a
commit db45639
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/src/Motor.Extensions.Hosting.CloudEvents/MotorCloudEvent.cs b/src/Motor.Extensions.Hosting.CloudEvents/MotorCloudEvent.cs
@@ -34,14 +34,15 @@ public MotorCloudEvent(
             IApplicationNameService applicationNameService,
             TData data,
             Uri source,
-            params KeyValuePair<CloudEventAttribute, object>[] extensions) : this(applicationNameService, data, source,
-            null, null, null, extensions)
+            params KeyValuePair<CloudEventAttribute, object>[] extensions) : this(applicationNameService, data, null,
+            source, null, null, null, extensions)
         {
         }
 
         public MotorCloudEvent(
             IApplicationNameService applicationNameService,
             TData data,
+            string? type,
             Uri source,
             string? id,
             DateTimeOffset? time,
@@ -51,7 +52,7 @@ public MotorCloudEvent(
             BaseEvent = new CloudEvent(CloudEventsSpecVersion.Default);
             foreach (var (key, value) in extensions) BaseEvent[key] = value;
             BaseEvent.Id = id ?? Guid.NewGuid().ToString();
-            BaseEvent.Type = typeof(TData).Name;
+            BaseEvent.Type = type ?? typeof(TData).Name;
             BaseEvent.Source = source;
             BaseEvent.Time = time ?? DateTimeOffset.UtcNow;
             BaseEvent.DataContentType = contentType ?? new ContentType().ToString();
@@ -111,15 +112,15 @@ private static MotorCloudEvent<T> CreateCloudEvent<T>(IApplicationNameService ap
             IEnumerable<KeyValuePair<CloudEventAttribute, object>>? extensions = null)
             where T : class
         {
-            return new(applicationNameService, data, applicationNameService.GetSource(),
+            return new MotorCloudEvent<T>(applicationNameService, data, applicationNameService.GetSource(),
                 extensions?.ToArray() ?? Array.Empty<KeyValuePair<CloudEventAttribute, object>>());
         }
 
         public MotorCloudEvent<T> CreateNew<T>(T data, bool useOldIdentifier = false)
             where T : class
         {
             return useOldIdentifier
-                ? new MotorCloudEvent<T>(_applicationNameService, data, BaseEvent.Source!, BaseEvent.Id, BaseEvent.Time,
+                ? new MotorCloudEvent<T>(_applicationNameService, data, BaseEvent.Type, BaseEvent.Source!, BaseEvent.Id, BaseEvent.Time,
                     BaseEvent.DataContentType, BaseEvent.GetPopulatedAttributes().ToArray())
                 : CreateCloudEvent(_applicationNameService, data, BaseEvent.GetPopulatedAttributes());
         }

diff --git a/src/Motor.Extensions.Hosting.Kafka/KafkaClientExtensions.cs b/src/Motor.Extensions.Hosting.Kafka/KafkaClientExtensions.cs
@@ -26,7 +26,7 @@ public static MotorCloudEvent<byte[]> ToMotorCloudEvent(this Message<string?, by
                 throw new ArgumentException("Source property of CloudEvent is null");
             }
             var motorCloudEvent = new MotorCloudEvent<byte[]>(applicationNameService, (byte[])cloudEvent.Data,
-                cloudEvent.Source, cloudEvent.Id, cloudEvent.Time, null);
+                cloudEvent.Type, cloudEvent.Source, cloudEvent.Id, cloudEvent.Time, cloudEvent.DataContentType);
             foreach (var (key, value) in cloudEvent.GetPopulatedAttributes())
             {
                 if (motorCloudEvent.GetAttribute(key.Name) is null)

diff --git a/src/Motor.Extensions.Hosting.RabbitMQ/BasicPropertiesExtensions.cs b/src/Motor.Extensions.Hosting.RabbitMQ/BasicPropertiesExtensions.cs
@@ -70,7 +70,7 @@ public static MotorCloudEvent<byte[]> ExtractCloudEvent(this IBasicProperties se
             }
 
             var cloudEvent = new MotorCloudEvent<byte[]>(applicationNameService, body.ToArray(),
-                new Uri("rabbitmq://notset"), null, null, self.ContentType);
+                null, new Uri("rabbitmq://notset"), null, null, self.ContentType);
 
             if (self.IsPriorityPresent())
             {

diff --git a/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/MotorCloudEventTests.cs b/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/MotorCloudEventTests.cs
@@ -38,14 +38,27 @@ public void CreateNew_UseOldIdentifierFromOld_IdAndDateAreNewCreated()
         }
 
         [Fact]
-        public void CreateNew_UseOldIdentifierFromOld_TypeMatchesActualDataType()
+        public void CreateNew_UseOldIdentifierFromOld_TypeMatchesOldDataType()
         {
             var oldEvent =
                 new MotorCloudEvent<string>(GetApplicationNameService(), " ", new Uri("test://non"));
             var expectedData = new List<string>();
 
             var newEvent = oldEvent.CreateNew(expectedData, true);
 
+            Assert.Equal(nameof(String), oldEvent.Type);
+            Assert.Equal(nameof(String), newEvent.Type);
+        }
+
+        [Fact]
+        public void CreateNew_DoNotUseOldIdentifierFromOld_TypeMatchesNewDataType()
+        {
+            var oldEvent =
+                new MotorCloudEvent<string>(GetApplicationNameService(), " ", new Uri("test://non"));
+            var expectedData = new List<string>();
+
+            var newEvent = oldEvent.CreateNew(expectedData, false);
+
             Assert.Equal(nameof(String), oldEvent.Type);
             Assert.Equal(typeof(List<string>).Name, newEvent.Type);
         }

diff --git a/test/Motor.Extensions.Hosting.Publisher_UnitTest/TypedMessagePublisherTests.cs b/test/Motor.Extensions.Hosting.Publisher_UnitTest/TypedMessagePublisherTests.cs
@@ -49,6 +49,20 @@ public async Task PublishMessageAsync_ContextToPassed_ContextPassed()
                 It.IsAny<CancellationToken>()), Times.Once);
         }
 
+        [Fact]
+        public async Task PublishMessageAsync_CloudEventOfTypeString_PublishedCloudEventHasTypeString()
+        {
+            var bytesPublisher = new Mock<ITypedMessagePublisher<byte[]>>();
+            var typedMessagePublisher = CreateTypedMessagePublisher(bytesPublisher.Object);
+            var motorEvent = MotorCloudEvent.CreateTestCloudEvent("test");
+
+            await typedMessagePublisher.PublishMessageAsync(motorEvent);
+
+            bytesPublisher.Verify(t => t.PublishMessageAsync(
+                It.Is<MotorCloudEvent<byte[]>>(it => it.Type == motorEvent.Type),
+                It.IsAny<CancellationToken>()), Times.Once);
+        }
+
         private static TypedMessagePublisher<string, ITypedMessagePublisher<byte[]>> CreateTypedMessagePublisher(
             ITypedMessagePublisher<byte[]>? publisher = null, IMessageSerializer<string>? serializer = null,
             IMessageEncoder? encoder = null)