From 45bb968fd3acf47dd2825b076553e3785ed33ad3 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Wed, 13 Nov 2019 09:28:27 +0530
Subject: [PATCH] Added new top-level bulk email settings

no issue
---
 app/models/setting.js       |  3 ++-
 app/services/settings.js    |  2 +-
 mirage/fixtures/settings.js | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/models/setting.js b/app/models/setting.js
index 3bac7f8f61..e4a2b48593 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -38,5 +38,6 @@ export default Model.extend(ValidationEngine, {
     twitterImage: attr('string'),
     ogTitle: attr('string'),
     ogDescription: attr('string'),
-    ogImage: attr('string')
+    ogImage: attr('string'),
+    bulkEmailSettings: attr('json-string')
 });
diff --git a/app/services/settings.js b/app/services/settings.js
index 3ecd8c0e9c..48a647c43a 100644
--- a/app/services/settings.js
+++ b/app/services/settings.js
@@ -27,7 +27,7 @@ export default Service.extend(_ProxyMixin, ValidationEngine, {
     _loadSettings() {
         if (!this._loadingPromise) {
             this._loadingPromise = this.store
-                .queryRecord('setting', {type: 'blog,theme,private,members'})
+                .queryRecord('setting', {type: 'blog,theme,private,members,bulk_email'})
                 .then((settings) => {
                     this._loadingPromise = null;
                     return settings;
diff --git a/mirage/fixtures/settings.js b/mirage/fixtures/settings.js
index 90b9e1575a..9f3896fa2d 100644
--- a/mirage/fixtures/settings.js
+++ b/mirage/fixtures/settings.js
@@ -182,5 +182,15 @@ export default [
         created_by: 1,
         updated_at: '2019-10-09T09:49:00.000Z',
         updated_by: 1
+    },
+    {
+        id: 24,
+        type: 'bulk_email',
+        key: 'bulk_email_settings',
+        value: '{"provider":"mailgun","apiKey":"","domain":"","baseUrl":""}',
+        created_at: '2019-10-09T09:49:00.000Z',
+        created_by: 1,
+        updated_at: '2019-10-09T09:49:00.000Z',
+        updated_by: 1
     }
 ];