fossa-app · tiksn · Jun 5, 2026 · Jun 5, 2026 · Jun 5, 2026 · Jun 5, 2026
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,7 +9,7 @@
     <PackageVersion Include="FluentValidation" Version="12.1.1" />
     <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.1" />
     <PackageVersion Include="Fossa.Bridge" Version="0.1.27" />
-    <PackageVersion Include="Fossa.Licensing" Version="1.3.0" />
+    <PackageVersion Include="Fossa.Licensing" Version="1.3.1" />
     <PackageVersion Include="Fossa.Messaging" Version="0.1.7" />
     <PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
     <PackageVersion Include="IdGen.DependencyInjection" Version="3.0.7" />
@@ -39,7 +39,7 @@
     <PackageVersion Include="UUIDNext" Version="4.2.4" />
     <PackageVersion Include="Verify.XunitV3" Version="31.18.0" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
-    <PackageVersion Include="TIKSN-Framework" Version="5.7.0" />
+    <PackageVersion Include="TIKSN-Framework" Version="5.7.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
   </ItemGroup>
 </Project>
diff --git a/src/API.Core/Services/PostalCodeParser.cs b/src/API.Core/Services/PostalCodeParser.cs
@@ -95,7 +95,7 @@ public ParserResult<string> ParsePostalCode(
     CountryInfo country,
     string inputPostalCode)
   {
-    var key = country.TwoLetterISORegionName;
+    var key = country.PrincipalRegion.TwoLetterISORegionName;
 
     if (PostalCodeParsers.TryGetValue(key, out var parser))
     {

diff --git a/src/API.Core/Validators/AddressValidator.cs b/src/API.Core/Validators/AddressValidator.cs
@@ -36,6 +36,6 @@ private static bool BranchAddressPostalCodeMustBeValidForCounpanyAddressCountry(
   private static string BranchAddressPostalCodeMustBeValidForCounpanyAddressCountryErrorMessage(
     Address address, string postalCode)
   {
-    return $"Postal Code '{postalCode}' for Country '{address.Country.TwoLetterISORegionName} - [{address.Country.PrincipalRegion.EnglishName}]' is invalid.";
+    return $"Postal Code '{postalCode}' for Country '{address.Country} - [{address.Country.PrincipalRegion.EnglishName}]' is invalid.";
   }
 }
diff --git a/src/API.Core/Validators/BranchCommandValidatorHelper.cs b/src/API.Core/Validators/BranchCommandValidatorHelper.cs
@@ -32,7 +32,7 @@ public static string BranchAddressCountryMustBeCompanyCountryErrorMessage<T>(T c
 
     static string GetAddressCountryCodeAndName(Address address)
     {
-      return $"{address.Country.TwoLetterISORegionName} - [{address.Country.PrincipalRegion.EnglishName}]";
+      return $"{address.Country} - [{address.Country.PrincipalRegion.EnglishName}]";
     }
   }
 

diff --git a/src/API.Core/Validators/CompanyCommandValidatorHelper.cs b/src/API.Core/Validators/CompanyCommandValidatorHelper.cs
@@ -17,6 +17,6 @@ public static async Task<bool> CompanyCountryMustBeLicensedAsync(
 
   public static string CompanyCountryMustBeLicensedErrorMessage<T>(T command, CountryInfo property)
   {
-    return $"Country '{property.TwoLetterISORegionName} - {property.PrincipalRegion.EnglishName}' is not licensed.";
+    return $"Country '{property} - {property.PrincipalRegion.EnglishName}' is not licensed.";
   }
 }
diff --git a/src/API.Infrastructure/Messages/Events/BranchCreatedEventBusHandler.cs b/src/API.Infrastructure/Messages/Events/BranchCreatedEventBusHandler.cs
@@ -28,7 +28,7 @@ protected override BranchChangedProtoEvent Map(BranchCreatedEvent domainEvent)
         City = s.City,
         Subdivision = s.Subdivision,
         PostalCode = s.PostalCode,
-        CountryCode = s.Country.TwoLetterISORegionName
+        CountryCode = s.Country.PrincipalRegion.TwoLetterISORegionName
       }, default(Address)),
       TimeZoneId = domainEvent.TimeZone.Id,
     };

diff --git a/src/API.Infrastructure/Messages/Events/BranchUpdatedEventBusHandler.cs b/src/API.Infrastructure/Messages/Events/BranchUpdatedEventBusHandler.cs
@@ -28,7 +28,7 @@ protected override BranchChangedProtoEvent Map(BranchUpdatedEvent domainEvent)
         City = s.City,
         Subdivision = s.Subdivision,
         PostalCode = s.PostalCode,
-        CountryCode = s.Country.TwoLetterISORegionName
+        CountryCode = s.Country.PrincipalRegion.TwoLetterISORegionName
       }, default(Address)),
       TimeZoneId = domainEvent.TimeZone.Id,
     };

