Add category, breed, gender and city in all animals marketplace

ConnectingPets · Jan 18, 2024 · e99de62 · e99de62
1 parent de90df3
commit e99de62
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 12 deletions.
diff --git a/Application/Animal/AllAnimal.cs b/Application/Animal/AllAnimal.cs
@@ -7,12 +7,12 @@
     using Microsoft.EntityFrameworkCore;
 
     using Domain;
+    using Domain.Enum;
     using Response;
     using Application.DTOs.Animal;
     using Persistence.Repositories;
 
     using static Common.ExceptionMessages.Animal;
-    using Domain.Enum;
 
     public class AllAnimal
     {

diff --git a/Application/DTOs/Marketplace/AllAnimalForSaleDto.cs b/Application/DTOs/Marketplace/AllAnimalForSaleDto.cs
@@ -2,7 +2,7 @@
 {
     using Animal;
 
-    public class AllAnimalsForSaleDto : AllAnimalsDto
+    public class AllAnimalsForSaleDto : AllAnimalsMarketplaceDto
     {
         public decimal? Price { get; set; }
     }

diff --git a/Application/DTOs/Marketplace/AllAnimalMarketplaceDto.cs b/Application/DTOs/Marketplace/AllAnimalMarketplaceDto.cs
@@ -0,0 +1,15 @@
+namespace Application.DTOs.Marketplace
+{
+    using Application.DTOs.Animal;
+
+    public class AllAnimalsMarketplaceDto : AllAnimalsDto
+    {
+        public string Category { get; set; } = null!;
+
+        public string Breed { get; set; } = null!;
+
+        public string Gender { get; set; } = null!;
+
+        public string City { get; set; } = null!;
+    }
+}
diff --git a/Application/Marketplace/AllAnimalsForAdoption.cs b/Application/Marketplace/AllAnimalsForAdoption.cs
@@ -8,20 +8,20 @@
 
     using Domain;
     using Response;
-    using DTOs.Animal;
     using Domain.Enum;
     using Persistence.Repositories;
+    using Application.DTOs.Marketplace;
 
     using static Common.ExceptionMessages.Marketplace;
 
     public class AllAnimalsForAdoption
     {
-        public class AllAnimalsForAdoptionQuery : IRequest<Result<IEnumerable<AllAnimalsDto>>>
+        public class AllAnimalsForAdoptionQuery : IRequest<Result<IEnumerable<AllAnimalsMarketplaceDto>>>
         {
             public string UserId { get; set; } = null!;
         }
 
-        public class AllAnimalsForAdoptionQueryHandler : IRequestHandler<AllAnimalsForAdoptionQuery, Result<IEnumerable<AllAnimalsDto>>>
+        public class AllAnimalsForAdoptionQueryHandler : IRequestHandler<AllAnimalsForAdoptionQuery, Result<IEnumerable<AllAnimalsMarketplaceDto>>>
         {
             private readonly IRepository repository;
 
@@ -30,25 +30,29 @@ public AllAnimalsForAdoptionQueryHandler(IRepository repository)
                 this.repository = repository;
             }
 
-            public async Task<Result<IEnumerable<AllAnimalsDto>>> Handle(AllAnimalsForAdoptionQuery request, CancellationToken cancellationToken)
+            public async Task<Result<IEnumerable<AllAnimalsMarketplaceDto>>> Handle(AllAnimalsForAdoptionQuery request, CancellationToken cancellationToken)
             {
                 string userId = request.UserId;
 
                 var allAnimals = await repository.
                     AllReadonly<Animal>(a => a.OwnerId.ToString() != userId && a.AnimalStatus == AnimalStatus.ForAdoption).
-                    Select(a => new AllAnimalsDto()
+                    Select(a => new AllAnimalsMarketplaceDto()
                     {
                         Id = a.AnimalId.ToString(),
                         MainPhoto = a.Photos.First(a => a.IsMain).Url,
                         Name = a.Name,
+                        Breed = a.Breed.Name,
+                        Category = a.Breed.Category.Name,
+                        City = a.Owner.City!,
+                        Gender = a.Gender.ToString(),
                     }).ToArrayAsync();
 
                 if (!allAnimals.Any())
                 {
-                    return Result<IEnumerable<AllAnimalsDto>>.Failure(NoAnimalsForAdoption);
+                    return Result<IEnumerable<AllAnimalsMarketplaceDto>>.Failure(NoAnimalsForAdoption);
                 }
 
-                return Result<IEnumerable<AllAnimalsDto>>.Success(allAnimals);
+                return Result<IEnumerable<AllAnimalsMarketplaceDto>>.Success(allAnimals);
             }
         }
     }

diff --git a/Application/Marketplace/AllAnimalsForSale.cs b/Application/Marketplace/AllAnimalsForSale.cs
@@ -42,7 +42,11 @@ public async Task<Result<IEnumerable<AllAnimalsForSaleDto>>> Handle(AllAnimalsFo
                         Id = a.AnimalId.ToString(),
                         Name = a.Name,
                         MainPhoto = a.Photos.First(p => p.IsMain).Url,
-                        Price = a.Price
+                        Price = a.Price,
+                        Breed = a.Breed.Name,
+                        Category = a.Breed.Category.Name,
+                        City = a.Owner.City!,
+                        Gender = a.Gender.ToString(),
                     }).ToArrayAsync();
 
                 if (!allAnimals.Any())

diff --git a/Application/User/GetAllTowns.cs b/Application/User/GetAllTowns.cs
@@ -29,6 +29,7 @@ public GetAllTownsQueryHandler(IRepository repository)
             public async Task<Result<IEnumerable<string>>> Handle(GetAllTownsQuery request, CancellationToken cancellationToken)
             {
                 var towns = await repository.AllReadonly<User>().
+                    Where(u => u.City != null).
                     Select(u => u.City).Distinct().ToArrayAsync();
 
                 return Result<IEnumerable<string>>.Success(towns);

diff --git a/Tests/Marketplace/AllAnimalsForAdoptionTests.cs b/Tests/Marketplace/AllAnimalsForAdoptionTests.cs
@@ -47,7 +47,20 @@ public async Task Handle_ShowAllAnimalForAdoption_ReturnsSuccessResult()
                            Url = "URL"
                       }
                 },
