Merge branch 'main' into xvibe/show-only-relevant-grid-areas

Energinet-DataHub · Dec 12, 2024 · 52bfc83 · 52bfc83
2 parents 14eceb5 + c0738f4
commit 52bfc83
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/...t.DataHub.MarketParticipant.Application/Commands/GridAreas/GetRelevantGridAreasCommand.cs b/...t.DataHub.MarketParticipant.Application/Commands/GridAreas/GetRelevantGridAreasCommand.cs
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 using MediatR;
-using NodaTime;
 
 namespace Energinet.DataHub.MarketParticipant.Application.Commands.GridAreas;
 
-public sealed record GetRelevantGridAreasCommand(Interval Period) : IRequest<GetGridAreasResponse>;
+public sealed record GetRelevantGridAreasCommand(GetRelevantGridAreasRequestDto GetRelevantGridAreasRequest) : IRequest<GetGridAreasResponse>;
diff --git a/...ipant/Energinet.DataHub.MarketParticipant.Application/Handlers/GetAuditIdentityHandler.cs b/...ipant/Energinet.DataHub.MarketParticipant.Application/Handlers/GetAuditIdentityHandler.cs
@@ -37,6 +37,7 @@ private static readonly IReadOnlyDictionary<AuditIdentity, KnownAuditIdentityPro
             { KnownAuditIdentityProvider.Migration.IdentityId, KnownAuditIdentityProvider.Migration },
             { KnownAuditIdentityProvider.TestFramework.IdentityId, KnownAuditIdentityProvider.TestFramework },
             { KnownAuditIdentityProvider.OrganizationBackgroundService.IdentityId, KnownAuditIdentityProvider.OrganizationBackgroundService },
+            { KnownAuditIdentityProvider.ProcessManagerBackgroundJobs.IdentityId, KnownAuditIdentityProvider.ProcessManagerBackgroundJobs },
         };
 
     private readonly IUserRepository _userRepository;

diff --git a/...t.DataHub.MarketParticipant.Application/Handlers/GridAreas/GetRelevantGridAreasHandler.cs b/...t.DataHub.MarketParticipant.Application/Handlers/GridAreas/GetRelevantGridAreasHandler.cs
@@ -23,7 +23,6 @@
 using Energinet.DataHub.MarketParticipant.Domain.Model;
 using Energinet.DataHub.MarketParticipant.Domain.Repositories;
 using MediatR;
-using NodaTime;
 
 namespace Energinet.DataHub.MarketParticipant.Application.Handlers.GridAreas;
 
