feat: Typify MDFMPMS-dto in IOMC

Energinet-DataHub · Dec 6, 2024 · b15d665 · b15d665
1 parent 026dd95
commit b15d665
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 32 deletions.
diff --git a/...ages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointCimJsonDocumentWriter.cs b/...ages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointCimJsonDocumentWriter.cs
@@ -69,13 +69,13 @@ private Document ParseFrom(OutgoingMessageHeader header, IReadOnlyCollection<str
         {
             meteredDataForMeasurementPoints.Add(
                 new MeteredDataForMeasurementPoint(
-                    activityRecord.TransactionId,
+                    activityRecord.TransactionId.Value,
                     activityRecord.MarketEvaluationPointNumber,
                     activityRecord.MarketEvaluationPointType,
-                    activityRecord.OriginalTransactionIdReferenceId,
+                    activityRecord.OriginalTransactionIdReferenceId?.Value,
                     activityRecord.Product,
-                    activityRecord.QuantityMeasureUnit,
-                    activityRecord.RegistrationDateTime,
+                    activityRecord.QuantityMeasureUnit.Code,
+                    activityRecord.RegistrationDateTime.ToString(),
                     new Period(
                         activityRecord.Resolution.Code,
                         new TimeInterval(

diff --git a/...sages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointCimXmlDocumentWriter.cs b/...sages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointCimXmlDocumentWriter.cs
@@ -42,18 +42,18 @@ protected override async Task WriteMarketActivityRecordsAsync(
         {
             var seriesElement = new XElement(
                 @namespace + "Series",
-                new XElement(@namespace + "mRID", activityRecord.TransactionId),
+                new XElement(@namespace + "mRID", activityRecord.TransactionId.Value),
                 new XElement(
                     @namespace + "originalTransactionIDReference_Series.mRID",
-                    activityRecord.OriginalTransactionIdReferenceId),
+                    activityRecord.OriginalTransactionIdReferenceId?.Value),
                 new XElement(
                     @namespace + "marketEvaluationPoint.mRID",
                     new XAttribute("codingScheme", "A10"),
                     activityRecord.MarketEvaluationPointNumber),
                 new XElement(@namespace + "marketEvaluationPoint.type", activityRecord.MarketEvaluationPointType),
                 new XElement(@namespace + "registration_DateAndOrTime.dateTime", activityRecord.RegistrationDateTime),
                 new XElement(@namespace + "product", activityRecord.Product),
-                new XElement(@namespace + "quantity_Measure_Unit.name", activityRecord.QuantityMeasureUnit),
+                new XElement(@namespace + "quantity_Measure_Unit.name", activityRecord.QuantityMeasureUnit.Code),
                 new XElement(
                     @namespace + "Period",
                     new XElement(@namespace + "resolution", activityRecord.Resolution.Code),

diff --git a/...sages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointMarketActivityRecord.cs b/...sages.Domain/DocumentWriters/RSM012/MeteredDateForMeasurementPointMarketActivityRecord.cs
@@ -18,13 +18,13 @@
 namespace Energinet.DataHub.EDI.OutgoingMessages.Domain.DocumentWriters.RSM012;
 
 public sealed record MeteredDateForMeasurementPointMarketActivityRecord(
-    string TransactionId,
+    TransactionId TransactionId,
     string MarketEvaluationPointNumber,
     string MarketEvaluationPointType,
-    string? OriginalTransactionIdReferenceId,
+    TransactionId? OriginalTransactionIdReferenceId,
     string Product,
-    string QuantityMeasureUnit,
-    string RegistrationDateTime,
+    MeasurementUnit QuantityMeasureUnit,
+    Instant RegistrationDateTime,
     Resolution Resolution,
     Instant StartedDateTime,
     Instant EndedDateTime,

diff --git a/...s/Models/MeteredDataForMeasurementPoint/MeteredDataForMeasurementPointMessageSeriesDto.cs b/...s/Models/MeteredDataForMeasurementPoint/MeteredDataForMeasurementPointMessageSeriesDto.cs
@@ -21,10 +21,10 @@ public sealed record MeteredDataForMeasurementPointMessageSeriesDto(
     TransactionId TransactionId,
     string MarketEvaluationPointNumber,
     string MarketEvaluationPointType,
-    string? OriginalTransactionIdReferenceId,
+    TransactionId? OriginalTransactionIdReferenceId,
     string Product,
-    string QuantityMeasureUnit,
-    string RegistrationDateTime,
+    MeasurementUnit QuantityMeasureUnit,
+    Instant RegistrationDateTime,
     Resolution Resolution,
     Instant StartedDateTime,
     Instant EndedDateTime,

diff --git a/...lication/ProcessInitializationHandlers/InitializeMeteredDataForMeasurementPointHandler.cs b/...lication/ProcessInitializationHandlers/InitializeMeteredDataForMeasurementPointHandler.cs
@@ -67,8 +67,8 @@ await _outgoingMessagesClient.EnqueueAndCommitAsync(
                             series.MeteringPointType!,
                             null,
                             series.ProductNumber!,
-                            series.ProductUnitType!,
-                            marketMessage.CreatedAt,
+                            MeasurementUnit.FromCode(series.ProductUnitType!),
+                            InstantPattern.General.Parse(marketMessage.CreatedAt).Value,
                             Resolution.FromCode(series.Resolution!),
                             InstantPattern.Create("yyyy-MM-ddTHH:mm'Z'", CultureInfo.InvariantCulture)
                                 .Parse(series.StartDateTime)

diff --git a/source/Tests/Factories/MeteredDateForMeasurementPointBuilder.cs b/source/Tests/Factories/MeteredDateForMeasurementPointBuilder.cs
@@ -37,16 +37,16 @@ public OutgoingMessageHeader BuildHeader()
     public MeteredDateForMeasurementPointMarketActivityRecord BuildMeteredDataForMeasurementPoint()
     {
         return new MeteredDateForMeasurementPointMarketActivityRecord(
-            SampleData.TransactionId.Value,
+            SampleData.TransactionId,
             SampleData.MeteringPointNumber,
             SampleData.MeteringPointType,
             SampleData.OriginalTransactionIdReferenceId,
             SampleData.Product,
             SampleData.QuantityMeasureUnit,
             SampleData.RegistrationDateTime,
-            Resolution.FromCode(SampleData.Resolution),
-            InstantPattern.CreateWithInvariantCulture("yyyy-MM-ddTHH:mm'Z'").Parse(SampleData.StartedDateTime).Value,
-            InstantPattern.CreateWithInvariantCulture("yyyy-MM-ddTHH:mm'Z'").Parse(SampleData.EndedDateTime).Value,
+            SampleData.Resolution,
+            SampleData.StartedDateTime,
+            SampleData.EndedDateTime,
             SampleData.Points);
     }
 }
diff --git a/...frastructure/OutgoingMessages/RSM012/MeteredDateForMeasurementPointDocumentWriterTests.cs b/...frastructure/OutgoingMessages/RSM012/MeteredDateForMeasurementPointDocumentWriterTests.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Globalization;
 using System.Text.Encodings.Web;
 using Energinet.DataHub.EDI.BuildingBlocks.Domain.Models;
 using Energinet.DataHub.EDI.BuildingBlocks.Infrastructure.Extensions.DependencyInjection;
@@ -63,13 +64,13 @@ await AssertDocument(document, DocumentFormat.FromName(documentFormat))
             .HasTransactionId(SampleData.TransactionId)
             .HasMeteringPointNumber(SampleData.MeteringPointNumber, "A10")
             .HasMeteringPointType(SampleData.MeteringPointType)
-            .HasOriginalTransactionIdReferenceId(SampleData.OriginalTransactionIdReferenceId)
+            .HasOriginalTransactionIdReferenceId(SampleData.OriginalTransactionIdReferenceId?.Value)
             .HasProduct(SampleData.Product)
-            .HasQuantityMeasureUnit(SampleData.QuantityMeasureUnit)
-            .HasRegistrationDateTime(SampleData.RegistrationDateTime)
-            .HasResolution(SampleData.Resolution)
-            .HasStartedDateTime(SampleData.StartedDateTime)
-            .HasEndedDateTime(SampleData.EndedDateTime)
+            .HasQuantityMeasureUnit(SampleData.QuantityMeasureUnit.Code)
+            .HasRegistrationDateTime(SampleData.RegistrationDateTime.ToString())
+            .HasResolution(SampleData.Resolution.Code)
+            .HasStartedDateTime(SampleData.StartedDateTime.ToString("yyyy-MM-dd'T'HH:mm'Z'", CultureInfo.InvariantCulture))
+            .HasEndedDateTime(SampleData.EndedDateTime.ToString("yyyy-MM-dd'T'HH:mm'Z'", CultureInfo.InvariantCulture))
             .HasPoints(SampleData.Points)
             .DocumentIsValidAsync();
     }

diff --git a/source/Tests/Infrastructure/OutgoingMessages/RSM012/SampleData.cs b/source/Tests/Infrastructure/OutgoingMessages/RSM012/SampleData.cs
@@ -47,19 +47,19 @@ internal static class SampleData
 
     public static string MeteringPointType => "E17";
 
-    public static string? OriginalTransactionIdReferenceId => "C1875000";
+    public static TransactionId? OriginalTransactionIdReferenceId => TransactionId.From("C1875000");
 
     public static string Product => "8716867000030";
 
-    public static string QuantityMeasureUnit => MeasurementUnit.Kwh.Code;
+    public static MeasurementUnit QuantityMeasureUnit => MeasurementUnit.Kwh;
 
-    public static string RegistrationDateTime => "2022-12-17T07:30:00Z";
+    public static Instant RegistrationDateTime => InstantPattern.General.Parse("2022-12-17T07:30:00Z").Value;
 
-    public static string Resolution => "PT1H";
+    public static Resolution Resolution => Resolution.Hourly;
 
-    public static string StartedDateTime => "2022-08-15T22:00Z";
+    public static Instant StartedDateTime => InstantPattern.General.Parse("2022-08-15T22:00:00Z").Value;
 
-    public static string EndedDateTime => "2022-08-15T04:00Z";
+    public static Instant EndedDateTime => InstantPattern.General.Parse("2022-08-15T04:00:00Z").Value;
 
     public static IReadOnlyList<PointActivityRecord> Points => new List<PointActivityRecord>
     {