From a9c27b217007b2b7cf2143891ebd244ca57f7a6d Mon Sep 17 00:00:00 2001 From: berkansasmaz Date: Fri, 17 Dec 2021 12:02:38 +0300 Subject: [PATCH] Add isDraft control to background services --- .../Events/EventReminderNotifier.cs | 6 +++--- .../Events/EventReminderWorker.cs | 4 ++-- .../Events/EventTimingChangeNotifier.cs | 6 +++--- .../Events/EventTimingChangeWorker.cs | 4 ++-- src/EventHub.BackgroundServices/Events/NewEventNotifier.cs | 4 ++-- src/EventHub.BackgroundServices/Events/NewEventWorker.cs | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs b/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs index 7ef1995..d2b3944 100644 --- a/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs +++ b/src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs @@ -37,7 +37,7 @@ namespace EventHub.Events public async Task NotifyAsync(Event @event) { - if (@event is null || @event.IsRemindingEmailSent) + if (@event is null || @event.IsRemindingEmailSent || !@event.IsDraft) { return; } @@ -47,7 +47,7 @@ namespace EventHub.Events var userQuery = from eventRegistration in registrationQueryable join user in userQueryable on eventRegistration.UserId equals user.Id - where eventRegistration.EventId == @event.Id + where eventRegistration.EventId == @event.Id && !@event.IsDraft select user; var users = await _asyncExecuter.ToListAsync(userQuery); @@ -71,4 +71,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +} diff --git a/src/EventHub.BackgroundServices/Events/EventReminderWorker.cs b/src/EventHub.BackgroundServices/Events/EventReminderWorker.cs index f8da636..ac18a93 100644 --- a/src/EventHub.BackgroundServices/Events/EventReminderWorker.cs +++ b/src/EventHub.BackgroundServices/Events/EventReminderWorker.cs @@ -32,7 +32,7 @@ namespace EventHub.Events var queryable = await eventRepository.GetQueryableAsync(); var query = queryable.Where(x => x.IsRemindingEmailSent == false && - x.StartTime <= thirtyMinutesLater + x.StartTime <= thirtyMinutesLater && !x.IsDraft ); var events = await asyncExecuter.ToListAsync(query); @@ -56,4 +56,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +} diff --git a/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs b/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs index e60b9f0..9f9fc30 100644 --- a/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs +++ b/src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs @@ -37,7 +37,7 @@ namespace EventHub.Events public async Task NotifyAsync(Event @event) { - if (@event is null || @event.IsTimingChangeEmailSent) + if (@event is null || @event.IsTimingChangeEmailSent || !@event.IsDraft) { return; } @@ -47,7 +47,7 @@ namespace EventHub.Events var userQuery = from eventRegistration in registrationQueryable join user in userQueryable on eventRegistration.UserId equals user.Id - where eventRegistration.EventId == @event.Id + where eventRegistration.EventId == @event.Id && !@event.IsDraft select user; var users = await _asyncExecuter.ToListAsync(userQuery); @@ -71,4 +71,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +} diff --git a/src/EventHub.BackgroundServices/Events/EventTimingChangeWorker.cs b/src/EventHub.BackgroundServices/Events/EventTimingChangeWorker.cs index aa6587d..faac3b4 100644 --- a/src/EventHub.BackgroundServices/Events/EventTimingChangeWorker.cs +++ b/src/EventHub.BackgroundServices/Events/EventTimingChangeWorker.cs @@ -31,7 +31,7 @@ namespace EventHub.Events var asyncExecuter = workerContext.ServiceProvider.GetRequiredService(); var queryable = await eventRepository.GetQueryableAsync(); - var query = queryable.Where(x => !x.IsTimingChangeEmailSent); + var query = queryable.Where(x => !x.IsTimingChangeEmailSent && !x.IsDraft); var events = await asyncExecuter.ToListAsync(query); @@ -51,4 +51,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +} diff --git a/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs b/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs index 64dcf02..486fb51 100644 --- a/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs +++ b/src/EventHub.BackgroundServices/Events/NewEventNotifier.cs @@ -37,7 +37,7 @@ namespace EventHub.Events public async Task NotifyAsync(Event @event) { - if (@event is null || @event.IsEmailSentToMembers) + if (@event is null || @event.IsEmailSentToMembers || !@event.IsDraft) { return; } @@ -71,4 +71,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +} diff --git a/src/EventHub.BackgroundServices/Events/NewEventWorker.cs b/src/EventHub.BackgroundServices/Events/NewEventWorker.cs index 4dd9a97..372744f 100644 --- a/src/EventHub.BackgroundServices/Events/NewEventWorker.cs +++ b/src/EventHub.BackgroundServices/Events/NewEventWorker.cs @@ -34,7 +34,7 @@ namespace EventHub.Events var queryable = await eventRepository.GetQueryableAsync(); var newEvents = await asyncExecuter.ToListAsync( - queryable.Where(x => x.IsEmailSentToMembers == false) + queryable.Where(x => x.IsEmailSentToMembers == false && !x.IsDraft) ); var fiveMinutesLater = clock.Now.AddMinutes(5); @@ -57,4 +57,4 @@ namespace EventHub.Events } } } -} \ No newline at end of file +}