@@ -44,8 +43,8 @@ public async Task<GetGridAreasResponse> Handle(GetRelevantGridAreasCommand reque
     {
         ArgumentNullException.ThrowIfNull(request, nameof(request));
 
-        var startDate = request.Period.Start.ToDateTimeOffset();
-        var endDate = request.Period.End.ToDateTimeOffset();
+        var startDate = request.GetRelevantGridAreasRequest.Period.Start.ToDateTimeOffset();
+        var endDate = request.GetRelevantGridAreasRequest.Period.End.ToDateTimeOffset();
 
         var gridAreas = await _gridAreaRepository.GetAsync().ConfigureAwait(false);
         var filteredByDateGridAreas = gridAreas.Where(ga => DoDatesOverlap(ga, startDate, endDate));

diff --git a/...nt/Energinet.DataHub.MarketParticipant.Application/Services/KnownAuditIdentityProvider.cs b/...nt/Energinet.DataHub.MarketParticipant.Application/Services/KnownAuditIdentityProvider.cs
@@ -28,6 +28,7 @@ private KnownAuditIdentityProvider(string friendlyName, string identityId)
     public static KnownAuditIdentityProvider Migration { get; } = new("Migrated Data", "00000000-FFFF-FFFF-FFFF-000000000000");
     public static KnownAuditIdentityProvider TestFramework { get; } = new("Test Framework", "AAAAAAAA-BBBB-CCCC-DDDD-000000000000");
     public static KnownAuditIdentityProvider OrganizationBackgroundService { get; } = new("Organization Background Service", "00000000-1111-0000-0001-000000000000");
+    public static KnownAuditIdentityProvider ProcessManagerBackgroundJobs { get; } = new("Process Manager Background Jobs", "C861C5E2-8DDA-43E5-A5D0-B94834EE3FF6");
 
     public AuditIdentity IdentityId { get; }
     public string FriendlyName { get; }

diff --git a/...t/Energinet.DataHub.MarketParticipant.EntryPoint.WebApi/Controllers/GridAreaController.cs b/...t/Energinet.DataHub.MarketParticipant.EntryPoint.WebApi/Controllers/GridAreaController.cs
@@ -17,13 +17,11 @@
 using System.Threading.Tasks;
 using Energinet.DataHub.MarketParticipant.Application.Commands;
 using Energinet.DataHub.MarketParticipant.Application.Commands.GridAreas;
-using Energinet.DataHub.MarketParticipant.Application.Commands.Users;
 using Energinet.DataHub.MarketParticipant.Domain.Model;
 using Energinet.DataHub.MarketParticipant.EntryPoint.WebApi.Revision;
 using Energinet.DataHub.RevisionLog.Integration.WebApi;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
-using NodaTime;
 
 namespace Energinet.DataHub.MarketParticipant.EntryPoint.WebApi.Controllers;
 
@@ -53,7 +51,7 @@ public async Task<ActionResult<IEnumerable<GridAreaDto>>> GetRelevantGridAreasAs
     {
         ArgumentNullException.ThrowIfNull(getRelevantGridAreasRequest);
 
-        var command = new GetRelevantGridAreasCommand(getRelevantGridAreasRequest.Period);
+        var command = new GetRelevantGridAreasCommand(getRelevantGridAreasRequest);
         var response = await _mediator.Send(command).ConfigureAwait(false);
         return Ok(response.GridAreas);
     }

diff --git a/...nt/Energinet.DataHub.MarketParticipant.Tests/Handlers/GetRelevantGridAreasHandlerTests.cs b/...nt/Energinet.DataHub.MarketParticipant.Tests/Handlers/GetRelevantGridAreasHandlerTests.cs
@@ -67,7 +67,7 @@ public async Task Handle_ActorWithGridAreas_ReturnsGridAreas()
         var target = new GetRelevantGridAreasHandler(actorRepositoryMock.Object, gridAreaRepositoryMock.Object, userContextMock.Object);
 
         // act
-        var actual = await target.Handle(new GetRelevantGridAreasCommand(period), CancellationToken.None);
+        var actual = await target.Handle(new GetRelevantGridAreasCommand(new GetRelevantGridAreasRequestDto(period)), CancellationToken.None);
 
         // assert
         Assert.NotEmpty(actual.GridAreas);
@@ -105,7 +105,7 @@ public async Task Handle_ActorHasNoGridAreas_ReturnsEmpty()
         var target = new GetRelevantGridAreasHandler(actorRepositoryMock.Object, gridAreaRepositoryMock.Object, userContextMock.Object);
 
         // act
-        var actual = await target.Handle(new GetRelevantGridAreasCommand(period), CancellationToken.None);
+        var actual = await target.Handle(new GetRelevantGridAreasCommand(new GetRelevantGridAreasRequestDto(period)), CancellationToken.None);
 
         // assert
         Assert.Empty(actual.GridAreas);
@@ -149,7 +149,7 @@ public async Task Handle_ValidDates_ReturnsGridAreas(string validFrom, string? v
         var target = new GetRelevantGridAreasHandler(actorRepositoryMock.Object, gridAreaRepositoryMock.Object, userContextMock.Object);
 
         // act
-        var actual = await target.Handle(new GetRelevantGridAreasCommand(period), CancellationToken.None);
+        var actual = await target.Handle(new GetRelevantGridAreasCommand(new GetRelevantGridAreasRequestDto(period)), CancellationToken.None);
 
         // assert
         Assert.NotEmpty(actual.GridAreas);
@@ -191,7 +191,7 @@ public async Task Handle_InvalidDates_ReturnsEmpty(string validFrom, string? val
         var target = new GetRelevantGridAreasHandler(actorRepositoryMock.Object, gridAreaRepositoryMock.Object, userContextMock.Object);
 
         // act
-        var actual = await target.Handle(new GetRelevantGridAreasCommand(period), CancellationToken.None);
+        var actual = await target.Handle(new GetRelevantGridAreasCommand(new GetRelevantGridAreasRequestDto(period)), CancellationToken.None);
 
         // assert
         Assert.Empty(actual.GridAreas);

diff --git a/...cipant/Energinet.DataHub.MarketParticipant.Tests/Security/ControllerAuthorizationTests.cs b/...cipant/Energinet.DataHub.MarketParticipant.Tests/Security/ControllerAuthorizationTests.cs
@@ -38,6 +38,7 @@ public void ControllerEndpoint_Exists_MustHaveAuthorizationAttribute()
             $"{nameof(ActorQueryController)}.{nameof(ActorQueryController.GetSelectionActorsAsync)}",
             $"{nameof(GridAreaController)}.{nameof(GridAreaController.GetGridAreasAsync)}",
             $"{nameof(GridAreaController)}.{nameof(GridAreaController.GetGridAreaAsync)}",
+            $"{nameof(GridAreaController)}.{nameof(GridAreaController.GetRelevantGridAreasAsync)}",
             $"{nameof(GridAreaController)}.{nameof(GridAreaController.GetAuditAsync)}",
             $"{nameof(GridAreaOverviewController)}.{nameof(GridAreaOverviewController.GetGridAreaOverviewAsync)}",
             $"{nameof(OrganizationController)}.{nameof(OrganizationController.ListAllAsync)}",