Add recent merchants feature to dashboard

EstateManagementUI.BlazorServer.Tests/Pages/HomePageTests.cs

@@ -60,7 +60,7 @@ public void Home_RendersCorrectly()
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetMerchantKpiQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchantKpi()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchants()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetRecentMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockRecentMerchants()));
 
         // Act
         var cut = RenderComponent<Home>();
@@ -87,7 +87,7 @@ public void Home_HasCorrectPageTitle()
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetMerchantKpiQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchantKpi()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
         this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetTodaysFailedSalesQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockTodaysSales()));
-        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockMerchants()));
+        this._mockMediator.Setup(m => m.Send(It.IsAny<Queries.GetRecentMerchantsQuery>())).ReturnsAsync(Result.Success(StubTestData.GetMockRecentMerchants()));
 
 
         // Act

EstateManagementUI.BlazorServer/Components/Pages/Home.razor

@@ -178,7 +178,7 @@
                 </div>
                 <div class="card-body">
                     <div class="space-y-3">
-                        @foreach (var merchant in recentMerchants.Take(5))
+                        @foreach (var merchant in recentMerchants)
                         {
                             <div class="flex items-center justify-between p-3 bg-gray-50 rounded hover:bg-gray-100 transition-colors">
                                 <div class="flex items-center">
@@ -188,8 +188,9 @@
                                         </svg>
                                     </div>
                                     <div>
-                                        <p class="text-gray-900 font-medium">@merchant.MerchantName</p>
-                                        <p class="text-sm text-gray-500">@merchant.MerchantReference</p>
+                                        <p class="text-gray-900 font-medium">@merchant.Name (@merchant.Reference)</p>
+                                        @* <p class="text-sm text-gray-500">@merchant.Reference</p> *@
+                                        <p class="text-sm text-gray-500">@merchant.CreatedDateTime.ToString("dd/MM/yyyy HH:mm")</p>
                                     </div>
                                 </div>
                                 <a href="/merchants/@merchant.MerchantId" class="btn btn-sm btn-primary">View</a>

EstateManagementUI.BlazorServer/Components/Pages/Home.razor.cs

@@ -26,7 +26,7 @@ public partial class Home
         private TodaysSalesModel? todaysSales;
         private TodaysSalesModel? todaysFailedSales;
         private List<ComparisonDateModel>? comparisonDates;
-        private List<MerchantModel>? recentMerchants;
+        private List<RecentMerchantsModel>? recentMerchants;
         private string _selectedComparisonDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
         private int changeEventCounter = 0;
 
@@ -115,7 +115,7 @@ private async Task<Result> LoadDashboardData(CorrelationId correlationId, Guid e
                 var kpiTask = Mediator.Send(new Queries.GetMerchantKpiQuery(correlationId, estateId));
                 var salesTask = Mediator.Send(new Queries.GetTodaysSalesQuery(correlationId, estateId, comparisonDateResult.Data));
                 var failedSalesTask = Mediator.Send(new Queries.GetTodaysFailedSalesQuery(correlationId, estateId, LOW_CREDIT_RESPONSE_CODE, comparisonDateResult.Data));
-                var merchantsTask = Mediator.Send(new Queries.GetMerchantsQuery(correlationId, estateId));
+                var merchantsTask = Mediator.Send(new Queries.GetRecentMerchantsQuery(correlationId, estateId));
 
                 await Task.WhenAll(kpiTask, salesTask, failedSalesTask, merchantsTask);
 

EstateManagementUI.BlazorServer/Factories/ModelFactory.cs

@@ -296,5 +296,29 @@ public static List<FileImportLogModel> ConvertFrom(List<BusinessLogic.Models.Fil
             models.ForEach(m => result.Add(ConvertFrom(m)));
             return result;
         }
+
+        public static List<RecentMerchantsModel>? ConvertFrom(List<BusinessLogic.Models.RecentMerchantsModel> models) {
+            List<RecentMerchantsModel> result = new List<RecentMerchantsModel>();
+            models.ForEach(m => result.Add(ConvertFrom(m)));
+            return result;
+        }
+
+        private static RecentMerchantsModel ConvertFrom(BusinessLogic.Models.RecentMerchantsModel model) {
+            RecentMerchantsModel result = new RecentMerchantsModel() {
+                CreatedDateTime = model.CreatedDateTime,
+                EstateReportingId = model.EstateReportingId,
+                LastSale = model.LastSale,
+                LastSaleDateTime = model.LastSaleDateTime,
+                LastStatement = model.LastStatement,
+                MerchantId = model.MerchantId,
+                MerchantReportingId = model.MerchantReportingId,
+                Name = model.Name,
+                PostCode = model.PostCode,
+                Reference = model.Reference,
+                Region = model.Region,
+                Town = model.Town
+            };
+            return result;
+        }
     }
 }

