Merge branch 'Dev'

ConnectingPets · Jan 19, 2024 · 1a42559 · 1a42559
2 parents 15b4cd9 + 588ad11
commit 1a42559
Show file tree

Hide file tree

Showing 88 changed files with 5,105 additions and 235 deletions.
diff --git a/.gitignore b/.gitignore
@@ -441,4 +441,5 @@ $RECYCLE.BIN/
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
-!.vscode/extensions.json
+!.vscode/extensions.json
+/*.lutconfig
diff --git a/API/Controllers/MarketplaceController.cs b/API/Controllers/MarketplaceController.cs
@@ -8,17 +8,17 @@
     using Application.DTOs.Marketplace;
 
     using static Application.Marketplace.GetAnimal;
-    using static Application.Marketplace.MyAnimalForSale;
-    using static Application.Marketplace.AllAnimalsForSale;
+    using static Application.Marketplace.MyAnimalsForSale;
     using static Application.Marketplace.MyAnimalsForAdoption;
     using static Application.Marketplace.AddAnimalMarketplace;
     using static Application.Marketplace.EditAnimalMarketplace;
     using static Application.Marketplace.AllAnimalsForAdoption;
     using static Application.Marketplace.DeleteAnimalMarketplace;
     using static Application.Marketplace.ShowAnimalMarketplaceToEdit;
+    using static Application.Marketplace.AllAnimalsForSale;
     using static Common.GeneralApplicationConstants;
 
-   // [Authorize(Roles = MarketplaceRoleName)]
+    // [Authorize(Roles = MarketplaceRoleName)]
     [ApiController]
     [Route("api/[controller]")]
     public class MarketplaceController : ControllerBase
@@ -129,8 +129,8 @@ public async Task<IActionResult> GetMyAnimalsForAdoption()
         [HttpGet("MyAnimalsForSale")]
         public async Task<IActionResult> GetMyAnimalsForSale()
         {
-            MyAnimalForSaleQuery query =
-                new MyAnimalForSaleQuery()
+            MyAnimalsForSaleQuery query =
+                new MyAnimalsForSaleQuery()
                 {
                     UserId = this.User.GetById()
                 };

diff --git a/API/Controllers/PhotoController.cs b/API/Controllers/PhotoController.cs
@@ -6,6 +6,7 @@
     using Microsoft.AspNetCore.Authorization;
 
     using Infrastructure;
+
     using static Application.Photo.AddUserPhoto;
     using static Application.Photo.AddAnimalPhoto;
     using static Application.Photo.DeleteAnimalPhoto;    
@@ -42,7 +43,7 @@ public async Task<IActionResult> DeleteAnimalPhoto([FromRoute]string photoId)
         {
             DeleteAnimalPhotoCommand command = new DeleteAnimalPhotoCommand()
             {
-                PublicId = photoId
+                PhotoId = photoId
             };
 
             var result = await mediator.Send(command);

diff --git a/API/Controllers/UserController.cs b/API/Controllers/UserController.cs
@@ -56,5 +56,15 @@ public async Task<IActionResult> Logout()
 
             return Ok(result);
         }
+
+        [Authorize]
+        [Route("AllTowns")]
+        [HttpGet]
+        public async Task<IActionResult> GetAllTowns()
+        {
+            var result = await this.userService.GetAllTownsAsync();
+
+            return Ok(result);
+        }
     }
 }
diff --git a/Application/Animal/AddAnimal.cs b/Application/Animal/AddAnimal.cs
@@ -15,7 +15,7 @@
 
     public class AddAnimal
     {
-        public class AddAnimalCommand : IRequest<Result<Unit>>
+        public class AddAnimalCommand : IRequest<Result<Unit>> 
         {
             public AddAnimalDto AnimalDto { get; set; } = null!;
 

diff --git a/Application/Animal/AllAnimal.cs b/Application/Animal/AllAnimal.cs
@@ -7,54 +7,54 @@
     using Microsoft.EntityFrameworkCore;
 
     using Domain;
+    using Domain.Enum;
     using Response;
-    using Persistence;
     using Application.DTOs.Animal;
     using Persistence.Repositories;
 
     using static Common.ExceptionMessages.Animal;
 
     public class AllAnimal
     {
-        public class AllAnimalQuery : IRequest<Result<IEnumerable<AllAnimalDto>>>
+        public class AllAnimalQuery : IRequest<Result<IEnumerable<AllAnimalsDto>>>
         {
             public string OwnerId { get; set; } = null!;
         }
 
         public class AllAnimalQueryHandler :
-            IRequestHandler<AllAnimalQuery, Result<IEnumerable<AllAnimalDto>>>
+            IRequestHandler<AllAnimalQuery, Result<IEnumerable<AllAnimalsDto>>>
         {
             private readonly IRepository repository;
-            private readonly DataContext dataContext;
 
-            public AllAnimalQueryHandler(IRepository repository, DataContext dataContext)
+            public AllAnimalQueryHandler(IRepository repository)
             {
                 this.repository = repository;
-                this.dataContext = dataContext;
             }
 
-            public async Task<Result<IEnumerable<AllAnimalDto>>> Handle(AllAnimalQuery request, CancellationToken cancellationToken)
+            public async Task<Result<IEnumerable<AllAnimalsDto>>> Handle(AllAnimalQuery request, CancellationToken cancellationToken)
             {
                 string userId = request.OwnerId;
                 User? user = await repository.
                     All<User>(u => u.Id.ToString() == userId).
-                    Include(u => u.Animals).FirstOrDefaultAsync();
+                    Include(u => u.Animals).
+                    ThenInclude(a => a.Photos).
+                    FirstOrDefaultAsync();
 
-                if (!(user!.Animals.Any()))
-                {
-                    return Result<IEnumerable<AllAnimalDto>>.Failure(NoPets);
-                }
-
-                var userAnimals = await repository.
-                    AllReadonly<Animal>(a => a.OwnerId.ToString() == userId).
-                    Select(a => new AllAnimalDto()
+                var userAnimals = user!.Animals.
+                    Where(a => a.AnimalStatus == AnimalStatus.ForSwiping).
+                    Select(a => new AllAnimalsDto()
                     {
                         Id = a.AnimalId.ToString(),
                         Name = a.Name,
                         MainPhoto = a.Photos.First(p => p.IsMain).Url
-                    }).ToListAsync();
+                    }).ToList();
+
+                if (!userAnimals.Any())
+                {
+                    return Result<IEnumerable<AllAnimalsDto>>.Failure(NoPets);
+                }
 
-                return Result<IEnumerable<AllAnimalDto>>.Success(userAnimals);
+                return Result<IEnumerable<AllAnimalsDto>>.Success(userAnimals);
             }
         }
     }

diff --git a/Application/Animal/DeleteAnimal.cs b/Application/Animal/DeleteAnimal.cs
@@ -72,7 +72,7 @@ await repository.
 
                 foreach (AnimalMatch match in animalMatch)
                 {
-                    AnimalMatch[] animalMatches = await repository.All<AnimalMatch>(am => am.MatchId == match.MatchId).ToArrayAsync();
+                    AnimalMatch[] animalMatches = repository.All<AnimalMatch>(am => am.MatchId == match.MatchId).ToArray();
 
                     Guid[] matchesIds = animalMatches.
                         Select(am => am.MatchId)
@@ -95,7 +95,7 @@ await repository.
                 try
                 {
                     await repository.SaveChangesAsync();
-                    return Result<Unit>.Success(Unit.Value,String.Format(SuccessfullyDeleteAnimal,animal.Name));
+                    return Result<Unit>.Success(Unit.Value, String.Format(SuccessfullyDeleteAnimal, animal.Name));
                 }
                 catch (Exception)
                 {

diff --git a/Application/Animal/ShowAnimalToEdit.cs b/Application/Animal/ShowAnimalToEdit.cs
@@ -36,7 +36,7 @@ public ShowAnimalToEditQueryHandler(IRepository repository)
             public async Task<Result<ShowAnimalToEditDto>> Handle(ShowAnimalToEditQuery request, CancellationToken cancellationToken)
             {
                 Animal? animal =
-                    await repository.
+                      await repository.
                     All<Animal>(a => a.AnimalId.ToString()
                     == request.AnimalId).
                     Include(a => a.Photos).

diff --git a/Application/Breed/AllBreeds.cs b/Application/Breed/AllBreeds.cs
@@ -33,20 +33,22 @@ public async Task<Result<IEnumerable<BreedDto>>> Handle(AllBreedsQuery request,
             {
                 int categoryId = request.CategoryId;
 
-                AnimalCategory? category = await repository.GetById<AnimalCategory>(categoryId);
+                AnimalCategory? category = await repository.
+                    All<AnimalCategory>(c => c.AnimalCategoryId == categoryId).Include(c => c.Breeds).
+                    FirstOrDefaultAsync();
 
                 if (category == null)
                 {
-                    return Result<IEnumerable<BreedDto>>.Failure(CategoryNotExist);
+                    return Result<IEnumerable<BreedDto>>.
+                        Failure(CategoryNotExist);
                 }
 
-                BreedDto[] breeds = await repository.
-                   All<Breed>().Where(b => b.CategoryId == categoryId).
+                BreedDto[] breeds = category.Breeds.
                    Select(b => new BreedDto()
                    {
                        BreedId = b.BreedId,
                        Name = b.Name,
-                   }).ToArrayAsync();
+                   }).ToArray();
 
                 return Result<IEnumerable<BreedDto>>.Success(breeds);
             }

diff --git a/Application/DTOs/Animal/AllAnimalDto.cs → Application/DTOs/Animal/AllAnimalsDto.cs b/Application/DTOs/Animal/AllAnimalDto.cs → Application/DTOs/Animal/AllAnimalsDto.cs
@@ -1,6 +1,6 @@
 namespace Application.DTOs.Animal
 {
-    public class AllAnimalDto
+    public class AllAnimalsDto
     {
         public required string Id { get; set; }
 

diff --git a/Application/DTOs/Marketplace/AddAnimalMarketplaceDto.cs b/Application/DTOs/Marketplace/AddAnimalMarketplaceDto.cs
@@ -1,7 +1,7 @@
-using Application.DTOs.Animal;
-
-namespace Application.DTOs.Marketplace
+namespace Application.DTOs.Marketplace
 {
+    using Animal;
+
     public class AddAnimalMarketplaceDto : AddAnimalDto
     {
         public bool IsForSale { get; set; }

diff --git a/Application/DTOs/Marketplace/AllAnimalForSaleDto.cs b/Application/DTOs/Marketplace/AllAnimalForSaleDto.cs
@@ -2,7 +2,7 @@
 {
     using Animal;
 
-    public class AllAnimalForSaleDto : AllAnimalDto
+    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/DTOs/User/UserDto.cs b/Application/DTOs/User/UserDto.cs
@@ -23,5 +23,7 @@ public class UserDto
         public string? Gender { get; set; }
 
         public string? JobTitle { get; set; }
+
+        public string[] Roles { get; set; } = null!;
     }
 }
diff --git a/Application/DTOs/User/UserProfileDto.cs b/Application/DTOs/User/UserProfileDto.cs
@@ -20,6 +20,10 @@ public class UserProfileDto
 
         public string? Photo { get; set; } = null!;
 
+        public string? Description { get; set; }
+
+        public string Token { get; set; } = null!;
+
         public IEnumerable<string> Roles { get; set; } = null!;
     }
 }
diff --git a/Application/Marketplace/AddAnimalMarketplace.cs b/Application/Marketplace/AddAnimalMarketplace.cs
@@ -12,6 +12,7 @@
     using Service.Interfaces;
     using Persistence.Repositories;
     using Application.DTOs.Marketplace;
+
     using static Common.ExceptionMessages.Animal;
     using static Common.SuccessMessages.Animal;
 
@@ -93,7 +94,8 @@ public async Task<Result<Unit>> Handle(AddAnimalMarketplaceCommand request, Canc
                 }
                 catch (Exception)
                 {
-                    return Result<Unit>.Failure(FailedToCreate);
+                    return Result<Unit>.
+                        Failure(string.Format(FailedToCreate,animal.Name));
                 }
             }
         }

diff --git a/Application/Marketplace/AllAnimalsForAdoption.cs b/Application/Marketplace/AllAnimalsForAdoption.cs
@@ -8,19 +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<AllAnimalDto>>>
+        public class AllAnimalsForAdoptionQuery : IRequest<Result<IEnumerable<AllAnimalsMarketplaceDto>>>
         {
             public string UserId { get; set; } = null!;
         }
 
-        public class AllAnimalsForAdoptionQueryHandler : IRequestHandler<AllAnimalsForAdoptionQuery, Result<IEnumerable<AllAnimalDto>>>
+        public class AllAnimalsForAdoptionQueryHandler : IRequestHandler<AllAnimalsForAdoptionQuery, Result<IEnumerable<AllAnimalsMarketplaceDto>>>
         {
             private readonly IRepository repository;
 
@@ -29,25 +30,29 @@ public AllAnimalsForAdoptionQueryHandler(IRepository repository)
                 this.repository = repository;
             }
 
-            public async Task<Result<IEnumerable<AllAnimalDto>>> 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 AllAnimalDto()
+                var allAnimals = await repository.
+                    AllReadonly<Animal>(a => a.OwnerId.ToString() != userId && a.AnimalStatus == AnimalStatus.ForAdoption).
+                    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<AllAnimalDto>>.Failure(NoAnimalsForAdoption);
+                    return Result<IEnumerable<AllAnimalsMarketplaceDto>>.Failure(NoAnimalsForAdoption);
                 }
 
-                return Result<IEnumerable<AllAnimalDto>>.Success(allAnimals);
+                return Result<IEnumerable<AllAnimalsMarketplaceDto>>.Success(allAnimals);
             }
         }
     }