Skip to content

Refactor GetMerchantContracts to meet repository complexity limits #1674

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 3 commits into from
Mar 18, 2026
Merged

Refactor GetMerchantContracts to meet repository complexity limits #1674

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f109d97
Initial plan
Copilot Mar 18, 2026
1eca3c3
refactor merchant contract read model assembly
Copilot Mar 18, 2026
c80a082
Merge branch 'master' into copilot/fix-merchant-contracts-complexity
StuartFerguson Mar 18, 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
96 changes: 45 additions & 51 deletions TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,61 +943,26 @@ public async Task<Result<List<ContractModel>>> GetMerchantContracts(Guid estateI
{
EstateManagementContext context = await this.GetContext(estateId);

var x = await (from c in context.Contracts
join cp in context.ContractProducts on c.ContractId equals cp.ContractId
join eo in context.Operators on c.OperatorId equals eo.OperatorId
join m in context.Merchants on c.EstateId equals m.EstateId
join e in context.Estates on c.EstateId equals e.EstateId
join mc in context.MerchantContracts on new { c.ContractId, m.MerchantId } equals new { mc.ContractId, mc.MerchantId }
where m.MerchantId == merchantId && e.EstateId == estateId
select new
{
Contract = c,
Product = cp,
Operator = eo
}).ToListAsync(cancellationToken);
var query = await (from c in context.Contracts
join cp in context.ContractProducts on c.ContractId equals cp.ContractId
join eo in context.Operators on c.OperatorId equals eo.OperatorId
join m in context.Merchants on c.EstateId equals m.EstateId
join e in context.Estates on c.EstateId equals e.EstateId
join mc in context.MerchantContracts on new { c.ContractId, m.MerchantId } equals new { mc.ContractId, mc.MerchantId }
where m.MerchantId == merchantId && e.EstateId == estateId
select new
{
Contract = c,
Product = cp,
Operator = eo
}).ToListAsync(cancellationToken);

List<ContractModel> contracts = new List<ContractModel>();

foreach (var test in x)
foreach (var contractData in query)
{
// attempt to find the contract
ContractModel contract = contracts.SingleOrDefault(c => c.ContractId == test.Contract.ContractId);

if (contract == null)
{
// create the contract
contract = new ContractModel
{
OperatorId = test.Contract.OperatorId,
OperatorName = test.Operator.Name,
Products = new List<Product>(),
Description = test.Contract.Description,
IsCreated = true,
ContractId = test.Contract.ContractId,
ContractReportingId = test.Contract.ContractReportingId,
EstateId = estateId
};

contracts.Add(contract);
}

// Now add the product if not already added
Boolean productFound = contract.Products.Any(p => p.ContractProductId == test.Product.ContractProductId);

if (productFound == false)
{
// Not already there so need to add it
contract.Products.Add(new Product
{
ContractProductId = test.Product.ContractProductId,
ContractProductReportingId = test.Product.ContractProductReportingId,
TransactionFees = null,
Value = test.Product.Value,
Name = test.Product.ProductName,
DisplayText = test.Product.DisplayText
});
}
ContractModel contract = this.GetOrCreateMerchantContract(contracts, estateId, contractData.Contract, contractData.Operator);
this.AddProductIfRequired(contract, contractData.Product);
}

return Result.Success(contracts);
Expand Down Expand Up @@ -1056,6 +1021,35 @@ private async Task<EstateManagementContext> GetContext(Guid estateId)
return resolvedContext.Context;
}

private ContractModel GetOrCreateMerchantContract(List<ContractModel> contracts,
Guid estateId,
Contract contractData,
Operator operatorData)
{
ContractModel contract = contracts.SingleOrDefault(c => c.ContractId == contractData.ContractId);

if (contract != null)
{
return contract;
}

contract = new ContractModel
{
OperatorId = contractData.OperatorId,
OperatorName = operatorData.Name,
Products = new List<Product>(),
Description = contractData.Description,
IsCreated = true,
ContractId = contractData.ContractId,
ContractReportingId = contractData.ContractReportingId,
EstateId = estateId
};

contracts.Add(contract);

return contract;
}

private ContractModel GetOrCreateContract(List<ContractModel> contracts,
Estate estate,
Contract contractData,
Expand Down
Loading