git commit -m "Merge from main"

MBS-COMMAND.API/DependencyInjection/Extensions/CurrentUserService.cs

@@ -0,0 +1,21 @@
+using MBS_COMMAND.Domain.Abstractions.Repositories;
+using Microsoft.AspNetCore.Authorization;
+using System.Security.Claims;
+
+namespace MBS_COMMAND.API.DependencyInjection.Extensions;
+
+public class CurrentUserService : ICurrentUserService
+{
+    private readonly ClaimsPrincipal? _claimsPrincipal;
+
+    public CurrentUserService(IHttpContextAccessor httpContextAccessor)
+    {
+        _claimsPrincipal = httpContextAccessor?.HttpContext?.User;
+
+    }
+
+    public string? UserId => _claimsPrincipal?.FindFirstValue(ClaimTypes.NameIdentifier);
+
+    public string? UserName => _claimsPrincipal?.FindFirstValue(ClaimTypes.Name);
+
+}

MBS-COMMAND.API/DependencyInjection/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-namespace Antree_Ecommerce_BE.API.DependencyInjection.Extensions;
+namespace MBS_COMMAND.API.DependencyInjection.Extensions;
 
 public static class ServiceCollectionExtensions
 {

MBS-COMMAND.API/Program.cs

@@ -1,8 +1,8 @@
-using Antree_Ecommerce_BE.API.DependencyInjection.Extensions;
 using Carter;
 using MBS_COMMAND.API.DependencyInjection.Extensions;
 using MBS_COMMAND.API.Middlewares;
 using MBS_COMMAND.Application.DependencyInjection.Extensions;
+using MBS_COMMAND.Domain.Abstractions.Repositories;
 using MBS_COMMAND.Infrastucture.DependencyInjection.Extensions;
 using MBS_COMMAND.Infrastucture.DependencyInjection.Options;
 using MBS_COMMAND.Persistence.DependencyInjection.Extensions;
@@ -77,6 +77,8 @@
 
 // Add Middleware => Remember using middleware
 builder.Services.AddTransient<ExceptionHandlingMiddleware>();
+builder.Services.AddTransient<ICurrentUserService,CurrentUserService>();
+builder.Services.AddHttpContextAccessor();
 
 var app = builder.Build();
 

MBS_COMMAND.Application/UserCases/Commands/Groups/AddListMemberToGroupCommandHandler.cs

@@ -0,0 +1,46 @@
+using MBS_COMMAND.Contract.Abstractions.Messages;
+using MBS_COMMAND.Contract.Abstractions.Shared;
+using MBS_COMMAND.Contract.Services.Groups;
+using MBS_COMMAND.Domain.Abstractions;
+using MBS_COMMAND.Domain.Abstractions.Repositories;
+using MBS_COMMAND.Domain.Entities;
+
+namespace MBS_COMMAND.Application.UserCases.Commands.Groups;
+
+public sealed class AddListMemberToGroupCommandHandler(IRepositoryBase<User, Guid> userRepository, IRepositoryBase<Group, Guid> groupRepository, IUnitOfWork unitOfWork) : ICommandHandler<Command.AddListMemberToGroup>
+{
+    public async Task<Result> Handle(Command.AddListMemberToGroup request, CancellationToken cancellationToken)
+    {
+        //validate all MemberId
+        Dictionary<Guid, string> MembersNotFound = [];
+        var G = await groupRepository.FindSingleAsync(x => x.Id == request.GroupId, cancellationToken);
+        if (G == null)
+            return Result.Failure(new Error("404", "Group Not Found"));
+        foreach (var memberId in request.MemberId)
+        {
+            var user = await userRepository.FindByIdAsync(memberId);
+            if (user == null)
+            {
+                MembersNotFound.Add(memberId, "Member Not Found");
+            }
+            else
+            {
+                G.Members!.Add(new Group_Student_Mapping { StudentId = user!.Id, GroupId = G.Id });
+                groupRepository.Update(G);
+                try
+                {
+                    await unitOfWork.SaveChangesAsync(cancellationToken);
+                }
+                catch 
+                {
+                    MembersNotFound.Add(memberId, "Member already joined group");
+                }
+            }
+
+        }
+        var returns = string.Join(", ", MembersNotFound.Select(x => $"MemberId: {x.Key}, Error: {x.Value}"));
+
+
+        return MembersNotFound.Count > 0 ? Result.Failure(new Error("422", returns)) : Result.Success();
+    }
+}

MBS_COMMAND.Application/UserCases/Commands/Groups/AddMemberToGroupCommandHandler.cs

@@ -0,0 +1,27 @@
+using MBS_COMMAND.Contract.Abstractions.Messages;
+using MBS_COMMAND.Contract.Abstractions.Shared;
+using MBS_COMMAND.Contract.Services.Groups;
+using MBS_COMMAND.Domain.Abstractions;
+using MBS_COMMAND.Domain.Abstractions.Repositories;
+using MBS_COMMAND.Domain.Entities;
+
+namespace MBS_COMMAND.Application.UserCases.Commands.Groups;
+
+public sealed class AddMemberToGroupCommandHandler(IRepositoryBase<Group, Guid> groupRepository, IRepositoryBase<User, Guid> userRepository, IUnitOfWork unitOfWork) : ICommandHandler<Command.AddMemberToGroup>
+{
+    public async Task<Result> Handle(Command.AddMemberToGroup request, CancellationToken cancellationToken)
+    {
+        var U = await userRepository.FindByIdAsync(request.MemberId);
+        if (U == null)
+            return Result.Failure(new Error("404", "User Not Found"));
+        var G = await groupRepository.FindSingleAsync(x => x.Id == request.GroupId, cancellationToken);
+        if (G == null)
+            return Result.Failure(new Error("404", "Group Not Found"));
+        if (G.Members!.Any(x => x.StudentId == U.Id))
+            return Result.Failure(new Error("422", "Member already joined group"));
+        G.Members!.Add(new Group_Student_Mapping { StudentId = U.Id, GroupId = G.Id });
+        groupRepository.Update(G);
+        await unitOfWork.SaveChangesAsync(cancellationToken);
+        return Result.Success();
+    }
+}

MBS_COMMAND.Application/UserCases/Commands/Groups/CreateGroupCommandHandler.cs

@@ -8,17 +8,31 @@ namespace MBS_COMMAND.Application.UserCases.Commands.Groups;
 
 public sealed class CreateGroupCommandHandler : ICommandHandler<Command.CreateGroupCommand>
 {
-    private readonly IRepositoryBase<Group, Guid> _repositoryBase;
+    private readonly IRepositoryBase<Group, Guid> _groupRepository;
+    private readonly IRepositoryBase<User, Guid> _userRepository;
 
-    public CreateGroupCommandHandler(IRepositoryBase<Group, Guid> repositoryBase)
+    public CreateGroupCommandHandler(IRepositoryBase<Group, Guid> repositoryBase, IRepositoryBase<User, Guid> userRepository)
     {
-        _repositoryBase = repositoryBase;
+        _groupRepository = repositoryBase;
+        _userRepository = userRepository;
+
     }
 
     public async Task<Result> Handle(Command.CreateGroupCommand request, CancellationToken cancellationToken)
     {
-        var G = Group.Create(request.Name, request.Stacks, request.MentorId);
-        _repositoryBase.Add(G);
+        var M = await _userRepository.FindSingleAsync(x => x.Id == request.MentorId, cancellationToken);
+        if (M == null)
+            return Result.Failure(new Error("404", "Mentor Not Found"));
+        var G = new Group
+        {
+            Name = request.Name,
+            MentorId = request.MentorId,
+            Stack = request.Stacks,
+
+        };
+        G.Members!.Add(new Group_Student_Mapping { StudentId = M.Id, GroupId = G.Id });
+        _groupRepository.Add(G);
+
         return Result.Success();
     }
 }

MBS_COMMAND.Application/UserCases/Commands/Groups/RemoveListMemberFromGroupCommandHandler.cs

@@ -0,0 +1,54 @@
+using MBS_COMMAND.Contract.Abstractions.Messages;
+using MBS_COMMAND.Contract.Abstractions.Shared;
+using MBS_COMMAND.Contract.Services.Groups;
+using MBS_COMMAND.Domain.Abstractions;
+using MBS_COMMAND.Domain.Abstractions.Repositories;
+using MBS_COMMAND.Domain.Entities;
+
+namespace MBS_COMMAND.Application.UserCases.Commands.Groups;
+
+public sealed class RemoveListMemberFromGroupCommandHandler(IRepositoryBase<Group, Guid> groupRepository, IRepositoryBase<User, Guid> userRepository, IUnitOfWork unitOfWork) : ICommandHandler<Command.RemoveListMemberFromGroup>
+{
+    public async Task<Result> Handle(Command.RemoveListMemberFromGroup request, CancellationToken cancellationToken)
+    {
+        Dictionary<Guid, string> MembersNotFound = [];
+        var G = await groupRepository.FindSingleAsync(x => x.Id == request.GroupId, cancellationToken);
+        if (G == null)
+            return Result.Failure(new Error("404", "Group Not Found"));
+        if (request.MemberId.Contains((Guid)G.LeaderId))
+            return Result.Failure(new Error("422", "Mentor cannot be removed from group"));
+        foreach (var memberId in request.MemberId)
+            {
+            var user = await userRepository.FindByIdAsync(memberId);
+            if (user == null)
+            {
+                MembersNotFound.Add(memberId, "Member Not Found");
+            }
+            else
+            {
+                var member = G.Members!.FirstOrDefault(x => x.StudentId == user!.Id);
+                if (member == null)
+                {
+                    MembersNotFound.Add(memberId, "Member Not Found in Group");
+                }
+                else
+                {
+                    G.Members!.Remove(member);
+                    groupRepository.Update(G);
+                    try
+                    {
+                        await unitOfWork.SaveChangesAsync(cancellationToken);
+                    }
+                    catch
+                    {
+                        MembersNotFound.Add(memberId, "Member already removed from group");
+                    }
+                }
+            }
+
+        }
+        var returns = string.Join(", ", MembersNotFound.Select(x => $"MemberId: {x.Key}, Error: {x.Value}"));
+        return MembersNotFound.Count > 0 ? Result.Failure(new Error("422", returns)) : Result.Success();
+
+    }
+}

MBS_COMMAND.Application/UserCases/Commands/Groups/RemoveMemberFromGroupCommandHandler.cs

@@ -0,0 +1,32 @@
+using MBS_COMMAND.Contract.Abstractions.Messages;
+using MBS_COMMAND.Contract.Abstractions.Shared;
+using MBS_COMMAND.Contract.Services.Groups;
+using MBS_COMMAND.Domain.Abstractions;
+using MBS_COMMAND.Domain.Abstractions.Repositories;
+using MBS_COMMAND.Domain.Entities;
+
+namespace MBS_COMMAND.Application.UserCases.Commands.Groups;
+
+public sealed class RemoveMemberFromGroupCommandHandler(IRepositoryBase<Group, Guid> groupRepository, IRepositoryBase<User, Guid> userRepository, IUnitOfWork unitOfWork, ICurrentUserService currentUserService) : ICommandHandler<Command.RemoveMemberFromGroup>
+{
+    public async Task<Result> Handle(Command.RemoveMemberFromGroup request, CancellationToken cancellationToken)
+    {
+        var CurrentUserId = currentUserService.UserId;
+
+        var U = await userRepository.FindByIdAsync(request.MemberId);
+        if (U == null)
+            return Result.Failure(new Error("404", "User Not Found"));
+        var G = await groupRepository.FindSingleAsync(x => x.Id == request.GroupId, cancellationToken);
+        if (G == null)
+            return Result.Failure(new Error("404", "Group Not Found"));
+        if (CurrentUserId != null && G.LeaderId.ToString() == CurrentUserId)
+            return Result.Failure(new Error("403", "Leader cannot be removed from group"));
+        var member = G.Members!.FirstOrDefault(x => x.StudentId == U.Id);
+        if (member == null)
+            return Result.Failure(new Error("422", "Member are not found in group"));
+        G.Members!.Remove(member);
+        groupRepository.Update(G);
+        await unitOfWork.SaveChangesAsync(cancellationToken);
+        return Result.Success();
+    }
+}

MBS_COMMAND.Application/UserCases/Commands/MentorSkills/CreateMentorSkillsCommandHandler.cs

@@ -1,4 +1,3 @@
-using MBS_AUTHORIZATION.Domain.Entities;
 using MBS_COMMAND.Application.Abstractions;
 using MBS_COMMAND.Contract.Abstractions.Messages;
 using MBS_COMMAND.Contract.Abstractions.Shared;

MBS_COMMAND.Contract/Abstractions/Shared/Error.cs

@@ -12,7 +12,6 @@ public Error(string code, string message)
     }
     public string Code { get; }
     public string Message { get; }
