Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Refactored Ghost mailer dependency out of MembersCSVImporter

Browse source 
refs https://github.com/TryGhost/Team/issues/916

-  The refactor was done follow the DI Constructor pattern and prepare module for extraction
This commit is contained in:
Naz 2021-07-20 18:42:26 +04:00 • committed by naz
parent 8f169720d1
commit c3b60a5628
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ghost/members-importer/lib/importer.js
View file

@ -4,7 +4,7 @@ const fs = require('fs-extra');
const membersCSV = require('@tryghost/members-csv'); const membersCSV = require('@tryghost/members-csv');
const errors = require('@tryghost/errors'); const errors = require('@tryghost/errors');
const tpl = require('@tryghost/tpl'); const tpl = require('@tryghost/tpl');
const GhostMailer = require('../../mail').GhostMailer;
const urlUtils = require('../../../../shared/url-utils'); const urlUtils = require('../../../../shared/url-utils');
const db = require('../../../data/db'); const db = require('../../../data/db');
const emailTemplate = require('./email-template'); const emailTemplate = require('./email-template');
@ -16,18 +16,19 @@ const messages = {
jobAlreadyComplete: 'Job is already complete.' jobAlreadyComplete: 'Job is already complete.'
}; };
const ghostMailer = new GhostMailer();
module.exports = class MembersCSVImporter { module.exports = class MembersCSVImporter {
/** /**
* @param {Object} config * @param {Object} config
* @param {string} config.storagePath - The path to store CSV's in before importing * @param {string} config.storagePath - The path to store CSV's in before importing
* @param {Object} settingsCache - An instance of the Ghost Settings Cache * @param {Object} settingsCache - An instance of the Ghost Settings Cache
* @param {Object} ghostMailer - An instance of GhostMailer
* @param {() => Object} getMembersApi * @param {() => Object} getMembersApi
*/ */
constructor(config, settingsCache, getMembersApi) { constructor(config, settingsCache, getMembersApi, ghostMailer) {
this._storagePath = config.storagePath; this._storagePath = config.storagePath;
this._settingsCache = settingsCache; this._settingsCache = settingsCache;
this._getMembersApi = getMembersApi; this._getMembersApi = getMembersApi;
this._ghostMailer = ghostMailer;
} }
/** /**
@ -289,7 +290,7 @@ module.exports = class MembersCSVImporter {
const errorCSV = this.generateErrorCSV(result); const errorCSV = this.generateErrorCSV(result);
const emailSubject = result.imported > 0 ? 'Your member import is complete' : 'Your member import was unsuccessful'; const emailSubject = result.imported > 0 ? 'Your member import is complete' : 'Your member import was unsuccessful';
await ghostMailer.send({ await this._ghostMailer.send({
to: emailRecipient, to: emailRecipient,
subject: emailSubject, subject: emailSubject,
html: emailContent, html: emailContent,