Skip to content

Reduce ModelFactory.ConvertFrom parameter count from 9 to 8 #1722

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 4 commits into from
Apr 8, 2026
Merged

Reduce ModelFactory.ConvertFrom parameter count from 9 to 8 #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fbb645
Initial plan
Copilot Apr 8, 2026
e92a743
fix: reduce ModelFactory.ConvertFrom from 9 to 8 parameters by groupi…
Copilot Apr 8, 2026
127ed1b
fix: use explicit tuple field names at call site for clarity
Copilot Apr 8, 2026
f766d7e
Merge branch 'master' into copilot/fix-modelfactory-convertfrom-param…
StuartFerguson Apr 8, 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
4 changes: 2 additions & 2 deletions TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public async Task<Result<MerchantModel>> GetMerchantFromReference(Guid estateId,
if (merchant == null)
return Result.NotFound($"No merchant found with reference {reference}");

return Result.Success(ModelFactory.ConvertFrom(estateId, merchant, null, null, null, null, null, null, null));
return Result.Success(ModelFactory.ConvertFrom(estateId, merchant));
}

public async Task<Result> AddMerchant(MerchantDomainEvents.MerchantCreatedEvent domainEvent,
Expand Down Expand Up @@ -887,7 +887,7 @@ where merchantSchedules.Select(s => s.MerchantScheduleId).Contains(sm.MerchantSc
List<MerchantDevice> d = merchantDevices.Where(ma => ma.MerchantId == m.MerchantId).ToList();
List<MerchantSchedule> s = merchantSchedules.Where(ms => ms.MerchantId == m.MerchantId).ToList();

models.Add(ModelFactory.ConvertFrom(estateId, m, a, c, o, d, u, s, merchantScheduleMonths));
models.Add(ModelFactory.ConvertFrom(estateId, m, a, c, o, d, u, (Schedules: s, Months: merchantScheduleMonths)));
}

return Result.Success(models);
Expand Down
5 changes: 2 additions & 3 deletions TransactionProcessor.Repository/ModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public static MerchantModel ConvertFrom(Guid estateId,
List<MerchantOperatorEntity> merchantOperators,
List<MerchantDeviceEntity> merchantDevices,
List<MerchantSecurityUserEntity> merchantSecurityUsers,
List<MerchantScheduleEntity> merchantSchedules,
List<MerchantScheduleMonthEntity> merchantScheduleMonths)
(List<MerchantScheduleEntity> Schedules, List<MerchantScheduleMonthEntity> Months) merchantScheduleData)
{
MerchantModel merchantModel = ModelFactory.ConvertFrom(estateId, merchant);

Expand All @@ -93,7 +92,7 @@ public static MerchantModel ConvertFrom(Guid estateId,
merchantModel.Operators = ConvertFrom(merchantOperators);
merchantModel.Devices = ConvertFrom(merchantDevices);
merchantModel.SecurityUsers = ConvertFrom(merchantSecurityUsers);
merchantModel.Schedules = ConvertFrom(merchantSchedules, merchantScheduleMonths);
merchantModel.Schedules = ConvertFrom(merchantScheduleData.Schedules, merchantScheduleData.Months);

return merchantModel;
}
Expand Down
Loading