-
     public static implicit operator string(Error error) => error.Code;
 
     public static bool operator ==(Error? a, Error? b)

MBS_COMMAND.Contract/Services/Groups/Command.cs

@@ -4,5 +4,9 @@ namespace MBS_COMMAND.Contract.Services.Groups;
 
 public static class Command
 {
-    public record CreateGroupCommand(string Name,Guid MentorId,string Stacks) : ICommand;
+    public record CreateGroupCommand(string Name, Guid MentorId, string Stacks) : ICommand;
+    public record AddListMemberToGroup(Guid GroupId, List<Guid> MemberId) : ICommand;
+    public record RemoveListMemberFromGroup(Guid GroupId, List<Guid> MemberId) : ICommand;
+    public record AddMemberToGroup(Guid GroupId, Guid MemberId) : ICommand;
+    public record RemoveMemberFromGroup(Guid GroupId, Guid MemberId) : ICommand;
 }

MBS_COMMAND.Domain/Abstractions/Repositories/ICurrentUserService.cs

@@ -0,0 +1,7 @@
+namespace MBS_COMMAND.Domain.Abstractions.Repositories;
+
+public interface ICurrentUserService
+{
+    string? UserId { get; }
+    string? UserName { get; }
+}

MBS_COMMAND.Domain/Entities/Group.cs

