Skip to content

Refactor ReportingManager.GetMerchant and extract merchant mapping to ModelFactory #510

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 5 commits into from
Mar 17, 2026
Merged

Refactor ReportingManager.GetMerchant and extract merchant mapping to ModelFactory #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1faf916
Initial plan
Copilot Mar 17, 2026
9bab06d
Reduce GetMerchant method LOC
Copilot Mar 17, 2026
87425eb
Extract GetMerchant helpers
Copilot Mar 17, 2026
b1494d5
Move merchant mapping to ModelFactory
Copilot Mar 17, 2026
7901a47
Move merchant projections to DatabaseModels
Copilot Mar 17, 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
31 changes: 31 additions & 0 deletions EstateReportingAPI.BusinessLogic/DatabaseModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
namespace EstateReportingAPI.BusinessLogic;

using System;

internal sealed class MerchantData {
public Guid MerchantId { get; init; }
public int MerchantReportingId { get; init; }
public string? Name { get; init; }
public DateTime CreatedDateTime { get; init; }
public string? Reference { get; init; }
public int SettlementSchedule { get; init; }
public MerchantAddressData? AddressInfo { get; init; }
public MerchantContactData? ContactInfo { get; init; }
}

internal sealed class MerchantAddressData {
public Guid AddressId { get; init; }
public string? AddressLine1 { get; init; }
public string? AddressLine2 { get; init; }
public string? Country { get; init; }
public string? PostalCode { get; init; }
public string? Region { get; init; }
public string? Town { get; init; }
}

internal sealed class MerchantContactData {
public Guid ContactId { get; init; }
public string? Name { get; init; }
public string? EmailAddress { get; init; }
public string? PhoneNumber { get; init; }
}
29 changes: 29 additions & 0 deletions EstateReportingAPI.BusinessLogic/ModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
namespace EstateReportingAPI.BusinessLogic;

using Merchant = EstateReportingAPI.Models.Merchant;

internal static class ModelFactory {
internal static Merchant ConvertFrom(MerchantData merchant,
decimal balance) {
return new Merchant {
Balance = balance,
CreatedDateTime = merchant.CreatedDateTime,
Name = merchant.Name,
Reference = merchant.Reference,
MerchantId = merchant.MerchantId,
MerchantReportingId = merchant.MerchantReportingId,
SettlementSchedule = merchant.SettlementSchedule,
AddressId = merchant.AddressInfo.AddressId,
AddressLine1 = merchant.AddressInfo.AddressLine1,
AddressLine2 = merchant.AddressInfo.AddressLine2,
Town = merchant.AddressInfo.Town,
Region = merchant.AddressInfo.Region,
PostCode = merchant.AddressInfo.PostalCode,
Country = merchant.AddressInfo.Country,
ContactId = merchant.ContactInfo.ContactId,
ContactName = merchant.ContactInfo.Name,
ContactEmail = merchant.ContactInfo.EmailAddress,
ContactPhone = merchant.ContactInfo.PhoneNumber
};
}
}
93 changes: 41 additions & 52 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,70 +1001,59 @@ public async Task<Result<List<Merchant>>> GetMerchants(MerchantQueries.GetMercha
return Result.Success(response);
}