diff --git a/src/API.Infrastructure/Messages/Events/CompanyCreatedEventBusHandler.cs b/src/API.Infrastructure/Messages/Events/CompanyCreatedEventBusHandler.cs
@@ -20,7 +20,7 @@ protected override CompanyChangedProtoEvent Map(CompanyCreatedEvent domainEvent)
     {
       CompanyId = domainEvent.CompanyId.AsPrimitive(),
       Name = domainEvent.Name,
-      CountryCode = domainEvent.Country?.TwoLetterISORegionName
+      CountryCode = domainEvent.Country?.PrincipalRegion.TwoLetterISORegionName
     };
 
   protected override long ResolveEntityId(CompanyCreatedEvent domainEvent)

diff --git a/src/API.Infrastructure/Messages/Events/CompanyUpdatedEventBusHandler.cs b/src/API.Infrastructure/Messages/Events/CompanyUpdatedEventBusHandler.cs
@@ -20,7 +20,7 @@ protected override CompanyChangedProtoEvent Map(CompanyUpdatedEvent domainEvent)
     {
       CompanyId = domainEvent.CompanyId.AsPrimitive(),
       Name = domainEvent.Name,
-      CountryCode = domainEvent.Country?.TwoLetterISORegionName
+      CountryCode = domainEvent.Country?.PrincipalRegion.TwoLetterISORegionName
     };
 
   protected override long ResolveEntityId(CompanyUpdatedEvent domainEvent)

diff --git a/src/API.Persistence/Mongo/Mappers/AddressMongoMapper.cs b/src/API.Persistence/Mongo/Mappers/AddressMongoMapper.cs
@@ -26,7 +26,7 @@ public AddressMongo Map(Address source)
       City = source.City.Trim(),
       Subdivision = source.Subdivision.Trim(),
       PostalCode = source.PostalCode.Trim(),
-      CountryCode = source.Country.TwoLetterISORegionName,
+      CountryCode = source.Country.PrincipalRegion.TwoLetterISORegionName,
     };
   }
 

diff --git a/src/API.Persistence/Mongo/Mappers/CompanyMongoMapper.cs b/src/API.Persistence/Mongo/Mappers/CompanyMongoMapper.cs
@@ -39,7 +39,7 @@ public CompanyMongoEntity Map(CompanyEntity source)
       ID = _domainIdentityToDataIdentityMapper.Map(source.ID),
       TenantID = source.TenantID,
       Name = source.Name,
-      CountryCode = source.Country.TwoLetterISORegionName,
+      CountryCode = source.Country.PrincipalRegion.TwoLetterISORegionName,
     };
   }
 }
diff --git a/src/API.Web/Mappers/AddressModelMapper.cs b/src/API.Web/Mappers/AddressModelMapper.cs
@@ -26,7 +26,7 @@ public AddressModel Map(Address source)
       source.City.Trim(),
       source.Subdivision.Trim(),
       source.PostalCode.Trim(),
-      source.Country.TwoLetterISORegionName);
+      source.Country.PrincipalRegion.TwoLetterISORegionName);
   }
 
   public Address Map(AddressModel source)

diff --git a/src/API.Web/Mappers/CompanyRetrievalModelMapper.cs b/src/API.Web/Mappers/CompanyRetrievalModelMapper.cs
@@ -19,6 +19,6 @@ public CompanyRetrievalModel Map(CompanyEntity source)
     return new CompanyRetrievalModel(
       _domainIdentityToDataIdentityMapper.Map(source.ID),
       source.Name,
-      source.Country.TwoLetterISORegionName);
+      source.Country.PrincipalRegion.TwoLetterISORegionName);
   }
 }
diff --git a/src/API.Web/Mappers/CountryModelMapper.cs b/src/API.Web/Mappers/CountryModelMapper.cs
@@ -8,6 +8,6 @@ public class CountryModelMapper : IMapper<CountryInfo, CountryModel>
 {
   public CountryModel Map(CountryInfo source)
   {
-    return new CountryModel(source.PrincipalRegion.EnglishName, source.TwoLetterISORegionName);
+    return new CountryModel(source.PrincipalRegion.EnglishName, source.PrincipalRegion.TwoLetterISORegionName);
   }
 }
diff --git a/src/API.Web/Mappers/TimeZoneModelMapper.cs b/src/API.Web/Mappers/TimeZoneModelMapper.cs
@@ -24,7 +24,7 @@ public TimeZoneModel Map(DateTimeZone source)
     return new TimeZoneModel(
       source.Id,
       TzdbDateTimeZoneSource.Default.TzdbToWindowsIds[source.Id],
-      _dateTimeZoneLookup.ResolveTimeZoneCountry(source).TwoLetterISORegionName,
+      _dateTimeZoneLookup.ResolveTimeZoneCountry(source).PrincipalRegion.TwoLetterISORegionName,
       source.GetUtcOffset(_clock.GetCurrentInstant()).ToTimeSpan());
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         static string GetAddressCountryCodeAndName(Address address)
         {
-          return $"{address.Country.TwoLetterISORegionName} - [{address.Country.PrincipalRegion.EnglishName}]";
+          return $"{address.Country} - [{address.Country.PrincipalRegion.EnglishName}]";
         }
       }
@@ Expand Down @@