Merge e7170b4 into fc6c563

source/marketparticipant/Energinet.DataHub.MarketParticipant.Application/Handlers/Actors/ConsolidateActorsHandler.cs

@@ -17,6 +17,7 @@
 using System.Threading.Tasks;
 using Energinet.DataHub.MarketParticipant.Application.Commands.Actors;
 using Energinet.DataHub.MarketParticipant.Application.Services;
+using Energinet.DataHub.MarketParticipant.Domain;
 using Energinet.DataHub.MarketParticipant.Domain.Model;
 using Energinet.DataHub.MarketParticipant.Domain.Repositories;
 using Energinet.DataHub.RevisionLog.Integration;
@@ -30,15 +31,18 @@ public sealed class ConsolidateActorsHandler : IRequestHandler<ConsolidateActors
     private readonly IActorConsolidationRepository _actorConsolidationRepository;
     private readonly IActorConsolidationService _actorConsolidationService;
     private readonly IRevisionLogClient _revisionLogClient;
+    private readonly IUnitOfWorkProvider _unitOfWorkProvider;
 
     public ConsolidateActorsHandler(
         IActorConsolidationRepository actorConsolidationRepository,
         IActorConsolidationService actorConsolidationService,
-        IRevisionLogClient revisionLogClient)
+        IRevisionLogClient revisionLogClient,
+        IUnitOfWorkProvider unitOfWorkProvider)
     {
         _actorConsolidationRepository = actorConsolidationRepository;
         _actorConsolidationService = actorConsolidationService;
         _revisionLogClient = revisionLogClient;
+        _unitOfWorkProvider = unitOfWorkProvider;
     }
 
     public async Task Handle(ConsolidateActorsCommand request, CancellationToken cancellationToken)
@@ -51,19 +55,34 @@ public async Task Handle(ConsolidateActorsCommand request, CancellationToken can
 
         foreach (var actorConsolidation in actorsReadyToConsolidate)
         {
-            await _revisionLogClient
-                .LogAsync(new RevisionLogEntry(
-                    logId: Guid.NewGuid(),
-                    systemId: SubsystemInformation.Id,
-                    activity: "ConsolidateActor",
-                    occurredOn: SystemClock.Instance.GetCurrentInstant(),
-                    origin: nameof(ConsolidateActorsHandler),
-                    affectedEntityType: nameof(Actor),
-                    affectedEntityKey: actorConsolidation.ActorFromId.ToString(),
-                    payload: actorConsolidation.Id.ToString()))
+            var uow = await _unitOfWorkProvider
+                .NewUnitOfWorkAsync()
                 .ConfigureAwait(false);
 
-            await _actorConsolidationService.ConsolidateAsync(actorConsolidation).ConfigureAwait(false);
+            await using (uow.ConfigureAwait(false))
+            {
+                await _revisionLogClient
+                    .LogAsync(new RevisionLogEntry(
+                        logId: Guid.NewGuid(),
+                        systemId: SubsystemInformation.Id,
+                        activity: "ConsolidateActor",
+                        occurredOn: SystemClock.Instance.GetCurrentInstant(),
+                        origin: nameof(ConsolidateActorsHandler),
+                        affectedEntityType: nameof(Actor),
+                        affectedEntityKey: actorConsolidation.ActorFromId.ToString(),
+                        payload: actorConsolidation.Id.ToString()))
+                    .ConfigureAwait(false);
+
+                await _actorConsolidationService
+                    .ConsolidateAsync(actorConsolidation)
+                    .ConfigureAwait(false);
+
+                await _actorConsolidationRepository
+                    .AddOrUpdateAsync(actorConsolidation)
+                    .ConfigureAwait(false);
+
+                await uow.CommitAsync().ConfigureAwait(false);
+            }
         }
     }
 }

source/marketparticipant/Energinet.DataHub.MarketParticipant.Application/Handlers/Actors/ScheduleConsolidateActorsHandler.cs

@@ -93,7 +93,7 @@ public async Task Handle(ScheduleConsolidateActorsCommand request, CancellationT
                 request.Consolidation.ConsolidateAt.ToInstant());
 
             await _actorConsolidationRepository
-                .AddAsync(actorConsolidation)
+                .AddOrUpdateAsync(actorConsolidation)
                 .ConfigureAwait(false);
 
             foreach (var gridArea in fromActor.MarketRole.GridAreas)