+                Breed = new Breed()
+                {
+                    CategoryId = 2,
+                    Name = "BreedTest",
+                    Category = new AnimalCategory()
+                    {
+                        Name = "AnimalCategoryTest"
+                    }
+                },
                 OwnerId = Guid.NewGuid(),
+                Owner = new User()
+                {
+                    Name = "OwnerTest"
+                }
             };
             var animalTwo = new Animal()
             {
@@ -68,7 +81,20 @@ public async Task Handle_ShowAllAnimalForAdoption_ReturnsSuccessResult()
                            Url = "URL"
                       }
                 },
+                Breed = new Breed()
+                {
+                    CategoryId = 2,
+                    Name = "BreedTest",
+                    Category = new AnimalCategory()
+                    {
+                        Name = "AnimalCategoryTest"
+                    }
+                },
                 OwnerId = Guid.NewGuid(),
+                Owner = new User()
+                {
+                    Name = "TestOwner"
+                }
             };
 
             var queryable =
@@ -87,8 +113,8 @@ public async Task Handle_ShowAllAnimalForAdoption_ReturnsSuccessResult()
         public async Task Handle_ShowAllAnimalForAdoption_WhenNoAnimalsFound_ReturnsFailureResult()
         {
             var queryable =
-               new List<Animal> {}.AsQueryable();
-           SetUpReturningAnimals(queryable, repositoryMock);
+               new List<Animal> { }.AsQueryable();
+            SetUpReturningAnimals(queryable, repositoryMock);
 
             var result = await handler.Handle(new AllAnimalsForAdoptionQuery(), CancellationToken.None);
 

diff --git a/Tests/Marketplace/AllAnimalsForSaleTests.cs b/Tests/Marketplace/AllAnimalsForSaleTests.cs
@@ -47,7 +47,20 @@ public async Task Handle_ShowAllAnimalForSale_ReturnsSuccessResult()
                            Url = "URL"
                       }
                 },
+                Breed = new Breed()
+                {
+                    CategoryId = 2,
+                    Name = "BreedTest",
+                    Category = new AnimalCategory()
+                    {
+                        Name = "AnimalCategoryTest"
+                    }
+                },
                 OwnerId = Guid.NewGuid(),
+                Owner = new User() 
+                {
+                    Name = "TestOwner"
+                }
             };
             var animalTwo = new Animal()
             {
@@ -68,7 +81,20 @@ public async Task Handle_ShowAllAnimalForSale_ReturnsSuccessResult()
                            Url = "URL"
                       }
                 },
+                Breed = new Breed()
+                {
+                    CategoryId = 2,
+                    Name = "BreedTest",
+                    Category = new AnimalCategory()
+                    {
+                        Name = "AnimalCategoryTest"
+                    }
+                },
                 OwnerId = Guid.NewGuid(),
+                Owner = new User()
+                {
+                    Name = "TestOwner"
+                }
             };
 
             var queryable =