EstateManagementUI.BlazorServer/Models/Models.cs

@@ -230,3 +230,19 @@ public class TransactionDetailModel
     public decimal NetAmount { get; set; }
     public string? SettlementReference { get; set; }
 }
+
+public class RecentMerchantsModel
+{
+    public DateTime CreatedDateTime { get; set; }
+    public Int32 EstateReportingId { get; set; }
+    public DateTime LastSale { get; set; }
+    public DateTime LastSaleDateTime { get; set; }
+    public DateTime LastStatement { get; set; }
+    public Guid MerchantId { get; set; }
+    public Int32 MerchantReportingId { get; set; }
+    public String Name { get; set; }
+    public String PostCode { get; set; }
+    public String Reference { get; set; }
+    public String Region { get; set; }
+    public String Town { get; set; }
+}

EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/DataTransferObjects.cs

@@ -9,7 +9,7 @@
         [JsonProperty("date")]
         public DateTime Date { get; set; }
         [JsonProperty("description")]
         public String Description { get; set; }
     }
 
     public class MerchantKpi
@@ -37,4 +37,36 @@
         [JsonProperty("comparison_average_sales_value")]
         public Decimal ComparisonAverageSalesValue { get; set; }
     }
+
+    public class Merchant
+    {
+        #region Properties
+
+        [JsonProperty("created_date_time")]
+        public DateTime CreatedDateTime { get; set; }
+        [JsonProperty("estate_reporting_id")]
+        public Int32 EstateReportingId { get; set; }
+        [JsonProperty("last_sale")]
+        public DateTime LastSale { get; set; }
+        [JsonProperty("last_sale_date_time")]
+        public DateTime LastSaleDateTime { get; set; }
+        [JsonProperty("last_statement")]
+        public DateTime LastStatement { get; set; }
+        [JsonProperty("merchant_id")]
+        public Guid MerchantId { get; set; }
+        [JsonProperty("merchant_reporting_id")]
+        public Int32 MerchantReportingId { get; set; }
+        [JsonProperty("name")]
+        public String Name { get; set; }
+        [JsonProperty("post_code")]
+        public String PostCode { get; set; }
+        [JsonProperty("reference")]
+        public String Reference { get; set; }
+        [JsonProperty("region")]
+        public String Region { get; set; }
+        [JsonProperty("town")]
+        public String Town { get; set; }
+
+        #endregion
+    }
 }

EstateManagmentUI.BusinessLogic/BackendAPI/IEstateReportingApiClient.cs

@@ -12,6 +12,9 @@
         Task<Result<List<ComparisonDate>>> GetComparisonDates(String accessToken, Guid estateId, CancellationToken cancellationToken);
         Task<Result<MerchantKpi>> GetMerchantKpi(String accessToken, Guid estateId, CancellationToken cancellationToken);
 
+        Task<Result<List<Merchant>>> GetRecentMerchants(String accessToken,
+                                                        Guid estateId,
+                                                        CancellationToken cancellationToken);
         Task<Result<TodaysSales>> GetTodaysSales(String accessToken,
                                                  Guid estateId,
                                                  Int32 merchantReportingId,
@@ -83,6 +86,31 @@
             }
         }
 
+        public async Task<Result<List<Merchant>>> GetRecentMerchants(String accessToken, Guid estateId, CancellationToken cancellationToken)
+        {
+            String requestUri = this.BuildRequestUrl("/api/merchants/recent");
+
+            try
+            {
+                List<(String headerName, String headerValue)> additionalHeaders = [
+                    (EstateIdHeaderName, estateId.ToString())
+                ];
+                Result<List<Merchant>> result = await this.SendHttpGetRequest<List<Merchant>>(requestUri, accessToken, additionalHeaders, cancellationToken);
+
+                if (result.IsFailed)
+                    return ResultHelpers.CreateFailure(result);
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                // An exception has occurred, add some additional information to the message
+                Exception exception = new Exception($"Error getting recent merchants for estate {estateId}.", ex);
+
+                return Result.Failure(exception.Message);
+            }
+        }
+
         public async Task<Result<TodaysSales>> GetTodaysSales(String accessToken, Guid estateId, Int32 merchantReportingId, Int32 operatorReportingId, DateTime comparisonDate, CancellationToken cancellationToken)
         {
             QueryStringBuilder builder = new QueryStringBuilder();
@@ -186,24 +214,24 @@
         if (alwaysInclude)
             return false;
 
         Object? defaultValue = GetDefault(value.GetType());
 
         if (defaultValue == null && value.GetType() == typeof(String))
         {
             defaultValue = String.Empty;
         }
         return defaultValue.Equals(value);
     }
 
     public static object GetDefault(Type t)
     {
         Func<object> f = GetDefault<object>;
         return f.Method.GetGenericMethodDefinition().MakeGenericMethod(t).Invoke(null, null);
     }
 
     private static T GetDefault<T>()
     {
         return default(T);
     }
 
     public string BuildQueryString()

EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs

@@ -42,4 +42,28 @@ public static TodaysSalesModel ConvertFrom(TodaysSales apiResultData) {
         };
         return model;
     }
+
+    public static List<RecentMerchantsModel> ConvertFrom(List<Merchant> apiResultData) {
+        List<RecentMerchantsModel> merchants = new();
+
+        foreach (Merchant merchant in apiResultData) {
+            merchants.Add(new RecentMerchantsModel
+            {
+                CreatedDateTime = merchant.CreatedDateTime,
+                EstateReportingId = merchant.EstateReportingId,
+                LastSale = merchant.LastSale,
+                LastSaleDateTime = merchant.LastSaleDateTime,
+                LastStatement = merchant.LastStatement,
+                MerchantId = merchant.MerchantId,
+                MerchantReportingId = merchant.MerchantReportingId,
+                Name = merchant.Name,
+                PostCode = merchant.PostCode,
+                Reference = merchant.Reference,
+                Region = merchant.Region,
+                Town = merchant.Town
+            });
+        }
+
+        return merchants;
+    }
 }

EstateManagmentUI.BusinessLogic/Client/MerchantMethods.cs

@@ -1,4 +1,5 @@
-using EstateManagementUI.BusinessLogic.Models;
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
+using EstateManagementUI.BusinessLogic.Models;
 using EstateManagementUI.BusinessLogic.Requests;
 using SecurityService.DataTransferObjects.Responses;
 using Shared.Results;
@@ -9,6 +10,7 @@ namespace EstateManagementUI.BusinessLogic.Client
     public partial interface IApiClient
     {
         Task<Result<MerchantKpiModel>> GetMerchantKpi(Queries.GetMerchantKpiQuery request, CancellationToken cancellationToken);
+        Task<Result<List<RecentMerchantsModel>>> GetRecentMerchants(Queries.GetRecentMerchantsQuery request, CancellationToken cancellationToken);
     }
 
     public partial class ApiClient : IApiClient {
@@ -29,5 +31,21 @@ public async Task<Result<MerchantKpiModel>> GetMerchantKpi(Queries.GetMerchantKp
 
             return Result.Success(merchantKpiModel);
         }
+
+        public async Task<Result<List<RecentMerchantsModel>>> GetRecentMerchants(Queries.GetRecentMerchantsQuery request,
+                                                                             CancellationToken cancellationToken) {
+            Result<String> token = await this.GetToken(cancellationToken);
+            if (token.IsFailed)
+                return ResultHelpers.CreateFailure(token);
+
+            Result<List<Merchant>> apiResult = await this.EstateReportingApiClient.GetRecentMerchants(token.Data, request.EstateId, cancellationToken);
+
+            if (apiResult.IsFailed)
+                return ResultHelpers.CreateFailure(apiResult);
+
+            List<RecentMerchantsModel> recentMerchantsModels = APIModelFactory.ConvertFrom(apiResult.Data);
+
+            return Result.Success(recentMerchantsModels);
+        }
     }
 }

EstateManagmentUI.BusinessLogic/Client/StubTestData.cs

@@ -43,6 +43,31 @@ public static class StubTestData {
         }
     };
 
