Delayed Notifications #298

BakhorikovEgor · 2023-09-22T16:45:58Z

No description provided.

DedSec256 · 2023-11-05T15:49:12Z

HwProj.NotificationsService/HwProj.NotificationsService.API/Startup.cs

+                .UseSqlServerStorage(Configuration.GetConnectionString("HangfireConnection")));
+
+            // Add the processing server as IHostedService
+            services.AddHangfireServer();


это точно нужно?

у hangfire клиент - серверная архитектура, где сервер и клиент общаются с общей бд
сервер нужно добавить, чтобы он брал задачи из бд и выполнял их время от времени

DedSec256 · 2023-11-05T15:49:37Z

...otificationsService/HwProj.NotificationsService.API/Repositories/IScheduleWorksRepository.cs

+using HwProj.Repositories;
+
+
+namespace HwProj.NotificationsService.API.Repositories;


namespace надо сделать block-scoped

DedSec256 · 2023-11-05T15:49:56Z

HwProj.NotificationsService/HwProj.NotificationsService.API/Models/NotificationsContext.cs

 using Microsoft.EntityFrameworkCore;

 namespace HwProj.NotificationsService.API.Models
 {
    public sealed class NotificationsContext : DbContext
    {
        public DbSet<Notification> Notifications { get; set; }
+        public DbSet<ScheduleWork> ScheduleWorks { get; set; }


Suggested change

public DbSet<ScheduleWork> ScheduleWorks { get; set; }

public DbSet<ScheduleJob> ScheduleJobs { get; set; }

DedSec256 · 2023-11-05T15:51:41Z

HwProj.Common/HwProj.Repositories/IEntity.cs

@@ -2,7 +2,7 @@

 namespace HwProj.Repositories
 {
-    public interface IEntity<TKey>
+    public interface  IEntity<TKey>


нужно отформатировать

DedSec256 · 2023-11-05T15:53:01Z

HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs

+{
+    public class UpdateTaskEvent : Event
+    {
+        public CourseDTO Course { get; set; }


можем ли мы из курса взять только необходимые данные?

DedSec256 · 2023-11-05T15:54:06Z

HwProj.Common/HwProj.Models/Events/CourseEvents/UpdateTaskEvent.cs

+        public string TaskTitle { get; set; }
+
+        public long TaskId { get; set; }
+
+        //закладываюсь, что дату публикации не будут менять после публикации
+        public DateTime PreviousPublicationDate { get; set; }
+
+        public DateTime PublicationDate { get; set; }
+
+        public DateTime? Deadline { get; set; }


Возможно, мы хотим старую задачу и новую задачу, а не набор отдельных полей?

DedSec256 · 2023-11-05T15:54:36Z

HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs

+
+namespace HwProj.Models.NotificationsService
+{
+    public class ScheduleWork : IEntity<string>


Suggested change

public class ScheduleWork : IEntity<string>

public class ScheduleJob : IEntity<string>

DedSec256 · 2023-11-05T16:01:02Z

...NotificationsService/HwProj.NotificationsService.API/EventHandlers/DeleteTaskEventHandler.cs

+
+        public override async Task HandleAsync(DeleteTaskEvent @event)
+        {
+            var id = ScheduleWorkIdBuilder.Build(@event, @event.TaskId);


По эвенту удаления не должны создаваться ключи других эвентов, тем более, что отменяемых эвентов может быть несколько

DedSec256 · 2023-11-05T16:37:17Z

HwProj.Common/HwProj.Models/NotificationsService/ScheduleWork.cs

+            {
+                _ when eventType == typeof(NewTaskEvent) || eventType == typeof(UpdateTaskEvent) ||
+                       eventType == typeof(DeleteTaskEvent)
+                    => "Task",


для дедлайнов и публикаций ключи должны отличаться

feat: new task delayed notification

feat: create ScheduleEventHandler + UpdateScheduleEventHandler abstract classes feat: Create ScheduleWorksRepository feat: Add schedule homework task

fix: schedule works not implement IRepository interfaces fix: change ScheduleWork primary key

Transferring CourseDataFilter

DedSec256 · 2023-12-05T16:55:53Z

HwProj.APIGateway/HwProj.APIGateway.API/Filters/CourseDataFilterAttribute.cs

+            var userId = context.HttpContext.User.Claims
+                .FirstOrDefault(claim => claim.Type.ToString() == "_id")
+                ?.Value;;


Suggested change

var userId = context.HttpContext.User.Claims

.FirstOrDefault(claim => claim.Type.ToString() == "_id")

?.Value;;

var userId = context.HttpContext.User.FindFirst("_id");

DedSec256 · 2023-12-05T16:59:05Z

HwProj.Common/HwProj.Models/NotificationsService/NotificationCategoryState.cs

+        Homeworks,
+        Tasks


Думаю, нам не нужно это изменение

DedSec256 · 2023-12-05T17:13:57Z

...icationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs

+            var course = await _coursesServiceClient.GetCourseById(@event.Course.Id);
+            if (course == null) return;
+
+            var studentIds = course.CourseMates.Select(t => t.StudentId).ToArray();


Suggested change

var studentIds = course.CourseMates.Select(t => t.StudentId).ToArray();

var studentIds = course.AcceptedStudents.Select(t => t.StudentId).ToArray();

DedSec256 · 2023-12-05T17:17:00Z

...icationsService/HwProj.NotificationsService.API/EventHandlers/NewHomeworkTaskEventHandler.cs

+            await EventHandlerExtensions<NewTaskEvent>.DeleteScheduleJobAsync(@event, @event.TaskId,
+                _scheduleJobsRepository);


Давай будем удалять джобу только тогда, когда её создаем: вынесем этот код из AddNotificationsAsync

Также нужно удалять джобы просто из репозитория

DedSec256 · 2023-12-05T17:19:46Z

...NotificationsService/HwProj.NotificationsService.API/EventHandlers/UpdateTaskEventHandler.cs

+            var accountsData = await _authServiceClient.GetAccountsData(studentIds);
+
+            var url = _configuration["Url"];
+            var isTaskPublished = @event.PreviousEvent.PublicationDate < DateTimeUtils.GetMoscowNow();


если задача опубликована, мы можем использовать логику из NewHomeworkTaskEventHandler

DedSec256 · 2023-12-05T17:25:42Z

....NotificationsService/HwProj.NotificationsService.API/Repositories/ScheduleJobsRepository.cs

+            var predicate = (ScheduleJob scheduleJob) =>
+            {
+                var id = ScheduleJobIdHelper.ParseId(scheduleJob.Id);
+                return id.CategoryId == categoryId && id.Category.Equals(category);
+            };


Этот код не транслируется в SQL. Нужно или делать фильтрацию по объектному ключу и его полям, или составлять список всех буквальных ключей, и искать записи в бд по ним

This reverts commit d220d21.

=

…vent

DedSec256 reviewed Nov 5, 2023

View reviewed changes

BakhorikovEgor added 9 commits November 15, 2023 21:41

feat: add HangFire settings to startup and app settings.

4c06e83

feat: new task delayed notification

feat: add delete and update delayed methods for tasks

248c316

feat: Moved hangfire to NotificationsService

4443ebb

feat: create ScheduleEvent

8557b6c

feat: create ScheduleEventHandler + UpdateScheduleEventHandler abstract classes feat: Create ScheduleWorksRepository feat: Add schedule homework task

feat: add UpdateScheduleEvent class

6e0d6ca

fix: delete delayed logic from CourseService

20d7fbf

fix: schedule works not implement IRepository interfaces fix: change ScheduleWork primary key

feat: change ScheduleWork id to string

635920d

feat: add and delete delayed task events and eventhandlers

f3a7d6a

feat: add delete update task events and eventhandlers are written

ac1eaa0

BakhorikovEgor force-pushed the DelayedNotifications branch from 76fd0e2 to ac1eaa0 Compare November 15, 2023 18:42

BakhorikovEgor added 7 commits November 15, 2023 21:55

fix: style fixes

53e2616

feat: bear main schedule event handler logic

2cb1af1

feat: transfer CourseDataFilterAttribute.cs to ApiGateway

1a9e978

feat: add lazy getting course data in task event-handlers

323dfd2

feat: change part of ScheduleWorkId

1d4d5b5

Merge pull request #340 from InteIIigeNET/TransferringCourseDataFilter

eab2e10

Transferring CourseDataFilter

feat: transfer hangfire dashboard to apigateway

d220d21

DedSec256 reviewed Dec 5, 2023

View reviewed changes

DedSec256 approved these changes Dec 14, 2023

View reviewed changes

BakhorikovEgor and others added 5 commits January 7, 2024 23:19

Revert "feat: transfer hangfire dashboard to apigateway"

6476105

This reverts commit d220d21.

fix: composite delayed job key

7ca52e4

=

feat: better choice for continuation

5d50b4a

fix: style fixes

3017b8f

fix: duplicate reference fix

8d8cec2

DedSec256 and others added 2 commits February 25, 2024 23:37

wip

70d9ec8

feat: change update extension to rescheduling + add lazy addorupdateE…

dac4582

…vent

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Delayed Notifications #298

Delayed Notifications #298

BakhorikovEgor commented Sep 22, 2023

DedSec256 Nov 5, 2023

BakhorikovEgor Nov 14, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Nov 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

DedSec256 Dec 5, 2023

		using HwProj.Repositories;


		namespace HwProj.NotificationsService.API.Repositories;

	public DbSet<ScheduleWork> ScheduleWorks { get; set; }
	public DbSet<ScheduleJob> ScheduleJobs { get; set; }

	public class ScheduleWork : IEntity<string>
	public class ScheduleJob : IEntity<string>

	var studentIds = course.CourseMates.Select(t => t.StudentId).ToArray();
	var studentIds = course.AcceptedStudents.Select(t => t.StudentId).ToArray();

		await EventHandlerExtensions<NewTaskEvent>.DeleteScheduleJobAsync(@event, @event.TaskId,
		_scheduleJobsRepository);

Delayed Notifications #298

Are you sure you want to change the base?

Delayed Notifications #298

Conversation

BakhorikovEgor commented Sep 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment