ghost 6.57.1 → 6.58.0

package/core/server/services/email-analytics/index.js

@@ -1,97 +1,59 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = exports.automations = exports.newsletters = void 0;
-// @ts-expect-error This module lacks type definitions.
-const email_analytics_service_wrapper_1 = __importDefault(require("./email-analytics-service-wrapper"));
-const config_1 = __importDefault(require("../../../shared/config"));
+const email_analytics_service_wrapper_1 = require("./email-analytics-service-wrapper");
 // @ts-expect-error This module lacks type definitions.
 const newsletter_email_analytics_batch_processor_1 = require("./newsletter-email-analytics-batch-processor");
 // @ts-expect-error This module lacks type definitions.
 const newsletter_email_event_storage_1 = __importDefault(require("../email-service/newsletter-email-event-storage"));
 // @ts-expect-error This module lacks type definitions.
 const email_event_processor_1 = __importDefault(require("../email-service/email-event-processor"));
-// @ts-expect-error This module lacks type definitions.
-const db_1 = __importDefault(require("../../data/db"));
-const members_1 = __importDefault(require("../members"));
-// @ts-expect-error This module lacks type definitions.
-const email_suppression_list_1 = __importDefault(require("../email-suppression-list"));
-// @ts-expect-error This module lacks type definitions.
-const models_1 = require("../../models");
-// @ts-expect-error This module lacks type definitions.
-const domain_events_1 = __importDefault(require("@tryghost/domain-events"));
-// @ts-expect-error This module lacks type definitions.
-const prometheus_client_1 = __importDefault(require("../../../shared/prometheus-client"));
 const queries_1 = require("./lib/queries");
 const start_email_analytics_job_event_1 = require("./events/start-email-analytics-job-event");
 const start_automation_email_analytics_job_event_1 = require("./events/start-automation-email-analytics-job-event");
 const constants_1 = require("../member-welcome-emails/constants");
-const automationsApi = __importStar(require("../automations/automations-api"));
 const automation_email_analytics_batch_processor_1 = require("./automation-email-analytics-batch-processor");
