Merge pull request #35 from slarkerino/update-private-message

feat: add category to pm

Author: gdlcf88

providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Abstractions/EasyAbp/NotificationService/Provider/PrivateMessaging/CreateNotificationInfoModelExtensions.cs

@@ -35,4 +35,14 @@ public static bool GetSendFromCreator(this CreateNotificationInfoModel model)
     {
         return (bool)model.GetProperty(nameof(CreatePrivateMessageNotificationEto.SendFromCreator));
     }
+
+    public static void SetCategory(this CreateNotificationInfoModel model, [CanBeNull] string category)
+    {
+        model.SetProperty(nameof(CreatePrivateMessageNotificationEto.Category), category);
+    }
+
+    public static string GetCategory(this CreateNotificationInfoModel model)
+    {
+        return (string)model.GetProperty(nameof(CreatePrivateMessageNotificationEto.Category));
+    }
 }

providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Abstractions/EasyAbp/NotificationService/Provider/PrivateMessaging/CreatePrivateMessageNotificationEto.cs

@@ -32,6 +32,13 @@ public bool SendFromCreator
         set => this.SetSendFromCreator(value);
     }
 
+    [CanBeNull]
+    public string Category
+    {
+        get => this.GetCategory();
+        set => this.SetCategory(value);
+    }
+
     public CreatePrivateMessageNotificationEto()
     {
     }

providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Abstractions/EasyAbp/NotificationService/Provider/PrivateMessaging/NotificationProviderPrivateMessagingConsts.cs

@@ -11,5 +11,7 @@ public static class NotificationProviderPrivateMessagingConsts
         public const string NotificationInfoSendFromCreatorPropertyName = "SendFromCreator";
 
         public const string NotificationIdPropertyName = "NotificationId";
+
+        public const string NotificationInfoCategoryPropertyName = "Category";
     }
 }

providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging/EasyAbp/NotificationService/Provider/PrivateMessaging/NotificationInfoExtensions.cs

@@ -6,7 +6,7 @@ namespace EasyAbp.NotificationService.Provider.PrivateMessaging;
 public static class NotificationInfoExtensions
 {
     public static void SetPrivateMessagingData(this NotificationInfo notificationInfo, [NotNull] string title,
-        [CanBeNull] string content, bool sendFromCreator)
+        [CanBeNull] string content, bool sendFromCreator, [CanBeNull] string category = null)
     {
         notificationInfo.SetDataValue(NotificationProviderPrivateMessagingConsts.NotificationInfoTitlePropertyName,
             title);
@@ -15,6 +15,9 @@ public static void SetPrivateMessagingData(this NotificationInfo notificationInf
         notificationInfo.SetDataValue(
             NotificationProviderPrivateMessagingConsts.NotificationInfoSendFromCreatorPropertyName,
             sendFromCreator);
+        notificationInfo.SetDataValue(
+            NotificationProviderPrivateMessagingConsts.NotificationInfoCategoryPropertyName,
+            category);
     }
 
     public static string GetPrivateMessagingTitle(this NotificationInfo notificationInfo)
@@ -34,4 +37,10 @@ public static bool GetPrivateMessagingSendFromCreator(this NotificationInfo noti
         return (bool)notificationInfo.GetDataValue(NotificationProviderPrivateMessagingConsts
             .NotificationInfoSendFromCreatorPropertyName);
     }
+
+    public static string GetPrivateMessagingCategory(this NotificationInfo notificationInfo)
+    {
+        return (string)notificationInfo.GetDataValue(NotificationProviderPrivateMessagingConsts
+            .NotificationInfoCategoryPropertyName);
+    }
 }

providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging/EasyAbp/NotificationService/Provider/PrivateMessaging/PrivateMessageNotificationManager.cs

@@ -25,7 +25,7 @@ public class PrivateMessageNotificationManager : NotificationManagerBase
     {
         var notificationInfo = new NotificationInfo(GuidGenerator.Create(), CurrentTenant.Id);
 
-        notificationInfo.SetPrivateMessagingData(model.GetTitle(), model.GetContent(), model.GetSendFromCreator());
+        notificationInfo.SetPrivateMessagingData(model.GetTitle(), model.GetContent(), model.GetSendFromCreator(), model.GetCategory());
 
         var notifications = await CreateNotificationsAsync(notificationInfo, model);
 
@@ -38,7 +38,8 @@ protected override async Task SendNotificationAsync(Notification notification, N
             notificationInfo.GetPrivateMessagingSendFromCreator() ? notification.CreatorId : null,
             notification.UserId,
             notificationInfo.GetPrivateMessagingTitle(),
-            notificationInfo.GetPrivateMessagingContent());
+            notificationInfo.GetPrivateMessagingContent(),
+            notificationInfo.GetPrivateMessagingCategory());
 
         model.SetProperty(NotificationProviderPrivateMessagingConsts.NotificationIdPropertyName, notification.Id);