Merge pull request #5 from kova1ev/dev

Dev
kova1ev · May 19, 2023 · b0a98da · b0a98da
2 parents 66df29d + 6115f42
commit b0a98da
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 11 deletions.
diff --git a/src/UrlShortener.Api/Controllers/LinkController.cs b/src/UrlShortener.Api/Controllers/LinkController.cs
@@ -42,8 +42,8 @@ public async Task<ActionResult> GetById([FromRoute] Guid id)
         public async Task<ActionResult> GetLinks()
         {
             // TODO:  PAGINATIONS!
-            var links = await Mediator.Send(new GetLinksQuery());
-            return Ok(links);
+            Result<IEnumerable<LinkDetailsResponse>> result = await Mediator.Send(new GetLinksQuery());
+            return Ok(result.Value);
         }
 
         //  COMMANDS

diff --git a/src/UrlShortener.Application.Common/Constants/LinkValidationErrorMessage.cs b/src/UrlShortener.Application.Common/Constants/LinkValidationErrorMessage.cs
@@ -3,6 +3,7 @@
 public static class LinkValidationErrorMessage
 {
     public const string ALIAS_TAKEN = "Alias is taken.";
+    public const string ALIAS_HAVE_WHITESPACE = "Alias must not contain spaces.";
     public const string LINK_NOT_EXISTING = "Link is not existing.";
     public const string URL_ADDRESS_REQUIRED = "UrlAddress is required.";
     public const string URL_ADDRESS_IS_NOT_URL = "UrlAddress is not url.";

diff --git a/src/UrlShortener.Application/Interfaces/ILinkService.cs b/src/UrlShortener.Application/Interfaces/ILinkService.cs
@@ -5,4 +5,6 @@ public interface ILinkService
     Task<bool> AliasIsBusy(string alias);
     Task<string> GenerateAlias();
     string CreateShortUrl(string alias);
+
+    string RemoveWhiteSpacesFromAlisa(string alias);
 }
diff --git a/src/UrlShortener.Application/Links/Commands/CreateLink/CreateLinkCommandValidator.cs b/src/UrlShortener.Application/Links/Commands/CreateLink/CreateLinkCommandValidator.cs
@@ -19,5 +19,10 @@ public CreateLinkCommandValidator()
             .Length(3, 30)
             .When(c => c.Alias != null)
             .WithMessage(LinkValidationErrorMessage.ALIAS_BAD_RANGE);
+
+        RuleFor(c => c.Alias)
+            .Matches(@"^\S*$")
+            .When(c => c.Alias != null)
+            .WithMessage(LinkValidationErrorMessage.ALIAS_HAVE_WHITESPACE);
     }
 }
diff --git a/src/UrlShortener.Application/Links/Commands/UpdateLink/UpdateLinkCommandValidator.cs b/src/UrlShortener.Application/Links/Commands/UpdateLink/UpdateLinkCommandValidator.cs
@@ -19,5 +19,10 @@ public UpdateLinkCommandValidator()
             .Length(3, 30)
             .When(c => c.Alias != null)
             .WithMessage(LinkValidationErrorMessage.ALIAS_BAD_RANGE);
+
+        RuleFor(c => c.Alias)
+            .Matches(@"^\S*$")
+            .When(c => c.Alias != null)
+            .WithMessage(LinkValidationErrorMessage.ALIAS_HAVE_WHITESPACE);
     }
 }
diff --git a/src/UrlShortener.Application/Links/Queries/GetLinks/GetLinksQuery.cs b/src/UrlShortener.Application/Links/Queries/GetLinks/GetLinksQuery.cs
@@ -1,7 +1,8 @@
 using MediatR;
 using UrlShortener.Application.Common.Models.Links;
+using UrlShortener.Application.Common.Result;
 
 namespace UrlShortener.Application.Links.Queries.GetLinks;
-public class GetLinksQuery : IRequest<IEnumerable<LinkDetailsResponse>>
+public class GetLinksQuery : IRequest<Result<IEnumerable<LinkDetailsResponse>>>
 {
 }
diff --git a/src/UrlShortener.Application/Links/Queries/GetLinks/GetLinksQueryHandler.cs b/src/UrlShortener.Application/Links/Queries/GetLinks/GetLinksQueryHandler.cs
@@ -1,12 +1,13 @@
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using UrlShortener.Application.Common.Models.Links;
+using UrlShortener.Application.Common.Result;
 using UrlShortener.Application.Interfaces;
 
 
 namespace UrlShortener.Application.Links.Queries.GetLinks;
 
-public class GetLinksQueryHandler : IRequestHandler<GetLinksQuery, IEnumerable<LinkDetailsResponse>>
+public class GetLinksQueryHandler : IRequestHandler<GetLinksQuery, Result<IEnumerable<LinkDetailsResponse>>>
 {
     private readonly IAppDbContext _appDbContext;
 
@@ -15,14 +16,15 @@ public GetLinksQueryHandler(IAppDbContext appDbContext)
         _appDbContext = appDbContext ?? throw new ArgumentNullException(nameof(appDbContext));
     }
 