@@ -1,39 +1,22 @@
-using MBS_AUTHORIZATION.Domain.Entities;
-using MBS_COMMAND.Domain.Abstractions.Aggregates;
-using MBS_COMMAND.Domain.Abstractions.Entities;
+using MBS_COMMAND.Domain.Abstractions.Entities;
 
 namespace MBS_COMMAND.Domain.Entities;
 
-public class Group : AggregateRoot<Guid>, IAuditableEntity
+public class Group : Entity<Guid>, IAuditableEntity
 {
-    public string Name { get; private set; }
-    public Guid? MentorId { get; private set; }
+    public string Name { get;  set; }
+    public Guid? MentorId { get;  set; }
     public virtual User? Mentor { get; set; }
-
     public Guid? LeaderId { get; set; }
     public virtual User? Leader { get; set; }
-    public string Stack { get; private set; }
-    public Guid? ProjectId { get; private set; }
+    public string Stack { get;  set; }
+    public Guid? ProjectId { get;  set; }
     public virtual Project? Project { get; set; }
     public DateTimeOffset CreatedOnUtc { get; set; }
     public DateTimeOffset? ModifiedOnUtc { get; set; }
+    public virtual ICollection<Group_Student_Mapping>? Members { get; set; } = [];
 
 
-
-    public Group(string name, string stack, Guid? mentorId)
-    {
-        Name = name;
-        Stack = stack;
-        MentorId = mentorId;
-    }
-
-    public static Group Create(string name, string stack, Guid? mentorId)
-    {
-        var G = new Group(name, stack, mentorId);
-        //G.RaiseDomainEvent(new Contract.Services.Groups.DomainEvents.GroupCreated(Guid.NewGuid(), G.Id, G.Name, G.MentorId, G.Stack));
-        return G;
-    }
-
 }
 
 

