Renamed continent to region

src/People.Api/Application/Commands/UpdateAccount/UpdateAccountCommand.cs

@@ -38,12 +38,12 @@ public async Task<Account> Handle(UpdateAccountCommand request, CancellationToke
         var account = await _repository.GetAsync(request.Id, ct)
             .ConfigureAwait(false) ?? throw AccountException.NotFound(request.Id);
 
-        var continent = await GetContinentAsync(request.Country, ct)
+        var region = await GetRegionAsync(request.Country, ct)
             .ConfigureAwait(false);
 
         account.Update(request.Nickname, request.FirstName, request.LastName, request.PreferNickname);
         account.Update(request.DateFormat, request.TimeFormat, request.StartOfWeek);
-        account.Update(request.Language, continent, request.Country, request.TimeZone);
+        account.Update(request.Language, region, request.Country, request.TimeZone);
 
         _repository.Update(account);
 
@@ -54,9 +54,9 @@ await _repository.UnitOfWork
         return account;
     }
 
-    private async Task<ContinentCode> GetContinentAsync(CountryCode country, CancellationToken ct)
+    private async Task<RegionCode> GetRegionAsync(CountryCode country, CancellationToken ct)
     {
         var result = await _worldClient.GetCountryAsync(country, ct);
-        return result is null ? ContinentCode.Empty : ContinentCode.Parse(result.Continent);
+        return result is null ? RegionCode.Empty : RegionCode.Parse(result.Region);
     }
 }

src/People.Api/Application/IntegrationEvents/EventHandling/AccountCreatedIntegrationEventHandler.cs

@@ -38,11 +38,11 @@ public async Task HandleAsync(AccountCreatedIntegrationEvent message)
 
         if (ipInformation is not null)
         {
-            _ = ContinentCode.TryParse(ipInformation.ContinentCode, out var continent);
+            _ = RegionCode.TryParse(ipInformation.ContinentCode, out var region);
             _ = CountryCode.TryParse(ipInformation.CountryCode, out var country);
             _ = TimeZone.TryParse(ipInformation.TimeZone, out var timeZone);
 
-            account.Update(account.Language, continent, country, timeZone);
+            account.Update(account.Language, region, country, timeZone);
         }
 
         var gravatar = await _gravatar.GetAsync(account.GetPrimaryEmail())

src/People.Api/Application/Queries/GetAccountSummary/GetAccountSummaryQuery.cs

@@ -26,7 +26,7 @@ public async Task<AccountSummary> Handle(GetAccountSummaryQuery request, Cancell
                    a.prefer_nickname,
                    a.picture,
                    a.language,
-                   a.continent_code,
+                   a.region_code,
                    a.country_code,
                    a.time_zone,
                    a.date_format,
@@ -51,7 +51,7 @@ LIMIT 1
                 ),
                 x.GetString(5),
                 Language.Parse(x.GetString(6)),
-                ContinentCode.Parse(x.GetString(7)),
+                RegionCode.Parse(x.GetString(7)),
                 CountryCode.Parse(x.GetString(8)),
                 TimeZone.Parse(x.GetString(9)),
                 DateFormat.Parse(x.GetString(10)),
