mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-24 23:48:13 -05:00
Removed usage of GhostMailer
in MilestonesService
no issue - With the switch of using a `MilestoneCreatedEvent` we'll be decoupling the mailing functionality and not need `GhostMailer` as dependency in the package anymore
This commit is contained in:
parent
513b7d1df4
commit
b55a95b944
3 changed files with 0 additions and 65 deletions
|
@ -34,14 +34,11 @@ module.exports = {
|
||||||
} = require('@tryghost/milestones');
|
} = require('@tryghost/milestones');
|
||||||
const config = require('../../../shared/config');
|
const config = require('../../../shared/config');
|
||||||
const milestonesConfig = config.get('milestones');
|
const milestonesConfig = config.get('milestones');
|
||||||
const {GhostMailer} = require('../mail');
|
|
||||||
|
|
||||||
const mailer = new GhostMailer();
|
|
||||||
const repository = new InMemoryMilestoneRepository({DomainEvents});
|
const repository = new InMemoryMilestoneRepository({DomainEvents});
|
||||||
const queries = new MilestoneQueries({db});
|
const queries = new MilestoneQueries({db});
|
||||||
|
|
||||||
this.api = new MilestonesService({
|
this.api = new MilestonesService({
|
||||||
mailer,
|
|
||||||
repository,
|
repository,
|
||||||
milestonesConfig, // avoid using getters and pass as JSON
|
milestonesConfig, // avoid using getters and pass as JSON
|
||||||
queries
|
queries
|
||||||
|
|
|
@ -17,11 +17,6 @@ const Milestone = require('./Milestone');
|
||||||
* @prop {() => Promise<string>} getDefaultCurrency
|
* @prop {() => Promise<string>} getDefaultCurrency
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @typedef {object} ghostMailer
|
|
||||||
* @property {Function} send
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {object} milestonesConfig
|
* @typedef {object} milestonesConfig
|
||||||
* @prop {Array<object>} milestonesConfig.arr
|
* @prop {Array<object>} milestonesConfig.arr
|
||||||
|
@ -34,10 +29,6 @@ module.exports = class MilestonesService {
|
||||||
/** @type {IMilestoneRepository} */
|
/** @type {IMilestoneRepository} */
|
||||||
#repository;
|
#repository;
|
||||||
|
|
||||||
/**
|
|
||||||
* @type {ghostMailer} */
|
|
||||||
#mailer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {milestonesConfig} */
|
* @type {milestonesConfig} */
|
||||||
#milestonesConfig;
|
#milestonesConfig;
|
||||||
|
@ -47,13 +38,11 @@ module.exports = class MilestonesService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {object} deps
|
* @param {object} deps
|
||||||
* @param {ghostMailer} deps.mailer
|
|
||||||
* @param {IMilestoneRepository} deps.repository
|
* @param {IMilestoneRepository} deps.repository
|
||||||
* @param {milestonesConfig} deps.milestonesConfig
|
* @param {milestonesConfig} deps.milestonesConfig
|
||||||
* @param {IQueries} deps.queries
|
* @param {IQueries} deps.queries
|
||||||
*/
|
*/
|
||||||
constructor(deps) {
|
constructor(deps) {
|
||||||
this.#mailer = deps.mailer;
|
|
||||||
this.#milestonesConfig = deps.milestonesConfig;
|
this.#milestonesConfig = deps.milestonesConfig;
|
||||||
this.#queries = deps.queries;
|
this.#queries = deps.queries;
|
||||||
this.#repository = deps.repository;
|
this.#repository = deps.repository;
|
||||||
|
@ -147,13 +136,6 @@ module.exports = class MilestonesService {
|
||||||
const shouldSendEmail = await this.#shouldSendEmail();
|
const shouldSendEmail = await this.#shouldSendEmail();
|
||||||
|
|
||||||
if (shouldSendEmail) {
|
if (shouldSendEmail) {
|
||||||
// TODO: hook up Ghostmailer or use StaffService and trigger event to send email
|
|
||||||
// await this.#mailer.send({
|
|
||||||
// subject: 'Test',
|
|
||||||
// html: '<div>Milestone achieved</div>',
|
|
||||||
// to: 'test@example.com'
|
|
||||||
// });
|
|
||||||
|
|
||||||
milestone.emailSentAt = new Date();
|
milestone.emailSentAt = new Date();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,10 +48,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -108,10 +104,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -141,10 +133,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
// TODO: make this a stub
|
|
||||||
mailer: {
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -179,10 +167,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -207,10 +191,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -251,10 +231,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getARR() {
|
async getARR() {
|
||||||
|
@ -284,10 +260,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getMembersCount() {
|
async getMembersCount() {
|
||||||
|
@ -341,10 +313,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getMembersCount() {
|
async getMembersCount() {
|
||||||
|
@ -382,10 +350,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getMembersCount() {
|
async getMembersCount() {
|
||||||
|
@ -419,10 +383,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getMembersCount() {
|
async getMembersCount() {
|
||||||
|
@ -462,10 +422,6 @@ describe('MilestonesService', function () {
|
||||||
|
|
||||||
const milestoneEmailService = new MilestonesService({
|
const milestoneEmailService = new MilestonesService({
|
||||||
repository,
|
repository,
|
||||||
mailer: {
|
|
||||||
// TODO: make this a stub
|
|
||||||
send: async () => {}
|
|
||||||
},
|
|
||||||
milestonesConfig,
|
milestonesConfig,
|
||||||
queries: {
|
queries: {
|
||||||
async getMembersCount() {
|
async getMembersCount() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue