From 19c5c0b05a863e92623b4118faa90b035baa022c Mon Sep 17 00:00:00 2001 From: Naz Date: Tue, 20 Jul 2021 19:35:49 +0400 Subject: [PATCH] Refactored storagePath parameter refs https://github.com/TryGhost/Team/issues/916 - The refactor was done follow the DI Constructor pattern with single options Object parameter - It didn't make sense to have a "config" object inside of options object containing just one property --- core/server/services/members/importer/importer.js | 7 +++---- core/server/services/members/service.js | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/server/services/members/importer/importer.js b/core/server/services/members/importer/importer.js index e5f5ae5664..0ee88d6476 100644 --- a/core/server/services/members/importer/importer.js +++ b/core/server/services/members/importer/importer.js @@ -15,8 +15,7 @@ const messages = { module.exports = class MembersCSVImporter { /** * @param {Object} options - * @param {Object} options.config - * @param {string} options.config.storagePath - The path to store CSV's in before importing + * @param {string} options.storagePath - The path to store CSV's in before importing * @param {Object} options.settingsCache - An instance of the Ghost Settings Cache * @param {() => Object} options.getMembersApi * @param {Object} options.ghostMailer - An instance of GhostMailer @@ -25,8 +24,8 @@ module.exports = class MembersCSVImporter { * @param {Object} options.knex - An instance of the Ghost Database connection * @param {Function} options.urlFor - function generating urls */ - constructor({config, settingsCache, getMembersApi, ghostMailer, isSet, addJob, knex, urlFor}) { - this._storagePath = config.storagePath; + constructor({storagePath, settingsCache, getMembersApi, ghostMailer, isSet, addJob, knex, urlFor}) { + this._storagePath = storagePath; this._settingsCache = settingsCache; this._getMembersApi = getMembersApi; this._ghostMailer = ghostMailer; diff --git a/core/server/services/members/service.js b/core/server/services/members/service.js index ce09475461..16889f069a 100644 --- a/core/server/services/members/service.js +++ b/core/server/services/members/service.js @@ -128,9 +128,7 @@ const membersService = { stripeConnect: require('./stripe-connect'), importer: new MembersCSVImporter({ - config: { - storagePath: config.getContentPath('data') - }, + storagePath: config.getContentPath('data'), settingsCache, getMembersApi: () => membersApi, ghostMailer,