Hochfrequenz · hf-kklein · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
diff --git a/MaLoIdentModels/MaLoIdentModels/Address.cs → ...IdentModels/MaLoIdentModels/v1/Address.cs b/MaLoIdentModels/MaLoIdentModels/Address.cs → ...IdentModels/MaLoIdentModels/v1/Address.cs
@@ -1,8 +1,8 @@
-namespace MaLoIdentModels;
-
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
+namespace MaLoIdentModels.v1;
+
 public class Address
 {
     [JsonIgnore]

diff --git a/...LoIdentModels/DataControllableResource.cs → ...dentModels/v1/DataControllableResource.cs b/...LoIdentModels/DataControllableResource.cs → ...dentModels/v1/DataControllableResource.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataControllableResource
 {

diff --git a/...els/MaLoIdentModels/DataMarketLocation.cs → .../MaLoIdentModels/v1/DataMarketLocation.cs b/...els/MaLoIdentModels/DataMarketLocation.cs → .../MaLoIdentModels/v1/DataMarketLocation.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataMarketLocation
 {

diff --git a/...entModels/DataMarketLocationProperties.cs → ...Models/v1/DataMarketLocationProperties.cs b/...entModels/DataMarketLocationProperties.cs → ...Models/v1/DataMarketLocationProperties.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataMarketLocationProperties
 {

diff --git a/...dels/MaLoIdentModels/DataMeterLocation.cs → ...s/MaLoIdentModels/v1/DataMeterLocation.cs b/...dels/MaLoIdentModels/DataMeterLocation.cs → ...s/MaLoIdentModels/v1/DataMeterLocation.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataMeterLocation
 {

diff --git a/...ls/MaLoIdentModels/DataNetworkLocation.cs → ...MaLoIdentModels/v1/DataNetworkLocation.cs b/...ls/MaLoIdentModels/DataNetworkLocation.cs → ...MaLoIdentModels/v1/DataNetworkLocation.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataNetworkLocation
 {

diff --git a/.../MaLoIdentModels/DataTechnicalResource.cs → ...LoIdentModels/v1/DataTechnicalResource.cs b/.../MaLoIdentModels/DataTechnicalResource.cs → ...LoIdentModels/v1/DataTechnicalResource.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataTechnicalResource
 {

diff --git a/...dentModels/MaLoIdentModels/DataTranche.cs → ...tModels/MaLoIdentModels/v1/DataTranche.cs b/...dentModels/MaLoIdentModels/DataTranche.cs → ...tModels/MaLoIdentModels/v1/DataTranche.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class DataTranche
 {

diff --git a/...Models/MaLoIdentModels/EnergyDirection.cs → ...els/MaLoIdentModels/v1/EnergyDirection.cs b/...Models/MaLoIdentModels/EnergyDirection.cs → ...els/MaLoIdentModels/v1/EnergyDirection.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum EnergyDirection
 {

diff --git a/.../MaLoIdentModels/GeographicCoordinates.cs → ...LoIdentModels/v1/GeographicCoordinates.cs b/.../MaLoIdentModels/GeographicCoordinates.cs → ...LoIdentModels/v1/GeographicCoordinates.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class GeographicCoordinates
 {

diff --git a/...aLoIdentModels/IdentificationParameter.cs → ...IdentModels/v1/IdentificationParameter.cs b/...aLoIdentModels/IdentificationParameter.cs → ...IdentModels/v1/IdentificationParameter.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class IdentificationParameter
 {

diff --git a/...arameterIdentificationParameterAddress.cs → ...arameterIdentificationParameterAddress.cs b/...arameterIdentificationParameterAddress.cs → ...arameterIdentificationParameterAddress.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class IdentificationParameterIdentificationParameterAddress
 {

diff --git a/...tionParameterIdentificationParameterId.cs → ...tionParameterIdentificationParameterId.cs b/...tionParameterIdentificationParameterId.cs → ...tionParameterIdentificationParameterId.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class IdentificationParameterIdentificationParameterId
 {

diff --git a/...IdentModels/MaLoIdentModels/LandParcel.cs → ...ntModels/MaLoIdentModels/v1/LandParcel.cs b/...IdentModels/MaLoIdentModels/LandParcel.cs → ...ntModels/MaLoIdentModels/v1/LandParcel.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class LandParcel
 {

diff --git a/...MaLoIdentModels/MarketLocationDateTime.cs → ...oIdentModels/v1/MarketLocationDateTime.cs b/...MaLoIdentModels/MarketLocationDateTime.cs → ...oIdentModels/v1/MarketLocationDateTime.cs
@@ -3,7 +3,7 @@
 using System.Text.Json.Serialization;
 using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationDateTime
 {

diff --git a/...s/MarketLocationMeasuringPointOperator.cs → ...1/MarketLocationMeasuringPointOperator.cs b/...s/MarketLocationMeasuringPointOperator.cs → ...1/MarketLocationMeasuringPointOperator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationMeasuringPointOperator
 {

diff --git a/...ntModels/MarketLocationNetworkOperator.cs → ...odels/v1/MarketLocationNetworkOperator.cs b/...ntModels/MarketLocationNetworkOperator.cs → ...odels/v1/MarketLocationNetworkOperator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationNetworkOperator
 {

diff --git a/...LoIdentModels/MarketLocationProperties.cs → ...dentModels/v1/MarketLocationProperties.cs b/...LoIdentModels/MarketLocationProperties.cs → ...dentModels/v1/MarketLocationProperties.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationProperties
 {

diff --git a/...MaLoIdentModels/MarketLocationProperty.cs → ...oIdentModels/v1/MarketLocationProperty.cs b/...MaLoIdentModels/MarketLocationProperty.cs → ...oIdentModels/v1/MarketLocationProperty.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum MarketLocationProperty
 {

diff --git a/...MaLoIdentModels/MarketLocationSupplier.cs → ...oIdentModels/v1/MarketLocationSupplier.cs b/...MaLoIdentModels/MarketLocationSupplier.cs → ...oIdentModels/v1/MarketLocationSupplier.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationSupplier
 {

diff --git a/...rketLocationTransmissionSystemOperator.cs → ...rketLocationTransmissionSystemOperator.cs b/...rketLocationTransmissionSystemOperator.cs → ...rketLocationTransmissionSystemOperator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MarketLocationTransmissionSystemOperator
 {

diff --git a/...ls/MeasurementTechnologyClassification.cs → ...v1/MeasurementTechnologyClassification.cs b/...ls/MeasurementTechnologyClassification.cs → ...v1/MeasurementTechnologyClassification.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum MeasurementTechnologyClassification
 {

diff --git a/...ls/MeterLocationMeasuringPointOperator.cs → ...v1/MeterLocationMeasuringPointOperator.cs b/...ls/MeterLocationMeasuringPointOperator.cs → ...v1/MeterLocationMeasuringPointOperator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class MeterLocationMeasuringPointOperator
 {

diff --git a/MaLoIdentModels/MaLoIdentModels/Name.cs → MaLoIdentModels/MaLoIdentModels/v1/Name.cs b/MaLoIdentModels/MaLoIdentModels/Name.cs → MaLoIdentModels/MaLoIdentModels/v1/Name.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class Name
 {

diff --git a/.../NetworkLocationMeasuringPointOperator.cs → .../NetworkLocationMeasuringPointOperator.cs b/.../NetworkLocationMeasuringPointOperator.cs → .../NetworkLocationMeasuringPointOperator.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class NetworkLocationMeasuringPointOperator
 {

diff --git a/...dentModels/OptionalChangeForecastBasis.cs → ...tModels/v1/OptionalChangeForecastBasis.cs b/...dentModels/OptionalChangeForecastBasis.cs → ...tModels/v1/OptionalChangeForecastBasis.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum OptionalChangeForecastBasis
 {

diff --git a/...IdentModels/MaLoIdentModels/Proportion.cs → ...ntModels/MaLoIdentModels/v1/Proportion.cs b/...IdentModels/MaLoIdentModels/Proportion.cs → ...ntModels/MaLoIdentModels/v1/Proportion.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum Proportion
 {

diff --git a/MaLoIdentModels/MaLoIdentModels/v1/README.md b/MaLoIdentModels/MaLoIdentModels/v1/README.md
@@ -0,0 +1,4 @@
+# FV2504
+
+Contains the data model as of April 2025.
+EDI@Energy names this "v1.0.0".
diff --git a/...tModels/MaLoIdentModels/ResultNegative.cs → ...dels/MaLoIdentModels/v1/ResultNegative.cs b/...tModels/MaLoIdentModels/ResultNegative.cs → ...dels/MaLoIdentModels/v1/ResultNegative.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class ResultNegative
 {

diff --git a/...tModels/MaLoIdentModels/ResultPositive.cs → ...dels/MaLoIdentModels/v1/ResultPositive.cs b/...tModels/MaLoIdentModels/ResultPositive.cs → ...dels/MaLoIdentModels/v1/ResultPositive.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class ResultPositive
 {

diff --git a/...Models/MaLoIdentModels/SrMarketPartner.cs → ...els/MaLoIdentModels/v1/SrMarketPartner.cs b/...Models/MaLoIdentModels/SrMarketPartner.cs → ...els/MaLoIdentModels/v1/SrMarketPartner.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Text.Json.Serialization;
+using MaLoIdentModels.JsonSettings;
 
-namespace MaLoIdentModels;
-
-using JsonSettings;
+namespace MaLoIdentModels.v1;
 
 public class SrMarketPartner
 {

diff --git a/...Models/MaLoIdentModels/TrancheSupplier.cs → ...els/MaLoIdentModels/v1/TrancheSupplier.cs b/...Models/MaLoIdentModels/TrancheSupplier.cs → ...els/MaLoIdentModels/v1/TrancheSupplier.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public class TrancheSupplier
 {

diff --git a/MaLoIdentModels/MaLoIdentModels/Zone.cs → MaLoIdentModels/MaLoIdentModels/v1/Zone.cs b/MaLoIdentModels/MaLoIdentModels/Zone.cs → MaLoIdentModels/MaLoIdentModels/v1/Zone.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 
-namespace MaLoIdentModels;
+namespace MaLoIdentModels.v1;
 
 public enum Zone
 {

diff --git a/MaLoIdentModels/MaLoIdentModelsTests/MaLoIdentModelsTests.csproj b/MaLoIdentModels/MaLoIdentModelsTests/MaLoIdentModelsTests.csproj
@@ -23,13 +23,13 @@
     </ItemGroup>
 
     <ItemGroup>
-      <None Update="examples\request.json">
+      <None Update="v1Tests\examples\request.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
-      <None Update="examples\result_negative.json">
+      <None Update="v1Tests\examples\result_negative.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
-      <None Update="examples\result_positive.json">
+      <None Update="v1Tests\examples\result_positive.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
     </ItemGroup>

diff --git a/...sts/DateTimeOffsetDeserializationTests.cs → ...sts/DateTimeOffsetDeserializationTests.cs b/...sts/DateTimeOffsetDeserializationTests.cs → ...sts/DateTimeOffsetDeserializationTests.cs
@@ -1,8 +1,8 @@
 using System.Text.Json;
 using FluentAssertions;
-using MaLoIdentModels;
+using MaLoIdentModels.v1;
 
-namespace MaLoIdentModelsTests;
+namespace MaLoIdentModelsTests.v1Tests;
 
 public class DateTimeOffsetDeserializationTests
 {
@@ -21,7 +21,7 @@ public void Deserializing_An_DatetimeOffset_Without_Explicit_Offset_Throws_JsonE
         string invalidDateTimeOffsetString
     )
     {
-        var fileBody = File.ReadAllText("examples/request.json");
+        var fileBody = File.ReadAllText("v1Tests/examples/request.json");
         fileBody
             .Should()
             .Contain(
@@ -58,7 +58,7 @@ public void Deserializing_An_DatetimeOffset_With_Explicit_Offset_Works(
         string dateTimeOffsetString
     )
     {
-        var fileBody = File.ReadAllText("examples/request.json");
+        var fileBody = File.ReadAllText("v1Tests/examples/request.json");
         fileBody
             .Should()
             .Contain(

diff --git a/...ls/MaLoIdentModelsTests/RoundTripTests.cs → ...dentModelsTests/v1Tests/RoundTripTests.cs b/...ls/MaLoIdentModelsTests/RoundTripTests.cs → ...dentModelsTests/v1Tests/RoundTripTests.cs
@@ -1,7 +1,7 @@
 using FluentAssertions;
-using MaLoIdentModels;
+using MaLoIdentModels.v1;
 
-namespace MaLoIdentModelsTests;
+namespace MaLoIdentModelsTests.v1Tests;
 
 /// <summary>
 /// test serialization and deserialization roundtrips
@@ -11,7 +11,7 @@ public class RoundTripTests
     [Fact]
     public void Test_Request()
     {
-        var fileBody = File.ReadAllText("examples/request.json");
+        var fileBody = File.ReadAllText("v1Tests/examples/request.json");
         var model = System.Text.Json.JsonSerializer.Deserialize<IdentificationParameter>(fileBody);
         model.Should().NotBeNull();
         {
@@ -28,7 +28,7 @@ public void Test_Request()
     [Fact]
     public void Test_Positive_Result()
     {
-        var fileBody = File.ReadAllText("examples/result_positive.json");
+        var fileBody = File.ReadAllText("v1Tests/examples/result_positive.json");
         var model = System.Text.Json.JsonSerializer.Deserialize<ResultPositive>(fileBody);
         model.Should().NotBeNull();
         var reSererialized = System.Text.Json.JsonSerializer.Serialize(model);
@@ -42,7 +42,7 @@ public void Test_Positive_Result()
     [Fact]
     public void Test_Positive_Negative()
     {
-        var fileBody = File.ReadAllText("examples/result_negative.json");
+        var fileBody = File.ReadAllText("v1Tests/examples/result_negative.json");
         var model = System.Text.Json.JsonSerializer.Deserialize<ResultNegative>(fileBody);
         model.Should().NotBeNull();
         var reSererialized = System.Text.Json.JsonSerializer.Serialize(model);

diff --git a/...aLoIdentModelsTests/examples/request.json → ...ModelsTests/v1Tests/examples/request.json b/...aLoIdentModelsTests/examples/request.json → ...ModelsTests/v1Tests/examples/request.json
diff --git a/...ModelsTests/examples/result_negative.json → ...sts/v1Tests/examples/result_negative.json b/...ModelsTests/examples/result_negative.json → ...sts/v1Tests/examples/result_negative.json
diff --git a/...ModelsTests/examples/result_positive.json → ...sts/v1Tests/examples/result_positive.json b/...ModelsTests/examples/result_positive.json → ...sts/v1Tests/examples/result_positive.json