Skip to content

Add new route to get Live Merchant balance from projection #505

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
merged 1 commit into from
Jan 4, 2024
Merged

Add new route to get Live Merchant balance from projection #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion TransactionProcessor.Client/ITransactionProcessorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ Task ResendEmailReceipt(String accessToken,
Task<MerchantBalanceResponse> GetMerchantBalance(String accessToken,
Guid estateId,
Guid merchantId,
CancellationToken cancellationToken);
CancellationToken cancellationToken,
Boolean liveBalance = true);

Task<List<MerchantBalanceChangedEntryResponse>> GetMerchantBalanceHistory(String accessToken,
Guid estateId,
Expand Down
10 changes: 9 additions & 1 deletion TransactionProcessor.Client/TransactionProcessorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,16 @@ public async Task ResendEmailReceipt(String accessToken,
public async Task<MerchantBalanceResponse> GetMerchantBalance(String accessToken,
Guid estateId,
Guid merchantId,
CancellationToken cancellationToken) {
CancellationToken cancellationToken,
Boolean liveBalance = true){


String requestUri = $"{this.BaseAddress}/api/estates/{estateId}/merchants/{merchantId}/balance";

if (liveBalance){
requestUri = $"{this.BaseAddress}/api/estates/{estateId}/merchants/{merchantId}/livebalance";
}

MerchantBalanceResponse response = null;
try
{
Expand Down
82 changes: 75 additions & 7 deletions TransactionProcessor/Controllers/MerchantController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
using DataTransferObjects;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using ProjectionEngine.Models;
using ProjectionEngine.Repository;
using ProjectionEngine.State;
using Shared.EventStore.EventStore;
using Shared.Exceptions;
using Shared.General;
using Swashbuckle.AspNetCore.Annotations;
Expand All @@ -25,12 +27,16 @@ public class MerchantController : ControllerBase
{
private readonly IProjectionStateRepository<MerchantBalanceState> MerchantBalanceStateRepository;

private readonly IEventStoreContext EventStoreContext;

private readonly ITransactionProcessorReadRepository TransactionProcessorReadRepository;

public MerchantController(IProjectionStateRepository<MerchantBalanceState> merchantBalanceStateRepository,
ITransactionProcessorReadRepository transactionProcessorReadRepository) {
ITransactionProcessorReadRepository transactionProcessorReadRepository,
IEventStoreContext eventStoreContext) {
this.MerchantBalanceStateRepository = merchantBalanceStateRepository;
this.TransactionProcessorReadRepository = transactionProcessorReadRepository;
this.EventStoreContext = eventStoreContext;
}

#region Others
Expand Down Expand Up @@ -110,12 +116,74 @@ public async Task<IActionResult> GetMerchantBalance([FromRoute] Guid estateId,
throw new NotFoundException($"Merchant Balance details not found with estate Id {estateId} and merchant Id {merchantId}");
}

MerchantBalanceResponse response= new MerchantBalanceResponse {
Balance = merchantBalance.Balance,
MerchantId = merchantId,
AvailableBalance = merchantBalance.AvailableBalance,
EstateId = estateId
};
MerchantBalanceResponse response = new MerchantBalanceResponse
{
Balance = merchantBalance.Balance,
MerchantId = merchantId,
AvailableBalance = merchantBalance.AvailableBalance,
EstateId = estateId
};

return this.Ok(response);
}

[HttpGet]
[Route("{merchantId}/livebalance")]
[SwaggerResponse(200, "OK", typeof(MerchantBalanceResponse))]
public async Task<IActionResult> GetMerchantBalanceLive([FromRoute] Guid estateId,
[FromRoute] Guid merchantId,
CancellationToken cancellationToken)
{
String estateRoleName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("EstateRoleName"))
? "Estate"
: Environment.GetEnvironmentVariable("EstateRoleName");
String merchantRoleName = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("MerchantRoleName"))
? "Merchant"
: Environment.GetEnvironmentVariable("MerchantRoleName");

if (ClaimsHelper.IsUserRolesValid(this.User, new[] { estateRoleName, merchantRoleName }) == false)
{
return this.Forbid();
}

Claim estateIdClaim = null;
Claim merchantIdClaim = null;

// Determine the users role
if (this.User.IsInRole(estateRoleName))
{
// Estate user
// Get the Estate Id claim from the user
estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId");
}

if (this.User.IsInRole(merchantRoleName))
{
// Get the merchant Id claim from the user
estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId");
merchantIdClaim = ClaimsHelper.GetUserClaim(this.User, "MerchantId");
}

if (ClaimsHelper.ValidateRouteParameter(estateId, estateIdClaim) == false)
{
return this.Forbid();
}

if (ClaimsHelper.ValidateRouteParameter(merchantId, merchantIdClaim) == false)
{
return this.Forbid();
}

String state = await this.EventStoreContext.GetPartitionStateFromProjection("MerchantBalanceProjection", $"MerchantBalance-{merchantId:N}", cancellationToken);
MerchantBalanceProjectionState1 projectionState = JsonConvert.DeserializeObject<MerchantBalanceProjectionState1>(state);

MerchantBalanceResponse response = new MerchantBalanceResponse
{
Balance = projectionState.merchant.balance,
MerchantId = merchantId,
AvailableBalance = projectionState.merchant.balance,
EstateId = estateId
};

return this.Ok(response);
}
Expand Down