Update

bentran1vn · Oct 25, 2024 · aa492f1 · aa492f1
1 parent 0236c87
commit aa492f1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 34 deletions.
diff --git a/MBS_COMMAND.Application/MBS_COMMAND.Application.csproj b/MBS_COMMAND.Application/MBS_COMMAND.Application.csproj
@@ -16,7 +16,7 @@
       <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
       <PackageReference Include="FluentValidation" Version="11.10.0" />
       <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
-      <PackageReference Include="MBS_CONTRACT.SHARE" Version="1.1.14" />
+      <PackageReference Include="MBS_CONTRACT.SHARE" Version="1.1.15" />
       <PackageReference Include="MediatR" Version="12.4.1" />
       <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     </ItemGroup>

diff --git a/MBS_COMMAND.Application/UserCases/Commands/Schedules/CreateScheduleCommandHandler.cs b/MBS_COMMAND.Application/UserCases/Commands/Schedules/CreateScheduleCommandHandler.cs
@@ -5,7 +5,6 @@
 using MBS_COMMAND.Domain.Entities;
 
 namespace MBS_COMMAND.Application.UserCases.Commands.Schedules;
-
 public class CreateScheduleCommandHandler : ICommandHandler<Command.CreateScheduleCommand>
 {
     private readonly IRepositoryBase<User, Guid> _userRepository;
@@ -14,7 +13,9 @@ public class CreateScheduleCommandHandler : ICommandHandler<Command.CreateSchedu
     private readonly IRepositoryBase<Subject, Guid> _subjectRepository;
     private readonly IRepositoryBase<Schedule, Guid> _scheduleRepository;
 
-    public CreateScheduleCommandHandler(IRepositoryBase<User, Guid> userRepository, IRepositoryBase<Group, Guid> groupRepository, IRepositoryBase<Slot, Guid> slotRepository, IRepositoryBase<Subject, Guid> subjectRepository, IRepositoryBase<Schedule, Guid> scheduleRepository)
+    public CreateScheduleCommandHandler(IRepositoryBase<User, Guid> userRepository,
+        IRepositoryBase<Group, Guid> groupRepository, IRepositoryBase<Slot, Guid> slotRepository,
+        IRepositoryBase<Subject, Guid> subjectRepository, IRepositoryBase<Schedule, Guid> scheduleRepository)
     {
         _userRepository = userRepository;
         _groupRepository = groupRepository;
@@ -32,15 +33,15 @@ public async Task<Result> Handle(Command.CreateScheduleCommand request, Cancella
             return Result.Failure(new Error("400", "User is not exist !"));
         }
 
-        var group = await _groupRepository.FindSingleAsync(x => x.LeaderId.Equals(user.Id) && x.ProjectId.Equals(request.ProjectId), cancellationToken);
-        
+        var group = await _groupRepository.FindSingleAsync(x => x.LeaderId.Equals(user.Id), cancellationToken);
+
         if (group == null || group.IsDeleted)
         {
             return Result.Failure(new Error("403", "Must own a group !"));
         }
 
         var slot = await _slotRepository.FindByIdAsync(request.SlotId, cancellationToken);
-        
+
         if (slot == null || group.IsDeleted)
         {
             return Result.Failure(new Error("400", "Slot is not exist !"));
@@ -52,15 +53,15 @@ public async Task<Result> Handle(Command.CreateScheduleCommand request, Cancella
         }
 
         var subject = await _subjectRepository.FindByIdAsync(request.SubjectId, cancellationToken);
-        
+
         if (subject == null || subject.IsDeleted)
         {
             return Result.Failure(new Error("400", "Subject is not exist !"));
         }
 
         var start = TimeOnly.Parse(request.StartTime);
         var end = TimeOnly.Parse(request.EndTime);
-        
+
         if (start.CompareTo(slot.StartTime) < 0 ||
             end.CompareTo(slot.EndTime) > 0)
         {
@@ -80,9 +81,9 @@ public async Task<Result> Handle(Command.CreateScheduleCommand request, Cancella
         };
 
         slot.IsBook = true;
-
+        slot.ChangeSlotStatusInToBooked(slot.Id);
         _scheduleRepository.Add(schedule);
-        
+
         return Result.Success("Booking Schedule Successfully !");
     }
 }
diff --git a/MBS_COMMAND.Domain/Entities/Slot.cs b/MBS_COMMAND.Domain/Entities/Slot.cs
@@ -1,6 +1,5 @@
 using MBS_COMMAND.Domain.Abstractions.Aggregates;
 using MBS_COMMAND.Domain.Abstractions.Entities;
-using MBS_CONTRACT.SHARE.Services.Groups;
 using MBS_CONTRACT.SHARE.Services.Slots;
 
 namespace MBS_COMMAND.Domain.Entities;
@@ -19,20 +18,9 @@ public class Slot : AggregateRoot<Guid>, IAuditableEntity
     public DateTimeOffset CreatedOnUtc { get; set; }
     public DateTimeOffset? ModifiedOnUtc { get; set; }
 
-    public void CreateSlot(IEnumerable<Slot> slots)
+    public void ChangeSlotStatusInToBooked(Guid SlotId)
     {
-        var slot = slots.Select(x => new DomainEvent.Slot
-        {
-            MentorId = x.MentorId,
-            StartTime = x.StartTime,
-            EndTime = x.EndTime,
-            Date = x.Date,
-            IsOnline = x.IsOnline,
-            Note = x.Note,
-            Month = x.Month,
-            IsBook = x.IsBook,
-        }).ToList();
-        RaiseDomainEvent(new DomainEvent.SlotsCreated(Guid.NewGuid(), slot));
+        RaiseDomainEvent(new DomainEvent.ChangeSlotStatusInToBooked(Guid.NewGuid(), SlotId));;
     }
 
 }
diff --git a/MBS_COMMAND.Domain/MBS_COMMAND.Domain.csproj b/MBS_COMMAND.Domain/MBS_COMMAND.Domain.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="MBS_CONTRACT.SHARE" Version="1.1.14" />
+      <PackageReference Include="MBS_CONTRACT.SHARE" Version="1.1.15" />
     </ItemGroup>
 
 </Project>
diff --git a/MBS_COMMAND.Infrastucture/BackgroundJobs/ProcessOutboxMessagesJob.cs b/MBS_COMMAND.Infrastucture/BackgroundJobs/ProcessOutboxMessagesJob.cs
@@ -79,15 +79,17 @@ public async Task Execute(IJobExecutionContext context)
                                 });
                         await _publishEndpoint.Publish(MentorSlotCreated, context.CancellationToken);
                         break;
