Cache last login date and improve log upload handling

TransactionProcessor.Mobile.BusinessLogic.Tests/RequestHandlerTests/SupportRequestHandlerTests.cs

@@ -40,6 +40,7 @@ public async Task SupportRequestHandlerTests_UploadLogsRequest_NoLogs_Handle_IsH
     public async Task SupportRequestHandlerTests_UploadLogsRequest_LogsToUpload_Only10Messages_Handle_IsHandled()
     {
         Mock<IConfigurationService> configurationService = new Mock<IConfigurationService>();
+        configurationService.Setup(c => c.PostDiagnosticLogs(It.IsAny<String>(), It.IsAny<List<Models.LogMessage>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
         Func<Boolean, IConfigurationService> configurationServiceResolver = new Func<bool, IConfigurationService>((param) =>
         {
             return configurationService.Object;
@@ -76,6 +77,7 @@ public async Task SupportRequestHandlerTests_UploadLogsRequest_LogsToUpload_Only
     public async Task SupportRequestHandlerTests_UploadLogsRequest_LogsToUpload_15Messages_Handle_IsHandled()
     {
         Mock<IConfigurationService> configurationService = new Mock<IConfigurationService>();
+        configurationService.Setup(c => c.PostDiagnosticLogs(It.IsAny<String>(), It.IsAny<List<Models.LogMessage>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
         Func<Boolean, IConfigurationService> configurationServiceResolver = new Func<bool, IConfigurationService>((param) =>
         {
             return configurationService.Object;

TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/MyAccount/MyAccountPageViewModelTests.cs

@@ -49,7 +49,7 @@ public MyAccountPageViewModelTests() {
     public async Task MyAccountPageViewModel_Initialise_IsInitialised() {
         this.ApplicationThemeService.Setup(s => s.GetDarkThemeEnabled()).ReturnsAsync(true);
         this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success( TestData.MerchantDetailsModel));
-
+        this.ApplicationCache.Setup(a => a.GetLastLoginDate()).Returns(DateTime.Now);
         await this.ViewModel.Initialise(CancellationToken.None);
 
         this.ViewModel.MerchantName.ShouldBe(TestData.MerchantDetailsModel.MerchantName);

TransactionProcessor.Mobile.BusinessLogic/Models/PerformVoucherIssueRequestModel.cs

@@ -5,7 +5,6 @@ namespace TransactionProcessor.Mobile.BusinessLogic.Models;
 [ExcludeFromCodeCoverage]
 public class PerformVoucherIssueRequestModel
 {
-    // TODO: should we have a base transaction request model ?
 
     #region Properties
 

TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/SupportRequestHandler.cs

@@ -49,10 +49,16 @@ public async Task<Result> Handle(SupportCommands.UploadLogsCommand request, Canc
                 }));
 
 
-                await configurationService.PostDiagnosticLogs(request.DeviceIdentifier, logMessageModels, CancellationToken.None);
+                Result result = await configurationService.PostDiagnosticLogs(request.DeviceIdentifier, logMessageModels, CancellationToken.None);
+
+                if (result.IsFailed) {
+                    // We have had a failure posting the logs so we will stop trying to upload any more logs
+                    return result;
+                }
 
                 // Clear the logs that have been uploaded
                 await this.DatabaseContext.RemoveUploadedMessages(logEntries);
+
             }
 
             return Result.Success();

TransactionProcessor.Mobile.BusinessLogic/Services/ApplicationCache.cs

@@ -13,7 +13,7 @@
     {
         String GetConfigHostUrl();
 
         void SetConfigHostUrl(String value, MemoryCacheEntryOptions options = default);
 
         Boolean GetUseTrainingMode();
 
@@ -42,6 +42,10 @@
         Decimal GetMerchantBalance();
 
         void SetMerchantBalance(Decimal value, MemoryCacheEntryOptions options = default);
+
+        DateTime GetLastLoginDate();
+
+        void SetLastLoginDate(DateTime value, MemoryCacheEntryOptions options = default);
     }
 
     [ExcludeFromCodeCoverage]
@@ -94,7 +98,7 @@
         }
 
         public void SetConfigHostUrl(String value,
                                      MemoryCacheEntryOptions options = default)
         {
             this.Set("ConfigHostUrl", value, options);
         }
@@ -105,25 +109,25 @@
         }
 
         public void SetAccessToken(TokenResponseModel value,
                                    MemoryCacheEntryOptions options = default)
         {
             this.Set("AccessToken", value, options);
         }
 
         public void SetConfiguration(Configuration value,
                                      MemoryCacheEntryOptions options = default)
         {
             this.Set("Configuration", value, options);
         }
 
         public void SetContractProducts(List<ContractProductModel> value,
                                         MemoryCacheEntryOptions options = default)
         {
             this.Set("ContractProducts", value, options);
         }
 
         public void SetIsLoggedIn(Boolean value,
                                   MemoryCacheEntryOptions options = default)
         {
             this.Set("isLoggedIn", value, options);
         }
@@ -134,7 +138,7 @@
         }
 
         public void SetMerchantDetails(MerchantDetailsModel value,
                                        MemoryCacheEntryOptions options = default)
         {
             this.Set("MerchantDetails", value, options);
         }
@@ -148,6 +152,15 @@
             this.Set("MerchantBalance", value, options);
         }
 
+        public DateTime GetLastLoginDate() {
+            return this.TryGetValue<DateTime>("LastLoginDate");
+        }
+
+        public void SetLastLoginDate(DateTime value,
+                                      MemoryCacheEntryOptions options = default) {
+            this.Set("LastLoginDate", value, options);
+        }
+
         public void SetUseTrainingMode(Boolean value,
                                        MemoryCacheEntryOptions options = default)
         {

TransactionProcessor.Mobile.BusinessLogic/Services/BalanceRefresher.cs

@@ -38,7 +38,7 @@ public void StopRefreshing()
 
         private async Task RefreshLoopAsync(CancellationToken token)
         {
-            using PeriodicTimer timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
+            using PeriodicTimer timer = new(TimeSpan.FromSeconds(30));
 
             try
             {
@@ -52,6 +52,7 @@ private async Task RefreshLoopAsync(CancellationToken token)
             }
             catch (OperationCanceledException)
             {
+                // Nothing here but the task was cancelled, which is expected when stopping the refresher.
             }
         }
 

TransactionProcessor.Mobile.BusinessLogic/Services/ConfigurationService.cs

@@ -12,7 +12,7 @@ public interface IConfigurationService
     Task<Result<Configuration>> GetConfiguration(String deviceIdentifier,
                                                  CancellationToken cancellationToken);
 
-    Task PostDiagnosticLogs(String deviceIdentifier,
+    Task<Result> PostDiagnosticLogs(String deviceIdentifier,
                             List<LogMessage> logMessages,
                             CancellationToken cancellationToken);
 }
@@ -92,7 +92,7 @@ public async Task<Result<Configuration>> GetConfiguration(String deviceIdentifie
         }
     }
 
-    public async Task PostDiagnosticLogs(String deviceIdentifier,
+    public async Task<Result> PostDiagnosticLogs(String deviceIdentifier,
                                          List<LogMessage> logMessages,
                                          CancellationToken cancellationToken)
     {
@@ -105,8 +105,8 @@ public async Task PostDiagnosticLogs(String deviceIdentifier,
         };
         StringContent content = new(StringSerialiser.Serialise(container), Encoding.UTF8, "application/json");
 
-        Result? result = await this.Post(requestUri, content, cancellationToken);
+        Result result = await this.Post(requestUri, content, cancellationToken);
 
-        // TODO: return the result to the caller so that we can retry if it fails (and also log any errors that occur here)
+        return result;
     }
 }

TransactionProcessor.Mobile.BusinessLogic/Services/TrainingModeServices/TrainingConfigurationService.cs

@@ -24,9 +24,10 @@ public async Task<Result<Configuration>> GetConfiguration(String deviceIdentifie
         });
     }
 
-    public async Task PostDiagnosticLogs(String deviceIdentifier,
+    public async Task<Result> PostDiagnosticLogs(String deviceIdentifier,
                                          List<LogMessage> logMessages,
                                          CancellationToken cancellationToken) {
         // Do nothing
+        return Result.Success();
     }
 }

TransactionProcessor.Mobile.BusinessLogic/ViewModels/LoginPageViewModel.cs

@@ -254,6 +254,9 @@ private async Task Logon(){
 
                 await this.WriteTimingTrace(sw, "After SetIsLoggedIn");
                 await this.NavigationService.GoToHome();
+
+                // Cache the last login date
+                this.ApplicationCache.SetLastLoginDate(DateTime.Now);
             }
             catch(ApplicationException aex) {
                 Logger.LogError("Error during logon", aex);

TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs

@@ -83,7 +83,7 @@ public async Task Initialise(CancellationToken cancellationToken) {
 
             this.MerchantName = merchantDetailsResult.Data.MerchantName;
 
-            this.LastLogin = DateTime.Now; // TODO: might cache this in the application
+            this.LastLogin = this.ApplicationCache.GetLastLoginDate();
             this.IsDarkThemeEnabled = await this.ApplicationThemeService.GetDarkThemeEnabled();
         }
 

TransactionProcessor.Mobile.BusinessLogic/ViewModels/Transactions/VoucherPerformIssuePageViewModel.cs

@@ -112,7 +112,6 @@ private async Task RecipientEmailAddressEntryCompleted()
     private async Task IssueVoucher()
     {
         Logger.LogInformation("IssueVoucher called");
-        // TODO: Create Command and Send
         TransactionCommands.PerformVoucherIssueCommand command = new TransactionCommands.PerformVoucherIssueCommand(DateTime.Now,
                                                                                                        this.ProductDetails.ContractId,
                                                                                                        this.ProductDetails.ProductId,

TransactionProcessor.Mobile/MauiProgram.cs

@@ -31,7 +31,7 @@ public static MauiApp CreateMauiApp()
             }).Services.AddTransient<IDeviceService, DeviceService>()
                 .AddMemoryCache();
 
-            builder.Logging.SetMinimumLevel(LogLevel.Trace);;
+            builder.Logging.SetMinimumLevel(LogLevel.Trace);
 
             Container = builder.Build();