diff --git a/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs b/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs index dec368c8..e45bc5ca 100644 --- a/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs +++ b/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs @@ -354,7 +354,7 @@ public async Task> 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 AddMerchant(MerchantDomainEvents.MerchantCreatedEvent domainEvent, @@ -887,7 +887,7 @@ where merchantSchedules.Select(s => s.MerchantScheduleId).Contains(sm.MerchantSc List d = merchantDevices.Where(ma => ma.MerchantId == m.MerchantId).ToList(); List 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); diff --git a/TransactionProcessor.Repository/ModelFactory.cs b/TransactionProcessor.Repository/ModelFactory.cs index 399afdef..cd262daa 100644 --- a/TransactionProcessor.Repository/ModelFactory.cs +++ b/TransactionProcessor.Repository/ModelFactory.cs @@ -83,8 +83,7 @@ public static MerchantModel ConvertFrom(Guid estateId, List merchantOperators, List merchantDevices, List merchantSecurityUsers, - List merchantSchedules, - List merchantScheduleMonths) + (List Schedules, List Months) merchantScheduleData) { MerchantModel merchantModel = ModelFactory.ConvertFrom(estateId, merchant); @@ -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; }