Added balance to GetMerchant response

Author: StuartFerguson

EstateManagement.DataTransferObjects/Responses/MerchantResponse.cs

@@ -67,6 +67,22 @@ public class MerchantResponse
         /// </value>
         public List<MerchantOperatorResponse> Operators { get; set; }
 
+        /// <summary>
+        /// Gets or sets the available balance.
+        /// </summary>
+        /// <value>
+        /// The available balance.
+        /// </value>
+        public Decimal AvailableBalance { get; set; }
+
+        /// <summary>
+        /// Gets or sets the balance.
+        /// </summary>
+        /// <value>
+        /// The balance.
+        /// </value>
+        public Decimal Balance { get; set; }
+
         #endregion
     }
 }

EstateManagement/Controllers/MerchantController.cs

@@ -208,7 +208,14 @@ public async Task<IActionResult> GetMerchant([FromRoute] Guid estateId, [FromRou
                 throw new NotFoundException($"Merchant not found with estate Id {estateId} and merchant Id {merchantId}");
             }
 
-            return this.Ok(this.ModelFactory.ConvertFrom(merchant));
+            MerchantBalance merchantBalance = await this.EstateManagementManager.GetMerchantBalance(estateId, merchantId, cancellationToken);
+
+            if (merchantBalance == null)
+            {
+                throw new NotFoundException($"Merchant Balance details not found with estate Id {estateId} and merchant Id {merchantId}");
+            }
+
+            return this.Ok(this.ModelFactory.ConvertFrom(merchant, merchantBalance));
         }
 
         /// <summary>

EstateManagement/Factories/IModelFactory.cs

@@ -23,13 +23,14 @@ public interface IModelFactory
         /// Converts from.
         /// </summary>
         /// <param name="merchant">The merchant.</param>
+        /// <param name="merchantBalance">The merchant balance.</param>
         /// <returns></returns>
-        MerchantResponse ConvertFrom(Merchant merchant);
+        MerchantResponse ConvertFrom(Merchant merchant, MerchantBalance merchantBalance = null);
 
         /// <summary>
         /// Converts from.
         /// </summary>
-        /// <param name="merchant">The merchant.</param>
+        /// <param name="merchantBalance">The merchant balance.</param>
         /// <returns></returns>
         MerchantBalanceResponse ConvertFrom(MerchantBalance merchantBalance);
 

EstateManagement/Factories/ModelFactory.cs

@@ -63,7 +63,7 @@ public EstateResponse ConvertFrom(Estate estate)
         /// </summary>
         /// <param name="merchant">The merchant.</param>
         /// <returns></returns>
-        public MerchantResponse ConvertFrom(Merchant merchant)
+        public MerchantResponse ConvertFrom(Merchant merchant, MerchantBalance merchantBalance = null)
         {
             if (merchant == null)
             {
@@ -131,6 +131,13 @@ public MerchantResponse ConvertFrom(Merchant merchant)
                                                                                }));
             }
 
+            // Only include the balance if the dto fed in is not null
+            if (merchantBalance != null)
+            {
+                merchantResponse.AvailableBalance = merchantBalance.AvailableBalance;
+                merchantResponse.Balance = merchantBalance.Balance;
+            }
+
             return merchantResponse;
         }