Remove: ChargeLinkV2Dto which was never fully implemented (#1853)

If applied, removes the contract `ChargeLinkV2Dto`. This contract was never fully operational.
Energinet-DataHub · Nov 6, 2022 · 61d94db · 61d94db
1 parent 0ec3bd6
commit 61d94db
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 413 deletions.
diff --git a/source/Contracts/ChargeLink/ChargeLinkV2Dto.cs b/source/Contracts/ChargeLink/ChargeLinkV2Dto.cs
diff --git a/...ataHub.Charges.Clients.Registration/Energinet.DataHub.Charges.Clients.Registration.csproj b/...ataHub.Charges.Clients.Registration/Energinet.DataHub.Charges.Clients.Registration.csproj
@@ -28,7 +28,7 @@ limitations under the License.
   <!-- Configuration for NuGet package -->
   <PropertyGroup>
     <PackageId>Energinet.DataHub.Charges.Clients.Registration</PackageId>
-    <PackageVersion>4.4.2$(VersionSuffix)</PackageVersion>
+    <PackageVersion>5.0.0$(VersionSuffix)</PackageVersion>
     <Title>Energinet.DataHub.Charges.Clients.Registration</Title>
     <Company>Energinet DataHub A/S</Company>
     <Authors>DataHub</Authors>

diff --git a/...t.DataHub.Charges.Clients.Registration/documents/release-notes/release-notes.md b/...t.DataHub.Charges.Clients.Registration/documents/release-notes/release-notes.md
@@ -1,5 +1,9 @@
 # Energinet.DataHub.Charges.Clients.Registrations Release notes
 
+## Version 5.0.0
+
+Removed `ChargeLinkV2Dto`
+
 ## Version 4.4.2
 
 `ChargeMessageType` is changed to reflect Charge BusinessReasonCode

diff --git a/...braries/source/Energinet.DataHub.Charges.Clients/Energinet.DataHub.Charges.Clients.csproj b/...braries/source/Energinet.DataHub.Charges.Clients/Energinet.DataHub.Charges.Clients.csproj
@@ -28,7 +28,7 @@ limitations under the License.
   <!-- Configuration for NuGet package -->
   <PropertyGroup>
     <PackageId>Energinet.DataHub.Charges.Clients</PackageId>
-    <PackageVersion>4.4.2$(VersionSuffix)</PackageVersion>
+    <PackageVersion>5.0.0$(VersionSuffix)</PackageVersion>
     <Title>Energinet.DataHub.Charges.Clients</Title>
     <Company>Energinet DataHub A/S</Company>
     <Authors>DataHub</Authors>
@@ -141,9 +141,6 @@ https://github.com/Energinet-DataHub/geh-charges/tree/main/source/Energinet.Data
     <Compile Include="..\..\..\Contracts\ChargeLink\ChargeLinkV1Dto.cs">
       <Link>Charges\Model\ChargeLink\ChargeLinkV1Dto.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Contracts\ChargeLink\ChargeLinkV2Dto.cs">
-      <Link>Charges\Model\ChargeLink\ChargeLinkV2Dto.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\Contracts\ChargeMessage\ChargeMessageSearchCriteriaV1Dto.cs">
       <Link>Charges\Model\ChargeMessage\ChargeMessageSearchCriteriaV1Dto.cs</Link>
     </Compile>

diff --git a/...urce/Energinet.DataHub.Charges.Clients/documents/release-notes/release-notes.md b/...urce/Energinet.DataHub.Charges.Clients/documents/release-notes/release-notes.md
@@ -1,5 +1,9 @@
 # Energinet.DataHub.Charges.Clients Release notes
 
+## Version 5.0.0
+
+Removed `ChargeLinkV2Dto`
+
 ## Version 4.4.2
 
 `ChargeMessageType` is changed to reflect Charge BusinessReasonCode

diff --git a/...es/source/GreenEnergyHub.Charges.IntegrationTests/IntegrationTests/WebApi/SwaggerTests.cs b/...es/source/GreenEnergyHub.Charges.IntegrationTests/IntegrationTests/WebApi/SwaggerTests.cs
@@ -74,7 +74,6 @@ public async Task StartPage_ReturnsOk()
 
         [Theory]
         [InlineData("v1")]
-        [InlineData("v2")]
         public async Task SpecificationForVersion_ReturnsOk(string version)
         {
             var response = await _client.GetAsync($"/swagger/{version}/swagger.json");

diff --git a/...ergyHub.Charges.IntegrationTests/IntegrationTests/WebApi/V2/ChargeLinksControllerTests.cs b/...ergyHub.Charges.IntegrationTests/IntegrationTests/WebApi/V2/ChargeLinksControllerTests.cs
diff --git a/...Hub.Charges/source/GreenEnergyHub.Charges.QueryApi/GreenEnergyHub.Charges.QueryApi.csproj b/...Hub.Charges/source/GreenEnergyHub.Charges.QueryApi/GreenEnergyHub.Charges.QueryApi.csproj
@@ -46,9 +46,6 @@ limitations under the License.
     <Compile Include="..\..\..\Contracts\ChargeLink\ChargeLinkV1Dto.cs">
       <Link>Dtos\ChargeLink\ChargeLinkV1Dto.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\Contracts\ChargeLink\ChargeLinkV2Dto.cs">
-      <Link>Dtos\ChargeLink\ChargeLinkV2Dto.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\Contracts\ChargeMessage\ChargeMessageSearchCriteriaV1Dto.cs">
       <Link>Dtos\ChargeMessage\ChargeMessageSearchCriteriaV1Dto.cs</Link>
     </Compile>

diff --git a/...ub.Charges/source/GreenEnergyHub.Charges.QueryApi/ModelPredicates/ChargeLinkQueryLogic.cs b/...ub.Charges/source/GreenEnergyHub.Charges.QueryApi/ModelPredicates/ChargeLinkQueryLogic.cs
@@ -55,37 +55,6 @@ public static IQueryable<ChargeLinkV1Dto> AsChargeLinkV1Dto(this IQueryable<Char
 #pragma warning restore SA1118
         }
 
-        public static IQueryable<ChargeLinkV2Dto> AsChargeLinkV2Dto(this IQueryable<ChargeLink> queryable)
-        {
-            var todayAtMidnightUtc = DateTime.Now.Date.ToUniversalTime();
-
-#pragma warning disable SA1118
-            return queryable
-                .Select(cl => new ChargeLinkV2Dto(
-                    Map(cl.Charge.GetChargeType()),
-                    cl.Charge.SenderProvidedChargeId,
-                    (cl.Charge.ChargePeriods
-                         .Where(cp => cp.StartDateTime <= todayAtMidnightUtc)
-                         .OrderByDescending(cp => cp.StartDateTime)
-                         .FirstOrDefault() ??
-                     cl.Charge.ChargePeriods
-                         .OrderBy(cp => cp.StartDateTime)
-                         .First()).Name,
-                    cl.Charge.Owner.Id,
-                    cl.Charge.TaxIndicator,
-                    (cl.Charge.ChargePeriods
-                        .Where(cp => cp.StartDateTime <= todayAtMidnightUtc)
-                        .OrderByDescending(cp => cp.StartDateTime)
-                        .FirstOrDefault() ??
-                     cl.Charge.ChargePeriods
-                         .OrderBy(cp => cp.StartDateTime)
-                         .First()).TransparentInvoicing,
-                    cl.Factor,
-                    cl.StartDateTime,
-                    cl.EndDateTime == InstantExtensions.GetEndDefault().ToDateTimeOffset() ? null : cl.EndDateTime)); // Nullify "EndDefault" end dates
-#pragma warning restore SA1118
-        }
-
         private static ChargeType Map(Domain.Charges.ChargeType chargeType) => chargeType switch
         {
             Domain.Charges.ChargeType.Fee => ChargeType.D02,

diff --git a/...arges/source/GreenEnergyHub.Charges.Tests/WebApi/Model/ChargeLink/ChargeLinkV2DtoTests.cs b/...arges/source/GreenEnergyHub.Charges.Tests/WebApi/Model/ChargeLink/ChargeLinkV2DtoTests.cs