MBS_COMMAND.Domain/Entities/Group_Student_Mapping.cs

@@ -1,6 +1,4 @@
-using MBS_AUTHORIZATION.Domain.Entities;
-
-namespace MBS_COMMAND.Domain.Entities;
+namespace MBS_COMMAND.Domain.Entities;
 
 public class Group_Student_Mapping
 {

MBS_COMMAND.Domain/Entities/Project.cs

@@ -6,10 +6,6 @@ public class Project : Entity<Guid>, IAuditableEntity
 {
     public string Name { get ; set ; }
     public string Description { get ; set ; }
-
-
-
-
     public DateTimeOffset CreatedOnUtc { get ; set ; }
     public DateTimeOffset? ModifiedOnUtc { get ; set ; }
 }

MBS_COMMAND.Domain/Entities/Slot.cs

@@ -1,5 +1,4 @@
-using MBS_AUTHORIZATION.Domain.Entities;
-using MBS_COMMAND.Domain.Abstractions.Entities;
+using MBS_COMMAND.Domain.Abstractions.Entities;
 
 namespace MBS_COMMAND.Domain.Entities;
 

MBS_COMMAND.Domain/Entities/Transaction.cs

@@ -1,5 +1,4 @@
-using MBS_AUTHORIZATION.Domain.Entities;
-using MBS_COMMAND.Domain.Abstractions.Entities;
+using MBS_COMMAND.Domain.Abstractions.Entities;
 
 namespace MBS_COMMAND.Domain.Entities;
 

MBS_COMMAND.Domain/Entities/User.cs

@@ -1,20 +1,26 @@
-using MBS_COMMAND.Domain.Abstractions.Entities;
+using MBS_COMMAND.Domain.Abstractions.Aggregates;
+using MBS_COMMAND.Domain.Abstractions.Entities;
 using MBS_COMMAND.Domain.Entities;
 
-namespace MBS_AUTHORIZATION.Domain.Entities;
+namespace MBS_COMMAND.Domain.Entities;
 
-public class User : Entity<Guid>, IAuditableEntity
+public class User : AggregateRoot<Guid>, IAuditableEntity
 {
     public string Email { get; set; }
     public string? FullName { get; set; }
     public string Password { get; set; }
     public int Role { get; set; }
     public int Points { get; set; }
-    public int Status { get; set; }
+    public int Status { get; set; } //0 Not Active, 1 Active, 2 Blocked
     public Guid? MentorId { get; set; }
     public bool IsFirstLogin { get; set; } = true;
     public virtual User? Mentor { get; set; }
     public DateTimeOffset CreatedOnUtc { get; set; }
     public DateTimeOffset? ModifiedOnUtc { get; set; }
+
+    public virtual ICollection<Group_Student_Mapping>? Groups { get; set; } = [];
+
+
+
     public virtual IReadOnlyCollection<MentorSkills> MentorSkillsList { get; set; } = default!;
 }