-    public async Task<IEnumerable<LinkDetailsResponse>> Handle(GetLinksQuery request, CancellationToken cancellationToken)
+    public async Task<Result<IEnumerable<LinkDetailsResponse>>> Handle(GetLinksQuery request, CancellationToken cancellationToken)
     {
         IEnumerable<LinkDetailsResponse> links = await _appDbContext.Links
              .Include(l => l.LinkStatistic)
                 .ThenInclude(st => st.Geolocation)
              .AsNoTracking()
-             .Select(link => LinkDetailsResponse.MapToLInkDto(link))
+             .Select(link => LinkDetailsResponse.MapToLInkDto(link)!)
              .ToArrayAsync();
-        return links;
+
+        return Result<IEnumerable<LinkDetailsResponse>>.Success(links);
     }
 }
diff --git a/src/UrlShortener.Application/Services/LinkService.cs b/src/UrlShortener.Application/Services/LinkService.cs
@@ -43,4 +43,9 @@ public string CreateShortUrl(string alias)
             throw new ArgumentNullException(nameof(_appOptions.AppUrl));
         return string.Concat(_appOptions.AppUrl, RedirectRoute, alias);
     }
+
+    public string RemoveWhiteSpacesFromAlisa(string alias)
+    {
+        return alias.Replace(" ", "");
+    }
 }
diff --git a/tests/Application.UnitTests/Links/Queries/GetLinksTests.cs b/tests/Application.UnitTests/Links/Queries/GetLinksTests.cs
@@ -1,5 +1,6 @@
 using Application.UnitTests.Utility;
 using UrlShortener.Application.Common.Models.Links;
+using UrlShortener.Application.Common.Result;
 using UrlShortener.Application.Links.Queries.GetLinks;
 using UrlShortener.Data;
 
@@ -17,11 +18,11 @@ public async Task Get_all_links()
 
         //act
         GetLinksQuery request = new();
-        IEnumerable<LinkDetailsResponse> result = await handler.Handle(request, CancellationToken.None);
+        Result<IEnumerable<LinkDetailsResponse>> result = await handler.Handle(request, CancellationToken.None);
 
         //assert
-        Assert.NotNull(result);
-        Assert.NotEmpty(result);
-        Assert.Equal(2, result.Count());
+        Assert.NotNull(result.Value);
+        Assert.NotEmpty(result.Value);
+        Assert.Equal(2, result.Value.Count());
     }
 }
diff --git a/tests/Application.UnitTests/ValidationRequest/CreateLinkCommandValidationTests.cs b/tests/Application.UnitTests/ValidationRequest/CreateLinkCommandValidationTests.cs
@@ -87,4 +87,27 @@ public void Validate_createLinkCommand_with_bad_Alias(string alias)
         Assert.Contains(LinkValidationErrorMessage.ALIAS_BAD_RANGE, errors);
         Assert.True(errors.Length == 1);
     }
+
+    [Theory]
+    [InlineData("fgg  df   gf")]
+    [InlineData("fg gdf")]
+    public void Validate_CreateLInkCommand_ShouldReturnFailureResult_with_WhiteSpaceError(string alias)
+    {
+        //arrange
+        var url = "https://git.com";
+        var request = new CreateLinkCommand(url, alias);
+        var validator = new CreateLinkCommandValidator();
+
+        //act
+        ValidationResult result = validator.Validate(request);
+
+        //assert
+        Assert.False(result.IsValid);
+        Assert.NotEmpty(result.Errors);
+
+        string[] errors = result.Errors.Select(s => s.ErrorMessage).ToArray();
+        Assert.Contains(LinkValidationErrorMessage.ALIAS_HAVE_WHITESPACE, errors);
+        Assert.True(errors.Length == 1);
+
+    }
 }
diff --git a/tests/Application.UnitTests/ValidationRequest/UpdateLinkCommandValidationTests.cs b/tests/Application.UnitTests/ValidationRequest/UpdateLinkCommandValidationTests.cs
@@ -88,4 +88,27 @@ public void Validate_updateLinkCommand_with_bad_Alias(string alias)
         Assert.Contains(LinkValidationErrorMessage.ALIAS_BAD_RANGE, errors);
         Assert.True(errors.Length == 1);
     }
+
+    [Theory]
+    [InlineData("fgg  df   gf")]
+    [InlineData("fg gdf")]
+    public void Validate_UpdateLInkCommand_ShouldReturnFailureResult_with_WhiteSpaceError(string alias)
+    {
+        //arrange
+        var url = "https://git.com";
+        var request = new UpdateLinkCommand(_linkId, url, alias);
+        var validator = new UpdateLinkCommandValidator();
+
+        //act
+        ValidationResult result = validator.Validate(request);
+
+        //assert
+        Assert.False(result.IsValid);
+        Assert.NotEmpty(result.Errors);
+
+        string[] errors = result.Errors.Select(s => s.ErrorMessage).ToArray();
+        Assert.Contains(LinkValidationErrorMessage.ALIAS_HAVE_WHITESPACE, errors);
+        Assert.True(errors.Length == 1);
+
+    }
 }