From ba594ef7ddea51dec51f1acdce11a59e94544309 Mon Sep 17 00:00:00 2001 From: Jesper Justesen <1972142+FirestarJes@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:54:03 +0100 Subject: [PATCH] Update ExistingActorConsolidationService.cs --- .../Services/Rules/ExistingActorConsolidationService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Services/Rules/ExistingActorConsolidationService.cs b/source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Services/Rules/ExistingActorConsolidationService.cs index d77c5e5e6..e0dcba173 100644 --- a/source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Services/Rules/ExistingActorConsolidationService.cs +++ b/source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Services/Rules/ExistingActorConsolidationService.cs @@ -36,15 +36,15 @@ public async Task CheckExistingConsolidationAsync(ActorId fromActorId, ActorId t .GetAsync() .ConfigureAwait(false)).ToList(); - if (existingConsolidations.Any(consolidation => consolidation.ActorFromId == fromActorId || consolidation.ActorToId == fromActorId)) + if (existingConsolidations.Any(consolidation => consolidation.ActorFromId == fromActorId || (consolidation.ActorToId == fromActorId && consolidation.Status == ActorConsolidationStatus.Pending))) { - throw new ValidationException("The specified From actor has already been consolidated before.") + throw new ValidationException("The specified From actor has already been consolidated before or is already scheduled to be consolidated in the future.") .WithErrorCode("actor.consolidation.fromexists"); } - if (existingConsolidations.Any(consolidation => consolidation.ActorToId == fromActorId || consolidation.ActorFromId == toActorId)) + if (existingConsolidations.Any(consolidation => consolidation.ActorFromId == toActorId)) { - throw new ValidationException("The specified From actor has an existing consolidation scheduled already.") + throw new ValidationException("The specified From actor has already been, or is, in an existing consolidation as the discontinued actor.") .WithErrorCode("actor.consolidation.toexists"); } }