-exports.newsletters = new email_analytics_service_wrapper_1.default({
+exports.newsletters = new email_analytics_service_wrapper_1.EmailAnalyticsServiceWrapper({
     logName: 'newsletters'
 });
-exports.automations = new email_analytics_service_wrapper_1.default({
+exports.automations = new email_analytics_service_wrapper_1.EmailAnalyticsServiceWrapper({
     logName: 'automations',
 });
-const init = () => {
+const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList, membersRepository, models: { Email, EmailRecipientFailure, EmailSpamComplaintEvent }, metrics, prometheusClient, settingsCache }) => {
+    const queries = new queries_1.Queries(db.knex);
     const newsletterEmailEventProcessor = new email_event_processor_1.default({
-        domainEvents: domain_events_1.default,
-        db: db_1.default,
+        domainEvents,
+        db,
         eventStorage: new newsletter_email_event_storage_1.default({
-            db: db_1.default,
-            membersRepository: members_1.default.api.members,
+            config,
+            db,
+            membersRepository,
             models: {
-                Email: models_1.Email,
-                EmailRecipientFailure: models_1.EmailRecipientFailure,
-                EmailSpamComplaintEvent: models_1.EmailSpamComplaintEvent
+                Email,
+                EmailRecipientFailure,
+                EmailSpamComplaintEvent
             },
-            emailSuppressionList: email_suppression_list_1.default,
-            prometheusClient: prometheus_client_1.default
+            emailSuppressionList,
+            prometheusClient
         }),
-        prometheusClient: prometheus_client_1.default
+        prometheusClient
     });
     const newsletterMailgunTags = ['bulk-email'];
-    if (config_1.default.get('bulkEmail:mailgun:tag')) {
-        newsletterMailgunTags.push(config_1.default.get('bulkEmail:mailgun:tag'));
+    if (config.get('bulkEmail:mailgun:tag')) {
+        newsletterMailgunTags.push(config.get('bulkEmail:mailgun:tag'));
     }
+    prometheusClient?.registerCounter({
+        name: newsletter_email_analytics_batch_processor_1.AGGREGATE_MEMBER_STATS_METRIC_NAME,
+        help: 'Count of member stats aggregations'
+    });
     exports.newsletters.init({
+        config,
+        domainEvents,
         event: start_email_analytics_job_event_1.StartEmailAnalyticsJobEvent,
+        queries,
         mailgunTags: newsletterMailgunTags,
         jobNames: {
             latestNonOpened: 'email-analytics-latest-others',
@@ -107,16 +69,20 @@ const init = () => {
                 failed: 'failed_at'
             }
         },
-        prometheusClient: prometheus_client_1.default,
+        metrics,
+        settingsCache,
         createEventProcessor: () => (new newsletter_email_analytics_batch_processor_1.NewsletterEmailAnalyticsBatchProcessor({
-            config: config_1.default,
+            config,
             emailEventProcessor: newsletterEmailEventProcessor,
-            prometheusClient: prometheus_client_1.default,
-            queries: queries_1.queries
+            prometheusClient,
+            queries
         }))
     });
     exports.automations.init({
+        config,
+        domainEvents,
         event: start_automation_email_analytics_job_event_1.StartAutomationEmailAnalyticsJobEvent,
+        queries,
         mailgunTags: [constants_1.AUTOMATION_EMAIL_TAG],
         jobNames: {
             latestNonOpened: 'email-analytics-automation-latest-others',
@@ -131,6 +97,8 @@ const init = () => {
                 opened: 'opened_at'
             }
         },
+        metrics,
+        settingsCache,
         createEventProcessor: () => (new automation_email_analytics_batch_processor_1.AutomationEmailAnalyticsBatchProcessor({
             automationsApi
         }))

package/core/server/services/email-analytics/lib/queries.js

@@ -3,11 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queries = void 0;
+exports.Queries = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const debug_1 = __importDefault(require("@tryghost/debug"));
-// @ts-expect-error This module lacks type definitions.
-const db_1 = __importDefault(require("../../../data/db"));
 const logging_1 = __importDefault(require("@tryghost/logging"));
 const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const debug = (0, debug_1.default)('services:email-analytics');
@@ -16,8 +14,8 @@ const MIN_EMAIL_COUNT_FOR_OPEN_RATE = 5;
  * Creates a job in the jobs table if it does not already exist.
  * @param jobName - The name of the job to create.
  */
-async function createJobIfNotExists(jobName) {
-    await db_1.default.knex('jobs').insert({
+async function createJobIfNotExists(knex, jobName) {
+    await knex('jobs').insert({
         id: new bson_objectid_1.default().toHexString(),
         name: jobName,
         started_at: new Date(),
@@ -25,7 +23,35 @@ async function createJobIfNotExists(jobName) {
         status: 'started'
     }).onConflict('name').ignore();
 }
-exports.queries = {
+function parseJsonObject(raw) {
+    if (typeof raw !== 'string') {
+        return null;
+    }
+    let result;
+    try {
+        result = JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+    return result && typeof result === 'object' && !Array.isArray(result) ? result : null;
+}
+function getStringValue(obj, key) {
+    const result = obj[key];
+    return typeof result === 'string' ? result : null;
+}
+function parseJobMetadata(rawMetadata) {
+    const parsed = parseJsonObject(rawMetadata) || {};
+    return {
+        begin: getStringValue(parsed, 'begin'),
+        end: getStringValue(parsed, 'end')
+    };
+}
+class Queries {
+    #knex;
+    constructor(knex) {
+        this.#knex = knex;
+    }
     /**
      * Retrieves the timestamp of the last seen event for the specified email analytics events.
      * @param jobName - The name of the job to update.
@@ -34,6 +60,7 @@ exports.queries = {
      * @returns The timestamp of the last seen event, or null if no events are found.
      */
     async getLastEventTimestamp(jobName, events, cursorSeed) {
+        const knex = this.#knex;
         const startDate = new Date();
         let timestamps = [];
         const lastJobRunTimestamp = await this.getLastJobRunTimestamp(jobName);
@@ -49,12 +76,12 @@ exports.queries = {
                 if (!columnName) {
                     continue;
                 }
-                const row = await db_1.default.knex(cursorSeed.tableName)
-                    .select(db_1.default.knex.raw('MAX(??) as maxTimestamp', [columnName]))
+                const row = await knex(cursorSeed.tableName)
+                    .select(knex.raw('MAX(??) as maxTimestamp', [columnName]))
                     .first();
                 timestamps.push(row.maxTimestamp);
             }
-            await createJobIfNotExists(jobName);
+            await createJobIfNotExists(knex, jobName);
         }
         // Convert string dates to Date objects for SQLite compatibility
         const normalizedTimestamps = timestamps.map(date => {
@@ -66,15 +93,23 @@ exports.queries = {
         const lastSeenEventTimestamp = lodash_1.default.max(normalizedTimestamps) ?? null;
         debug(`getLastEventTimestamp: finished in ${Date.now() - startDate.getTime()}ms`);
         return lastSeenEventTimestamp;
-    },
+    }
     /**
      * Retrieves the job data for the specified job name.
      * @param jobName - The name of the job to retrieve data for.
      * @returns The job data, or null if no job data is found.
      */
     async getJobData(jobName) {
-        return await db_1.default.knex('jobs').select('finished_at', 'started_at', 'metadata').where('name', jobName).first();
-    },
+        const row = await this.#knex('jobs')
+            .select('finished_at', 'started_at', 'metadata')
+            .where('name', jobName)
+            .first();
+        return row ? {
+            finished_at: row.finished_at,
+            started_at: row.started_at,
+            metadata: parseJobMetadata(row.metadata)
+        } : null;
+    }
     /**
      * Retrieves the timestamp of the last job run for the specified job name.
      * @param jobName - The name of the job to retrieve the last run timestamp for.
@@ -83,7 +118,7 @@ exports.queries = {
     async getLastJobRunTimestamp(jobName) {
         const jobData = await this.getJobData(jobName);
         return jobData ? jobData.finished_at || jobData.started_at : null;
-    },
+    }
     /**
      * Sets the timestamp of the last seen event for the specified email analytics events.
      * @param jobName - The name of the job to update.
@@ -99,12 +134,13 @@ exports.queries = {
             debug(`Setting ${field} timestamp for job ${jobName} to ${date}`);
             const updateField = field === 'finished' ? 'finished_at' : 'started_at';
             const status = field === 'finished' ? 'finished' : 'started';
-            const result = await db_1.default.knex('jobs').update({ [updateField]: date, updated_at: new Date(), status: status }).where('name', jobName);
+            const result = await this.#knex('jobs').update({ [updateField]: date, updated_at: new Date(), status: status }).where('name', jobName);
             if (result === 0) {
-                await db_1.default.knex('jobs').insert({
+                await this.#knex('jobs').insert({
                     id: new bson_objectid_1.default().toHexString(),
                     name: jobName,
                     [updateField]: date.toISOString(), // force to iso string for sqlite
+                    created_at: date.toISOString(), // force to iso string for sqlite
                     updated_at: date.toISOString(), // force to iso string for sqlite
                     status: status
                 });
@@ -114,25 +150,16 @@ exports.queries = {
             const message = err instanceof Error ? err.message : String(err);
             debug(`Error setting ${field} timestamp for job ${jobName}: ${message}`);
         }
-    },
+    }
     /**
      * Retrieves and parses the metadata JSON for the specified job.
      * @param jobName - The name of the job.
      * @returns The parsed metadata object, or null.
      */
     async getJobMetadata(jobName) {
-        try {
-            const row = await db_1.default.knex('jobs').select('metadata').where('name', jobName).first();
-            if (row && row.metadata) {
-                return JSON.parse(row.metadata);
-            }
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            logging_1.default.error(`Error reading metadata for job ${jobName}: ${message}`);
-        }
-        return null;
-    },
+        const row = await this.#knex('jobs').select('metadata').where('name', jobName).first();
+        return row ? parseJobMetadata(row.metadata) : null;
+    }
     /**
      * Writes metadata JSON for the specified job.
      * @param jobName - The name of the job.
@@ -141,7 +168,7 @@ exports.queries = {
     async setJobMetadata(jobName, metadata) {
         try {
             const value = metadata ? JSON.stringify(metadata) : null;
-            await db_1.default.knex.transaction(async (trx) => {
+            await this.#knex.transaction(async (trx) => {
                 const result = await trx('jobs').update({ metadata: value, updated_at: new Date() }).where('name', jobName);
                 if (result === 0 && metadata) {
                     await trx('jobs').insert({
@@ -158,7 +185,7 @@ exports.queries = {
             const message = err instanceof Error ? err.message : String(err);
             logging_1.default.error(`Error setting metadata for job ${jobName}: ${message}`);
         }
-    },
+    }
     /**
      * Sets the status of the specified email analytics job.
      * @param jobName - The name of the job to update.
@@ -170,14 +197,14 @@ exports.queries = {
     async setJobStatus(jobName, status) {
         debug(`Setting status for job ${jobName} to ${status}`);
         try {
-            const result = await db_1.default.knex('jobs')
+            const result = await this.#knex('jobs')
                 .update({
                 status: status,
                 updated_at: new Date()
             })
                 .where('name', jobName);
             if (result === 0) {
-                await db_1.default.knex('jobs').insert({
+                await this.#knex('jobs').insert({
                     id: new bson_objectid_1.default().toHexString(),
                     name: jobName,
                     status: status,
@@ -191,48 +218,56 @@ exports.queries = {
             debug(`Error setting status for job ${jobName}: ${message}`);
             throw err;
         }
-    },
+    }
     async aggregateEmailStats(emailId, updateOpenedCount) {
-        const [deliveredCount] = await db_1.default.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND delivered_at IS NOT NULL', [emailId]);
-        const [failedCount] = await db_1.default.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND failed_at IS NOT NULL', [emailId]);
+        const [deliveredCount] = await this.#knex('email_recipients').count('id as count').whereRaw('email_id = ? AND delivered_at IS NOT NULL', [emailId]);
+        const [failedCount] = await this.#knex('email_recipients').count('id as count').whereRaw('email_id = ? AND failed_at IS NOT NULL', [emailId]);
         const updateData = {
             delivered_count: deliveredCount.count,
             failed_count: failedCount.count
         };
         if (updateOpenedCount) {
-            const [openedCount] = await db_1.default.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND opened_at IS NOT NULL', [emailId]);
+            const [openedCount] = await this.#knex('email_recipients').count('id as count').whereRaw('email_id = ? AND opened_at IS NOT NULL', [emailId]);
             updateData.opened_count = openedCount.count;
         }
-        await db_1.default.knex('emails').update(updateData).where('id', emailId);
-    },
+        await this.#knex('emails').update(updateData).where('id', emailId);
+    }
     async aggregateMemberStats(memberId) {
-        const { trackedEmailCount } = await db_1.default.knex('email_recipients')
-            .select(db_1.default.knex.raw('COUNT(email_recipients.id) as trackedEmailCount'))
+        const { trackedEmailCount } = await this.#knex('email_recipients')
+            .select(this.#knex.raw('COUNT(email_recipients.id) as trackedEmailCount'))
             .leftJoin('emails', 'email_recipients.email_id', 'emails.id')
             .where('email_recipients.member_id', memberId)
             .where('emails.track_opens', true)
             .first() || {};
-        const [emailCount] = await db_1.default.knex('email_recipients').count('id as count').whereRaw('member_id = ?', [memberId]);
-        const [emailOpenedCount] = await db_1.default.knex('email_recipients').count('id as count').whereRaw('member_id = ? AND opened_at IS NOT NULL', [memberId]);
+        const emailCountResult = await this.#knex('email_recipients')
+            .count('id as count')
+            .whereRaw('member_id = ?', [memberId])
+            .first();
+        const emailOpenedCountResult = await this.#knex('email_recipients')
+            .count('id as count')
+            .whereRaw('member_id = ? AND opened_at IS NOT NULL', [memberId])
+            .first();
+        const emailCount = Number(emailCountResult?.count || 0);
+        const emailOpenedCount = Number(emailOpenedCountResult?.count || 0);
         const updateQuery = {
-            email_count: emailCount.count,
-            email_opened_count: emailOpenedCount.count
+            email_count: emailCount,
+            email_opened_count: emailOpenedCount
         };
         if (trackedEmailCount >= MIN_EMAIL_COUNT_FOR_OPEN_RATE) {
-            updateQuery.email_open_rate = Math.round(emailOpenedCount.count / trackedEmailCount * 100);
+            updateQuery.email_open_rate = Math.round(emailOpenedCount / trackedEmailCount * 100);
         }
-        await db_1.default.knex('members')
+        await this.#knex('members')
             .update(updateQuery)
             .where('id', memberId);
-    },
+    }
     async aggregateMemberStatsBatch(memberIds) {
         if (!memberIds || memberIds.length === 0) {
             return;
         }
         // Batch query to get stats for all members at once
-        const stats = await db_1.default.knex('email_recipients')
+        const stats = await this.#knex('email_recipients')
             .leftJoin('emails', 'emails.id', 'email_recipients.email_id')
-            .select('email_recipients.member_id', db_1.default.knex.raw('COUNT(email_recipients.id) as email_count'), db_1.default.knex.raw('SUM(CASE WHEN email_recipients.opened_at IS NOT NULL THEN 1 ELSE 0 END) as email_opened_count'), db_1.default.knex.raw('SUM(CASE WHEN emails.track_opens = 1 THEN 1 ELSE 0 END) as tracked_count'))
+            .select('email_recipients.member_id', this.#knex.raw('COUNT(email_recipients.id) as email_count'), this.#knex.raw('SUM(CASE WHEN email_recipients.opened_at IS NOT NULL THEN 1 ELSE 0 END) as email_opened_count'), this.#knex.raw('SUM(CASE WHEN emails.track_opens = 1 THEN 1 ELSE 0 END) as tracked_count'))
             .whereIn('email_recipients.member_id', memberIds)
             .groupBy('email_recipients.member_id');
         // Build update data for each member
@@ -285,7 +320,7 @@ exports.queries = {
             ...memberIds
         ];
         // Execute batched update with CASE statements
-        await db_1.default.knex.raw(`
+        await this.#knex.raw(`
             UPDATE members
             SET
                 email_count = CASE id ${emailCountCases.join(' ')} END,
@@ -294,4 +329,6 @@ exports.queries = {
             WHERE id IN (${memberIds.map(() => '?').join(',')})
         `, bindings);
     }
-};
+}
+exports.Queries = Queries;
+;

package/core/server/services/email-analytics/newsletter-email-analytics-batch-processor.js

@@ -3,6 +3,9 @@ const logging = require('@tryghost/logging');
 /** @import {BatchEventProcessor} from './batch-event-processor' */
 /** @import {FetchData} from './email-analytics-service' */
 
+const AGGREGATE_MEMBER_STATS_METRIC_NAME = 'email_analytics_aggregate_member_stats_count';
+exports.AGGREGATE_MEMBER_STATS_METRIC_NAME = AGGREGATE_MEMBER_STATS_METRIC_NAME;
+
 /**
  * @implements {BatchEventProcessor}
  */
@@ -222,7 +225,7 @@ class NewsletterEmailAnalyticsBatchProcessor {
         }
         const emailAggregationTimeMs = Date.now() - emailAggregationStart;
 
-        const memberMetric = this.#prometheusClient?.getMetric('email_analytics_aggregate_member_stats_count');
+        const memberMetric = this.#prometheusClient?.getMetric(AGGREGATE_MEMBER_STATS_METRIC_NAME);
 
         const memberAggregationStart = Date.now();
         if (useBatchProcessing) {

package/core/server/services/email-service/batch-sending-service.js

@@ -611,7 +611,7 @@ class BatchSendingService {
                 async () => {
                     await batch.save({
                         status: 'submitted',
-                        provider_id: response.id,
+                        mailgun_message_id: response.id,
                         // reset error fields when sending succeeds
                         error_status_code: null,
                         error_message: null,

package/core/server/services/email-service/email-event-processor.js

@@ -1,11 +1,11 @@
 const logging = require('@tryghost/logging');
 
-const EmailDeliveredEvent = require('./events/email-delivered-event');
-const EmailOpenedEvent = require('./events/email-opened-event');
-const EmailBouncedEvent = require('./events/email-bounced-event');
-const EmailTemporaryBouncedEvent = require('./events/email-temporary-bounced-event');
-const EmailUnsubscribedEvent = require('./events/email-unsubscribed-event');
-const SpamComplaintEvent = require('./events/spam-complaint-event');
+const {EmailDeliveredEvent} = require('./events/email-delivered-event');
+const {EmailOpenedEvent} = require('./events/email-opened-event');
+const {EmailBouncedEvent} = require('./events/email-bounced-event');
+const {EmailTemporaryBouncedEvent} = require('./events/email-temporary-bounced-event');
+const {EmailUnsubscribedEvent} = require('./events/email-unsubscribed-event');
+const {SpamComplaintEvent} = require('./events/spam-complaint-event');
 
 async function waitForEvent() {
     return new Promise((resolve) => {
@@ -50,7 +50,7 @@ class EmailEventProcessor {
         this.#db = db;
         this.#eventStorage = eventStorage;
         this.#prometheusClient = prometheusClient;
-        // Avoid having to query email_batch by provider_id for every event
+        // Avoid having to query email_batch by mailgun_message_id for every event
         this.providerIdEmailIdMap = {};
 
         if (this.#prometheusClient) {
@@ -211,7 +211,7 @@ class EmailEventProcessor {
             return;
         }
 
-        // With the provider_id and email address we can look for the EmailRecipient
+        // With the mailgun_message_id and email address we can look for the EmailRecipient
         const emailId = emailIdentification.emailId ?? await this.getEmailId(emailIdentification.providerId);
         if (!emailId) {
             // Invalid
@@ -269,7 +269,7 @@ class EmailEventProcessor {
 
         const {emailId} = await this.#db.knex('email_batches')
             .select('email_id as emailId')
-            .where('provider_id', providerId)
+            .where('mailgun_message_id', providerId)
             .first() || {};
 
         if (!emailId) {
@@ -301,11 +301,11 @@ class EmailEventProcessor {
 
         if (providerIds.length > 0) {
             const providerIdMapping = await this.#db.knex('email_batches')
-                .select('provider_id', 'email_id')
-                .whereIn('provider_id', providerIds);
+                .select('mailgun_message_id', 'email_id')
+                .whereIn('mailgun_message_id', providerIds);
 
             for (const row of providerIdMapping) {
-                this.providerIdEmailIdMap[row.provider_id] = row.email_id;
+                this.providerIdEmailIdMap[row.mailgun_message_id] = row.email_id;
             }
         }
 

package/core/server/services/email-service/events/email-bounced-event.js

@@ -1,50 +1,15 @@
-module.exports = class EmailBouncedEvent {
-    /**
-     * @readonly
-     * @type {string}
-     */
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmailBouncedEvent = void 0;
+class EmailBouncedEvent {
     id;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     email;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     memberId;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     emailId;
-
-    /**
-     * @readonly
-     * @type {{message: string, code: number, enhancedCode: string | null}|null}
-     */
     error;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     emailRecipientId;
-
-    /**
-     * @readonly
-     * @type {Date}
-     */
     timestamp;
-
-    /**
-     * @private
-     */
-    constructor({id, email, memberId, emailId, error, emailRecipientId, timestamp}) {
+    constructor({ id, email, memberId, emailId, error, emailRecipientId, timestamp }) {
         this.id = id;
         this.memberId = memberId;
         this.emailId = emailId;
@@ -53,11 +18,8 @@ module.exports = class EmailBouncedEvent {
         this.emailRecipientId = emailRecipientId;
         this.timestamp = timestamp;
     }
-
     static create(data) {
-        return new EmailBouncedEvent({
-            ...data,
-            timestamp: data.timestamp || new Date
-        });
+        return new EmailBouncedEvent({ ...data, timestamp: data.timestamp || new Date() });
     }
-};
+}
+exports.EmailBouncedEvent = EmailBouncedEvent;

package/core/server/services/email-service/events/email-delivered-event.js

@@ -1,49 +1,21 @@
-module.exports = class EmailDeliveredEvent {
-    /**
-     * @readonly
-     * @type {string}
-     */
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmailDeliveredEvent = void 0;
+class EmailDeliveredEvent {
     email;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     memberId;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     emailId;
-
-    /**
-     * @readonly
-     * @type {string}
-     */
     emailRecipientId;
-
-    /**
-     * @readonly
-     * @type {Date}
-     */
     timestamp;
-
-    /**
-     * @private
-     */
-    constructor({email, memberId, emailId, emailRecipientId, timestamp}) {
+    constructor({ email, memberId, emailId, emailRecipientId, timestamp }) {
         this.email = email;
         this.memberId = memberId;
         this.emailId = emailId;
         this.emailRecipientId = emailRecipientId;
         this.timestamp = timestamp;
     }
-
     static create(data) {
-        return new EmailDeliveredEvent({
-            ...data,
-            timestamp: data.timestamp || new Date
-        });
+        return new EmailDeliveredEvent({ ...data, timestamp: data.timestamp || new Date() });
     }
-};
+}
+exports.EmailDeliveredEvent = EmailDeliveredEvent;