Return Estate and merchant Id's on the logon transaction response

TransactionProcessorACL.BusinessLogic.Tests/RequestHandlerTests.cs

@@ -41,6 +41,8 @@ public async Task ProcessLogonTransactionRequestHandler_Handle_RequestIsHandled(
             response.ShouldNotBeNull();
             response.ResponseCode.ShouldBe(TestData.ResponseCode);
             response.ResponseMessage.ShouldBe(TestData.ResponseMessage);
+            response.EstateId.ShouldBe(TestData.EstateId);
+            response.MerchantId.ShouldBe(TestData.MerchantId);
         }
 
         [Fact]

TransactionProcessorACL.BusinessLogic/Requests/ProcessLogonTransactionRequest.cs

@@ -1,6 +1,7 @@
 namespace TransactionProcessorACL.BusinessLogic.Requests
 {
     using System;
+    using System.Diagnostics.CodeAnalysis;
     using MediatR;
     using Models;
 
@@ -12,6 +13,7 @@ public class ProcessLogonTransactionRequest : IRequest<ProcessLogonTransactionRe
     {
         #region Constructors
 
+        [ExcludeFromCodeCoverage]
         public ProcessLogonTransactionRequest()
         {
 

TransactionProcessorACL.BusinessLogic/Requests/ProcessSaleTransactionRequest.cs

@@ -1,11 +1,16 @@
 namespace TransactionProcessorACL.BusinessLogic.Requests
 {
     using System;
+    using System.Diagnostics.CodeAnalysis;
     using MediatR;
     using Models;
 
     public class ProcessSaleTransactionRequest : IRequest<ProcessSaleTransactionResponse>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ProcessSaleTransactionRequest"/> class.
+        /// </summary>
+        [ExcludeFromCodeCoverage]
         public ProcessSaleTransactionRequest()
         {
 

TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs

@@ -100,7 +100,9 @@ public async Task<ProcessLogonTransactionResponse> ProcessLogonTransaction(Guid
                 response = new ProcessLogonTransactionResponse
                            {
                                ResponseCode = logonTransactionResponse.ResponseCode,
-                               ResponseMessage = logonTransactionResponse.ResponseMessage
+                               ResponseMessage = logonTransactionResponse.ResponseMessage,
+                               EstateId = estateId,
+                               MerchantId = merchantId
                            };
             }
             catch(Exception ex)
@@ -111,8 +113,10 @@ public async Task<ProcessLogonTransactionResponse> ProcessLogonTransaction(Guid
                     response = new ProcessLogonTransactionResponse
                                {
                                    ResponseCode = "0001", // Request Message error
-                                   ResponseMessage = ex.InnerException.Message
-                               };
+                                   ResponseMessage = ex.InnerException.Message,
+                                   EstateId = estateId,
+                                   MerchantId = merchantId
+                    };
                 }
             }
 

TransactionProcessorACL.DataTransferObjects/Responses/LogonTransactionResponseMessage.cs

@@ -0,0 +1,25 @@
+namespace TransactionProcessorACL.DataTransferObjects.Responses
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    [ExcludeFromCodeCoverage]
+    public class LogonTransactionResponseMessage : TransactionResponseMessage
+    {
+        /// <summary>
+        /// Gets or sets the estate identifier.
+        /// </summary>
+        /// <value>
+        /// The estate identifier.
+        /// </value>
+        public Guid EstateId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the merchant identifier.
+        /// </summary>
+        /// <value>
+        /// The merchant identifier.
+        /// </value>
+        public Guid MerchantId { get; set; }
+    }
+}

TransactionProcessorACL.DataTransferObjects/Responses/SaleTransactionResponseMessage.cs

@@ -0,0 +1,10 @@
+namespace TransactionProcessorACL.DataTransferObjects.Responses
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    [ExcludeFromCodeCoverage]
+    public class SaleTransactionResponseMessage : TransactionResponseMessage
+    {
+
+    }
+}

TransactionProcessorACL.DataTransferObjects/Responses/TransactionResponseMessage.cs

@@ -25,16 +25,4 @@ public class TransactionResponseMessage
         /// </value>
         public String ResponseMessage { get; set; }
     }
-
-    [ExcludeFromCodeCoverage]
-    public class LogonTransactionResponseMessage : TransactionResponseMessage
-    {
-
-    }
-
-    [ExcludeFromCodeCoverage]
-    public class SaleTransactionResponseMessage : TransactionResponseMessage
-    {
-
-    }
 }

TransactionProcessorACL.Models/ProcessLogonTransactionResponse.cs

@@ -22,5 +22,21 @@ public class ProcessLogonTransactionResponse
         /// The response message.
         /// </value>
         public String ResponseMessage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the estate identifier.
+        /// </summary>
+        /// <value>
+        /// The estate identifier.
+        /// </value>
+        public Guid EstateId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the merchant identifier.
+        /// </summary>
+        /// <value>
+        /// The merchant identifier.
+        /// </value>
+        public Guid MerchantId { get; set; }
     }
 }

TransactionProcessorACL.Testing/TestData.cs

@@ -77,7 +77,9 @@ public class TestData
         public static ProcessLogonTransactionResponse ProcessLogonTransactionResponse = new ProcessLogonTransactionResponse
                                                                                         {
                                                                                             ResponseMessage = TestData.ResponseMessage,
-                                                                                            ResponseCode = TestData.ResponseCode
+                                                                                            ResponseCode = TestData.ResponseCode,
+                                                                                            EstateId = TestData.EstateId,
+                                                                                            MerchantId = TestData.MerchantId
                                                                                         };
 
         public static SerialisedMessage SerialisedMessageResponse = new SerialisedMessage

TransactionProcessorACL.Tests/General/ModelFactoryTests.cs

@@ -25,6 +25,8 @@ public void ModelFactory_ConvertFrom_ProcessLogonTransactionResponse_IsConverted
             response.ShouldNotBeNull();
             response.ResponseMessage.ShouldBe(processLogonTransactionResponse.ResponseMessage);
             response.ResponseCode.ShouldBe(processLogonTransactionResponse.ResponseCode);
+            response.EstateId.ShouldBe(processLogonTransactionResponse.EstateId);
+            response.MerchantId.ShouldBe(processLogonTransactionResponse.MerchantId);
         }
 
         [Fact]

TransactionProcessorACL/Factories/ModelFactory.cs

@@ -27,6 +27,8 @@ public LogonTransactionResponseMessage ConvertFrom(ProcessLogonTransactionRespon
 
             logonTransactionResponseMessage.ResponseMessage = processLogonTransactionResponse.ResponseMessage;
             logonTransactionResponseMessage.ResponseCode = processLogonTransactionResponse.ResponseCode;
+            logonTransactionResponseMessage.MerchantId = processLogonTransactionResponse.MerchantId;
+            logonTransactionResponseMessage.EstateId = processLogonTransactionResponse.EstateId;
 
             return logonTransactionResponseMessage;
         }