Miscellaneous fixes. (#15)

* Implemented exception handling.

* Fixed empty roster bug.

* Allow to receive regions and types as unique names.

* Implementing an edit modal.

* Fixed SearchNumber.

* Using library components.

* Using library components.

* Using library components.

backend/PokeData.sln

@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokeData.EntityFrameworkCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokeData", "src\PokeData\PokeData.csproj", "{1448F506-73E9-4664-A419-002B79A8C276}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokeData.Contracts", "src\PokeData.Contracts\PokeData.Contracts.csproj", "{6F2213F6-F202-4C6E-B5DA-5957213C917E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokeData.Contracts", "src\PokeData.Contracts\PokeData.Contracts.csproj", "{6F2213F6-F202-4C6E-B5DA-5957213C917E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

backend/src/PokeData.Application/AggregateNotFoundException.cs

@@ -1,8 +1,9 @@
 using Logitar;
+using PokeData.Contracts.Errors;
 
 namespace PokeData.Application;
 
-public class AggregateNotFoundException : Exception
+public class AggregateNotFoundException : Exception, IErrorException
 {
   public const string ErrorMessage = "The specified aggregate could not be found.";
 
@@ -22,6 +23,12 @@ public string? PropertyName
     private set => Data[nameof(PropertyName)] = value;
   }
 
+  public Error Error => new(this.GetErrorCode(), ErrorMessage, new ErrorData[]
+  {
+    new(nameof(AggregateId), AggregateId),
+    new(nameof(PropertyName), PropertyName)
+  });
+
   public AggregateNotFoundException(Type type, string aggregateId, string? propertyName = null) : base(BuildMessage(type, aggregateId, propertyName))
   {
     TypeName = type.GetNamespaceQualifiedName();

backend/src/PokeData.Application/Roster/Commands/SaveRosterItemCommandHandler.cs

@@ -40,10 +40,10 @@ public async Task<Unit> Handle(SaveRosterItemCommand command, CancellationToken
     PokemonType primaryType = await _typeRepository.LoadAsync(payload.PrimaryType, cancellationToken)
       ?? throw new AggregateNotFoundException<PokemonType>(payload.PrimaryType.ToString(), nameof(payload.PrimaryType));
     PokemonType? secondaryType = null;
-    if (payload.SecondaryType.HasValue)
+    if (!string.IsNullOrWhiteSpace(payload.SecondaryType))
     {
-      secondaryType = await _typeRepository.LoadAsync(payload.SecondaryType.Value, cancellationToken)
-        ?? throw new AggregateNotFoundException<PokemonType>(payload.SecondaryType.Value.ToString(), nameof(payload.SecondaryType));
+      secondaryType = await _typeRepository.LoadAsync(payload.SecondaryType, cancellationToken)
+        ?? throw new AggregateNotFoundException<PokemonType>(payload.SecondaryType, nameof(payload.SecondaryType));
     }
 
     PokemonRoster roster = new()

backend/src/PokeData.Application/TooManyResultsException.cs

@@ -1,4 +1,5 @@
 using Logitar;
+using PokeData.Contracts.Errors;
 
 namespace PokeData.Application;
 
@@ -22,6 +23,12 @@ public int ActualCount
     private set => Data[nameof(ActualCount)] = value;
   }
 
+  public Error Error => new(this.GetErrorCode(), ErrorMessage, new ErrorData[]
+  {
+    new(nameof(ExpectedCount), ExpectedCount),
+    new(nameof(ActualCount), ActualCount)
+  });
+
   public TooManyResultsException(Type type, int expectedCount, int actualCount) : base(BuildMessage(type, expectedCount, actualCount))
   {
     TypeName = type.GetNamespaceQualifiedName();

backend/src/PokeData.Contracts/Errors/Error.cs

@@ -0,0 +1,18 @@
+namespace PokeData.Contracts.Errors;
+
+public record Error
+{
+  public string Code { get; set; }
+  public string Message { get; set; }
+  public List<ErrorData>? Data { get; set; }
+
+  public Error() : this(string.Empty, string.Empty)
+  {
+  }
+  public Error(string code, string message, IEnumerable<ErrorData>? data = null)
+  {
+    Code = code;
+    Message = message;
+    Data = data?.ToList();
+  }
+}

backend/src/PokeData.Contracts/Errors/ErrorData.cs

@@ -0,0 +1,16 @@
+namespace PokeData.Contracts.Errors;
+
+public record ErrorData
+{
+  public string Key { get; set; }
+  public string? Value { get; set; }
+
+  public ErrorData() : this(string.Empty)
+  {
+  }
+  public ErrorData(string key, object? value = null)
+  {
+    Key = key;
+    Value = value?.ToString();
+  }
+}

backend/src/PokeData.Contracts/Errors/IErrorException.cs

@@ -0,0 +1,6 @@
+namespace PokeData.Contracts.Errors;
+
+public interface IErrorException
+{
+  Error Error { get; }
+}

backend/src/PokeData.Contracts/Roster/RosterStatistic.cs

@@ -10,6 +10,6 @@ public record RosterStatistic
   {
     Key = key,
     Count = count,
-    Percentage = count / (double)total
+    Percentage = total == 0 ? 0 : count / (double)total
   };
 }

backend/src/PokeData.Contracts/Roster/SaveRosterItemPayload.cs

@@ -6,9 +6,9 @@ public record SaveRosterItemPayload
   public string Name { get; set; } = string.Empty;
   public string? Category { get; set; }
 
-  public byte Region { get; set; }
-  public byte PrimaryType { get; set; }
-  public byte? SecondaryType { get; set; }
+  public string Region { get; set; } = string.Empty;
+  public string PrimaryType { get; set; } = string.Empty;
+  public string? SecondaryType { get; set; }
 
   public bool IsBaby { get; set; }
   public bool IsLegendary { get; set; }

backend/src/PokeData.Domain/Regions/IRegionRepository.cs

@@ -2,6 +2,6 @@
 
 public interface IRegionRepository
 {
-  Task<RegionAggregate?> LoadAsync(byte id, CancellationToken cancellationToken = default);
+  Task<RegionAggregate?> LoadAsync(string idOrUniqueName, CancellationToken cancellationToken = default);
   Task SaveAsync(RegionAggregate region, CancellationToken cancellationToken = default);
 }

backend/src/PokeData.Domain/Types/IPokemonTypeRepository.cs

@@ -2,5 +2,5 @@
 
 public interface IPokemonTypeRepository
 {
-  Task<PokemonType?> LoadAsync(byte id, CancellationToken cancellationToken = default);
+  Task<PokemonType?> LoadAsync(string idOrUniqueName, CancellationToken cancellationToken = default);
 }

backend/src/PokeData.EntityFrameworkCore.Relational/Repositories/PokemonTypeRepository.cs

@@ -14,10 +14,23 @@ public PokemonTypeRepository(PokemonContext context)
     _context = context;
   }
 
-  public async Task<PokemonType?> LoadAsync(byte id, CancellationToken cancellationToken)
+  public async Task<PokemonType?> LoadAsync(string idOrUniqueName, CancellationToken cancellationToken)
   {
-    PokemonTypeEntity? type = await _context.PokemonTypes.AsNoTracking()
-      .SingleOrDefaultAsync(x => x.PokemonTypeId == id, cancellationToken);
+    PokemonTypeEntity? type = null;
+
+    if (byte.TryParse(idOrUniqueName, out byte id))
+    {
+      type = await _context.PokemonTypes.AsNoTracking()
+        .SingleOrDefaultAsync(x => x.PokemonTypeId == id, cancellationToken);
+    }
+
+    if (type == null)
+    {
+      string uniqueNameNormalized = idOrUniqueName.Trim().ToUpper();
+
+      type = await _context.PokemonTypes.AsNoTracking()
+        .SingleOrDefaultAsync(x => x.UniqueNameNormalized == uniqueNameNormalized, cancellationToken);
+    }
 
     return type == null ? null : DomainMapper.ToPokemonType(type);
   }

backend/src/PokeData.EntityFrameworkCore.Relational/Repositories/RegionRepository.cs

@@ -13,13 +13,27 @@ public RegionRepository(PokemonContext context)
     _context = context;
   }
 
-  public async Task<RegionAggregate?> LoadAsync(byte id, CancellationToken cancellationToken)
+  public async Task<RegionAggregate?> LoadAsync(string idOrUniqueName, CancellationToken cancellationToken)
   {
-    RegionEntity? entity = await _context.Regions.AsNoTracking()
-      .Include(x => x.MainGeneration)
-      .SingleOrDefaultAsync(x => x.RegionId == id, cancellationToken);
+    RegionEntity? region = null;
 
-    return entity == null ? null : DomainMapper.ToRegion(entity);
+    if (byte.TryParse(idOrUniqueName, out byte id))
+    {
+      region = await _context.Regions.AsNoTracking()
+        .Include(x => x.MainGeneration)
+        .SingleOrDefaultAsync(x => x.RegionId == id, cancellationToken);
+    }
+
+    if (region == null)
+    {
+      string uniqueNameNormalized = idOrUniqueName.Trim().ToUpper();
+
+      region = await _context.Regions.AsNoTracking()
+        .Include(x => x.MainGeneration)
+        .SingleOrDefaultAsync(x => x.UniqueNameNormalized == uniqueNameNormalized, cancellationToken);
+    }
+
+    return region == null ? null : DomainMapper.ToRegion(region);
   }
 
   public async Task SaveAsync(RegionAggregate region, CancellationToken cancellationToken)

backend/src/PokeData/Filters/PokemonExceptionFilter.cs

@@ -0,0 +1,43 @@
+using FluentValidation;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using PokeData.Application;
+
+namespace PokeData.Filters;
+
+internal class PokemonExceptionFilter : ExceptionFilterAttribute
+{
+  private readonly Dictionary<Type, Func<ExceptionContext, IActionResult>> _handlers = new()
+  {
+    [typeof(ValidationException)] = HandleValidationException
+  };
+
+  public override void OnException(ExceptionContext context)
+  {
+    if (_handlers.TryGetValue(context.Exception.GetType(), out Func<ExceptionContext, IActionResult>? handler))
+    {
+      context.Result = handler(context);
+      context.ExceptionHandled = true;
+    }
+    else if (context.Exception is AggregateNotFoundException aggregateNotFound)
+    {
+      context.Result = new NotFoundObjectResult(aggregateNotFound.Error);
+      context.ExceptionHandled = true;
+    }
+    else if (context.Exception is TooManyResultsException tooManyResults)
+    {
+      context.Result = new BadRequestObjectResult(tooManyResults.Error);
+      context.ExceptionHandled = true;
+    }
+    else
+    {
+      base.OnException(context);
+    }
+  }
+
+  private static BadRequestObjectResult HandleValidationException(ExceptionContext context)
+  {
+    ValidationException exception = (ValidationException)context.Exception;
+    return new BadRequestObjectResult(new { exception.Errors });
+  }
+}

backend/src/PokeData/Startup.cs

@@ -2,6 +2,7 @@
 using PokeData.EntityFrameworkCore.Relational;
 using PokeData.EntityFrameworkCore.SqlServer;
 using PokeData.Extensions;
+using PokeData.Filters;
 using PokeData.Infrastructure.PokeApiClient;
 using PokeData.Settings;
 
@@ -22,7 +23,7 @@ public override void ConfigureServices(IServiceCollection services)
   {
     base.ConfigureServices(services);
 
-    services.AddControllers()
+    services.AddControllers(options => options.Filters.Add<PokemonExceptionFilter>())
       .AddJsonOptions(options =>
       {
         options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());

docker-compose.yml

@@ -20,6 +20,6 @@ services:
     restart: unless-stopped
     environment:
       ASPNETCORE_Environment: Development
-      SQLCONNSTR_Master: Server=pokedata_mssql,27945;Database=Pokemon;User Id=SA;Password=m7tPnE6dB5TQxYCW;Persist Security Info=False;Encrypt=False;
+      SQLCONNSTR_Master: Server=pokedata_mssql;Database=Pokemon;User Id=SA;Password=m7tPnE6dB5TQxYCW;Persist Security Info=False;Encrypt=False;
     ports:
       - 43551:8080

frontend/.env.development

@@ -1,2 +1,2 @@
-VITE_APP_API_BASE_URL="http://localhost:43551/"
-__VITE_APP_API_BASE_URL="https://localhost:32768/"
+__VITE_APP_API_BASE_URL="http://localhost:43551/"
+VITE_APP_API_BASE_URL="https://localhost:32770/"

frontend/src/components/PokemonCategoryInput.vue

@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { TarInput, type InputSize } from "logitar-vue3-ui";
+import { computed } from "vue";
+
+const props = withDefaults(
+  defineProps<{
+    disabled?: boolean;
+    floating?: boolean;
+    id?: string;
+    label?: string;
+    max?: number;
+    min?: number;
+    modelValue?: string;
+    placeholder?: string;
+    required?: boolean;
+    size?: InputSize;
+  }>(),
+  {
+    floating: true,
+    id: "category",
+    label: "Category",
+    max: 128,
+  },
+);
+
+const inputPlaceholder = computed<string | undefined>(() => (props.floating ? props.placeholder ?? props.label : props.placeholder));
+
+defineEmits<{
+  (e: "update:model-value", value?: string): void;
+}>();
+</script>
+
+<template>
+  <TarInput
+    :disabled="disabled"
+    :floating="floating"
+    :id="id"
+    :label="label"
+    :max="max"
+    :min="min"
+    :model-value="modelValue"
+    :placeholder="inputPlaceholder"
+    :required="required"
+    :size="size"
+    type="text"
+    @update:model-value="$emit('update:model-value', $event)"
+  />
+</template>

frontend/src/components/PokemonNameInput.vue

@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { TarInput, type InputSize } from "logitar-vue3-ui";
+import { computed } from "vue";
+
+const props = withDefaults(
+  defineProps<{
+    disabled?: boolean;
+    floating?: boolean;
+    id?: string;
+    label?: string;
+    max?: number;
+    min?: number;
+    modelValue?: string;
+    placeholder?: string;
+    required?: boolean;
+    size?: InputSize;
+  }>(),
+  {
+    floating: true,
+    id: "name",
+    label: "Name",
+    max: 128,
+  },
+);
+
+const inputPlaceholder = computed<string | undefined>(() => (props.floating ? props.placeholder ?? props.label : props.placeholder));
+
+defineEmits<{
+  (e: "update:model-value", value?: string): void;
+}>();
+</script>
+
+<template>
+  <TarInput
+    :disabled="disabled"
+    :floating="floating"
+    :id="id"
+    :label="label"
+    :max="max"
+    :min="min"
+    :model-value="modelValue"
+    :placeholder="inputPlaceholder"
+    :required="required"
+    :size="size"
+    type="text"
+    @update:model-value="$emit('update:model-value', $event)"
+  />
+</template>