Use actual values for starting process

Energinet-DataHub · Dec 11, 2024 · edad36a · edad36a
1 parent 0c45187
commit edad36a
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 8 deletions.
diff --git a/source/IncomingMessages.Infrastructure/IncomingMessages.Infrastructure.csproj b/source/IncomingMessages.Infrastructure/IncomingMessages.Infrastructure.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Energinet.DataHub.ProcessManager.Client" Version="0.14.1" />
-    <PackageReference Include="Energinet.DataHub.ProcessManager.Orchestrations.Abstractions" Version="0.2.0" />
+    <PackageReference Include="Energinet.DataHub.ProcessManager.Orchestrations.Abstractions" Version="0.2.2-alpha-17" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.9.0" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">

diff --git a/source/IncomingMessages.Infrastructure/ProcessManager/RequestProcessOrchestrationStarter.cs b/source/IncomingMessages.Infrastructure/ProcessManager/RequestProcessOrchestrationStarter.cs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Authentication;
+using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.Process.Interfaces;
 using Energinet.DataHub.ProcessManager.Abstractions.Api.Model.OrchestrationInstance;
 using Energinet.DataHub.ProcessManager.Client;
@@ -38,10 +39,42 @@ public async Task StartRequestWholesaleServicesOrchestrationAsync(
         var startProcessTasks = new List<Task>();
         foreach (var transaction in initializeProcessDto.Series)
         {
+            var resolution = transaction.Resolution != null
+                ? Resolution.TryGetNameFromCode(transaction.Resolution, fallbackValue: transaction.Resolution)
+                : null;
+
+            var settlementVersion = transaction.SettlementVersion is not null
+                ? SettlementVersion.TryGetNameFromCode(transaction.SettlementVersion, fallbackValue: transaction.SettlementVersion)
+                : null;
+
+            var chargeTypes = transaction.ChargeTypes.Select(
+                ct =>
+                {
+                    var chargeType = ct.Type != null
+                        ? ChargeType.TryGetNameFromCode(ct.Type, fallbackValue: ct.Type)
+                        : null;
+
+                    return new RequestCalculatedWholesaleServicesInputV1.ChargeTypeInputV1(
+                        ChargeType: chargeType,
+                        ChargeCode: ct.Id);
+                })
+                .ToList();
+
             var startCommand = new RequestCalculatedWholesaleServicesCommandV1(
-                actorIdentity,
-                new RequestCalculatedWholesaleServicesInputV1(),
-                transaction.Id);
+                operatingIdentity: actorIdentity,
+                inputParameter: new RequestCalculatedWholesaleServicesInputV1(
+                    RequestedForActorNumber: transaction.OriginalActor.ActorNumber.Value,
+                    RequestedForActorRole: transaction.OriginalActor.ActorRole.Name,
+                    BusinessReason: BusinessReason.TryGetNameFromCode(initializeProcessDto.BusinessReason, fallbackValue: initializeProcessDto.BusinessReason),
+                    Resolution: resolution,
+                    PeriodStart: transaction.StartDateTime,
+                    PeriodEnd: transaction.EndDateTime,
+                    EnergySupplierNumber: transaction.EnergySupplierId,
+                    ChargeOwnerNumber: transaction.ChargeOwner,
+                    GridAreas: transaction.GridAreas,
+                    SettlementVersion: settlementVersion,
+                    ChargeTypes: chargeTypes),
+                messageId: transaction.Id);
 
             // TODO: Handle resiliency. Could use something like Polly to retry if failing?
             var startProcessTask = _processManagerMessageClient.StartNewOrchestrationInstanceAsync(startCommand, cancellationToken);
@@ -61,11 +94,33 @@ public async Task StartRequestAggregatedMeasureDataOrchestrationAsync(
         var startProcessTasks = new List<Task>();
         foreach (var transaction in initializeProcessDto.Series)
         {
+            var meteringPointType = transaction.MeteringPointType is not null
+                ? MeteringPointType.TryGetNameFromCode(transaction.MeteringPointType, fallbackValue: transaction.MeteringPointType)
+                : null;
+
+            var settlementMethod = transaction.SettlementMethod is not null
+                ? SettlementMethod.TryGetNameFromCode(transaction.SettlementMethod, fallbackValue: transaction.SettlementMethod)
+                : null;
+
+            var settlementVersion = transaction.SettlementVersion is not null
+                ? SettlementVersion.TryGetNameFromCode(transaction.SettlementVersion, fallbackValue: transaction.SettlementVersion)
+                : null;
+
             var startCommand = new StartRequestCalculatedEnergyTimeSeriesCommandV1(
-                actorIdentity,
-                new RequestCalculatedEnergyTimeSeriesInputV1(
-                    BusinessReason: initializeProcessDto.BusinessReason),
-                transaction.Id.Value);
+                operatingIdentity: actorIdentity,
+                inputParameter: new RequestCalculatedEnergyTimeSeriesInputV1(
+                    RequestedForActorNumber: transaction.OriginalActor.ActorNumber.Value,
+                    RequestedForActorRole: transaction.OriginalActor.ActorRole.Name,
+                    BusinessReason: BusinessReason.TryGetNameFromCode(initializeProcessDto.BusinessReason, fallbackValue: initializeProcessDto.BusinessReason),
+                    PeriodStart: transaction.StartDateTime,
+                    PeriodEnd: transaction.EndDateTime,
+                    EnergySupplierNumber: transaction.EnergySupplierNumber,
+                    BalanceResponsibleNumber: transaction.BalanceResponsibleNumber,
+                    GridAreas: transaction.GridAreas,
+                    MeteringPointType: meteringPointType,
+                    SettlementMethod: settlementMethod,
+                    SettlementVersion: settlementVersion),
+                messageId: transaction.Id.Value);
 
             // TODO: Handle resiliency. Could use something like Polly to retry if failing?
             var startProcessTask = _processManagerMessageClient.StartNewOrchestrationInstanceAsync(startCommand, cancellationToken);