Save notification in the feed during an API call POST template/sendno…

…tification
VirtoCommerce · Apr 16, 2018 · 13765d0 · 13765d0
1 parent 6f748b2
commit 13765d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/VirtoCommerce.Platform.Core/Notifications/Notification.cs b/VirtoCommerce.Platform.Core/Notifications/Notification.cs
@@ -99,7 +99,12 @@ protected Notification(INotificationSendingGateway notificationSendingGateway)
         public virtual SendNotificationResult SendNotification()
         {
             var result = NotificationSendingGateway.SendNotification(this);
-
+            if(result.IsSuccess)
+            {
+                IsActive = false;
+                IsSuccessSend = true;
+                SentDate = DateTime.UtcNow;
+            }
             return result;
         }
     }

diff --git a/VirtoCommerce.Platform.Web/BackgroundJobs/SendNotificationsJobs.cs b/VirtoCommerce.Platform.Web/BackgroundJobs/SendNotificationsJobs.cs
@@ -44,14 +44,8 @@ public void Process()
                         };
                     }
 
-                    if (sendResult.IsSuccess)
-                    {
-                        notification.IsActive = false;
-                        notification.IsSuccessSend = true;
-                        notification.SentDate = DateTime.UtcNow;
-                    }
-                    else
-					{
+                    if (!sendResult.IsSuccess)
+                    { 
 						if(notification.AttemptCount >= notification.MaxAttemptCount)
 						{
 							notification.IsActive = false;
@@ -66,4 +60,4 @@ public void Process()
 			}
         }
 	}
-}
+}
diff --git a/VirtoCommerce.Platform.Web/Controllers/Api/NotificationsController.cs b/VirtoCommerce.Platform.Web/Controllers/Api/NotificationsController.cs
@@ -195,7 +195,9 @@ public IHttpActionResult SendNotification(webModels.TestNotificationRequest requ
             {
                 SetValue(notification, param);
             }
-            var result = _notificationManager.SendNotification(notification);
+            var result = _notificationManager.SendNotification(notification);          
+            //save notification in feed
+            _notificationManager.ScheduleSendNotification(notification);
 
             return Ok(result);
         }