+    public static List<RecentMerchantsModel> GetMockRecentMerchants() => new()
+    {
+        new RecentMerchantsModel
+        {
+            MerchantId = Guid.Parse("22222222-2222-2222-2222-222222222222"),
+            Name = "Test Merchant 1",
+            Reference = "MERCH001",
+            CreatedDateTime = DateTime.Now
+        },
+        new RecentMerchantsModel
+        {
+            MerchantId = Guid.Parse("22222222-2222-2222-2222-222222222223"),
+            Name = "Test Merchant 2",
+            Reference = "MERCH002",
+            CreatedDateTime = DateTime.Now.AddDays(-1)
+        },
+        new RecentMerchantsModel
+        {
+            MerchantId = Guid.Parse("22222222-2222-2222-2222-222222222224"),
+            Name = "Test Merchant 3",
+            Reference = "MERCH003",
+            CreatedDateTime = DateTime.Now.AddDays(-5)
+        }
+    };
+
     public static MerchantModel GetMockMerchant() => new()
     {
         MerchantId = Guid.Parse("22222222-2222-2222-2222-222222222222"),

EstateManagmentUI.BusinessLogic/Models/Models.cs

@@ -35,6 +35,7 @@ public class MerchantModel
     public string? ContactName { get; set; }
     public string? ContactEmailAddress { get; set; }
     public string? ContactPhoneNumber { get; set; }
+    public DateTime CreatedDateTime { get; set; }
 }
 
 // Operator Models
@@ -253,3 +254,19 @@ public class TransactionDetailModel
     public decimal NetAmount { get; set; }
     public string? SettlementReference { get; set; }
 }
+
+public class RecentMerchantsModel
+{
+    public DateTime CreatedDateTime { get; set; }
+    public Int32 EstateReportingId { get; set; }
+    public DateTime LastSale { get; set; }
+    public DateTime LastSaleDateTime { get; set; }
+    public DateTime LastStatement { get; set; }
+    public Guid MerchantId { get; set; }
+    public Int32 MerchantReportingId { get; set; }
+    public String Name { get; set; }
+    public String PostCode { get; set; }
+    public String Reference { get; set; }
+    public String Region { get; set; }
+    public String Town { get; set; }
+}

EstateManagmentUI.BusinessLogic/RequestHandlers/DateRequestHandler.cs

@@ -58,7 +58,8 @@ public class MerchantRequestHandler : IRequestHandler<Queries.GetMerchantsQuery,
                                         IRequestHandler<Commands.UpdateMerchantAddressCommand, Result>,
                                         IRequestHandler<Commands.UpdateMerchantCommand, Result>,
                                         IRequestHandler<Commands.UpdateMerchantContactCommand, Result>,
-                                        IRequestHandler<Commands.AssignContractToMerchantCommand, Result>
+                                        IRequestHandler<Commands.AssignContractToMerchantCommand, Result>,
+                                        IRequestHandler<Queries.GetRecentMerchantsQuery, Result<List<RecentMerchantsModel>>>
     {
         private readonly IApiClient ApiClient;
 
@@ -136,6 +137,11 @@ public async Task<Result> Handle(Commands.AssignContractToMerchantCommand reques
                                          CancellationToken cancellationToken) {
             return Result.Success();
         }
+
+        public async Task<Result<List<RecentMerchantsModel>>> Handle(Queries.GetRecentMerchantsQuery request,
+                                                        CancellationToken cancellationToken) {
+            return await this.ApiClient.GetRecentMerchants(request, cancellationToken);
+        }
     }
 
     public class ContractRequestHandler : IRequestHandler<Queries.GetContractsQuery, Result<List<ContractModel>>>,

EstateManagmentUI.BusinessLogic/Requests/Requests.cs

@@ -15,6 +15,7 @@ public static class Queries
 {
     public record GetEstateQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId) : IRequest<Result<EstateModel>>;
     public record GetMerchantsQuery(CorrelationId CorrelationId, Guid EstateId) : IRequest<Result<List<MerchantModel>>>;
+    public record GetRecentMerchantsQuery(CorrelationId CorrelationId, Guid EstateId) : IRequest<Result<List<RecentMerchantsModel>>>;
     public record GetOperatorsQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId) : IRequest<Result<List<OperatorModel>>>;
     public record GetContractsQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId) : IRequest<Result<List<ContractModel>>>;
     public record GetOperatorQuery(CorrelationId CorrelationId, string AccessToken, Guid EstateId, Guid OperatorId) : IRequest<Result<OperatorModel>>;

EstateManagmentUI.BusinessLogic/Services/ITestDataStore.cs

@@ -14,6 +14,7 @@ public interface ITestDataStore
 
     // Merchant Management
     List<MerchantModel> GetMerchants(Guid estateId);
+    List<RecentMerchantsModel> GetRecentMerchants(Guid estateId);
     MerchantModel? GetMerchant(Guid estateId, Guid merchantId);
     void AddMerchant(Guid estateId, MerchantModel merchant);
     void UpdateMerchant(Guid estateId, MerchantModel merchant);