Merge branch 'main' into juj/IncreaseLimitOnMeteringPointTimeSeries

Energinet-DataHub · Sep 25, 2024 · 3c75f94 · 3c75f94
2 parents 2a4e6dc + 3a2f2f1
commit 3c75f94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...estration.SettlementReports/Functions/SettlementReports/SettlementReportRequestTrigger.cs b/...estration.SettlementReports/Functions/SettlementReports/SettlementReportRequestTrigger.cs
@@ -64,6 +64,7 @@ await _revisionLogClient.LogAsync(
                     payload: System.Text.Json.JsonSerializer.Serialize(settlementReportRequest)))
             .ConfigureAwait(false);
 
+        var actorNumber = _userContext.CurrentUser.Actor.ActorNumber;
         var marketRole = _userContext.CurrentUser.Actor.MarketRole switch
         {
             FrontendActorMarketRole.Other => MarketRole.Other,
@@ -75,9 +76,10 @@ await _revisionLogClient.LogAsync(
         };
 
         if (_userContext.CurrentUser is { MultiTenancy: true, Actor.MarketRole: FrontendActorMarketRole.DataHubAdministrator } &&
-            settlementReportRequest.MarketRoleOverride.HasValue)
+            settlementReportRequest is { MarketRoleOverride: not null, ActorNumberOverride: not null })
         {
             marketRole = settlementReportRequest.MarketRoleOverride.Value;
+            actorNumber = settlementReportRequest.ActorNumberOverride;
         }
 
         if (marketRole == MarketRole.EnergySupplier && string.IsNullOrWhiteSpace(settlementReportRequest.Filter.EnergySupplier))
@@ -103,7 +105,7 @@ await _revisionLogClient.LogAsync(
         }
 
         var chargeOwnerId = marketRole is MarketRole.GridAccessProvider or MarketRole.SystemOperator
-            ? _userContext.CurrentUser.Actor.ActorNumber
+            ? actorNumber
             : null;
 
         var actorInfo = new SettlementReportRequestedByActor(marketRole, chargeOwnerId);

diff --git a/...rt/SettlementReports.Interfaces/SettlementReports_v2/Models/SettlementReportRequestDto.cs b/...rt/SettlementReports.Interfaces/SettlementReports_v2/Models/SettlementReportRequestDto.cs
@@ -20,4 +20,5 @@ public sealed record SettlementReportRequestDto(
     bool IncludeBasisData,
     bool IncludeMonthlyAmount,
     SettlementReportRequestFilterDto Filter,
+    string? ActorNumberOverride = null,
     MarketRole? MarketRoleOverride = null);
diff --git a/source/settlement-report/SettlementReports.WebAPI/Controllers/SettlementReportsController.cs b/source/settlement-report/SettlementReports.WebAPI/Controllers/SettlementReportsController.cs
@@ -54,6 +54,7 @@ public SettlementReportsController(
     [EnableRevision(activityName: "RequestSettlementReportAPI", entityType: typeof(SettlementReportRequestDto))]
     public async Task<ActionResult<long>> RequestSettlementReport([FromBody] SettlementReportRequestDto settlementReportRequest)
     {
+        var actorNumber = _userContext.CurrentUser.Actor.ActorNumber;
         var marketRole = _userContext.CurrentUser.Actor.MarketRole switch
         {
             FrontendActorMarketRole.Other => MarketRole.Other,
@@ -65,9 +66,10 @@ public async Task<ActionResult<long>> RequestSettlementReport([FromBody] Settlem
         };
 
         if (_userContext.CurrentUser is { MultiTenancy: true, Actor.MarketRole: FrontendActorMarketRole.DataHubAdministrator } &&
-            settlementReportRequest.MarketRoleOverride.HasValue)
+            settlementReportRequest is { MarketRoleOverride: not null, ActorNumberOverride: not null })
         {
             marketRole = settlementReportRequest.MarketRoleOverride.Value;
+            actorNumber = settlementReportRequest.ActorNumberOverride;
         }
 
         if (marketRole == MarketRole.EnergySupplier && string.IsNullOrWhiteSpace(settlementReportRequest.Filter.EnergySupplier))
@@ -97,7 +99,7 @@ public async Task<ActionResult<long>> RequestSettlementReport([FromBody] Settlem
             _userContext.CurrentUser.UserId,
             _userContext.CurrentUser.Actor.ActorId,
             _userContext.CurrentUser.MultiTenancy,
-            _userContext.CurrentUser.Actor.ActorNumber,
+            actorNumber,
             marketRole);
 
         var result = await _requestSettlementReportJobHandler.HandleAsync(requestCommand).ConfigureAwait(false);