VCST-919: Add drafts and recipients tracking (#4)

src/VirtoCommerce.PushMessages.Core/BackgroundJobs/IPushMessageJobService.cs

@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace VirtoCommerce.PushMessages.Core.BackgroundJobs;
 
-public interface IPushMessageJobService
+public interface IPushMessageJobService : IRecurringJobService
 {
-    Task StartStopRecurringJobs();
+    void EnqueueAddRecipients(IList<string> messageIds = null);
 }

src/VirtoCommerce.PushMessages.Core/BackgroundJobs/IRecurringJobService.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using VirtoCommerce.Platform.Core.Events;
+using VirtoCommerce.Platform.Core.Settings.Events;
+
+namespace VirtoCommerce.PushMessages.Core.BackgroundJobs;
+
+public interface IRecurringJobService : IEventHandler<ObjectSettingChangedEvent>
+{
+    Task StartStopRecurringJobs();
+}

src/VirtoCommerce.PushMessages.Core/BackgroundJobs/RecurringJobDescriptor.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading.Tasks;
+using VirtoCommerce.Platform.Core.Settings;
+
+namespace VirtoCommerce.PushMessages.Core.BackgroundJobs;
+
+public class RecurringJobDescriptor<T>
+{
+    public SettingDescriptor EnableSetting { get; set; }
+    public SettingDescriptor CronSetting { get; set; }
+    public MethodInfo Method { get; set; }
+    public Expression<Func<T, Task>> MethodCall { get; set; }
+}

src/VirtoCommerce.PushMessages.Core/Extensions/ApplicationBuilderExtensions.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using VirtoCommerce.Platform.Core.Events;
+using VirtoCommerce.Platform.Core.Settings.Events;
+using VirtoCommerce.PushMessages.Core.BackgroundJobs;
+
+namespace VirtoCommerce.PushMessages.Core.Extensions;
+
+public static class ApplicationBuilderExtensions
+{
+    public static void UseRecurringJobService<T>(this IApplicationBuilder appBuilder)
+        where T : class, IRecurringJobService
+    {
+        appBuilder.RegisterEventHandler<ObjectSettingChangedEvent, T>();
+
+        var pushMessageJobService = appBuilder.ApplicationServices.GetService<T>();
+        pushMessageJobService.StartStopRecurringJobs().GetAwaiter().GetResult();
+    }
+}

src/VirtoCommerce.PushMessages.Core/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,15 @@
+using Microsoft.Extensions.DependencyInjection;
+using VirtoCommerce.PushMessages.Core.BackgroundJobs;
+
+namespace VirtoCommerce.PushMessages.Core.Extensions;
+
+public static class ServiceCollectionExtensions
+{
+    public static void AddRecurringJobService<TService, TImplementation>(this IServiceCollection serviceCollection)
+        where TService : class, IRecurringJobService
+        where TImplementation : class, TService
+    {
+        serviceCollection.AddSingleton<TImplementation>();
+        serviceCollection.AddSingleton<TService, TImplementation>();
+    }
+}

src/VirtoCommerce.PushMessages.Core/Models/PushMessage.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 using VirtoCommerce.Platform.Core.Common;
 
 namespace VirtoCommerce.PushMessages.Core.Models;
@@ -13,15 +12,21 @@ public class PushMessage : AuditableEntity, ICloneable
 
     public DateTime? StartDate { get; set; }
 
-    public string Status { get; set; }
+    public string Status { get; set; } = PushMessageStatus.Draft;
 
-    public IList<string> MemberIds { get; set; }
+    public bool TrackNewRecipients { get; set; }
+
+    public string MemberQuery { get; set; }
 
-    [JsonIgnore]
-    public IList<string> UserIds { get; set; }
+    public IList<string> MemberIds { get; set; }
 
-    public object Clone()
+    public virtual object Clone()
     {
         return MemberwiseClone();
     }
+
+    public virtual bool HasRecipients()
+    {
+        return MemberIds != null && MemberIds.Count > 0 || !string.IsNullOrEmpty(MemberQuery);
+    }
 }

