Skip to content

Update versioning and address model properties #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucrengineer merged 1 commit into from
May 23, 2025
Merged

Update versioning and address model properties #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mode: ContinuousDelivery
next-version: 6.3.7
next-version: 6.3.8
increment: Patch
major-version-bump-message: '\+semver:\s?(breaking|major|release)'
minor-version-bump-message: '\+semver:\s?(feat|feature|minor)'
Expand Down
6 changes: 3 additions & 3 deletions src/EasyKeys.Shipping.DHL.Abstractions/OpenApis/V2/Express/DHLExpressApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3979,12 +3979,12 @@ public partial class SupermodelIoLogisticsExpressAddressRatesRequest
/// </summary>
[Newtonsoft.Json.JsonProperty("addressLine1", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
public string AddressLine1 { get; set; }
public string? AddressLine1 { get; set; }

/// <summary>
/// Please enter address line 3
/// </summary>
[Newtonsoft.Json.JsonProperty("addressLine2", Required = Newtonsoft.Json.Required.AllowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[Newtonsoft.Json.JsonProperty("addressLine2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
public string? AddressLine2 { get; set; }

Expand All @@ -3993,7 +3993,7 @@ public partial class SupermodelIoLogisticsExpressAddressRatesRequest
/// </summary>
[Newtonsoft.Json.JsonProperty("addressLine3", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
[System.ComponentModel.DataAnnotations.StringLength(45, MinimumLength = 1)]
public string AddressLine3 { get; set; }
public string? AddressLine3 { get; set; }

/// <summary>
/// Please enter your suburb or county name
Expand Down
4 changes: 2 additions & 2 deletions src/EasyKeys.Shipping.DHL.Rates/DHLExpressRateProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ public async Task<Shipment> GetRatesManyAsync(Shipment shipment, CancellationTok
PostalCode = shipment.DestinationAddress.PostalCode,
CityName = shipment.DestinationAddress.City,
CountryCode = shipment.DestinationAddress.CountryCode,
AddressLine1 = shipment.DestinationAddress.StreetLine,
AddressLine1 = string.IsNullOrEmpty(shipment.DestinationAddress.StreetLine) ? null : shipment.DestinationAddress.StreetLine,
AddressLine2 = string.IsNullOrEmpty(shipment.DestinationAddress.StreetLine2) ? null : shipment.DestinationAddress.StreetLine2,
AddressLine3 = shipment.DestinationAddress.StateOrProvince
AddressLine3 = string.IsNullOrEmpty(shipment.DestinationAddress.StateOrProvince) ? null : shipment.DestinationAddress.StateOrProvince
}
},
Accounts = new[]
Expand Down
2 changes: 1 addition & 1 deletion test/EasyKeys.Shipping.FuncTest/TestHelpers/TestShipments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static Shipment CreateInternationalShipment()
stateOrProvince: "ON",
postalCode: "K1M 1M4",
countryCode: "CA");
destinationAddress = new Address("285 Wang Fu Jing Avenue", "BEIJING", "Beijing", "100006", "CN", isResidential: false);
destinationAddress = new Address("285 Wang Fu Jing Avenue", "BEIJING", "", "100006", "CN", isResidential: false);
var packages = new List<Package>
{
new Package(
Expand Down
Loading