source/marketparticipant/Energinet.DataHub.MarketParticipant.Application/Services/ActorConsolidationService.cs

@@ -16,7 +16,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Energinet.DataHub.MarketParticipant.Domain;
 using Energinet.DataHub.MarketParticipant.Domain.Exception;
 using Energinet.DataHub.MarketParticipant.Domain.Model;
 using Energinet.DataHub.MarketParticipant.Domain.Repositories;
@@ -32,24 +31,21 @@ public sealed class ActorConsolidationService : IActorConsolidationService
     private readonly IAuditIdentityProvider _auditIdentityProvider;
     private readonly IDomainEventRepository _domainEventRepository;
     private readonly IGridAreaRepository _gridAreaRepository;
-    private readonly IUnitOfWorkProvider _unitOfWorkProvider;
 
     public ActorConsolidationService(
         IActorConsolidationAuditLogRepository actorConsolidationAuditLogRepository,
         IActorCredentialsRemovalService actorCredentialsRemovalService,
         IActorRepository actorRepository,
         IAuditIdentityProvider auditIdentityProvider,
         IDomainEventRepository domainEventRepository,
-        IGridAreaRepository gridAreaRepository,
-        IUnitOfWorkProvider unitOfWorkProvider)
+        IGridAreaRepository gridAreaRepository)
     {
         _actorConsolidationAuditLogRepository = actorConsolidationAuditLogRepository;
         _actorCredentialsRemovalService = actorCredentialsRemovalService;
         _actorRepository = actorRepository;
         _auditIdentityProvider = auditIdentityProvider;
         _domainEventRepository = domainEventRepository;
         _gridAreaRepository = gridAreaRepository;
-        _unitOfWorkProvider = unitOfWorkProvider;
     }
 
     public async Task ConsolidateAsync(ActorConsolidation actorConsolidation)
@@ -62,43 +58,36 @@ public async Task ConsolidateAsync(ActorConsolidation actorConsolidation)
         var toActor = await _actorRepository.GetAsync(actorConsolidation.ActorToId).ConfigureAwait(false);
         NotFoundValidationException.ThrowIfNull(toActor, actorConsolidation.ActorToId.Value);
 
-        var uow = await _unitOfWorkProvider
-            .NewUnitOfWorkAsync()
-            .ConfigureAwait(false);
-
-        await using (uow.ConfigureAwait(false))
+        if (fromActor.MarketRole.Function is EicFunction.GridAccessProvider
+            && toActor.MarketRole.Function is EicFunction.GridAccessProvider)
         {
-            if (fromActor.MarketRole.Function is EicFunction.GridAccessProvider
-                && toActor.MarketRole.Function is EicFunction.GridAccessProvider)
-            {
-                var actorGridAreasToTransfer = fromActor.MarketRole.GridAreas.ToList();
+            var actorGridAreasToTransfer = fromActor.MarketRole.GridAreas.ToList();
 
-                toActor.TransferGridAreasFrom(fromActor);
+            toActor.TransferGridAreasFrom(fromActor);
 
-                await UpdateGridAreasValidToDateAsync(actorGridAreasToTransfer, actorConsolidation.ConsolidateAt).ConfigureAwait(false);
-                await AuditLogConsolidationCompletedAsync(actorGridAreasToTransfer, actorConsolidation).ConfigureAwait(false);
-            }
+            await UpdateGridAreasValidToDateAsync(actorGridAreasToTransfer, actorConsolidation.ConsolidateAt).ConfigureAwait(false);
+            await AuditLogConsolidationCompletedAsync(actorGridAreasToTransfer, actorConsolidation).ConfigureAwait(false);
+        }
 
-            await DeactivateActorAsync(fromActor).ConfigureAwait(false);
+        await DeactivateActorAsync(fromActor).ConfigureAwait(false);
 
-            await _actorRepository
-                .AddOrUpdateAsync(fromActor)
-                .ConfigureAwait(false);
+        await _actorRepository
+            .AddOrUpdateAsync(fromActor)
+            .ConfigureAwait(false);
 
-            await _actorRepository
-                .AddOrUpdateAsync(toActor)
-                .ConfigureAwait(false);
+        await _actorRepository
+            .AddOrUpdateAsync(toActor)
+            .ConfigureAwait(false);
 
