Merge pull request #12 from osstotalsoft/feature/RequestsAndEventsMet…

…adata requests and events metadata update
osstotalsoft · Jun 5, 2019 · 1c9d1f6 · 1c9d1f6
2 parents ec36b21 + 7057ad4
commit 1c9d1f6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 20 deletions.
diff --git a/src/Application/NBB.Application.DataContracts/Command.cs b/src/Application/NBB.Application.DataContracts/Command.cs
@@ -8,15 +8,15 @@ public abstract class Command : ICommand, IMetadataProvider<CommandMetadata>
     {
         public CommandMetadata Metadata { get; }
 
-        protected Command(CommandMetadata metadata)
+        protected Command(CommandMetadata metadata = null)
         {
             Metadata = metadata ?? CommandMetadata.Default();
         }
     }
 
     public abstract class Command<TResponse> : Command, IRequest<TResponse>
     {
-        protected Command(CommandMetadata metadata)
+        protected Command(CommandMetadata metadata = null)
             : base(metadata)
         {
         }

diff --git a/src/Application/NBB.Application.DataContracts/Event.cs b/src/Application/NBB.Application.DataContracts/Event.cs
@@ -7,7 +7,7 @@ public abstract class Event : IEvent, IMetadataProvider<EventMetadata>
     {
         public EventMetadata Metadata { get; }
 
-        protected Event(EventMetadata metadata)
+        protected Event(EventMetadata metadata = null)
         {
             Metadata = metadata ?? EventMetadata.Default();
         }

diff --git a/src/Application/NBB.Application.DataContracts/Query.cs b/src/Application/NBB.Application.DataContracts/Query.cs
@@ -7,7 +7,7 @@ public abstract class Query<TResponse> : IQuery<TResponse>, IMetadataProvider<Qu
     {
         public QueryMetadata Metadata { get; }
 
-        protected Query(QueryMetadata metadata)
+        protected Query(QueryMetadata metadata = null)
         {
             Metadata = metadata ?? QueryMetadata.Default();
         }

diff --git a/src/Domain/NBB.Domain/DomainEvent.cs b/src/Domain/NBB.Domain/DomainEvent.cs
@@ -8,7 +8,7 @@ public abstract class DomainEvent : IDomainEvent, IMetadataProvider<DomainEventM
     {
         public DomainEventMetadata Metadata { get; }
 
-        protected DomainEvent(DomainEventMetadata metadata)
+        protected DomainEvent(DomainEventMetadata metadata = null)
         {
             Metadata = metadata ?? DomainEventMetadata.Default();
         }

diff --git a/test/UnitTests/Messaging/NBB.Messaging.Abstractions.Tests/MessageSerDesTests.cs b/test/UnitTests/Messaging/NBB.Messaging.Abstractions.Tests/MessageSerDesTests.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using FluentAssertions;
 using Moq;
+using NBB.Application.DataContracts;
 using NBB.Core.Abstractions;
 using NBB.Messaging.DataContracts;
 using Newtonsoft.Json;
@@ -12,7 +13,7 @@ namespace NBB.Messaging.Abstractions.Tests
 {
     public class MessageSerDesTests
     {
-        public class TestMessage : IEvent
+        public class TestMessage : Event
         {
             public Guid EventId { get; private set; }
             public DateTime CreationDate { get; private set; }
@@ -24,26 +25,16 @@ public class TestMessage : IEvent
             private readonly bool _constructedWithPrivateConstructor;
             public bool ConstructedWithPrivateConstructor() => _constructedWithPrivateConstructor;
 
-            [JsonConstructor]
-            private TestMessage(Guid eventId, DateTime creationDate, long contractId, long partnerId, string details)
+            public TestMessage(long partnerId, long contractId, string details, EventMetadata metadata = null) : base(metadata)
             {
-                EventId = eventId;
-                CreationDate = creationDate;
-                ContractId = contractId;
                 PartnerId = partnerId;
+                ContractId = contractId;
                 Details = details;
-
-                _constructedWithPrivateConstructor = true;
-            }
-
-            public TestMessage(long contractId, long partnerId, string details)
-                :this(Guid.NewGuid(), DateTime.Now, contractId, partnerId, details)
-            {
             }
         }
 
         [Fact]
-        public void Should_deserialize_messages_using_the_attributed_private_constructor()
+        public void Should_deserialize_messages_using_constructor_with_optional_params()
         {
             //Arrange
             var sut = new NewtonsoftJsonMessageSerDes(Mock.Of<IMessageTypeRegistry>(x => x.ResolveType(It.IsAny<string>(), It.IsAny<IEnumerable<Assembly>>()) == typeof(TestMessage)));
@@ -56,7 +47,8 @@ public void Should_deserialize_messages_using_the_attributed_private_constructor
 
             //Assert
             deserialized.Should().NotBeNull();
-            deserialized.Payload.ConstructedWithPrivateConstructor().Should().BeTrue();
+            deserialized.Payload.Should().NotBeNull();
+            deserialized.Payload.Should().BeEquivalentTo(@event);
         }
 
         [Fact]

diff --git a/...tTests/Messaging/NBB.Messaging.Abstractions.Tests/NBB.Messaging.Abstractions.Tests.csproj b/...tTests/Messaging/NBB.Messaging.Abstractions.Tests/NBB.Messaging.Abstractions.Tests.csproj
@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\Application\NBB.Application.DataContracts\NBB.Application.DataContracts.csproj" />
     <ProjectReference Include="..\..\..\..\src\Messaging\NBB.Messaging.Abstractions\NBB.Messaging.Abstractions.csproj" />
   </ItemGroup>