feat: add and delete delayed task events and eventhandlers

BakhorikovEgor · BakhorikovEgor · commit f3a7d6a21661 · 2023-11-15T21:42:20.000+03:00
diff --git a/HwProj.Common/HwProj.Events/HwProj.Events.csproj b/HwProj.Common/HwProj.Events/HwProj.Events.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <RootNamespace>HwProj.Events2</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\HwProj.EventBus\HwProj.EventBus.Client\HwProj.EventBus.Client.csproj" />
+      <ProjectReference Include="..\HwProj.Models\HwProj.Models.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/DeleteTaskEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/DeleteTaskEvent.cs
@@ -0,0 +1,14 @@
+﻿using HwProj.EventBus.Client;
+
+namespace HwProj.Events.CourseEvents
+{
+    public class DeleteTaskEvent: Event
+    {
+        public long TaskId { get; set; }
+
+        public DeleteTaskEvent(long taskId)
+        {
+            TaskId = taskId;
+        }
+    }
+}
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerAcceptToCourseEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerAcceptToCourseEvent.cs
@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Events.CourseEvents
 {
     public class LecturerAcceptToCourseEvent : Event
     {
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerInvitedToCourseEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerInvitedToCourseEvent.cs
@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Events.CourseEvents
 {
     public class LecturerInvitedToCourseEvent : Event
     {
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerRejectToCourseEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/LecturerRejectToCourseEvent.cs
@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace  HwProj.Events.CourseEvents
 {
     public class LecturerRejectToCourseEvent : Event
     {
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/NewCourseMateEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/NewCourseMateEvent.cs
@@ -1,6 +1,6 @@
 using HwProj.EventBus.Client;
 
-namespace HwProj.CoursesService.API.Events
+namespace  HwProj.Events.CourseEvents
 {
     public class NewCourseMateEvent : Event
     {
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/NewHomeworkEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/NewHomeworkEvent.cs
@@ -1,7 +1,7 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace  HwProj.Events.CourseEvents
 {
     public class NewHomeworkEvent : Event
     {
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/NewTaskEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/NewTaskEvent.cs
@@ -2,9 +2,9 @@
 using HwProj.EventBus.Client;
 using HwProj.Models.CoursesService.ViewModels;
 
-namespace HwProj.CoursesService.API.Events
+namespace HwProj.Events.CourseEvents
 {
-    public class NewHomeworkTaskEvent : Event
+    public class NewTaskEvent : Event
     {
         public string TaskTitle { get; set; }
         
@@ -17,7 +17,7 @@ public class NewHomeworkTaskEvent : Event
         public CourseDTO Course { get; set; }
         
 
-        public NewHomeworkTaskEvent(string taskTitle, long taskId, DateTime? deadline,
+        public NewTaskEvent(string taskTitle, long taskId, DateTime? deadline,
             DateTime publicationDate, CourseDTO course)
         {
             TaskTitle = taskTitle;
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateHomeworkEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateHomeworkEvent.cs
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateSolutionMaxRatingEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateSolutionMaxRatingEvent.cs
diff --git a/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs b/HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs
@@ -0,0 +1,25 @@
+using System;
+using HwProj.EventBus.Client;
+using HwProj.Models.CoursesService.ViewModels;
+
+namespace HwProj.Events.CourseEvents
+{
+    public class UpdateTaskEvent : Event
+    {
+        public CourseDTO Course { get; set; }
+        
+        public string TaskTitle { get; set; }
+        
+        public long TaskId { get; set; }
+        
+        public DateTime PublicationDate { get; set; }
+        
+        public UpdateTaskEvent(CourseDTO course, string taskTitle, long taskId, DateTime publicationDate)
+        {
+            Course = course;
+            TaskTitle = taskTitle;
+            TaskId = taskId;
+            PublicationDate = publicationDate;
+        }
+    }
+}
diff --git a/HwProj.Common/HwProj.Models/HwProj.Models.csproj b/HwProj.Common/HwProj.Models/HwProj.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <Folder Include="CoursesService" />
+    <Folder Include="Events\" />
   </ItemGroup>
 
 </Project>
diff --git a/HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs b/HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs
@@ -1,4 +1,6 @@
 ﻿using System.ComponentModel.DataAnnotations;
+using HwProj.EventBus.Client;
+using HwProj.Events.CourseEvents;
 using HwProj.Repositories;
 
 
@@ -12,15 +14,16 @@ public class ScheduleWork : IEntity<string>
 
     public static class ScheduleWorkIdBuilder
     {
-        public static string Build(string eventName, long id)
+        public static string Build(Event @event, long id)
         {
             //TODO: fill
-            var category = eventName switch
+            var eventType = @event.GetType();
+            var category = eventType switch
             {
-                _ when eventName.Equals("NewHomeworkTaskEvent") || eventName.Equals("UpdateTaskMaxRatingEvent") ||
-                       eventName.Equals("UpdateSolutionMaxRatingEvent")
+                _ when eventType == typeof(NewTaskEvent) || eventType == typeof(UpdateTaskEvent) ||
+                       eventType == typeof(DeleteTaskEvent)
                     => "Task",
-                _ when eventName.Equals("NewHomeworkEvent")
+                _ when eventType == typeof(NewHomeworkEvent) 
                     => "Homework",
                 _ => "Unknown"
             };
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/UpdateTaskMaxRatingEvent.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/UpdateTaskMaxRatingEvent.cs
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Services/CoursesService.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Services/CoursesService.cs
@@ -12,6 +12,7 @@
 using HwProj.Models.CoursesService.ViewModels;
 using HwProj.Models.Roles;
 using Microsoft.EntityFrameworkCore;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.CoursesService.API.Services
 {
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Services/HomeworksService.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Services/HomeworksService.cs
@@ -6,6 +6,7 @@
 using HwProj.CoursesService.API.Events;
 using HwProj.Models;
 using HwProj.Models.CoursesService.ViewModels;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.CoursesService.API.Services
 {
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Services/TasksService.cs b/HwProj.CoursesService/HwProj.CoursesService.API/Services/TasksService.cs
@@ -11,6 +11,7 @@
 using HwProj.Models;
 using HwProj.Models.CoursesService.ViewModels;
 using static System.TimeSpan;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.CoursesService.API.Services
 {
@@ -50,26 +51,27 @@ public async Task<long> AddTaskAsync(long homeworkId, HomeworkTask task)
 
             var taskId = await _tasksRepository.AddAsync(task);
 
-            if (task.PublicationDate > DateTimeUtils.GetMoscowNow())
-                _eventBus.Publish(new NewHomeworkTaskEvent(task.Title, taskId, task.DeadlineDate, task.PublicationDate, courseModel));
+            _eventBus.Publish(new NewTaskEvent(task.Title, taskId, task.DeadlineDate, task.PublicationDate,
+                courseModel));
 
             return taskId;
         }
 
         public async Task DeleteTaskAsync(long taskId)
         {
-            var task = await _tasksRepository.GetAsync(taskId);
+            _eventBus.Publish(new DeleteTaskEvent(taskId));
             await _tasksRepository.DeleteAsync(taskId);
         }
 
         public async Task UpdateTaskAsync(long taskId, HomeworkTask update)
         {
             var task = await _tasksRepository.GetAsync(taskId);
-            var taskModel = _mapper.Map<HomeworkTaskViewModel>(task);
             var homework = await _homeworksRepository.GetAsync(task.HomeworkId);
             var course = await _coursesRepository.GetWithCourseMatesAsync(homework.CourseId);
             var courseModel = _mapper.Map<CourseDTO>(course);
-            _eventBus.Publish(new UpdateTaskMaxRatingEvent(courseModel, taskModel, update.MaxRating));
+
+
+            _eventBus.Publish(new UpdateTaskEvent(courseModel, update.Title, taskId, update.PublicationDate));
 
             await _tasksRepository.UpdateAsync(taskId, t => new HomeworkTask()
             {
diff --git a/HwProj.EventBus/HwProj.EventBus.Client/HwProj.EventBus.Client.csproj b/HwProj.EventBus/HwProj.EventBus.Client/HwProj.EventBus.Client.csproj
@@ -18,9 +18,6 @@
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json" />
-  </ItemGroup>
+  
 
 </Project>
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/DeleteTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/DeleteTaskEventHandler.cs
@@ -0,0 +1,29 @@
+﻿using System.Threading.Tasks;
+using Hangfire;
+using HwProj.EventBus.Client.Interfaces;
+using HwProj.Events.CourseEvents;
+using HwProj.Models.NotificationsService;
+using HwProj.NotificationsService.API.Repositories;
+
+namespace HwProj.NotificationsService.API.EventHandlers
+{
+    public class DeleteTaskEventHandler : EventHandlerBase<DeleteTaskEvent>
+    {
+        private readonly IScheduleWorksRepository _scheduleWorksRepository;
+
+        public DeleteTaskEventHandler(IScheduleWorksRepository scheduleWorksRepository)
+        {
+            _scheduleWorksRepository = scheduleWorksRepository;
+        }
+
+        public override async Task HandleAsync(DeleteTaskEvent @event)
+        {
+            var id = ScheduleWorkIdBuilder.Build(@event, @event.TaskId);
+            var scheduleWork = await _scheduleWorksRepository.GetAsync(id);
+
+            BackgroundJob.Delete(scheduleWork.JobId);
+            
+            await _scheduleWorksRepository.DeleteAsync(id);
+        }
+    }
+}
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerAcceptToCourseEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerAcceptToCourseEventHandler.cs
@@ -7,6 +7,7 @@
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerInvitedToCourseEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerInvitedToCourseEventHandler.cs
@@ -6,6 +6,7 @@
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerRejectToCourseEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/LecturerRejectToCourseEventHandler.cs
@@ -7,6 +7,7 @@
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewCourseMateHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewCourseMateHandler.cs
@@ -7,6 +7,7 @@
 using HwProj.NotificationsService.API.Repositories;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkEventHandler.cs
@@ -8,6 +8,7 @@
 using HwProj.Models;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
+using HwProj.Events.CourseEvents;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs
@@ -8,12 +8,13 @@
 using HwProj.CoursesService.API.Events;
 using HwProj.Models;
 using Hangfire;
+using HwProj.Events.CourseEvents;
 using HwProj.NotificationsService.API.Services;
 using Microsoft.Extensions.Configuration;
 
 namespace HwProj.NotificationsService.API.EventHandlers
 {
-    public class NewHomeworkTaskEventHandler : EventHandlerBase<NewHomeworkTaskEvent>
+    public class NewHomeworkTaskEventHandler : EventHandlerBase<NewTaskEvent>
     {
         private readonly INotificationsRepository _notificationRepository;
         private readonly IScheduleWorksRepository _scheduleWorksRepository;
@@ -35,11 +36,13 @@ public NewHomeworkTaskEventHandler(
             _configuration = configuration.GetSection("Notification");
         }
 
-        public override async Task HandleAsync(NewHomeworkTaskEvent @event)
+        public override async Task HandleAsync(NewTaskEvent @event)
         {
-            var id = ScheduleWorkIdBuilder.Build(nameof(NewHomeworkTaskEvent), @event.TaskId);
-            var jobId = BackgroundJob.Schedule(() => ScheduleWorkAsync(@event, id),
-                @event.PublicationDate.Subtract(TimeSpan.FromHours(3)));
+            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)));
 
             var scheduleWork = new ScheduleWork
             {
@@ -50,7 +53,7 @@ public override async Task HandleAsync(NewHomeworkTaskEvent @event)
         }
 
 
-        public async Task ScheduleWorkAsync(NewHomeworkTaskEvent @event, string id)
+        public async Task ScheduleWorkAsync(NewTaskEvent @event, string id)
         {
             var studentIds = @event.Course.CourseMates.Select(t => t.StudentId).ToArray();
             var accountsData = await _authServiceClient.GetAccountsData(studentIds);
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/UpdateTaskEventHandler.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/EventHandlers/UpdateTaskEventHandler.cs
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/IScheduleWorksRepository.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/IScheduleWorksRepository.cs
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/ScheduleWorksRepository.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Repositories/ScheduleWorksRepository.cs
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Startup.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using HwProj.EventBus.Client;`
`2`	`2`
`3`		`-namespace HwProj.CoursesService.API.Events`
	`3`	`+namespace HwProj.Events.CourseEvents`
`4`	`4`	`{`
`5`	`5`	`public class LecturerAcceptToCourseEvent : Event`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using HwProj.EventBus.Client;`
`2`	`2`	`using HwProj.Models.CoursesService.ViewModels;`
`3`	`3`
`4`		`-namespace HwProj.CoursesService.API.Events`
	`4`	`+namespace HwProj.Events.CourseEvents`
`5`	`5`	`{`
`6`	`6`	`public class NewHomeworkEvent : Event`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using HwProj.EventBus.Client;`
`3`	`3`	`using HwProj.Models.CoursesService.ViewModels;`
`4`	`4`
`5`		`-namespace HwProj.CoursesService.API.Events`
	`5`	`+namespace HwProj.Events.CourseEvents`
`6`	`6`	`{`
`7`		`- public class NewHomeworkTaskEvent : Event`
	`7`	`+ public class NewTaskEvent : Event`
`8`	`8`	`{`
`9`	`9`	`public string TaskTitle { get; set; }`
`10`	`10`
`@@ -17,7 +17,7 @@ public class NewHomeworkTaskEvent : Event`
`17`	`17`	`public CourseDTO Course { get; set; }`
`18`	`18`
`19`	`19`
`20`		`- public NewHomeworkTaskEvent(string taskTitle, long taskId, DateTime? deadline,`
	`20`	`+ public NewTaskEvent(string taskTitle, long taskId, DateTime? deadline,`
`21`	`21`	`DateTime publicationDate, CourseDTO course)`
`22`	`22`	`{`
`23`	`23`	`TaskTitle = taskTitle;`