feat: add delete update task events and eventhandlers are written

BakhorikovEgor · BakhorikovEgor · commit 76fd0e293cec · 2023-10-27T23:01:31.000+03:00
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs
@@ -12,14 +12,21 @@ public class UpdateTaskEvent : Event
         
         public long TaskId { get; set; }
         
+        //закладываюсь, что дату публикации не будут менять после публикации
+        public DateTime PreviousPublicationDate { get; set; }
+        
         public DateTime PublicationDate { get; set; }
         
-        public UpdateTaskEvent(CourseDTO course, string taskTitle, long taskId, DateTime publicationDate)
+        public DateTime? Deadline { get; set; }
+        
+        public UpdateTaskEvent(CourseDTO course, string taskTitle, long taskId, DateTime previousPublicationDate, DateTime publicationDate, DateTime? deadline)
         {
             Course = course;
             TaskTitle = taskTitle;
             TaskId = taskId;
+            PreviousPublicationDate = previousPublicationDate;
             PublicationDate = publicationDate;
+            Deadline = deadline;
         }
     }
 }
diff --git a/HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs b/HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs
@@ -23,7 +23,7 @@ public static string Build(Event @event, long id)
                 _ when eventType == typeof(NewTaskEvent) || eventType == typeof(UpdateTaskEvent) ||
                        eventType == typeof(DeleteTaskEvent)
                     => "Task",
-                _ when eventType == typeof(NewHomeworkEvent) 
+                _ when eventType == typeof(NewHomeworkEvent)
                     => "Homework",
                 _ => "Unknown"
             };
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Services/TasksService.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Services/TasksService.cs
@@ -70,8 +70,8 @@ public async Task UpdateTaskAsync(long taskId, HomeworkTask update)
             var course = await _coursesRepository.GetWithCourseMatesAsync(homework.CourseId);
             var courseModel = _mapper.Map<CourseDTO>(course);
 
-
-            _eventBus.Publish(new UpdateTaskEvent(courseModel, update.Title, taskId, update.PublicationDate));
+            _eventBus.Publish(new UpdateTaskEvent(courseModel, update.Title, taskId, task.PublicationDate,
+                update.PublicationDate, update.DeadlineDate));
 
             await _tasksRepository.UpdateAsync(taskId, t => new HomeworkTask()
             {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/DeleteTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/DeleteTaskEventHandler.cs
@@ -22,7 +22,6 @@ public override async Task HandleAsync(DeleteTaskEvent @event)
             var scheduleWork = await _scheduleWorksRepository.GetAsync(id);
 
             BackgroundJob.Delete(scheduleWork.JobId);
-            
             await _scheduleWorksRepository.DeleteAsync(id);
         }
     }
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Hangfire;
 using HwProj.AuthService.Client;
 using HwProj.EventBus.Client.Interfaces;
+using HwProj.Events.CourseEvents;
+using HwProj.Models;
 using HwProj.Models.NotificationsService;
 using HwProj.NotificationsService.API.Repositories;
-using HwProj.CoursesService.API.Events;
-using HwProj.Models;
-using Hangfire;
-using HwProj.Events.CourseEvents;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
 
@@ -39,10 +38,15 @@ public NewHomeworkTaskEventHandler(
         public override async Task HandleAsync(NewTaskEvent @event)
         {
             var id = ScheduleWorkIdBuilder.Build(@event, @event.TaskId);
-            var jobId = BackgroundJob.Schedule( () => ScheduleWorkAsync(@event, id),
-                @event.PublicationDate >= DateTimeUtils.GetMoscowNow()
-                    ? @event.PublicationDate.Subtract(TimeSpan.FromHours(3))
-                    : DateTimeUtils.GetMoscowNow().Subtract(TimeSpan.FromHours(3)));
+
+            if (@event.PublicationDate <= DateTimeUtils.GetMoscowNow())
+            {
+                await AddNotificationsAsync(@event);
+                return;
+            }
+
+            var jobId = BackgroundJob.Schedule(() => AddNotificationsAsync(@event),
+                @event.PublicationDate.Subtract(TimeSpan.FromHours(3)));
 
             var scheduleWork = new ScheduleWork
             {
@@ -53,7 +57,7 @@ public override async Task HandleAsync(NewTaskEvent @event)
         }
 
 
-        public async Task ScheduleWorkAsync(NewTaskEvent @event, string id)
+        public async Task AddNotificationsAsync(NewTaskEvent @event)
         {
             var studentIds = @event.Course.CourseMates.Select(t => t.StudentId).ToArray();
             var accountsData = await _authServiceClient.GetAccountsData(studentIds);
@@ -79,8 +83,6 @@ public async Task ScheduleWorkAsync(NewTaskEvent @event, string id)
 
                 await Task.WhenAll(addNotificationTask, sendEmailTask);
             }
-
-            await _scheduleWorksRepository.DeleteAsync(id);
         }
     }
 }
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/UpdateTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/UpdateTaskEventHandler.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Threading.Tasks;
 using AutoMapper;
