Merge pull request #15 from StuartFerguson/task/#8_logontransactionspecflow

Task/#8 logontransactionspecflow

Author: StuartFerguson

.github/workflows/createrelease.yml

@@ -41,6 +41,9 @@ jobs:
       run: |
         docker build . --file TransactionProcessor/Dockerfile --tag transactionprocessor:latest --tag stuartferguson/transactionprocessor:latest --tag stuartferguson/transactionprocessor:${{ steps.get_version.outputs.VERSION }}         
 
+    - name: Run Integration Tests
+      run: dotnet test "TransactionProcessor.IntegrationTests\TransactionProcessor.IntegrationTests.csproj"
+
     - name: Publish Images to Docker Hub
       run: |
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}

.github/workflows/nightlybuild.yml

@@ -49,3 +49,6 @@ jobs:
 
     - name: Build Docker Image
       run: docker build . --file TransactionProcessor/Dockerfile --tag transactionprocessor:latest
+
+    - name: Run Integration Tests
+      run: dotnet test "TransactionProcessor.IntegrationTests\TransactionProcessor.IntegrationTests.csproj"

.github/workflows/pullrequest.yml

@@ -37,3 +37,5 @@ jobs:
     - name: Build Docker Image
       run: docker build . --file TransactionProcessor/Dockerfile --tag transactionprocessor:latest
 
+    - name: Run Integration Tests
+      run: dotnet test "TransactionProcessor.IntegrationTests\TransactionProcessor.IntegrationTests.csproj" --filter Category=PRTest

README.md

@@ -1 +1,18 @@
-# TransactionProcessor
+# TransactionProcessor
+
+## Build Status
+
+[![Last Nightly Build Status Badge](https://github.com/StuartFerguson/TransactionProcessor/workflows/Nightly%20Build/badge.svg)](https://github.com/StuartFerguson/TransactionProcessor/workflows/Nightly%20Build/badge.svg)
+[![Last Release Build Status Badge](https://github.com/StuartFerguson/TransactionProcessor/workflows/Release/badge.svg)](https://github.com/StuartFerguson/TransactionProcessor/workflows/Release/badge.svg)
+
+## Nuget Versions
+
+
+
+## Code Coverage Results
+
+[![Coverage Status](https://coveralls.io/repos/github/StuartFerguson/TransactionProcessor/badge.svg)](https://coveralls.io/github/StuartFerguson/TransactionProcessor)
+
+## Code Quality Results
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5bcb33c3c68e473193a872f0d3375f61)](https://www.codacy.com/manual/stuart_ferguson1/TransactionProcessor?utm_source=github.com&utm_medium=referral&utm_content=StuartFerguson/TransactionProcessor&utm_campaign=Badge_Grade)

TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs

@@ -54,7 +54,9 @@ public async Task<ProcessLogonTransactionResponse> ProcessLogonTransaction(Guid
             return new ProcessLogonTransactionResponse
                    {
                        ResponseMessage = transactionAggregate.ResponseMessage,
-                       ResponseCode = transactionAggregate.ResponseCode
+                       ResponseCode = transactionAggregate.ResponseCode,
+                       EstateId = estateId,
+                       MerchantId = merchantId
                    };
         }
 

TransactionProcessor.DataTransferObjects/DataTransferObject.cs

@@ -0,0 +1,37 @@
+namespace TransactionProcessor.DataTransferObjects
+{
+    using System;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public abstract class DataTransferObject
+    {
+        #region Properties
+
+        // This only here as a shell base class...
+        /// <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; }
+
+        #endregion
+    }
+
+    public class MetadataContants
+    {
+        public const String KeyNameEstateId = "EstateId";
+        public const String KeyNameMerchantId = "MerchantId";
+    }
+}

TransactionProcessor.DataTransferObjects/LogonTransactionRequest.cs

@@ -7,7 +7,7 @@
     /// 
     /// </summary>
     [ExcludeFromCodeCoverage]
-    public class LogonTransactionRequest
+    public class LogonTransactionRequest : DataTransferObject
     {
         #region Properties
 

TransactionProcessor.DataTransferObjects/LogonTransactionResponse.cs

@@ -11,6 +11,9 @@ public class LogonTransactionResponse
     {
         #region Properties
 
+        public Guid EstateId { get; set; }
+        public Guid MerchantId { get; set; }
+
         /// <summary>
         /// Gets or sets the response code.
         /// </summary>

TransactionProcessor.DataTransferObjects/SerialisedMessage.cs

@@ -0,0 +1,46 @@
+namespace TransactionProcessor.DataTransferObjects
+{
+    using System;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class SerialisedMessage
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SerialisedMessage"/> class.
+        /// </summary>
+        public SerialisedMessage()
+        {
+            this.Metadata = new Dictionary<String, String>();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the metadata.
+        /// </summary>
+        /// <value>
+        /// The metadata.
+        /// </value>
+        [JsonProperty("metadata")]
+        public Dictionary<String, String> Metadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the serialised data.
+        /// </summary>
+        /// <value>
+        /// The serialised data.
+        /// </value>
+        [JsonProperty("serialised_data")]
+        public String SerialisedData { get; set; }
+
+        #endregion
+    }
+}

TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj

@@ -4,4 +4,8 @@
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+
 </Project>