#1659 Made the option to ignore notifcations for auto approve

appveyor.yml

@@ -10,6 +10,8 @@ install:
 build_script:
   - ps: ./build.ps1 --settings_skipverification=true
 
+test: off
+  
 after_build:
 - cmd: >-
     

src/.vscode/src.code-workspace

@@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "C:\\Users\\Jamie.Rees\\Source\\Repos\\test2\\ombi\\src"
+		}
+	],
+	"settings": {
+		"files.associations": {
+			"dockerfile.*": "dockerfile"
+		},
+		"typescript.tsdk": "node_modules\\typescript\\lib"
+	}
+}

src/.vscode/ui.code-workspace

@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "C:\\Users\\Jamie.Rees\\Source\\Repos\\test2\\ombi\\src\\Ombi"
+		}
+	],
+	"settings": {
+		"typescript.tsdk": "node_modules\\typescript\\lib"
+	}
+}

src/Ombi.Core/Rule/Rules/Specific/SendNotificationRule.cs

@@ -2,7 +2,9 @@
 using Microsoft.EntityFrameworkCore;
 using Ombi.Core.Authentication;
 using Ombi.Core.Rule.Interfaces;
+using Ombi.Core.Settings;
 using Ombi.Helpers;
+using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 
@@ -10,26 +12,35 @@ namespace Ombi.Core.Rule.Rules.Specific
 {
     public class SendNotificationRule : SpecificRule, ISpecificRule<object>
     {
-        public SendNotificationRule(OmbiUserManager um)
+        public SendNotificationRule(OmbiUserManager um, ISettingsService<OmbiSettings> settings)
         {
             UserManager = um;
+            Settings = settings;
         }
 
         public override SpecificRules Rule => SpecificRules.CanSendNotification;
         private OmbiUserManager UserManager { get; }
+        private ISettingsService<OmbiSettings> Settings { get; }
 
         public async Task<RuleResult> Execute(object obj)
         {
             var req = (BaseRequest)obj;
-            var sendNotification = !req.Approved; /*|| !prSettings.IgnoreNotifyForAutoApprovedRequests;*/
+            var settings = await Settings.GetSettingsAsync();
+            var sendNotification = true;
             var requestedUser = await UserManager.Users.FirstOrDefaultAsync(x => x.Id == req.RequestedUserId);
             if (req.RequestType == RequestType.Movie)
             {
-                sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveMovie);
+                if (settings.DoNotSendNotificationsForAutoApprove)
+                {
+                    sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveMovie);
+                }
             }
-            else if(req.RequestType ==  RequestType.TvShow)
+            else if (req.RequestType == RequestType.TvShow)
             {
-                sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveTv);
+                if (settings.DoNotSendNotificationsForAutoApprove)
+                {
+                    sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveTv);
+                }
             }
 
             if (await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.Admin))

src/Ombi.Settings/Settings/Models/OmbiSettings.cs

@@ -7,6 +7,7 @@
         public bool Wizard { get; set; }
         public string ApiKey { get; set; }
         public bool IgnoreCertificateErrors { get; set; }
+        public bool DoNotSendNotificationsForAutoApprove {get;set;}
 
     }
 }

src/Ombi/ClientApp/app/interfaces/ISettings.ts

@@ -13,6 +13,7 @@ export interface IOmbiSettings extends ISettings {
   wizard: boolean;
   apiKey: string;
   ignoreCertificateErrors: boolean;
+  doNotSendNotificationsForAutoApprove: boolean;
 }
 
 export interface IUpdateSettings extends ISettings {

src/Ombi/ClientApp/app/settings/ombi/ombi.component.html

@@ -45,6 +45,14 @@
             </div>
         </div>
         <br/>
+
+        <div class="form-group">
+            <div class="checkbox">
+                <input type="checkbox" id="doNotSendNotificationsForAutoApprove" name="doNotSendNotificationsForAutoApprove" formControlName="doNotSendNotificationsForAutoApprove">
+                <label for="doNotSendNotificationsForAutoApprove">Do not send Notifications if a User has the Auto Approve permission</label>
+            </div>
+        </div>
+
         <div class="form-group">
             <div class="checkbox">
                 <input type="checkbox" id="ignoreCertificateErrors" name="ignoreCertificateErrors" formControlName="ignoreCertificateErrors">

src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts

@@ -22,6 +22,7 @@ export class OmbiComponent implements OnInit {
                 apiKey: [x.apiKey],
                 ignoreCertificateErrors: [x.ignoreCertificateErrors],
                 baseUrl: [x.baseUrl],
+                doNotSendNotificationsForAutoApprove: [x.doNotSendNotificationsForAutoApprove],
             });
         });
     }