sync main to dev

Dockerfile

@@ -26,6 +26,8 @@ WORKDIR /app
 
 # Copy the published output from the publish stage
 COPY --from=publish /app/publish .
+# Copy the EmailTemplates folder
+COPY src/Hng.Infrastructure/EmailTemplates /app/EmailTemplates
 
 # Command to run the application
 ENTRYPOINT ["dotnet", "Hng.Web.dll"]

docker-compose.prod.yml

@@ -13,6 +13,14 @@ services:
       - postgres
       - redis
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          cpus: '0.17'
+          memory: 170M
+        reservations:
+          cpus: '0.08'
+          memory: 85M
 
   nginx:
     image: nginx:latest
@@ -22,6 +30,7 @@ services:
       - backend
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
+    restart: unless-stopped
 
   postgres:
     image: postgres:latest
@@ -35,6 +44,6 @@ services:
 
   redis:
     image: redis:latest
-
+    restart: unless-stopped
 volumes:
   postgres_data:

docker-compose.staging.yml

@@ -13,6 +13,14 @@ services:
       - postgres
       - redis
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          cpus: '0.17'
+          memory: 170M
+        reservations:
+          cpus: '0.08'
+          memory: 85M
 
   nginx:
     image: nginx:latest

docker-compose.yml

@@ -13,6 +13,14 @@ services:
       - postgres
       - redis
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          cpus: '0.17'
+          memory: 170M
+        reservations:
+          cpus: '0.08'
+          memory: 85M
 
   nginx:
     image: nginx:latest

src/Hng.Application.Test/Features/Blog/GetBlogByIdQueryShould.cs

@@ -4,7 +4,7 @@
 using Hng.Application.Features.Blogs.Dtos;
 using Hng.Application.Features.Blogs.Handlers;
 using Hng.Application.Features.Blogs.Queries;
-using Hng.Application.Features.SuperAdmin.Dto;
+using Hng.Application.Features.UserManagement.Dtos;
 using Hng.Domain.Entities;
 using Hng.Domain.Enums;
 using Hng.Infrastructure.Repository.Interface;

src/Hng.Application.Test/Features/SuperAdmin/GetUsersBySearchQueryHandlerShould.cs

@@ -22,7 +22,7 @@ public GetUsersBySearchQueryHandlerShould()
             var config = new MapperConfiguration(cfg =>
             {
                 // Add your AutoMapper profiles here
-                cfg.CreateMap<User, UserDto>();
+                cfg.CreateMap<User, UserSuperDto>();
             });
 
             _mapper = config.CreateMapper();

src/Hng.Application.Test/Features/UserManagement/LoginUserCommandShould.cs

@@ -1,16 +1,23 @@
 using AutoMapper;
+using Hng.Application.Features.UserManagement.Commands;
 using Hng.Application.Features.UserManagement.Dtos;
+using Hng.Application.Features.UserManagement.Handlers;
 using Hng.Domain.Entities;
 using Hng.Infrastructure.Repository.Interface;
 using Hng.Infrastructure.Services.Interfaces;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
 using Moq;
