Revert "feat: settlement report - include previous grid owners (#73)" (…

…#74)

This reverts commit f7d0fc3.

source/settlement-report/SettlementReports.Application/Handlers/RequestSettlementReportHandler.cs

@@ -13,79 +13,29 @@
 // limitations under the License.
 
 using Energinet.DataHub.SettlementReport.Application.Commands;
-using Energinet.DataHub.SettlementReport.Application.Model;
-using Energinet.DataHub.SettlementReport.Application.Services;
 using Energinet.DataHub.SettlementReport.Interfaces.Helpers;
 using Energinet.DataHub.SettlementReport.Interfaces.SettlementReports_v2;
 using Energinet.DataHub.SettlementReport.Interfaces.SettlementReports_v2.Models;
-using NodaTime.Extensions;
 
 namespace Energinet.DataHub.SettlementReport.Application.Handlers;
 
 public sealed class RequestSettlementReportHandler : IRequestSettlementReportJobHandler
 {
     private readonly IDatabricksJobsHelper _jobHelper;
     private readonly ISettlementReportInitializeHandler _settlementReportInitializeHandler;
-    private readonly IGridAreaOwnerRepository _gridAreaOwnerRepository;
 
     public RequestSettlementReportHandler(
         IDatabricksJobsHelper jobHelper,
-        ISettlementReportInitializeHandler settlementReportInitializeHandler,
-        IGridAreaOwnerRepository gridAreaOwnerRepository)
+        ISettlementReportInitializeHandler settlementReportInitializeHandler)
     {
         _jobHelper = jobHelper;
         _settlementReportInitializeHandler = settlementReportInitializeHandler;
-        _gridAreaOwnerRepository = gridAreaOwnerRepository;
     }
 
     public async Task<JobRunId> HandleAsync(RequestSettlementReportCommand request)
-    {
-        if (request.MarketRole == MarketRole.GridAccessProvider)
-        {
-            JobRunId? firstRunId = null;
-
-            var gridAreas = request.RequestDto.Filter.GridAreas.Select(x => x.Key);
-
-            var distinctOwners = await GetGridAreaOwnersAsync(gridAreas, request.RequestDto.Filter).ConfigureAwait(false);
-
-            foreach (var owner in distinctOwners)
-            {
-                var id = await StartReportAsync(request, owner.Value).ConfigureAwait(false);
-                firstRunId ??= id;
-            }
-
-            return firstRunId!;
-        }
-
-        return await StartReportAsync(request, request.ActorGln).ConfigureAwait(false);
-    }
-
-    private async Task<IEnumerable<ActorNumber>> GetGridAreaOwnersAsync(IEnumerable<string> gridAreaCodes, SettlementReportRequestFilterDto filter)
-    {
-        var gridAreaOwners = new HashSet<ActorNumber>();
-
-        foreach (var grid in gridAreaCodes)
-        {
-            var owners = await _gridAreaOwnerRepository.GetGridAreaOwnersAsync(
-                new GridAreaCode(grid),
-                filter.PeriodStart.ToInstant(),
-                filter.PeriodEnd.ToInstant()).ConfigureAwait(false);
-
-            foreach (var owner in owners)
-            {
-                gridAreaOwners.Add(owner.ActorNumber);
-            }
-        }
-
-        return gridAreaOwners;
-    }
-
-    private async Task<JobRunId> StartReportAsync(RequestSettlementReportCommand request, string requestActorGln)
     {
         var reportId = new SettlementReportRequestId(Guid.NewGuid().ToString());
-
-        var runId = await _jobHelper.RunSettlementReportsJobAsync(request.RequestDto, request.MarketRole, reportId, requestActorGln).ConfigureAwait(false);
-
+        var runId = await _jobHelper.RunSettlementReportsJobAsync(request.RequestDto, request.MarketRole, reportId, request.ActorGln).ConfigureAwait(false);
         await _settlementReportInitializeHandler
             .InitializeFromJobAsync(
                 request.UserId,

source/settlement-report/SettlementReports.Application/Model/ActorNumber.cs → source/settlement-report/SettlementReports.Infrastructure/Model/ActorNumber.cs

@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Energinet.DataHub.SettlementReport.Application.Model;
+namespace Energinet.DataHub.SettlementReport.Infrastructure.Model;
 
 public sealed record ActorNumber(string Value);

source/settlement-report/SettlementReports.Application/Model/GridAreaCode.cs → source/settlement-report/SettlementReports.Infrastructure/Model/GridAreaCode.cs

@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Energinet.DataHub.SettlementReport.Application.Model;
+namespace Energinet.DataHub.SettlementReport.Infrastructure.Model;
 
 public sealed record GridAreaCode(string Value);

source/settlement-report/SettlementReports.Application/Model/GridAreaOwner.cs → source/settlement-report/SettlementReports.Infrastructure/Model/GridAreaOwner.cs

@@ -14,6 +14,6 @@
 
 using NodaTime;
 
-namespace Energinet.DataHub.SettlementReport.Application.Model;
+namespace Energinet.DataHub.SettlementReport.Infrastructure.Model;
 
 public sealed record GridAreaOwner(GridAreaCode Code, ActorNumber ActorNumber, Instant ValidFrom);

source/settlement-report/SettlementReports.Infrastructure/Services/GridAreaOwnerRepository.cs

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.SettlementReport.Application.Model;
-using Energinet.DataHub.SettlementReport.Application.Services;
 using Energinet.DataHub.SettlementReport.Infrastructure.Contracts;
+using Energinet.DataHub.SettlementReport.Infrastructure.Model;
 using Energinet.DataHub.SettlementReport.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;

source/settlement-report/SettlementReports.Application/Services/IGridAreaOwnerRepository.cs → source/settlement-report/SettlementReports.Infrastructure/Services/IGridAreaOwnerRepository.cs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.SettlementReport.Application.Model;
+using Energinet.DataHub.SettlementReport.Infrastructure.Model;
 using NodaTime;
 
-namespace Energinet.DataHub.SettlementReport.Application.Services;
+namespace Energinet.DataHub.SettlementReport.Infrastructure.Services;
 
 public interface IGridAreaOwnerRepository
 {

source/settlement-report/SettlementReports.IntegrationTests/Infrastructure/SettlementReports_v2/Persistence/GridAreaOwnerRepositoryTests.cs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Energinet.DataHub.SettlementReport.Application.Model;
 using Energinet.DataHub.SettlementReport.Infrastructure.Contracts;
+using Energinet.DataHub.SettlementReport.Infrastructure.Model;
 using Energinet.DataHub.SettlementReport.Infrastructure.Persistence;
 using Energinet.DataHub.SettlementReport.Infrastructure.Services;
 using Energinet.DataHub.SettlementReport.Test.Core.Fixture.Database;

source/settlement-report/SettlementReports.UnitTests/Handlers/RequestSettlementReportHandlerTests.cs

@@ -15,7 +15,6 @@
 using System.Collections.ObjectModel;
 using Energinet.DataHub.SettlementReport.Application.Commands;
 using Energinet.DataHub.SettlementReport.Application.Handlers;
-using Energinet.DataHub.SettlementReport.Application.Services;
 using Energinet.DataHub.SettlementReport.Interfaces.Helpers;
 using Energinet.DataHub.SettlementReport.Interfaces.Models;
 using Energinet.DataHub.SettlementReport.Interfaces.SettlementReports_v2;
@@ -56,7 +55,7 @@ public async Task Handle_ValidRequest_ReturnsJobId()
             .ReturnsAsync(jobRunId);
 
         var command = new RequestSettlementReportCommand(request, Guid.NewGuid(), Guid.NewGuid(), true, "1233", MarketRole.EnergySupplier);
-        var handler = new RequestSettlementReportHandler(jobHelperMock.Object, initializerMock.Object, new Mock<IGridAreaOwnerRepository>().Object);
+        var handler = new RequestSettlementReportHandler(jobHelperMock.Object, initializerMock.Object);
 
         // Act
         var result = await handler.HandleAsync(command);

source/settlement-report/SettlementReports.WebAPI/Extensions/DependencyInjection/SettlementReportModuleExtensions.cs

@@ -14,7 +14,6 @@
 
 using Energinet.DataHub.Core.App.Common.Extensions.DependencyInjection;
 using Energinet.DataHub.SettlementReport.Application.Handlers;
-using Energinet.DataHub.SettlementReport.Application.Services;
 using Energinet.DataHub.SettlementReport.Application.SettlementReports_v2;
 using Energinet.DataHub.SettlementReport.Common.Infrastructure.Extensions.Options;
 using Energinet.DataHub.SettlementReport.Common.Infrastructure.HealthChecks;