-                    case nameof(ServicesShared.Slots.DomainEvent.SlotsCreated):
-                        var slotsCreated = JsonConvert.DeserializeObject<ServicesShared.Slots.DomainEvent.SlotsCreated>(
-                            outboxMessage.Content,
-                            new JsonSerializerSettings
-                            {
-                                TypeNameHandling = TypeNameHandling.All
-                            });
+                    case nameof(ServicesShared.Slots.DomainEvent.ChangeSlotStatusInToBooked):
+                        var ChangeSlotStatusInToBooked =
+                            JsonConvert.DeserializeObject<ServicesShared.Slots.DomainEvent.ChangeSlotStatusInToBooked>(
+                                outboxMessage.Content,
+                                new JsonSerializerSettings
+                                {
+                                    TypeNameHandling = TypeNameHandling.All
+                                });
+
 
-                        await _publishEndpoint.Publish(slotsCreated, context.CancellationToken);
+                        await _publishEndpoint.Publish(ChangeSlotStatusInToBooked, context.CancellationToken);
                         break;
                 }
 

diff --git a/MBS_COMMAND.Persistence/Migrations/ApplicationDbContextModelSnapshot.cs b/MBS_COMMAND.Persistence/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -267,6 +267,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateOnly>("Date")
                         .HasColumnType("date");
 
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<TimeOnly>("EndTime")
                         .HasColumnType("time");
 

diff --git a/MBS_COMMAND.Presentation/APIs/Schedules/SchedulesApi.cs b/MBS_COMMAND.Presentation/APIs/Schedules/SchedulesApi.cs
@@ -15,7 +15,7 @@ public void AddRoutes(IEndpointRouteBuilder app)
         var gr1 = app.NewVersionedApi("Schedules")
             .MapGroup(BaseUrl).HasApiVersion(1);
 
-        gr1.MapPost("", CreateSchedules).RequireAuthorization(RoleNames.Student);
+        gr1.MapPost("", CreateSchedules);
     }
 
     public static async Task<IResult> CreateSchedules(ISender sender, HttpContext context, IJwtTokenService jwtTokenService,