+using System.Linq.Expressions;
+using Xunit;
 
 namespace Hng.Application.Test.Features.UserManagement
 {
     public class LoginUserCommandShould
     {
         private readonly IMapper _mapper;
         private readonly Mock<IRepository<User>> _userRepositoryMock;
+        private readonly Mock<IRepository<LastLogin>> _lastLoginMock;
         private readonly Mock<IPasswordService> _passwordServiceMock;
         private readonly Mock<ITokenService> _tokenServiceMock;
         private readonly User _user;
@@ -27,6 +34,7 @@ public LoginUserCommandShould()
             _userRepositoryMock = new Mock<IRepository<User>>();
             _passwordServiceMock = new Mock<IPasswordService>();
             _tokenServiceMock = new Mock<ITokenService>();
+            _lastLoginMock = new Mock<IRepository<LastLogin>>();
 
             _user = new User
             {
@@ -35,24 +43,28 @@ public LoginUserCommandShould()
                 FirstName = "John",
                 LastName = "Doe",
                 Password = "hashedpassword",
-                PasswordSalt = "salt"
+                PasswordSalt = "salt",
+
             };
         }
 
         //[Fact]
         //public async Task ReturnLoginResponseDtoForValidCredentials()
         //{
         //    // Arrange
-        //    _userRepositoryMock.Setup(repo => repo.GetBySpec(It.IsAny<Expression<Func<User, bool>>>(), It.IsAny<Expression<Func<User, object>>[]>()))
-        //        .ReturnsAsync(_user);
+        //    _userRepositoryMock.Setup(repo => repo.GetQueryableBySpec(It.IsAny<Expression<Func<User, bool>>>())
+        //    .Include(It.IsAny<Expression<Func<User, ICollection<Hng.Domain.Entities.Organization>>>>())
+        //    .ThenInclude(It.IsAny<Expression<Func<Hng.Domain.Entities.Organization, ICollection<UserRole>>>>())
+        //    .ThenInclude(It.IsAny<Expression<Func<UserRole,Role>>>())
+        //    .Include(It.IsAny<Expression<Func<User,ICollection<Subscription>>>>()).FirstOrDefaultAsync<User>(CancellationToken.None)).ReturnsAsync(_user);
 
         //    _passwordServiceMock.Setup(service => service.IsPasswordEqual("password", _user.PasswordSalt, _user.Password))
         //        .Returns(true);
 
-        //    _tokenServiceMock.Setup(service => service.GenerateJwt(It.IsAny<User>()))
+        //    _tokenServiceMock.Setup(service => service.GenerateJwt(It.IsAny<User>(), 5))
         //        .Returns("token");
 
-        //    var handler = new LoginUserCommandHandler(_userRepositoryMock.Object, _mapper, _passwordServiceMock.Object, _tokenServiceMock.Object);
+        //    var handler = new LoginUserCommandHandler(_userRepositoryMock.Object,_lastLoginMock.Object, _mapper, _passwordServiceMock.Object, _tokenServiceMock.Object,new HttpContextAccessor());
 
         //    var command = new CreateUserLoginCommand(new UserLoginRequestDto
         //    {

src/Hng.Application/Features/SuperAdmin/Dto/UserDto.cs

@@ -2,7 +2,7 @@
 
 namespace Hng.Application.Features.SuperAdmin.Dto
 {
-    public class UserDto
+    public class UserSuperDto
     {
         [JsonPropertyName("id")]
         public Guid Id { get; set; }

src/Hng.Application/Features/SuperAdmin/Handlers/GetUsersBySearchQueryHandler.cs

@@ -8,7 +8,7 @@
 
 namespace Hng.Application.Features.SuperAdmin.Handlers
 {
-    public class GetUsersBySearchQueryHandler : IRequestHandler<GetUsersBySearchQuery, PagedListDto<UserDto>>
+    public class GetUsersBySearchQueryHandler : IRequestHandler<GetUsersBySearchQuery, PagedListDto<UserSuperDto>>
     {
         private readonly IRepository<User> _userRepository;
         private readonly IMapper _mapper;
@@ -19,15 +19,15 @@ public GetUsersBySearchQueryHandler(IRepository<User> userRepository, IMapper ma
             _mapper = mapper;
         }
 
-        public async Task<PagedListDto<UserDto>> Handle(GetUsersBySearchQuery request, CancellationToken cancellationToken)
+        public async Task<PagedListDto<UserSuperDto>> Handle(GetUsersBySearchQuery request, CancellationToken cancellationToken)
         {
             var users = await _userRepository.GetAllAsync();
             users = users.Where(v => request.usersQueryParameters.Email == null || v.Email.ToLower().Equals(request.usersQueryParameters.Email.ToLower())).ToList();
             users = users.Where(v => request.usersQueryParameters.Firstname == null || v.FirstName.ToLower().Equals(request.usersQueryParameters.Firstname.ToLower())).ToList();
             users = users.Where(v => request.usersQueryParameters.Lastname == null || v.LastName.ToLower().Equals(request.usersQueryParameters.Lastname.ToLower())).ToList();
 
-            var mappedusers = _mapper.Map<IEnumerable<UserDto>>(users);
-            var userSearchResult = PagedListDto<UserDto>.ToPagedList(mappedusers, request.usersQueryParameters.Offset, request.usersQueryParameters.Limit);
+            var mappedusers = _mapper.Map<IEnumerable<UserSuperDto>>(users);
+            var userSearchResult = PagedListDto<UserSuperDto>.ToPagedList(mappedusers, request.usersQueryParameters.Offset, request.usersQueryParameters.Limit);
 
             return userSearchResult;
         }

src/Hng.Application/Features/SuperAdmin/Mappers/AdminUsersMappingProfile.cs

@@ -7,7 +7,7 @@ public class AdminUsersMappingProfile : AutoMapper.Profile
     {
         public AdminUsersMappingProfile()
         {
-            CreateMap<User, UserDto>().ReverseMap();
+            CreateMap<User, UserSuperDto>().ReverseMap();
         }
     }
 }

src/Hng.Application/Features/SuperAdmin/Queries/GetUsersBySearchQuery.cs

@@ -4,7 +4,7 @@
 
 namespace Hng.Application.Features.SuperAdmin.Queries
 {
-    public class GetUsersBySearchQuery : IRequest<PagedListDto<UserDto>>
+    public class GetUsersBySearchQuery : IRequest<PagedListDto<UserSuperDto>>
     {
         public GetUsersBySearchQuery(UsersQueryParameters parameters)
         {

src/Hng.Graphql/Features/Mutations/Mutations.Authentication.cs

@@ -0,0 +1,73 @@
+using Hng.Application.Features.UserManagement.Commands;
+using Hng.Application.Features.UserManagement.Dtos;
+using HotChocolate.Authorization;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Hng.Graphql
+{
+    public partial class Mutations
+    {
+        public async Task<UserLoginResponseDto<SignupResponseData>> Login(UserLoginRequestDto loginRequest, [FromServices] IMediator mediator)
+        {
+            var command = new CreateUserLoginCommand(loginRequest);
+            return await mediator.Send(command);
+        }
+
+        public async Task<UserLoginResponseDto<SignupResponseData>> GoogleLogin(GoogleLoginRequestDto googleLoginRequest, [FromServices] IMediator mediator)
+        {
+            var command = new GoogleLoginCommand(googleLoginRequest.IdToken);
+            return await mediator.Send(command);
+        }
+
+        public async Task<SignUpResponse> UserSignUp(UserSignUpDto body, [FromServices] IMediator mediator)
+        {
+            var command = new UserSignUpCommand(body);
+            return await mediator.Send(command);
+        }
+
+        [Authorize]
+        public async Task<ChangePasswordResponse> ChangePassword([FromBody] ChangePasswordCommand command, [FromServices] IMediator mediator)
+        {
+            var response = await mediator.Send(command);
+            return response.Value;
+        }
+
+        public async Task<ForgotPasswordResponse> ForgotPassword([FromBody] ForgotPasswordRequestDto request, [FromServices] IMediator mediator)
+        {
+            var response = await mediator.Send(new ForgotPasswordDto(request.Email, false));
+            return response.Value;
+        }
+
+        public async Task<ForgotPasswordResponse> ForgotPasswordMobile([FromBody] ForgotPasswordRequestDto request, [FromServices] IMediator mediator)
+        {
+            var response = await mediator.Send(new ForgotPasswordDto(request.Email, true));
+            return response.Value;
+        }
+
+        public async Task<VerifyForgotPasswordCodeResponse> VerifyForgotPasswordCode([FromBody] VerifyForgotPasswordCodeDto request, [FromServices] IMediator mediator)
+        {
+            var response = await mediator.Send(request);
+            return response.Value;
+        }
+
+        public async Task<PasswordResetMobileResponse> PasswordResetMobile([FromBody] PasswordResetMobileDto request, [FromServices] IMediator mediator)
+        {
+            var respone = await mediator.Send(new PasswordResetMobileCommand(request));
+            return respone.Value;
+        }
+
+        [Authorize]
+        public async Task<PasswordResetResponse> PasswordReset([FromBody] PasswordResetDto request, [FromServices] IMediator mediator)
+        {
+            var response = await mediator.Send(request);
+            return response.Value;
+        }
+
+        public async Task<UserLoginResponseDto<object>> FacebookLogin([FromBody] FacebookLoginRequestDto request, [FromServices] IMediator mediator)
+        {
+            var command = new FacebookLoginCommand(request.AccessToken);
+            return await mediator.Send(command);
+        }
+    }
+}

src/Hng.Graphql/Mutations.BillingPlans.cs → src/Hng.Graphql/Features/Mutations/Mutations.BillingPlans.cs

@@ -1,6 +1,5 @@
 using Hng.Application.Features.BillingPlans.Commands;
 using Hng.Application.Features.BillingPlans.Dtos;
-using Hng.Application.Features.BillingPlans.Queries;
 using Hng.Application.Shared.Dtos;
 using HotChocolate.Authorization;
 using MediatR;

src/Hng.Graphql/Features/Mutations/Mutations.Blog.cs

@@ -0,0 +1,32 @@
+using Hng.Application.Features.Blogs.Commands;
+using Hng.Application.Features.Blogs.Dtos;
+using HotChocolate.Authorization;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Hng.Graphql
+{
+    public partial class Mutations
+    {
+        [Authorize]
+        public async Task<CreateBlogResponseDto> CreateBlog(CreateBlogDto body, [FromServices] IMediator mediator)
+        {
+            var command = new CreateBlogCommand(body);
+            return await mediator.Send(command);
+        }
+
+        [Authorize]
+        public async Task<bool> DeleteBlogById(Guid id, [FromServices] IMediator mediator)
+        {
+            var command = (new DeleteBlogByIdCommand(id));
+            return await mediator.Send(command);
+        }
+
+        [Authorize]
+        public async Task<UpdateBlogResponseDto> UpdateBlog(Guid id, UpdateBlogDto updateBlogDto, [FromServices] IMediator mediator)
+        {
+            var command = new UpdateBlogCommand(updateBlogDto, id);
+            return await mediator.Send(command);
+        }
+    }
+}

src/Hng.Graphql/Features/Mutations/Mutations.Categories.cs

@@ -0,0 +1,27 @@
+using Hng.Application.Features.Categories.Commands;
+using Hng.Application.Features.Categories.Dtos;
+using Hng.Application.Shared.Dtos;
+using HotChocolate.Authorization;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Hng.Graphql
+{
+    public partial class Mutations
+    {
+        [Authorize]
+        public async Task<SuccessResponseDto<CategoryDto>> CreateCategory(CreateCategoryDto createCategoryDto, [FromServices] IMediator mediator)
+        {
+            var command = new CreateCategoryCommand(createCategoryDto.Name, createCategoryDto.Description, createCategoryDto.Slug);
+            return await mediator.Send(command);
+        }
+
+        [Authorize]
+        public async Task<SuccessResponseDto<bool>> DeleteCategory(Guid id, [FromServices] IMediator mediator)
+        {
+            var command = new DeleteCategoryCommand(id);
+            return await mediator.Send(command);
+        }
+
+    }
+}