Merge branch 'main' into hf-nsoeker-patch-1

Hochfrequenz · Nov 19, 2024 · 7019851 · 7019851
2 parents b0e0431 + 067f4ec
commit 7019851
Show file tree

Hide file tree

Showing 8 changed files with 372 additions and 363 deletions.
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
diff --git a/BO4E/BO4E.csproj b/BO4E/BO4E.csproj
@@ -1,98 +1,98 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>BO4E</RootNamespace>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageId>Hochfrequenz.BO4Enet</PackageId>
-    <Authors>Hochfrequenz Untenehmensberatung GmbH</Authors>
-    <Product>BO4E .net core bindings</Product>
-    <RepositoryUrl>https://github.com/Hochfrequenz/BO4E-dotnet/</RepositoryUrl>
-
-    <VersionPrefix>0.2.50</VersionPrefix>
-    <AssemblyName>BO4Enet</AssemblyName>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
-    <!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <!-- Optional: Include PDB in the built .nupkg -->
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PackageProjectUrl>https://github.com/Hochfrequenz/BO4E-dotnet/</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-
-    <RepositoryType>git</RepositoryType>
-    <IncludeSymbols>true</IncludeSymbols>
-    <DebugType>Embedded</DebugType>
-    <EmbedAllSources>True</EmbedAllSources>
-    <LangVersion>12</LangVersion>
-    <DocumentationFile>BO4Enet.xml</DocumentationFile>
-	 <Nullable>annotations</Nullable>
-	 <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <Optimize>false</Optimize>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>DEBUG</DefineConstants>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="BO\NewFolder\**" />
-    <Compile Remove="json-schema-files\**" />
-    <EmbeddedResource Remove="BO\NewFolder\**" />
-    <EmbeddedResource Remove="json-schema-files\**" />
-    <None Remove="BO\NewFolder\**" />
-    <None Remove="json-schema-files\**" />
-    <None Include="..\LICENSE.txt">
-      <Pack>True</Pack>
-      <PackagePath />
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="CentralEuropeStandardTime.json" />
-    <None Remove="protobuf-files\BO4E.BO.Angebot.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Ansprechpartner.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Benachrichtigung.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Energiemenge.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Geschaeftspartner.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Kosten.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Marktlokation.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Messlokation.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Preisblatt.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Rechnung.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Region.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Vertrag.proto" />
-    <None Remove="protobuf-files\BO4E.BO.Zaehler.proto" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="meta\CentralEuropeStandardTime.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="Enums.NET" Version="5.0.0" />
-	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
-    <PackageReference Include="Polyfill" Version="7.4.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.1" />
-    <PackageReference Include="protobuf-net" Version="3.2.45" />
-    <PackageReference Include="SourceLink.Copy.PdbFiles" Version="2.8.3" PrivateAssets="All" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>BO4E</RootNamespace>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>Hochfrequenz.BO4Enet</PackageId>
+    <Authors>Hochfrequenz Untenehmensberatung GmbH</Authors>
+    <Product>BO4E .net core bindings</Product>
+    <RepositoryUrl>https://github.com/Hochfrequenz/BO4E-dotnet/</RepositoryUrl>
+
+    <VersionPrefix>0.2.50</VersionPrefix>
+    <AssemblyName>BO4Enet</AssemblyName>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+    <!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <!-- Optional: Include PDB in the built .nupkg -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <PackageProjectUrl>https://github.com/Hochfrequenz/BO4E-dotnet/</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+
+    <RepositoryType>git</RepositoryType>
+    <IncludeSymbols>true</IncludeSymbols>
+    <DebugType>Embedded</DebugType>
+    <EmbedAllSources>True</EmbedAllSources>
+    <LangVersion>12</LangVersion>
+    <DocumentationFile>BO4Enet.xml</DocumentationFile>
+	 <Nullable>annotations</Nullable>
+	 <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <Optimize>false</Optimize>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>DEBUG</DefineConstants>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="BO\NewFolder\**" />
+    <Compile Remove="json-schema-files\**" />
+    <EmbeddedResource Remove="BO\NewFolder\**" />
+    <EmbeddedResource Remove="json-schema-files\**" />
+    <None Remove="BO\NewFolder\**" />
+    <None Remove="json-schema-files\**" />
+    <None Include="..\LICENSE.txt">
+      <Pack>True</Pack>
+      <PackagePath />
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="CentralEuropeStandardTime.json" />
+    <None Remove="protobuf-files\BO4E.BO.Angebot.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Ansprechpartner.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Benachrichtigung.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Energiemenge.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Geschaeftspartner.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Kosten.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Marktlokation.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Messlokation.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Preisblatt.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Rechnung.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Region.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Vertrag.proto" />
+    <None Remove="protobuf-files\BO4E.BO.Zaehler.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="meta\CentralEuropeStandardTime.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+	<PackageReference Include="Enums.NET" Version="5.0.0" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
+    <PackageReference Include="Polyfill" Version="7.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.2" />
+    <PackageReference Include="protobuf-net" Version="3.2.45" />
+    <PackageReference Include="SourceLink.Copy.PdbFiles" Version="2.8.3" PrivateAssets="All" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/BO4E/ENUM/RechnungspositionsAbschlag.cs b/BO4E/ENUM/RechnungspositionsAbschlag.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using ProtoBuf;
 
 namespace BO4E.ENUM;
 
