Skip to content
This repository has been archived by the owner on May 8, 2023. It is now read-only.

Remove: ChargeLinkV2Dto which was never fully implemented #1853

Merged
merged 6 commits into from
Nov 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions source/Contracts/ChargeLink/ChargeLinkV2Dto.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

This file was deleted.

Loading