Merge pull request #1287 from dhruvb14/dev

Quick fix for email false positive message. ISSUE: #1286

Ombi.Services/Jobs/RecentlyAddedNewsletter/RecentlyAddedNewsletter.cs

@@ -138,7 +138,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
             if (embySettings.Enable)
             {
                 var letter = EmbyNewsletter.GetNewsletter(testEmail) ?? new Newsletter();
-                if (letter.Send)
+                if (letter.Send || testEmail)
                 {
                     SendNewsletter(newletterSettings, letter.Html, testEmail, "New Content On Emby!");
                 }
@@ -153,7 +153,7 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
                 if (plexSettings.Enable)
                 {
                     var letter = PlexNewsletter.GetNewsletter(testEmail) ?? new Newsletter();
-                    if (letter.Send)
+                    if (letter.Send || testEmail)
                     {
                         SendNewsletter(newletterSettings, letter.Html, testEmail);
                     }

Ombi.Services/Notification/EmailMessageNotification.cs

@@ -227,6 +227,7 @@ namespace Ombi.Services.Notification
             catch (Exception e)
             {
                 Log.Error(e);
+                throw new InvalidOperationException(e.Message);
             }
         }
 

Ombi.Services/Notification/NotificationService.cs

@@ -97,6 +97,7 @@ namespace Ombi.Services.Notification
             catch (Exception ex)
             {
                 Log.Error(ex, $"Notification '{notification.NotificationName}' failed with exception");
+                throw new InvalidOperationException(ex.Message);
             }
         }
     }

Ombi.UI/Modules/Admin/AdminModule.cs

@@ -642,9 +642,11 @@ namespace Ombi.UI.Modules.Admin
                 await NotificationService.Publish(notificationModel, settings);
                 Log.Info("Sent email notification test");
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Log.Error("Failed to subscribe and publish test Email Notification");
+                var msg = "Failed: " + ex.Message;
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = msg });
             }
             finally
             {
@@ -653,7 +655,9 @@ namespace Ombi.UI.Modules.Admin
                     NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
                 }
             }
+
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
+
         }
 
         private Response SaveEmailNotifications()
@@ -1299,7 +1303,8 @@ namespace Ombi.UI.Modules.Admin
             {
                 var settings = this.Bind<MassEmailSettings>();
                 Log.Debug("Clicked Admin Mass Email Test");
-                if (settings.Subject == null) {
+                if (settings.Subject == null)
+                {
                     return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Subject" });
                 }
                 if (settings.Body == null)

Ombi.UI/Modules/Admin/CustomizationModule.cs

@@ -122,8 +122,7 @@ namespace Ombi.UI.Modules.Admin
             }
             catch (Exception e)
             {
-
-                throw;
+                throw e;
             }
         }
     }