@@ -12,12 +13,14 @@ public enum RechnungspositionsAbschlag
     /// </summary>
     [EnumMember(Value = "GEMEINDERABATT")]
     [System.Text.Json.Serialization.JsonStringEnumMemberName("GEMEINDERABATT")]
+    [ProtoEnum(Name = nameof(RechnungspositionsAbschlag) + "_" + nameof(GEMEINDERABATT))]
     GEMEINDERABATT,
 
     /// <summary>
     /// Anpassung nach § 19, Absatz 2 Stromnetzentgeltverordnung [Z04]
     /// </summary>
-    [EnumMember(Value = "ABSCHLAG_ANPASSUNG")]
-    [System.Text.Json.Serialization.JsonStringEnumMemberName("ABSCHLAG_ANPASSUNG")]
-    ABSCHLAG_ANPASSUNG,
+    [EnumMember(Value = "ANPASSUNG_STROM_NEV_19_2")]
+    [System.Text.Json.Serialization.JsonStringEnumMemberName("ANPASSUNG_STROM_NEV_19_2")]
+    [ProtoEnum(Name = nameof(RechnungspositionsAbschlag) + "_" + nameof(ANPASSUNG_STROM_NEV_19_2))]
+    ANPASSUNG_STROM_NEV_19_2,
 }
diff --git a/BO4E/ENUM/RechnungspositionsZuschlag.cs b/BO4E/ENUM/RechnungspositionsZuschlag.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using ProtoBuf;
 
 namespace BO4E.ENUM;
 
@@ -11,29 +12,42 @@ public enum RechnungspositionsZuschlag
     /// Umspannungszuschlag [Z02]
     /// </summary>
     [EnumMember(Value = "UMSPANNUNGSZUSCHLAG")]
+    [ProtoEnum(Name = nameof(RechnungspositionsZuschlag) + "_" + nameof(UMSPANNUNGSZUSCHLAG))]
     [System.Text.Json.Serialization.JsonStringEnumMemberName("UMSPANNUNGSZUSCHLAG")]
     UMSPANNUNGSZUSCHLAG,
 
     /// <summary>
     /// allein genutzte Betriebsmittel nach § 19, Absatz 3 Stromnetzentgeltverordnung [Z03]
     /// </summary>
-    [EnumMember(Value = "ALLEIN_GENUTZTE_BETRIEBSMITTEL")]
-    [System.Text.Json.Serialization.JsonStringEnumMemberName("ALLEIN_GENUTZTE_BETRIEBSMITTEL")]
-    ALLEIN_GENUTZTE_BETRIEBSMITTEL,
+    [EnumMember(Value = "ALLEIN_GENUTZTE_BETRIEBSMITTEL_STROM_NEV")]
+    [System.Text.Json.Serialization.JsonStringEnumMemberName(
+        "ALLEIN_GENUTZTE_BETRIEBSMITTEL_STROM_NEV"
+    )]
+    [ProtoEnum(
+        Name = nameof(RechnungspositionsZuschlag)
+            + "_"
+            + nameof(ALLEIN_GENUTZTE_BETRIEBSMITTEL_STROM_NEV)
+    )]
+    ALLEIN_GENUTZTE_BETRIEBSMITTEL_STROM_NEV,
 
     /// <summary>
     /// Anpassung nach § 19, Absatz 2 Stromnetzentgeltverordnung [Z04]
     /// </summary>