src/VirtoCommerce.PushMessages.Core/Models/PushMessageSearchCriteria.cs

@@ -6,6 +6,9 @@ namespace VirtoCommerce.PushMessages.Core.Models;
 
 public class PushMessageSearchCriteria : SearchCriteriaBase
 {
+    public bool? IsDraft { get; set; }
+    public bool? TrackNewRecipients { get; set; }
+    public DateTime? CreatedDateBefore { get; set; }
     public DateTime? StartDateBefore { get; set; }
     public IList<string> Statuses { get; set; }
 }

src/VirtoCommerce.PushMessages.Core/Models/PushMessageStatus.cs

@@ -2,6 +2,7 @@ namespace VirtoCommerce.PushMessages.Core.Models;
 
 public static class PushMessageStatus
 {
+    public const string Draft = "Draft";
     public const string Scheduled = "Scheduled";
     public const string Sent = "Sent";
 }

src/VirtoCommerce.PushMessages.Core/ModuleConstants.cs

@@ -50,28 +50,46 @@ public static IEnumerable<SettingDescriptor> AllGeneralSettings
 
         public static class BackgroundJobs
         {
-            public static SettingDescriptor Enable { get; } = new()
+            public static SettingDescriptor SendScheduledMessagesRecurringJobEnable { get; } = new()
             {
-                Name = "PushMessages.BackgroundJobs.Enable",
+                Name = "PushMessages.SendScheduledMessagesRecurringJob.Enable",
                 GroupName = "Push Messages|Background Jobs",
                 ValueType = SettingValueType.Boolean,
                 DefaultValue = true,
             };
 
-            public static SettingDescriptor CronExpression { get; } = new()
+            public static SettingDescriptor SendScheduledMessagesRecurringJobCronExpression { get; } = new()
             {
-                Name = "PushMessages.BackgroundJobs.CronExpression",
+                Name = "PushMessages.SendScheduledMessagesRecurringJob.CronExpression",
                 GroupName = "Push Messages|Background Jobs",
                 ValueType = SettingValueType.ShortText,
                 DefaultValue = "0/5 * * * *",
             };
 
+            public static SettingDescriptor TrackNewRecipientsRecurringJobEnable { get; } = new()
+            {
+                Name = "PushMessages.TrackNewRecipientsRecurringJob.Enable",
+                GroupName = "Push Messages|Background Jobs",
+                ValueType = SettingValueType.Boolean,
+                DefaultValue = true,
+            };
+
+            public static SettingDescriptor TrackNewRecipientsRecurringJobCronExpression { get; } = new()
+            {
+                Name = "PushMessages.TrackNewRecipientsRecurringJob.CronExpression",
+                GroupName = "Push Messages|Background Jobs",
+                ValueType = SettingValueType.ShortText,
+                DefaultValue = "0 0/1 * * *",
+            };
+
             public static IEnumerable<SettingDescriptor> AllBackgroundJobsSettings
             {
                 get
                 {
-                    yield return Enable;
-                    yield return CronExpression;
+                    yield return SendScheduledMessagesRecurringJobEnable;
+                    yield return SendScheduledMessagesRecurringJobCronExpression;
+                    yield return TrackNewRecipientsRecurringJobEnable;
+                    yield return TrackNewRecipientsRecurringJobCronExpression;
                 }
             }
         }

src/VirtoCommerce.PushMessages.Core/Services/IPushMessageService.cs

@@ -1,8 +1,10 @@
+using System.Threading.Tasks;
 using VirtoCommerce.Platform.Core.GenericCrud;
 using VirtoCommerce.PushMessages.Core.Models;
 
 namespace VirtoCommerce.PushMessages.Core.Services;
 
 public interface IPushMessageService : ICrudService<PushMessage>
 {
+    Task<PushMessage> ChangeTracking(string messageId, bool value);
 }