Skip to content

Cache merchant details after login and reuse in account #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Jul 9, 2026
Merged

Cache merchant details after login and reuse in account #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c34ae7
Cache merchant details after login and reuse in account
StuartFerguson Jul 9, 2026
a978d24
fix failing unit tests
StuartFerguson Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion TransactionProcessor.Mobile.BusinessLogic.Tests/ViewModelTests/LoginPageViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ public void LoginPageViewModel_LoginCommand_Execute_IsExecuted()
this.Mediator.Setup(m => m.Send(It.IsAny<LogonCommands.GetTokenCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.AccessToken));
this.Mediator.Setup(m => m.Send(It.IsAny<TransactionCommands.PerformLogonCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.PerformLogonResponseModel));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetContractProductsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.ContractProductList));

this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.MerchantDetailsModel));

this.ViewModel.LogonCommand.Execute(null);

this.Mediator.Verify(x => x.Send(It.IsAny<LogonCommands.GetTokenCommand>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<TransactionCommands.PerformLogonCommand>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<MerchantQueries.GetContractProductsQuery>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>()), Times.Once);
this.NavigationService.Verify(n => n.GoToHome(), Times.Once);
}

Expand All @@ -86,13 +88,16 @@ public void LoginPageViewModel_LoginCommand_Execute_ConfigUrlSet_IsExecuted(Stri
this.Mediator.Setup(m => m.Send(It.IsAny<LogonCommands.GetTokenCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.AccessToken));
this.Mediator.Setup(m => m.Send(It.IsAny<TransactionCommands.PerformLogonCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.PerformLogonResponseModel));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetContractProductsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.ContractProductList));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.MerchantDetailsModel));

this.ViewModel.ConfigHostUrl = configUrl;

this.ViewModel.LogonCommand.Execute(null);

this.Mediator.Verify(x => x.Send(It.IsAny<LogonCommands.GetTokenCommand>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<TransactionCommands.PerformLogonCommand>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<MerchantQueries.GetContractProductsQuery>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Verify(x => x.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>()), Times.Once);
this.NavigationService.Verify(n => n.GoToHome(), Times.Once);
if (String.IsNullOrEmpty(configUrl) == false){
this.ApplicationCache.Verify(v => v.SetConfigHostUrl(It.IsAny<String>(), It.IsAny<MemoryCacheEntryOptions>()), Times.Once);
Expand Down Expand Up @@ -147,6 +152,9 @@ public async Task LoginPageViewModel_LoginCommand_Execute_UpdateCheckFails_Logon
this.Mediator.Setup(m => m.Send(It.IsAny<TransactionCommands.PerformLogonCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.PerformLogonResponseModel));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetContractProductsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.ContractProductList));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantBalanceQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.MerchantBalance));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.MerchantDetailsModel));
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetMerchantDetailsQuery>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.MerchantDetailsModel));

this.ApplicationInfoService.Setup(a => a.VersionString).Returns(TestData.ApplicationVersion);
this.ApplicationInfoService.Setup(a => a.PackageName).Returns("com.transactionprocessor.mobile");
this.DeviceService.Setup(d => d.GetPlatform()).Returns("Android");
Expand Down
14 changes: 12 additions & 2 deletions TransactionProcessor.Mobile.BusinessLogic/ViewModels/LoginPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ private async Task<Result<PerformLogonResponseModel>> PerformLogonTransaction()
TransactionCommands.PerformLogonCommand command = new(DateTime.Now);
return await this.Mediator.Send(command);
}

private async Task<Result<MerchantDetailsModel>> GetMerchantDetails()
{
MerchantQueries.GetMerchantDetailsQuery query = new MerchantQueries.GetMerchantDetailsQuery();
return await this.Mediator.Send(query);
}

private async Task<Result<List<ContractProductModel>>> GetMerchantContractProducts() {
// Get Contracts
Expand Down Expand Up @@ -245,9 +251,13 @@ private async Task Logon(){
await this.WriteTimingTrace(sw, "After PerformLogonTransaction");
Result<List<ContractProductModel>> getMerchantContractProductsResult = await this.GetMerchantContractProducts();
this.HandleResult(getMerchantContractProductsResult);

await this.WriteTimingTrace(sw, "After GetMerchantContractProducts");


Result<MerchantDetailsModel> getMerchantDetailsResult = await this.GetMerchantDetails();
this.HandleResult(getMerchantDetailsResult);
await this.WriteTimingTrace(sw, "After GetMerchantDetails");

this.ApplicationCache.SetMerchantDetails(getMerchantDetailsResult.Data);
this.ApplicationCache.SetIsLoggedIn(true);

this.BalanceRefresher.StartRefreshing();
Expand Down
26 changes: 17 additions & 9 deletions TransactionProcessor.Mobile.BusinessLogic/ViewModels/MyAccount/MyAccountPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,24 @@ public async Task Initialise(CancellationToken cancellationToken) {
new() { Title = "Logout" }
];

MerchantQueries.GetMerchantDetailsQuery query = new MerchantQueries.GetMerchantDetailsQuery();

Result<MerchantDetailsModel> merchantDetailsResult = await this.Mediator.Send(query, cancellationToken);
if (merchantDetailsResult.IsFailed) {
await this.DialogService.ShowWarningToast("Unable to load merchant details. Please try again later.", cancellationToken: cancellationToken);
return;
MerchantDetailsModel merchant = this.ApplicationCache.GetMerchantDetails();
if (merchant == null)
{
MerchantQueries.GetMerchantDetailsQuery query = new();

Result<MerchantDetailsModel> merchantDetailsResult = await this.Mediator.Send(query, cancellationToken);
if (merchantDetailsResult.IsFailed)
{
await this.DialogService.ShowWarningToast("Unable to load merchant details. Please try again later.", cancellationToken: cancellationToken);
return;
}

this.MerchantName = merchantDetailsResult.Data.MerchantName;
}

this.MerchantName = merchantDetailsResult.Data.MerchantName;

else {
this.MerchantName = merchant.MerchantName;
}

this.LastLogin = this.ApplicationCache.GetLastLoginDate();
this.IsDarkThemeEnabled = await this.ApplicationThemeService.GetDarkThemeEnabled();
}
Expand Down
Loading