-    [EnumMember(Value = "ZUSCHLAG_ANPASSUNG")]
-    [System.Text.Json.Serialization.JsonStringEnumMemberName("ZUSCHLAG_ANPASSUNG")]
-    ZUSCHLAG_ANPASSUNG,
+    [EnumMember(Value = "ANPASSUNG_STROM_NEV_19_2")]
+    [System.Text.Json.Serialization.JsonStringEnumMemberName("ANPASSUNG_STROM_NEV_19_2")]
+    ANPASSUNG_STROM_NEV_19_2,
 
     /// <summary>
     /// Anpassung Pauschale Netzentgeltreduzierung nach § 14a EnWG auf Höhe der NNE [Z05]
     /// </summary>
-    [EnumMember(Value = "ANPASSUNG_PAUSCHALE_NETZENTGELTREDUZIERUNG")]
+    [EnumMember(Value = "PAUSCHALE_NETZENTGELTREDUZIERUNG_ENWG_14A")]
     [System.Text.Json.Serialization.JsonStringEnumMemberName(
-        "ANPASSUNG_PAUSCHALE_NETZENTGELTREDUZIERUNG"
+        "PAUSCHALE_NETZENTGELTREDUZIERUNG_ENWG_14A"
+    )]
+    [ProtoEnum(
+        Name = nameof(RechnungspositionsZuschlag)
+            + "_"
+            + nameof(PAUSCHALE_NETZENTGELTREDUZIERUNG_ENWG_14A)
     )]
-    ANPASSUNG_PAUSCHALE_NETZENTGELTREDUZIERUNG,
+    PAUSCHALE_NETZENTGELTREDUZIERUNG_ENWG_14A,
 }
diff --git a/BO4E/protobuf-files/bo4e.proto b/BO4E/protobuf-files/bo4e.proto
@@ -1267,9 +1267,17 @@ message Rechnungsposition {
    string VertragskontoId = 15;
    string ArtikelId = 28;
    .google.protobuf.Timestamp Ausfuehrungsdatum = 29;
+   .bcl.Decimal GesamtZuAbschlagsbetrag = 30;
+   RechnungspositionsZuschlag Zuschlag = 31;
+   RechnungspositionsAbschlag Abschlag = 32;
    string VertragsId = 1017;
    RechnungspositionsStatus Status = 1018;
 }
+enum RechnungspositionsAbschlag {
+   option (.protobuf_net.enumopt).namespace = "BO4E.ENUM";
+   GEMEINDERABATT = 0;
+   ANPASSUNG_STROM_NEV_19_2 = 1;
+}
 enum RechnungspositionsStatus {
    option (.protobuf_net.enumopt).namespace = "BO4E.ENUM";
    ROH = 0;
@@ -1278,6 +1286,13 @@ enum RechnungspositionsStatus {
    ABRECHENBAR_AUSGENOMMEN = 3;
    ABGERECHNET = 4;
 }
+enum RechnungspositionsZuschlag {
+   option (.protobuf_net.enumopt).namespace = "BO4E.ENUM";
+   RechnungspositionsZuschlag_UMSPANNUNGSZUSCHLAG = 0;
+   RechnungspositionsZuschlag_ALLEIN_GENUTZTE_BETRIEBSMITTEL_STROM_NEV = 1;
+   ANPASSUNG_STROM_NEV_19_2 = 2;
+   RechnungspositionsZuschlag_PAUSCHALE_NETZENTGELTREDUZIERUNG_ENWG_14A = 3;
+}
 enum Rechnungsstatus {
    option (.protobuf_net.enumopt).namespace = "BO4E.ENUM";
    GEPRUEFT_OK = 0;