svrnty/dotnet-geo-management
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

refactor Country to CountryCode to better reflect the value it contain
All checks were successful
Publish NuGet Packages / build-and-publish (push) Successful in 29s
Details

Browse Source
This commit is contained in:
Mathias Beaulieu-Duncan 2025-10-08 11:35:23 -04:00
parent 854658f732
commit c6e6b29905
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Svrnty.GeoManagement.Abstractions/Abstractions/IAddress.cs
View File

@ -7,5 +7,5 @@ public interface IAddress
public string City { get; set; } public string City { get; set; }
public string Subdivision { get; set; } public string Subdivision { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public string Country { get; set; } public string CountryCode { get; set; }
} }

4
Svrnty.GeoManagement.Abstractions/Models/Address.cs
View File

@ -11,7 +11,7 @@ public record Address(bool Normalized = false) : IAddress
public required string City { get; set; } public required string City { get; set; }
public required string Subdivision { get; set; } public required string Subdivision { get; set; }
public required string PostalCode { get; set; } public required string PostalCode { get; set; }
public required string Country { get; set; } public required string CountryCode { get; set; }
public GeoPoint? Location { get; set; } public GeoPoint? Location { get; set; }
public string? Note { get; set; } public string? Note { get; set; }
public bool IsNormalized() => Normalized; public bool IsNormalized() => Normalized;
@ -25,7 +25,7 @@ public record Address(bool Normalized = false) : IAddress
City = address.City, City = address.City,
Subdivision = address.Subdivision, Subdivision = address.Subdivision,
PostalCode = address.PostalCode, PostalCode = address.PostalCode,
Country = address.Country, CountryCode = address.CountryCode,
Location = location, Location = location,
Note = note, Note = note,
}; };

12
Svrnty.GeoManagement.Abstractions/ServiceCollectionExtensions.cs
View File

@ -11,7 +11,7 @@ public static class ServiceCollectionExtensions
toAddress.Line2 = address.Line2; toAddress.Line2 = address.Line2;
toAddress.City = address.City; toAddress.City = address.City;
toAddress.PostalCode = address.PostalCode; toAddress.PostalCode = address.PostalCode;
toAddress.Country = address.Country; toAddress.CountryCode = address.CountryCode;
toAddress.Subdivision = address.Subdivision; toAddress.Subdivision = address.Subdivision;
} }
@ -21,7 +21,7 @@ public static class ServiceCollectionExtensions
address.Line2 = fromAddress.Line2; address.Line2 = fromAddress.Line2;
address.City = fromAddress.City; address.City = fromAddress.City;
address.PostalCode = fromAddress.PostalCode; address.PostalCode = fromAddress.PostalCode;
address.Country = fromAddress.Country; address.CountryCode = fromAddress.CountryCode;
address.Subdivision = fromAddress.Subdivision; address.Subdivision = fromAddress.Subdivision;
} }
@ -40,10 +40,10 @@ public static class ServiceCollectionExtensions
{ {
if (string.IsNullOrWhiteSpace(address.Line2)) if (string.IsNullOrWhiteSpace(address.Line2))
{ {
return $"{address.Line1}, {address.City}, {address.Subdivision} {address.PostalCode}, {address.Country}"; return $"{address.Line1}, {address.City}, {address.Subdivision} {address.PostalCode}, {address.CountryCode}";
} }
return $"{address.Line2}, {address.Line1}, {address.City}, {address.Subdivision} {address.PostalCode}, {address.Country}"; return $"{address.Line2}, {address.Line1}, {address.City}, {address.Subdivision} {address.PostalCode}, {address.CountryCode}";
} }
private static string FormatCompactOneLine(IAddress address) private static string FormatCompactOneLine(IAddress address)
@ -60,9 +60,9 @@ public static class ServiceCollectionExtensions
{ {
if (string.IsNullOrWhiteSpace(address.Line2)) if (string.IsNullOrWhiteSpace(address.Line2))
{ {
return $"{address.Line1}\n{address.City}, {address.Subdivision} {address.PostalCode}\n{address.Country}"; return $"{address.Line1}\n{address.City}, {address.Subdivision} {address.PostalCode}\n{address.CountryCode}";
} }
return $"{address.Line2}, {address.Line1}\n{address.City}, {address.Subdivision} {address.PostalCode}\n{address.Country}"; return $"{address.Line2}, {address.Line1}\n{address.City}, {address.Subdivision} {address.PostalCode}\n{address.CountryCode}";
} }
} }

2
Svrnty.GeoManagement.Google/Mapping/GoogleAddressMapper.cs
View File

@ -36,7 +36,7 @@ internal static class GoogleAddressMapper
City = city, City = city,
Subdivision = subdivision, Subdivision = subdivision,
PostalCode = postalCode, PostalCode = postalCode,
Country = country, CountryCode = country,
Location = location, Location = location,
Note = null Note = null
}; };

8
Svrnty.GeoManagement.Tests/GoogleProviderTests.cs
View File

@ -61,7 +61,7 @@ public class GoogleProviderTests : IDisposable
City = _testData.ValidAddress.City, City = _testData.ValidAddress.City,
Subdivision = _testData.ValidAddress.Subdivision, Subdivision = _testData.ValidAddress.Subdivision,
PostalCode = _testData.ValidAddress.PostalCode, PostalCode = _testData.ValidAddress.PostalCode,
Country = _testData.ValidAddress.Country, CountryCode = _testData.ValidAddress.Country,
Location = null, Location = null,
Note = null Note = null
}; };
@ -90,7 +90,7 @@ public class GoogleProviderTests : IDisposable
Assert.NotNull(result); Assert.NotNull(result);
Assert.NotNull(result.Line1); Assert.NotNull(result.Line1);
Assert.NotNull(result.City); Assert.NotNull(result.City);
Assert.NotNull(result.Country); Assert.NotNull(result.CountryCode);
Assert.True(result.IsNormalized()); Assert.True(result.IsNormalized());
Assert.NotNull(result.Location); Assert.NotNull(result.Location);
} }
@ -106,7 +106,7 @@ public class GoogleProviderTests : IDisposable
City = _testData.NormalizeTestAddress.City, City = _testData.NormalizeTestAddress.City,
Subdivision = _testData.NormalizeTestAddress.Subdivision, Subdivision = _testData.NormalizeTestAddress.Subdivision,
PostalCode = _testData.NormalizeTestAddress.PostalCode, PostalCode = _testData.NormalizeTestAddress.PostalCode,
Country = _testData.NormalizeTestAddress.Country, CountryCode = _testData.NormalizeTestAddress.Country,
Location = null, Location = null,
Note = null Note = null
}; };
@ -150,7 +150,7 @@ public class GoogleProviderTests : IDisposable
City = _testData.InvalidAddress.City, City = _testData.InvalidAddress.City,
Subdivision = _testData.InvalidAddress.Subdivision, Subdivision = _testData.InvalidAddress.Subdivision,
PostalCode = _testData.InvalidAddress.PostalCode, PostalCode = _testData.InvalidAddress.PostalCode,
Country = _testData.InvalidAddress.Country, CountryCode = _testData.InvalidAddress.Country,
Location = null, Location = null,
Note = null Note = null
}; };