@@ -70,7 +70,7 @@ internal sealed record AccountSummary(
     Name Name,
     string Picture,
     Language Language,
-    ContinentCode ContinentCode,
+    RegionCode RegionCode,
     CountryCode CountryCode,
     TimeZone TimeZone,
     DateFormat DateFormat,

src/People.Api/Endpoints/Account/ModelMapper.cs

@@ -17,7 +17,7 @@ internal static AccountSummaryModel ToModel(this AccountSummary result) =>
             result.Name.FullName(),
             result.Language.ToString(),
             result.Picture,
-            result.ContinentCode.ToModel(),
+            result.RegionCode.ToModel(),
             result.CountryCode.ToModel(),
             result.TimeZone.ToString(),
             result.DateFormat.ToString(),
@@ -36,7 +36,7 @@ internal static AccountDetailsModel ToModel(this Domain.Entities.Account account
             account.Name.FullName(),
             account.Language.ToString(),
             account.Picture,
-            account.ContinentCode.ToModel(),
+            account.RegionCode.ToModel(),
             account.CountryCode.ToModel(),
             account.TimeZone.ToString(),
             account.DateFormat.ToString(),
@@ -47,7 +47,7 @@ internal static AccountDetailsModel ToModel(this Domain.Entities.Account account
             account.Externals.Select(x => x.ToModel())
         );
 
-    private static string? ToModel(this ContinentCode code) =>
+    private static string? ToModel(this RegionCode code) =>
         code.IsEmpty() ? null : code.ToString();
 
     private static string? ToModel(this CountryCode code) =>

src/People.Api/Endpoints/Account/Models/AccountDetailsModel.cs

@@ -9,7 +9,7 @@ internal sealed record AccountDetailsModel(
     string FullName,
     string Language,
     string Picture,
-    string? ContinentCode,
+    string? RegionCode,
     string? CountryCode,
     string TimeZone,
     string DateFormat,

src/People.Api/Endpoints/Account/Models/AccountSummaryModel.cs

@@ -8,7 +8,7 @@ internal sealed record AccountSummaryModel(
     string FullName,
     string Language,
     string Picture,
-    string? ContinentCode,
+    string? RegionCode,
     string? CountryCode,
     string TimeZone,
     string DateFormat,

src/People.Api/Infrastructure/Providers/World/CountryDetails.cs

@@ -1,3 +1,3 @@
 namespace People.Api.Infrastructure.Providers.World;
 
-internal sealed record CountryDetails(string Numeric, string Alpha2, string Alpha3, string Continent, string Region);
+internal sealed record CountryDetails(string Numeric, string Alpha2, string Alpha3, string Region);

src/People.Api/Program.cs

@@ -225,7 +225,7 @@
         .Enrich.WithProperty("ApplicationName", appName)
         .Destructure.AsScalar<AccountId>()
         .Destructure.AsScalar<Language>()
-        .Destructure.AsScalar<ContinentCode>()
+        .Destructure.AsScalar<RegionCode>()
         .Destructure.AsScalar<CountryCode>()
         .Destructure.AsScalar<TimeZone>()
         .Destructure.AsScalar<DateFormat>()

src/People.Domain/Entities/Account.cs

@@ -39,7 +39,7 @@ public Account(string nickname, Language language, IPAddress ip, IIpHasher hashe
     {
         Name = new Name(nickname);
         Picture = DefaultPicture;
-        ContinentCode = ContinentCode.Empty;
+        RegionCode = RegionCode.Empty;
         CountryCode = CountryCode.Empty;
         Language = language;
         TimeZone = TimeZone.Utc;
@@ -62,7 +62,7 @@ public Account(string nickname, Language language, IPAddress ip, IIpHasher hashe
 
     public string Picture { get; private set; }
 
-    public ContinentCode ContinentCode { get; private set; }
+    public RegionCode RegionCode { get; private set; }
 
     public CountryCode CountryCode { get; private set; }
 
@@ -218,9 +218,9 @@ public void Update(Uri? picture)
         AddDomainEvent(new AccountUpdatedDomainEvent(this));
     }
 
-    public void Update(Language language, ContinentCode continent, CountryCode country, TimeZone timeZone)
+    public void Update(Language language, RegionCode region, CountryCode country, TimeZone timeZone)
     {
-        ContinentCode = continent;
+        RegionCode = region;
         CountryCode = country;
         Language = language;
         TimeZone = timeZone;

src/People.Domain/ValueObjects/RegionCode.cs

@@ -0,0 +1,113 @@
+namespace People.Domain.ValueObjects;
+
+public readonly struct RegionCode :
+    IComparable,
+    IComparable<RegionCode>,
+    IEquatable<RegionCode>
+{
+    private static readonly (string Code, string Name)[] Regions =
+    {
+        ("AF", "Africa"),
+        ("AN", "Antarctica"),
+        ("AS", "Asia"),
+        ("EU", "Europe"),
+        ("NA", "North America"),
+        ("OC", "Oceania"),
+        ("SA", "South America")
+    };
+
+    public static RegionCode Empty =>
+        new("--");
+
+    private readonly string _value;
+
+    private RegionCode(string value) =>
+        _value = value.ToUpperInvariant();
+
+    public static RegionCode Parse(string? value)
+    {
+        if (TryParse(value, out var code))
+            return code;
+
+        throw new ArgumentException($"{nameof(RegionCode)} value must be two chars", nameof(value));
+    }
+
+    public static bool TryParse(string? value, out RegionCode regionCode)
+    {
+        regionCode = Empty;
+
+        if (string.IsNullOrWhiteSpace(value))
+            return false;
+
+        if (value.Length != 2)
+            return false;
+
+        regionCode = GetCodeOrDefault(value);
+
+        return !regionCode.IsEmpty();
+    }
+
+    private static RegionCode GetCodeOrDefault(string value)
+    {
+        if (value.Length == 2)
+        {
+            foreach (var (code, _) in Regions.AsSpan())
+                if (code.Equals(value, StringComparison.OrdinalIgnoreCase))
+                    return new RegionCode(code);
+
+            return Empty;
+        }
+
+        foreach (var (code, name) in Regions.AsSpan())
+            if (name.Equals(value, StringComparison.OrdinalIgnoreCase))
+                return new RegionCode(code);
+
+        return Empty;
+    }
+
+    public bool IsEmpty() =>
+        this == Empty;
+
+    public bool Equals(RegionCode other) =>
+        _value == other._value;
+
+    public override bool Equals(object? obj) =>
+        obj is RegionCode other && Equals(other);
+
+    public override int GetHashCode() =>
+        _value.GetHashCode();
+
+    public override string ToString() =>
+        _value;
+
+    public int CompareTo(RegionCode other) =>
+        string.Compare(_value, other._value, StringComparison.Ordinal);
+
+    public int CompareTo(object? obj)
+    {
+        if (ReferenceEquals(null, obj))
+            return 1;
+
+        return obj is RegionCode other
+            ? CompareTo(other)
+            : throw new ArgumentException($"Object must be of type {nameof(RegionCode)}");
+    }
+
+    public static bool operator <(RegionCode left, RegionCode right) =>
+        left.CompareTo(right) < 0;
+
+    public static bool operator >(RegionCode left, RegionCode right) =>
+        left.CompareTo(right) > 0;
+
+    public static bool operator <=(RegionCode left, RegionCode right) =>
+        left.CompareTo(right) <= 0;
+
+    public static bool operator >=(RegionCode left, RegionCode right) =>
+        left.CompareTo(right) >= 0;
+
+    public static bool operator ==(RegionCode left, RegionCode right) =>
+        left.Equals(right);
+
+    public static bool operator !=(RegionCode left, RegionCode right) =>
+        !left.Equals(right);
+}

src/People.Infrastructure/EntityConfigurations/AccountEntityTypeConfiguration.cs

@@ -55,10 +55,10 @@ public void Configure(EntityTypeBuilder<Account> builder)
             .HasMaxLength(2)
             .IsRequired();
 
-        builder.Property(x => x.ContinentCode)
-            .HasColumnName("continent_code")
-            .HasConversion(x => x.ToString(), x => ContinentCode.Parse(x))
-            .HasDefaultValue(ContinentCode.Empty)
+        builder.Property(x => x.RegionCode)
+            .HasColumnName("region_code")
+            .HasConversion(x => x.ToString(), x => RegionCode.Parse(x))
+            .HasDefaultValue(RegionCode.Empty)
             .HasMaxLength(2)
             .IsRequired();