-            await _domainEventRepository
-                .EnqueueAsync(fromActor)
-                .ConfigureAwait(false);
+        await _domainEventRepository
+            .EnqueueAsync(fromActor)
+            .ConfigureAwait(false);
 
-            await _domainEventRepository
-                .EnqueueAsync(toActor)
-                .ConfigureAwait(false);
+        await _domainEventRepository
+            .EnqueueAsync(toActor)
+            .ConfigureAwait(false);
 
-            await uow.CommitAsync().ConfigureAwait(false);
-        }
+        actorConsolidation.Complete();
     }
 
     private async Task AuditLogConsolidationCompletedAsync(

source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Model/ActorConsolidation.cs

@@ -36,9 +36,14 @@ public ActorConsolidation(ActorConsolidationId id, ActorId fromId, ActorId toId,
         Status = status;
     }
 
-    public ActorConsolidationId Id { get; init; }
-    public ActorId ActorFromId { get; init; }
-    public ActorId ActorToId { get; init; }
-    public Instant ConsolidateAt { get; set; }
-    public ActorConsolidationStatus Status { get; set; }
+    public ActorConsolidationId Id { get; }
+    public ActorId ActorFromId { get; }
+    public ActorId ActorToId { get; }
+    public Instant ConsolidateAt { get; }
+    public ActorConsolidationStatus Status { get; private set; }
+
+    public void Complete()
+    {
+        Status = ActorConsolidationStatus.Executed;
+    }
 }

source/marketparticipant/Energinet.DataHub.MarketParticipant.Domain/Repositories/IActorConsolidationRepository.cs

@@ -24,12 +24,11 @@ namespace Energinet.DataHub.MarketParticipant.Domain.Repositories;
 public interface IActorConsolidationRepository
 {
     /// <summary>
-    /// Adds an <see cref="ActorConsolidation"/>.
+    /// Adds or updates an <see cref="ActorConsolidation"/>.
     /// </summary>
     /// <param name="actorConsolidation">The actor to consolidate.</param>
     /// <returns>The <see cref="ActorConsolidationId">id</see> of the added <see cref="ActorConsolidation"/>.</returns>
-    /// <remarks>Throws an exception if the entity to add is not with a default GUID as id.</remarks>
-    Task<ActorConsolidationId> AddAsync(ActorConsolidation actorConsolidation);
+    Task<ActorConsolidationId> AddOrUpdateAsync(ActorConsolidation actorConsolidation);
 
     /// <summary>
     /// Gets a List of all <see cref="ActorConsolidation"/>.

source/marketparticipant/Energinet.DataHub.MarketParticipant.Infrastructure/Persistence/Repositories/ActorConsolidationRepository.cs

@@ -35,7 +35,7 @@ public ActorConsolidationRepository(IMarketParticipantDbContext marketParticipan
         _marketParticipantDbContext = marketParticipantDbContext;
     }
 
-    public async Task<ActorConsolidationId> AddAsync(ActorConsolidation actorConsolidation)
+    public async Task<ActorConsolidationId> AddOrUpdateAsync(ActorConsolidation actorConsolidation)
     {
         ArgumentNullException.ThrowIfNull(actorConsolidation, nameof(actorConsolidation));
 
@@ -46,7 +46,10 @@ public async Task<ActorConsolidationId> AddAsync(ActorConsolidation actorConsoli
         }
         else
         {
-            throw new InvalidOperationException($"ActorConsolidation you are adding already exists, or has a non default id");
+            destination = await _marketParticipantDbContext
+                .ActorConsolidations
+                .FindAsync(actorConsolidation.Id.Value)
+                .ConfigureAwait(false) ?? throw new InvalidOperationException($"ActorConsolidation with id {actorConsolidation.Id.Value} is missing, even though it cannot be deleted.");
         }
 
         MapToEntity(actorConsolidation, destination);

source/marketparticipant/Energinet.DataHub.MarketParticipant.IntegrationTests/Repositories/ActorConsolidationRepositoryTests.cs

@@ -82,7 +82,7 @@ public async Task AddAsync_OneActorConsolidation_CanReadBack()
             scheduledAt);
 
         // Act
-        var consolidationId = await consolidationRepository.AddAsync(testConsolidation);
+        var consolidationId = await consolidationRepository.AddOrUpdateAsync(testConsolidation);
         var newConsolidation = await consolidationRepository2.GetAsync(consolidationId);
 
         // Assert
@@ -129,8 +129,8 @@ public async Task AddAsync_MultipleActorConsolidations_CanReadBack()
             scheduledAt);
 
         // Act