public async Task<Result<Merchant>> GetMerchant(MerchantQueries.GetMerchantQuery request,
CancellationToken cancellationToken) {
public async Task<Result<Merchant>> GetMerchant(MerchantQueries.GetMerchantQuery request, CancellationToken cancellationToken) {
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;


var merchantQuery = context.Merchants.Select(m => new {
MerchantReportingId = m.MerchantReportingId,
Name = m.Name,
CreatedDateTime = m.CreatedDateTime,
MerchantId = m.MerchantId,
Reference = m.Reference,
m.SettlementSchedule,
AddressInfo = context.MerchantAddresses.Where(ma => ma.MerchantId == m.MerchantId).OrderByDescending(ma => ma.CreatedDateTime).Select(ma => new {
ma.AddressId,
ma.AddressLine1,
ma.AddressLine2,
ma.Country,
ma.PostalCode,
ma.Region,
ma.Town
}).FirstOrDefault(),
ContactInfo = context.MerchantContacts.Where(mc => mc.MerchantId == m.MerchantId).OrderByDescending(mc => mc.CreatedDateTime).Select(mc => new { mc.ContactId, mc.Name, mc.EmailAddress, mc.PhoneNumber }).FirstOrDefault()
}).Where(m => m.MerchantId == request.MerchantId);

var merchantQuery = BuildMerchantQuery(context, request.MerchantId);
var merchantQueryResult = await ExecuteQuerySafeSingleOrDefault(merchantQuery, cancellationToken, "Error getting merchant");

if (merchantQueryResult.IsFailed)
if (merchantQueryResult.IsFailed) {
return ResultHelpers.CreateFailure(merchantQueryResult);
}

var merchant = merchantQueryResult.Data;

// Get the merchant state to get the balance
var merchantStateQueryResult = await ExecuteQuerySafeSingleOrDefault(context.MerchantBalanceProjectionState.Where(ms => ms.MerchantId == request.MerchantId), cancellationToken, "Error getting merchant state");
if (merchantStateQueryResult.IsFailed) return ResultHelpers.CreateFailure(merchantStateQueryResult);
var merchantState = merchantStateQueryResult.Data;

// Ok now enumerate the results
Merchant result = new() {
Balance = merchantState.Balance,
CreatedDateTime = merchant.CreatedDateTime,
Name = merchant.Name,
Reference = merchant.Reference,
MerchantId = merchant.MerchantId,
MerchantReportingId = merchant.MerchantReportingId,
SettlementSchedule = merchant.SettlementSchedule,
AddressId = merchant.AddressInfo.AddressId,
AddressLine1 = merchant.AddressInfo.AddressLine1,
AddressLine2 = merchant.AddressInfo.AddressLine2,
Town = merchant.AddressInfo.Town,
Region = merchant.AddressInfo.Region,
PostCode = merchant.AddressInfo.PostalCode,
Country = merchant.AddressInfo.Country,
ContactId = merchant.ContactInfo.ContactId,
ContactName = merchant.ContactInfo.Name,
ContactEmail = merchant.ContactInfo.EmailAddress,
ContactPhone = merchant.ContactInfo.PhoneNumber
};

return Result.Success(result);
return Result.Success(ModelFactory.ConvertFrom(merchantQueryResult.Data, merchantStateQueryResult.Data.Balance));
}

private static IQueryable<MerchantData> BuildMerchantQuery(EstateManagementContext context,
Guid merchantId) {
return context.Merchants
.Select(m => new MerchantData {
MerchantReportingId = m.MerchantReportingId,
Name = m.Name,
CreatedDateTime = m.CreatedDateTime,
MerchantId = m.MerchantId,
Reference = m.Reference,
SettlementSchedule = m.SettlementSchedule,
AddressInfo = context.MerchantAddresses.Where(ma => ma.MerchantId == m.MerchantId)
.OrderByDescending(ma => ma.CreatedDateTime)
.Select(ma => new MerchantAddressData {
AddressId = ma.AddressId,
AddressLine1 = ma.AddressLine1,
AddressLine2 = ma.AddressLine2,
Country = ma.Country,
PostalCode = ma.PostalCode,
Region = ma.Region,
Town = ma.Town
})
.FirstOrDefault(),
ContactInfo = context.MerchantContacts.Where(mc => mc.MerchantId == m.MerchantId)
.OrderByDescending(mc => mc.CreatedDateTime)
.Select(mc => new MerchantContactData {
ContactId = mc.ContactId,
Name = mc.Name,
EmailAddress = mc.EmailAddress,
PhoneNumber = mc.PhoneNumber
})
.FirstOrDefault()
})
.Where(m => m.MerchantId == merchantId);
}

public async Task<Result<List<MerchantOperator>>> GetMerchantOperators(MerchantQueries.GetMerchantOperatorsQuery request,
CancellationToken cancellationToken) {
CancellationToken cancellationToken) {
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

Expand Down
Loading