+using Hangfire;
 using HwProj.AuthService.Client;
 using HwProj.EventBus.Client.Interfaces;
 using HwProj.Events.CourseEvents;
@@ -39,8 +41,37 @@ public UpdateTaskEventHandler(
 
         public override async Task HandleAsync(UpdateTaskEvent @event)
         {
-            //TODO: event types
             var id = ScheduleWorkIdBuilder.Build(@event, @event.TaskId);
+            var isTaskPublished = @event.PreviousPublicationDate <= DateTimeUtils.GetMoscowNow();
+            if (isTaskPublished)
+            {
+                await AddNotificationsAsync(@event);
+                return;
+            }
+
+            var previousWork = await _scheduleWorksRepository.GetAsync(id);
+            BackgroundJob.Delete(previousWork.JobId);
+
+            var jobId = BackgroundJob.Schedule(() => AddNotificationsAsync(@event),
+                @event.PublicationDate.Subtract(TimeSpan.FromHours(3)));
+
+            await _scheduleWorksRepository.UpdateAsync(id, work => new ScheduleWork()
+            {
+                Id = id,
+                JobId = jobId
+            });
+        }
+
+        public async Task AddNotificationsAsync(UpdateTaskEvent @event)
+        {
+            var url = _configuration["Url"];
+            var isTaskPublished = @event.PreviousPublicationDate < DateTimeUtils.GetMoscowNow();
+            var message = isTaskPublished
+                ? $"Задача <a href='{_configuration["Url"]}/task/{@event.TaskId}'>{@event.TaskTitle}</a>" +
+                  $" из курса <a href='{_configuration["Url"]}/courses/{@event.Course.Id}'>{@event.Course.Name}</a> обновлена."
+                : $"В курсе <a href='{url}/courses/{@event.Course.Id}'>{@event.Course.Name}</a>" +
+                  $" опубликована новая задача <a href='{url}/task/{@event.TaskId}'>{@event.TaskTitle}</a>." +
+                  (@event.Deadline is { } deadline ? $"\n\nДедлайн: {deadline:U}" : "");
             
             foreach (var student in @event.Course.CourseMates)
             {
@@ -49,8 +80,7 @@ public override async Task HandleAsync(UpdateTaskEvent @event)
                 var notification = new Notification
                 {
                     Sender = "CourseService",
-                    Body = $"Задача <a href='{_configuration["Url"]}/task/{@event.TaskId}'>{@event.TaskTitle}</a>" +
-                           $" из курса <a href='{_configuration["Url"]}/courses/{@event.Course.Id}'>{@event.Course.Name}</a> обновлена.",
+                    Body = message,
                     Category = CategoryState.Courses,
                     Date = DateTimeUtils.GetMoscowNow(),
                     HasSeen = false,
@@ -63,10 +93,5 @@ public override async Task HandleAsync(UpdateTaskEvent @event)
                 await Task.WhenAll(addNotificationTask, sendEmailTask);
             }
         }
-
-        public async Task ScheduleWorkAsync()
-        {
-            
-        }
     }
-}
+}
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/IScheduleWorksRepository.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/IScheduleWorksRepository.cs
@@ -7,5 +7,4 @@ namespace HwProj.NotificationsService.API.Repositories;
 
 public interface IScheduleWorksRepository : ICrudRepository<ScheduleWork, string>
 {
-    bool Contains(string id);
 }
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/ScheduleWorksRepository.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/ScheduleWorksRepository.cs
@@ -13,9 +13,5 @@ public ScheduleWorksRepository(NotificationsContext context) : base(context)
         {
         }
         
-        public bool Contains(string id)
-        {
-            return Context.Set<ScheduleWork>().AsNoTracking().Any(work => work.Id.Equals(id));
-        }
     }
 }
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Startup.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Startup.cs
@@ -1,22 +1,20 @@
-﻿using HwProj.AuthService.API.Events;
+﻿using Hangfire;
+using HwProj.AuthService.API.Events;
 using HwProj.AuthService.Client;
+using HwProj.CoursesService.API.Events;
 using HwProj.EventBus.Client.Interfaces;
+using HwProj.Events.CourseEvents;
 using HwProj.NotificationsService.API.EventHandlers;
 using HwProj.NotificationsService.API.Models;
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
+using HwProj.SolutionsService.API.Events;
 using HwProj.Utils.Configuration;