-        await consolidationRepository.AddAsync(testConsolidation);
-        await consolidationRepository.AddAsync(testConsolidation2);
+        await consolidationRepository.AddOrUpdateAsync(testConsolidation);
+        await consolidationRepository.AddOrUpdateAsync(testConsolidation2);
         var consolidations = (await consolidationRepository2.GetAsync()).ToList();
 
         // Assert

source/marketparticipant/Energinet.DataHub.MarketParticipant.IntegrationTests/Services/ActorConsolidationServiceIntegrationTests.cs

@@ -15,7 +15,6 @@
 using System;
 using System.Threading.Tasks;
 using Energinet.DataHub.MarketParticipant.Application.Services;
-using Energinet.DataHub.MarketParticipant.Domain;
 using Energinet.DataHub.MarketParticipant.Domain.Model;
 using Energinet.DataHub.MarketParticipant.Domain.Repositories;
 using Energinet.DataHub.MarketParticipant.Infrastructure.Persistence.Model;
@@ -53,7 +52,6 @@ public async Task ConsolidateAsync_GridAreasAreTransferred_NoException()
         var actorCredentialsRemovalService = scope.ServiceProvider.GetRequiredService<IActorCredentialsRemovalService>();
         var actorRepository = scope.ServiceProvider.GetRequiredService<IActorRepository>();
         var gridAreaRepository = scope.ServiceProvider.GetRequiredService<IGridAreaRepository>();
-        var unitOfWorkProvider = scope.ServiceProvider.GetRequiredService<IUnitOfWorkProvider>();
 
         var auditIdentityProvider = new Mock<IAuditIdentityProvider>();
         auditIdentityProvider.Setup(repo => repo.IdentityId).Returns(new Domain.Model.Users.AuditIdentity(Guid.NewGuid()));
@@ -88,8 +86,7 @@ public async Task ConsolidateAsync_GridAreasAreTransferred_NoException()
             actorRepository,
             auditIdentityProvider.Object,
             domainEventRepository.Object,
-            gridAreaRepository,
-            unitOfWorkProvider);
+            gridAreaRepository);
 
         var scheduledAt = Instant.FromUtc(2024, 1, 1, 10, 59);
 

source/marketparticipant/Energinet.DataHub.MarketParticipant.Tests/Services/ActorConsolidationServiceTests.cs

@@ -20,7 +20,6 @@
 using Energinet.DataHub.MarketParticipant.Domain.Model.Users;
 using Energinet.DataHub.MarketParticipant.Domain.Repositories;
 using Energinet.DataHub.MarketParticipant.Tests.Common;
-using Energinet.DataHub.MarketParticipant.Tests.Handlers;
 using Moq;
 using NodaTime;
 using Xunit;
@@ -63,8 +62,7 @@ public async Task ConsolidateAsync_TwoGridAccessProviders_EmptyDestination_Trans
             actorRepository.Object,
             auditIdentityProvider.Object,
             domainEventRepository.Object,
-            gridAreaRepository.Object,
-            UnitOfWorkProviderMock.Create());
+            gridAreaRepository.Object);
 
         actorRepository
             .Setup(repo => repo.GetAsync(validFromActor.Id))
@@ -119,8 +117,7 @@ public async Task ConsolidateAsync_TwoGridAccessProviders_NotEmptyDestination_Tr
             actorRepository.Object,
             auditIdentityProvider.Object,
             domainEventRepository.Object,
-            gridAreaRepository.Object,
-            UnitOfWorkProviderMock.Create());
+            gridAreaRepository.Object);
 
         actorRepository
             .Setup(repo => repo.GetAsync(validFromActor.Id))
@@ -172,8 +169,7 @@ public async Task ConsolidateAsync_FromNotGridAccessProvider_NoTransfer_Deactiva
             actorRepository.Object,
             auditIdentityProvider.Object,
             domainEventRepository.Object,
-            gridAreaRepository.Object,
-            UnitOfWorkProviderMock.Create());
+            gridAreaRepository.Object);
 
         actorRepository
             .Setup(repo => repo.GetAsync(validFromActor.Id))