fix: change predicate to use Dto instead entity (#45)

* fix: change predicate to use Dto instead entity

* improvement: extracct implementation to method

* fix: correções de comentarios

Author: encinecarlos

.vscode/launch.json

@@ -14,6 +14,9 @@
       "args": [],
       "cwd": "${workspaceFolder}/src/DEPLOY.Cachorro.Api",
       "stopAtEntry": false,
+      "launchBrowser": {
+        "enabled": true
+      },
       // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
       "serverReadyAction": {
         "action": "openExternally",

src/DEPLOY.Cachorro.Api/Controllers/v1/CachorrosController.cs

@@ -49,7 +49,7 @@ public async Task<IActionResult> ListAllCachorrosAdotadosAsync(
             CancellationToken cancellationToken = default)
         {
             var items = await _cachorroAppService.GetByKeyAsync(
-                c => c.Tutor != null,
+                c => c.Adotado,
                 cancellationToken);
 
             return items?.Count() > 0 ? Ok(items) : NoContent();
@@ -67,7 +67,7 @@ public async Task<IActionResult> ListAllCachorrosParaAdocaoAsync(
             CancellationToken cancellationToken = default)
         {
             var items = await _cachorroAppService.GetByKeyAsync(
-                c => c.Tutor == null,
+                c => !c.Adotado,
                 cancellationToken);
 
             return items?.Count > 0 ? Ok(items) : NoContent();

src/DEPLOY.Cachorro.Application/AppServices/CachorroAppServices.cs

@@ -1,5 +1,6 @@
 using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
+using DEPLOY.Cachorro.Application.Shared;
 using DEPLOY.Cachorro.Domain.Aggregates.Cachorro.Interfaces.Services;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
@@ -44,10 +45,12 @@ public async Task<bool> DeleteAsync(
 
 
         public async Task<List<CachorroDto>> GetByKeyAsync(
-            Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>> predicate,
+            Expression<Func<CachorroDto, bool>> predicate,
             CancellationToken cancellationToken = default)
-        { 
-            var item = await _cachorroService.GetByKeyAsync(predicate, cancellationToken);
+        {
+            Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>> domainPredicate = ConvertExpression(predicate);
+
+            var item = await _cachorroService.GetByKeyAsync(domainPredicate, cancellationToken);
 
             return item.Select(x => (CachorroDto)x!).ToList();
         }
@@ -71,5 +74,18 @@ public async Task<IEnumerable<string>> UpdateAsync(
                 cachorroDto, 
                 cancellationToken);
         }
+
+        private static Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>> ConvertExpression(Expression<Func<CachorroDto, bool>> predicate)
+        {
+            ParameterExpression parameter = Expression.Parameter(typeof(Domain.Aggregates.Cachorro.Entities.Cachorro), "cachorro");
+
+            ExpressionConverter body = new(parameter);
+
+            Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>> domainPredicate = Expression.Lambda<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>>(
+                body.Visit(predicate.Body),
+                parameter
+            );
+            return domainPredicate;
+        }
     }
 }

src/DEPLOY.Cachorro.Application/Interfaces/Services/ICachorroAppServices.cs

@@ -26,7 +26,7 @@ public Task<bool> DeleteAsync(
             CancellationToken cancellationToken = default);
 
         Task<List<CachorroDto>> GetByKeyAsync(
-            Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>> predicate,
+            Expression<Func<CachorroDto, bool>> predicate,
             CancellationToken cancellationToken = default);
 
     }

src/DEPLOY.Cachorro.Application/Shared/ExpressionConverter.cs

@@ -0,0 +1,47 @@
+using System.Linq.Expressions;
+using DEPLOY.Cachorro.Application.Dtos;
+
+namespace DEPLOY.Cachorro.Application.Shared
+{
+    public class ExpressionConverter : ExpressionVisitor
+    {
+        private readonly ParameterExpression _parameter;
+
+        public ExpressionConverter(ParameterExpression parameter)
+        {
+            _parameter = parameter;
+        }
+
+        protected override Expression VisitParameter(ParameterExpression node)
+        {
+            return _parameter;
+        }
+
+        protected override Expression VisitMember(MemberExpression node)
+        {
+            if(node.Member.DeclaringType == typeof(CachorroDto))
+            {
+                return Expression.Property(Visit(node.Expression), node.Member.Name);
+            }
+
+            return base.VisitMember(node);
+        }
+
+        protected override Expression VisitBinary(BinaryExpression node)
+        {
+            if(node.NodeType == ExpressionType.Equal || node.NodeType == ExpressionType.NotEqual) 
+            {
+                if(node.Left.NodeType == ExpressionType.Constant && ((ConstantExpression)node.Left).Value == null)
+                {
+                    return Expression.MakeBinary(node.NodeType, Visit(node.Right), node.Left);
+                } 
+                else if (node.Right.NodeType == ExpressionType.Constant && ((ConstantExpression)node.Right).Value == null)
+                {
+                    return Expression.MakeBinary(node.NodeType, Visit(node.Left), node.Right);
+                }
+            }
+
+            return base.VisitBinary(node);
+        }
+    }
+}

src/Tests/DEPLOY.Cachorro.Api.Tests/CachorrosControllerTests.cs

@@ -332,7 +332,7 @@ public async Task GivenListAllCachorrosAdotadosAsync_WhenExistsCachorrosAdotados
             var cachorrosAdotados = _cachorroDtoFixture.CreateManyCachorroDtoWithTutorDto(40);
 
             _cachorroAppServiceMock.Setup(repo => repo.GetByKeyAsync(
-                It.IsAny<Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>>>(),
+                It.IsAny<Expression<Func<CachorroDto, bool>>>(),
                 It.IsAny<CancellationToken>()))
                 .ReturnsAsync(cachorrosAdotados);
 
@@ -357,7 +357,7 @@ public async Task GivenListAllCachorrosAdotadosAsync_WhenDontExistsCachorrosAdot
         {
             // Arrange
             _cachorroAppServiceMock.Setup(repo => repo.GetByKeyAsync(
-                It.IsAny<Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>>>(),
+                It.IsAny<Expression<Func<CachorroDto, bool>>>(),
                 It.IsAny<CancellationToken>()))
                 .ReturnsAsync(new List<CachorroDto>());
 
@@ -382,7 +382,7 @@ public async Task GivenListAllCachorrosParaAdocaoAsync_WhenCachorrosExistis_Than
             var cachorrosParaAdocao = _cachorroDtoFixture.CreateManyCachorroDtoWithoutTutorDto(40);
 
             _cachorroAppServiceMock.Setup(repo => repo.GetByKeyAsync(
-                It.IsAny<Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>>>(),
+                It.IsAny<Expression<Func<CachorroDto, bool>>>(),
                 It.IsAny<CancellationToken>()))
                 .ReturnsAsync(cachorrosParaAdocao);
 
@@ -404,7 +404,7 @@ public async Task GivenListAllCachorrosParaAdocaoAsync_WhenCachorrosDontExistis_
         {
             // Arrange
             _cachorroAppServiceMock.Setup(repo => repo.GetByKeyAsync(
-                It.IsAny<Expression<Func<Domain.Aggregates.Cachorro.Entities.Cachorro, bool>>>(),
+                It.IsAny<Expression<Func<CachorroDto, bool>>>(),
                 It.IsAny<CancellationToken>()))
                 .ReturnsAsync(new List<CachorroDto>());