Trim string fields during conversion of request DTOs into entities. (#93

)
Yorubaname · Aug 17, 2024 · b2a4953 · b2a4953
1 parent f7475da
commit b2a4953
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/Api/Controllers/SuggestedNameController.cs b/Api/Controllers/SuggestedNameController.cs
@@ -7,6 +7,7 @@
 using System.Net;
 using Application.Mappers;
 using Application.Validation;
+using FluentValidation;
 
 namespace Api.Controllers;
 
@@ -16,9 +17,9 @@ namespace Api.Controllers;
 public class SuggestedNameController : ControllerBase
 {
     private readonly SuggestedNameService _suggestedNameService;
-    private readonly CreateSuggestedNameValidator _suggestedNameValidator;
+    private readonly IValidator<CreateSuggestedNameDto> _suggestedNameValidator;
 
-    public SuggestedNameController(SuggestedNameService suggestedNameService, CreateSuggestedNameValidator suggestedNameValidator)
+    public SuggestedNameController(SuggestedNameService suggestedNameService, IValidator<CreateSuggestedNameDto> suggestedNameValidator)
     {
         _suggestedNameService = suggestedNameService;
         _suggestedNameValidator = suggestedNameValidator;

diff --git a/Application/Mappers/NameEntryMapper.cs b/Application/Mappers/NameEntryMapper.cs
@@ -29,7 +29,7 @@ public static NameEntry MapToEntity(this NameDto request)
         {
             return new NameEntry
             {
-                Name = request.Name,
+                Name = request.Name.Trim(),
                 Pronunciation = request.Pronunciation?.Trim(),
                 Meaning = request.Meaning.Trim(),
                 ExtendedMeaning = request.ExtendedMeaning?.Trim(),

diff --git a/Application/Mappers/SuggestedNameMapper.cs b/Application/Mappers/SuggestedNameMapper.cs
@@ -16,9 +16,9 @@ public static SuggestedName MapToEntity(this CreateSuggestedNameDto request)
         return new SuggestedName
         {
             Id = ObjectId.GenerateNewId().ToString(),
-            Name = request.Name,
-            Email = request.Email,
-            Details = request.Details,
+            Name = request.Name.Trim(),
+            Email = request.Email?.Trim(),
+            Details = request.Details?.Trim(),
             GeoLocation = request.GeoLocation.Select(x => new GeoLocation
             {
                 Place = x.Place,

diff --git a/Application/Validation/NameValidator.cs b/Application/Validation/NameValidator.cs
@@ -1,13 +1,9 @@
-using Core.Dto;
-using Core.Dto.Request;
+using Core.Dto.Request;
 using FluentValidation;
 namespace Application.Validation
 {
     public class NameValidator : AbstractValidator<NameDto>
     {
-
-
-
         public NameValidator(GeoLocationValidator geoLocationValidator, EmbeddedVideoValidator embeddedVideoValidator, EtymologyValidator etymologyValidator)
         {
             RuleLevelCascadeMode = CascadeMode.Stop;

diff --git a/Core/Dto/CharacterSeparatedString.cs b/Core/Dto/CharacterSeparatedString.cs
@@ -8,7 +8,7 @@ public abstract class CharacterSeparatedString<T> where T : CharacterSeparatedSt
 
         public CharacterSeparatedString(string? value)
         {
-            this.value = value ?? string.Empty;
+            this.value = value?.Trim() ?? string.Empty;
         }
 
         public override string ToString()