-using Hangfire;
-using Hangfire.SqlServer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using HwProj.CoursesService.API.Events;
-using HwProj.EventBus.Client;
-using HwProj.SolutionsService.API.Events;
-using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API
 {
@@ -51,6 +49,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<IEventHandler<StudentPassTaskEvent>, StudentPassTaskEventHandler>();
             services.AddTransient<IEventHandler<UpdateHomeworkEvent>, UpdateHomeworkEventHandler>();
             services.AddTransient<IEventHandler<UpdateTaskEvent>, UpdateTaskEventHandler>();
+            services.AddTransient<IEventHandler<DeleteTaskEvent>, DeleteTaskEventHandler>();
             services.AddTransient<IEventHandler<LecturerAcceptToCourseEvent>, LecturerAcceptToCourseEventHandler>();
             services.AddTransient<IEventHandler<LecturerRejectToCourseEvent>, LecturerRejectToCourseEventHandler>();
             services.AddTransient<IEventHandler<LecturerInvitedToCourseEvent>, LecturerInvitedToCourseEventHandler>();
@@ -76,6 +75,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, IEventBu
                 eventBustSubscriber.Subscribe<StudentPassTaskEvent, StudentPassTaskEventHandler>();
                 eventBustSubscriber.Subscribe<UpdateHomeworkEvent, UpdateHomeworkEventHandler>();
                 eventBustSubscriber.Subscribe<UpdateTaskEvent, UpdateTaskEventHandler>();
+                eventBustSubscriber.Subscribe<DeleteTaskEvent, DeleteTaskEventHandler>();
                 eventBustSubscriber.Subscribe<LecturerAcceptToCourseEvent, LecturerAcceptToCourseEventHandler>();
                 eventBustSubscriber.Subscribe<LecturerRejectToCourseEvent, LecturerRejectToCourseEventHandler>();
                 eventBustSubscriber.Subscribe<LecturerInvitedToCourseEvent, LecturerInvitedToCourseEventHandler>();

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,21 @@ public class UpdateTaskEvent : Event`
`12`	`12`
`13`	`13`	`public long TaskId { get; set; }`
`14`	`14`
	`15`	`+ //закладываюсь, что дату публикации не будут менять после публикации`
	`16`	`+ public DateTime PreviousPublicationDate { get; set; }`
	`17`	`+`
`15`	`18`	`public DateTime PublicationDate { get; set; }`
`16`	`19`
`17`		`- public UpdateTaskEvent(CourseDTO course, string taskTitle, long taskId, DateTime publicationDate)`
	`20`	`+ public DateTime? Deadline { get; set; }`
	`21`	`+`
	`22`	`+ public UpdateTaskEvent(CourseDTO course, string taskTitle, long taskId, DateTime previousPublicationDate, DateTime publicationDate, DateTime? deadline)`
`18`	`23`	`{`
`19`	`24`	`Course = course;`
`20`	`25`	`TaskTitle = taskTitle;`
`21`	`26`	`TaskId = taskId;`
	`27`	`+ PreviousPublicationDate = previousPublicationDate;`
`22`	`28`	`PublicationDate = publicationDate;`
	`29`	`+ Deadline = deadline;`
`23`	`30`	`}`
`24`	`31`	`}`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ public async Task UpdateTaskAsync(long taskId, HomeworkTask update)`
`70`	`70`	`var course = await _coursesRepository.GetWithCourseMatesAsync(homework.CourseId);`
`71`	`71`	`var courseModel = _mapper.Map<CourseDTO>(course);`
`72`	`72`
`73`		`-`
`74`		`- _eventBus.Publish(new UpdateTaskEvent(courseModel, update.Title, taskId, update.PublicationDate));`
	`73`	`+ _eventBus.Publish(new UpdateTaskEvent(courseModel, update.Title, taskId, task.PublicationDate,`
	`74`	`+ update.PublicationDate, update.DeadlineDate));`
`75`	`75`
`76`	`76`	`await _tasksRepository.UpdateAsync(taskId, t => new HomeworkTask()`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public override async Task HandleAsync(DeleteTaskEvent @event)`
`22`	`22`	`var scheduleWork = await _scheduleWorksRepository.GetAsync(id);`
`23`	`23`
`24`	`24`	`BackgroundJob.Delete(scheduleWork.JobId);`
`25`		`-`
`26`	`25`	`await _scheduleWorksRepository.DeleteAsync(id);`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ namespace HwProj.NotificationsService.API.Repositories;`
`7`	`7`
`8`	`8`	`public interface IScheduleWorksRepository : ICrudRepository<ScheduleWork, string>`
`9`	`9`	`{`
`10`		`- bool Contains(string id);`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,5 @@ public ScheduleWorksRepository(NotificationsContext context) : base(context)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- public bool Contains(string id)`
`17`		`- {`
`18`		`- return Context.Set<ScheduleWork>().AsNoTracking().Any(work => work.Id.Equals(id));`
`19`		`- }`
`20`	`16`	`}`
`21`	`17`	`}`