ghost 6.58.0 → 6.59.0

package/core/server/data/schema/schema.js

@@ -1421,8 +1421,11 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         token: {type: 'string', maxlength: 48, nullable: false, unique: true},
 
-        buyer_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        buyer_email: {type: 'string', maxlength: 191, nullable: true, validations: {isEmail: true}},
         buyer_member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
+        buyer_name: {type: 'string', maxlength: 191, nullable: true},
+        recipient_name: {type: 'string', maxlength: 191, nullable: true},
+        personal_message: {type: 'text', maxlength: 500, nullable: true},
 
         redeemer_member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
 
@@ -1437,18 +1440,19 @@ module.exports = {
         currency: {type: 'string', maxlength: 50, nullable: false},
         amount: {type: 'integer', nullable: false, unsigned: true},
 
-        stripe_checkout_session_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
-        stripe_payment_intent_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
+        stripe_checkout_session_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
+        stripe_payment_intent_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
 
+        checkout_started_at: {type: 'dateTime', nullable: true},
         consumes_at: {type: 'dateTime', nullable: true},
-        expires_at: {type: 'dateTime', nullable: false},
+        expires_at: {type: 'dateTime', nullable: true},
 
         status: {
             type: 'string', maxlength: 50, nullable: false, validations: {
-                isIn: [['purchased', 'redeemed', 'consumed', 'expired', 'refunded']]
+                isIn: [['payment_pending', 'purchased', 'redeemed', 'consumed', 'expired', 'refunded']]
             }
         },
-        purchased_at: {type: 'dateTime', nullable: false},
+        purchased_at: {type: 'dateTime', nullable: true},
         redeemed_at: {type: 'dateTime', nullable: true},
         consumed_at: {type: 'dateTime', nullable: true},
         expired_at: {type: 'dateTime', nullable: true},
@@ -1456,7 +1460,24 @@ module.exports = {
         consumes_soon_reminder_sent_at: {type: 'dateTime', nullable: true},
         '@@INDEXES@@': [
             ['status', 'consumes_at'],
-            ['status', 'expires_at']
+            ['status', 'expires_at'],
+            ['status', 'checkout_started_at']
+        ]
+    },
+    gift_deliveries: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        gift_id: {type: 'string', maxlength: 24, nullable: false, unique: true, references: 'gifts.id', cascadeDelete: true},
+        recipient_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        status: {
+            type: 'string', maxlength: 50, nullable: false, defaultTo: 'pending', validations: {
+                isIn: [['pending', 'sending', 'sent', 'failed', 'cancelled']]
+            }
+        },
+        started_at: {type: 'dateTime', nullable: true},
+        email_sent_at: {type: 'dateTime', nullable: true},
+        email_provider_message_id: {type: 'string', maxlength: 1000, nullable: true},
+        '@@INDEXES@@': [
+            ['status', 'started_at']
         ]
     }
 };

package/core/server/data/seeders/importers/automation-action-revisions-importer.js

@@ -1,37 +1,4 @@
 "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 };
 };
@@ -40,7 +7,7 @@ exports.AutomationActionRevisionsImporter = void 0;
 const faker_1 = require("@faker-js/faker");
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const table_importer_1 = require("./table-importer");
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
 const constants_1 = require("../../../services/member-welcome-emails/constants");
 class AutomationActionRevisionsImporter extends table_importer_1.TableImporter {
     static table = 'automation_action_revisions';
@@ -75,12 +42,12 @@ class AutomationActionRevisionsImporter extends table_importer_1.TableImporter {
         if (!this.#action) {
             throw new errors_1.default.IncorrectUsageError({ message: 'Cannot generate automation action revision without an action' });
         }
-        const createdAt = databaseDate.parse(this.#action.created_at);
+        const createdAt = (0, db_date_1.fromDatabaseDate)(this.#action.created_at);
         createdAt.setSeconds(createdAt.getSeconds() + this.#revisionIndex);
         this.#revisionIndex += 1;
         const common = {
             id: this.fastFakeObjectId(),
-            created_at: databaseDate.dateToDatabaseString(createdAt),
+            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
             action_id: this.#action.id,
             email_sent_count: null,
             email_opened_count: null,

package/core/server/data/seeders/importers/automation-actions-importer.js

@@ -1,46 +1,13 @@
 "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.AutomationActionsImporter = void 0;
-const faker_1 = require("@faker-js/faker");
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const table_importer_1 = require("./table-importer");
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
+const random_1 = require("../utils/random");
 class AutomationActionsImporter extends table_importer_1.TableImporter {
     static table = 'automation_actions';
     static dependencies = ['automations'];
@@ -65,16 +32,13 @@ class AutomationActionsImporter extends table_importer_1.TableImporter {
         if (!this.#automation) {
             throw new errors_1.default.IncorrectUsageError({ message: 'Cannot generate automation action without an automation' });
         }
-        const createdAt = faker_1.faker.date.between({
-            from: databaseDate.parse(this.#automation.created_at),
-            to: new Date()
-        });
+        const createdAt = (0, random_1.randomDateBetween)(this.#automation.created_at, new Date());
         const type = this.#actionIndex % 2 === 0 ? 'wait' : 'send_email';
         this.#actionIndex += 1;
         return {
             id: this.fastFakeObjectId(),
-            created_at: databaseDate.dateToDatabaseString(createdAt),
-            updated_at: databaseDate.dateToDatabaseString(createdAt),
+            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, db_date_1.toDatabaseDate)(createdAt),
             deleted_at: null,
             automation_id: this.#automation.id,
             type

package/core/server/data/seeders/importers/automation-run-steps-importer.js

@@ -1,37 +1,4 @@
 "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 };
 };
@@ -41,7 +8,7 @@ const faker_1 = require("@faker-js/faker");
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const lodash_1 = require("lodash");
 const table_importer_1 = require("./table-importer");
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
 class AutomationRunStepsImporter extends table_importer_1.TableImporter {
     static table = 'automation_run_steps';
     static dependencies = ['automation_runs', 'automation_action_revisions', 'automation_action_edges'];
@@ -102,12 +69,12 @@ class AutomationRunStepsImporter extends table_importer_1.TableImporter {
             const requestedStepCount = (0, lodash_1.clamp)(Math.floor(stepsPerRun) + extraStep, 1, actionCount);
             const runStepCount = fullPathGeneratedForAutomation.has(run.automation_id) ? requestedStepCount : actionCount;
             fullPathGeneratedForAutomation.add(run.automation_id);
-            const runCreatedAt = databaseDate.parse(run.created_at);
+            const runCreatedAt = (0, db_date_1.fromDatabaseDate)(run.created_at);
             const lastStepStatus = faker_1.faker.helpers.arrayElement(['pending', 'finished', 'failed']);
             for (let index = 0; index < runStepCount; index += 1) {
                 const createdAt = new Date(runCreatedAt);
                 createdAt.setHours(createdAt.getHours() + index);
-                const createdAtString = databaseDate.dateToDatabaseString(createdAt);
+                const createdAtString = (0, db_date_1.toDatabaseDate)(createdAt);
                 const status = index === runStepCount - 1 ? lastStepStatus : 'finished';
                 const isTerminal = status !== 'pending';
                 steps.push({

package/core/server/data/seeders/importers/automation-runs-importer.js

@@ -1,37 +1,4 @@
 "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 };
 };
@@ -42,7 +9,8 @@ const errors_1 = __importDefault(require("@tryghost/errors"));
 const strict_1 = __importDefault(require("node:assert/strict"));
 const table_importer_1 = require("./table-importer");
 const parse_email_address_1 = require("@tryghost/parse-email-address");
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
+const random_1 = require("../utils/random");
 const assertExampleEmailDomain = (email) => {
     const { domain } = (0, parse_email_address_1.parseEmailAddress)(email) ?? {};
     (0, strict_1.default)(domain, 'Refusing to seed an automation run for a member with no email');
@@ -77,17 +45,14 @@ class AutomationRunsImporter extends table_importer_1.TableImporter {
             throw new errors_1.default.IncorrectUsageError({ message: 'Cannot generate automation run without an automation' });
         }
         const member = faker_1.faker.helpers.arrayElement(this.#members);
-        const automationCreatedAt = databaseDate.parse(this.#automation.created_at);
-        const memberCreatedAt = databaseDate.parse(member.created_at);
-        const createdAt = faker_1.faker.date.between({
-            from: new Date(Math.max(automationCreatedAt.valueOf(), memberCreatedAt.valueOf())),
-            to: new Date()
-        });
+        const automationCreatedAt = (0, db_date_1.fromDatabaseDate)(this.#automation.created_at);
+        const memberCreatedAt = (0, db_date_1.fromDatabaseDate)(member.created_at);
+        const createdAt = (0, random_1.randomDateBetween)(new Date(Math.max(automationCreatedAt.valueOf(), memberCreatedAt.valueOf())), new Date());
         assertExampleEmailDomain(member.email);
         return {
             id: this.fastFakeObjectId(),
-            created_at: databaseDate.dateToDatabaseString(createdAt),
-            updated_at: databaseDate.dateToDatabaseString(createdAt),
+            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, db_date_1.toDatabaseDate)(createdAt),
             automation_id: this.#automation.id,
             member_id: member.id,
             member_email: member.email

package/core/server/data/seeders/importers/automations-importer.js

@@ -1,37 +1,4 @@
 "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;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutomationsImporter = void 0;
 const faker_1 = require("@faker-js/faker");
@@ -40,7 +7,7 @@ const string_1 = require("@tryghost/string");
 const table_importer_1 = require("./table-importer");
 // @ts-expect-error This module currently lacks type definitions.
 const blog_info_1 = require("../utils/blog-info");
-const databaseDate = __importStar(require("../utils/database-date"));
+const db_date_1 = require("../../../lib/db-date");
 const constants_1 = require("../../../services/member-welcome-emails/constants");
 const defaultAutomations = [{
         name: 'Free member welcome flow',
@@ -70,8 +37,8 @@ class AutomationsImporter extends table_importer_1.TableImporter {
             status: faker_1.faker.helpers.arrayElement(['active', 'inactive']),
             name,
             slug,
-            created_at: databaseDate.dateToDatabaseString(createdAt),
-            updated_at: databaseDate.dateToDatabaseString(createdAt)
+            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, db_date_1.toDatabaseDate)(createdAt)
         };
     }
 }

package/core/server/data/seeders/importers/comment-reports-importer.js

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
-const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {luck, randomDateBetween} = require('../utils/random');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class CommentReportsImporter extends TableImporter {
     static table = 'comment_reports';
@@ -49,7 +49,7 @@ class CommentReportsImporter extends TableImporter {
             return null;
         }
 
-        const reportTime = databaseDate.randomBetween(this.model.created_at, new Date());
+        const reportTime = randomDateBetween(this.model.created_at, new Date());
 
         const reporter = this.possibleReporters[faker.number.int(this.possibleReporters.length - 1)];
 
@@ -57,8 +57,8 @@ class CommentReportsImporter extends TableImporter {
             id: this.fastFakeObjectId(),
             comment_id: this.model.id,
             member_id: reporter.id,
-            created_at: databaseDate.dateToDatabaseString(reportTime),
-            updated_at: databaseDate.dateToDatabaseString(reportTime)
+            created_at: toDatabaseDate(reportTime),
+            updated_at: toDatabaseDate(reportTime)
         };
     }
 }

package/core/server/data/seeders/importers/comments-importer.js

@@ -2,7 +2,7 @@ const {faker} = require('@faker-js/faker');
 const {TableImporter} = require('./table-importer');
 const {luck} = require('../utils/random');
 const generateEvents = require('../utils/event-generator');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class CommentsImporter extends TableImporter {
     static table = 'comments';
@@ -24,7 +24,7 @@ class CommentsImporter extends TableImporter {
 
     setReferencedModel(model) {
         this.model = model;
-        const publishedAt = databaseDate.parse(model.published_at);
+        const publishedAt = fromDatabaseDate(model.published_at);
 
         this.commentIds = []; // Store [id, parent_id, timestamp] tuples for reply-to-reply
 
@@ -37,7 +37,7 @@ class CommentsImporter extends TableImporter {
             endTime: new Date()
         }).sort((a, b) => a.getTime() - b.getTime()); // Sort chronologically so replies always come after their targets
 
-        this.possibleMembers = this.members.filter(member => databaseDate.parse(member.created_at) < publishedAt);
+        this.possibleMembers = this.members.filter(member => fromDatabaseDate(member.created_at) < publishedAt);
     }
 
     generate() {
@@ -97,8 +97,8 @@ class CommentsImporter extends TableImporter {
             parent_id: parentId,
             in_reply_to_id: inReplyToId,
             status: 'published',
-            created_at: databaseDate.dateToDatabaseString(timestamp),
-            updated_at: databaseDate.dateToDatabaseString(timestamp),
+            created_at: toDatabaseDate(timestamp),
+            updated_at: toDatabaseDate(timestamp),
             html: `<p>${faker.lorem.sentence().replace(/[&<>"']/g, c => `&#${c.charCodeAt(0)};`)}</p>`
         };
 

package/core/server/data/seeders/importers/email-batches-importer.js

@@ -1,6 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
-const databaseDate = require('../utils/database-date');
+const {randomDateBetween} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class EmailBatchesImporter extends TableImporter {
     static table = 'email_batches';
@@ -21,8 +22,8 @@ class EmailBatchesImporter extends TableImporter {
     }
 
     generate() {
-        const emailSentDate = databaseDate.parse(this.model.created_at);
-        const latestUpdatedDate = databaseDate.parse(this.model.created_at);
+        const emailSentDate = fromDatabaseDate(this.model.created_at);
+        const latestUpdatedDate = new Date(emailSentDate);
         latestUpdatedDate.setHours(latestUpdatedDate.getHours() + 1);
 
         return {
@@ -31,7 +32,7 @@ class EmailBatchesImporter extends TableImporter {
             mailgun_message_id: `${new Date().toISOString().split('.')[0].replace(/[^0-9]/g, '')}.${faker.string.hexadecimal({length: 16, prefix: '', casing: 'lower'})}@m.example.com`,
             status: 'submitted', // TODO: introduce failures
             created_at: this.model.created_at,
-            updated_at: databaseDate.dateToDatabaseString(databaseDate.randomBetween(emailSentDate, latestUpdatedDate))
+            updated_at: toDatabaseDate(randomDateBetween(emailSentDate, latestUpdatedDate))
         };
     }
 }

package/core/server/data/seeders/importers/email-recipients-importer.js

@@ -1,7 +1,8 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const generateEvents = require('../utils/event-generator');
-const databaseDate = require('../utils/database-date');
+const {randomDateBetween} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 const debug = require('@tryghost/debug')('EmailRecipientsImporter');
 
 const emailStatus = {
@@ -109,11 +110,7 @@ class EmailRecipientsImporter extends TableImporter {
                 this.membersSubscribeEventsCreatedAtsByNewsletterId.set(memberSubscribeEvent.newsletter_id, []);
             }
 
-            if (!(memberSubscribeEvent.created_at instanceof Date)) {
-                // SQLite fix
-                memberSubscribeEvent.created_at = databaseDate.parse(memberSubscribeEvent.created_at);
-            }
-            this.membersSubscribeEventsCreatedAtsByNewsletterId.get(memberSubscribeEvent.newsletter_id).push(memberSubscribeEvent.created_at.getTime());
+            this.membersSubscribeEventsCreatedAtsByNewsletterId.get(memberSubscribeEvent.newsletter_id).push(fromDatabaseDate(memberSubscribeEvent.created_at).getTime());
         }
 
         await this.importForEach(this.emailBatches, quantity ? quantity / emails.length : 1000);
@@ -123,15 +120,12 @@ class EmailRecipientsImporter extends TableImporter {
         this.batch = model;
         this.model = this.emails.get(this.batch.email_id);
         this.batchIndex = this.batch.index;
-
-        // Shallow clone members list so we can shuffle and modify it
-        const earliestOpenTime = databaseDate.parse(this.batch.updated_at);
-        const latestOpenTime = databaseDate.parse(this.batch.updated_at);
-        latestOpenTime.setDate(latestOpenTime.getDate() + 14);
+        this.batchUpdatedAt = fromDatabaseDate(this.batch.updated_at);
+        this.batchProcessedAt = toDatabaseDate(this.batchUpdatedAt);
 
         // Get all members that were subscribed to this newsletter BEFORE the batch was sent
         // We use binary search to speed up it up
-        const lastIndex = findFirstHigherIndex(this.membersSubscribeEventsCreatedAtsByNewsletterId.get(this.model.newsletter_id), earliestOpenTime);
+        const lastIndex = findFirstHigherIndex(this.membersSubscribeEventsCreatedAtsByNewsletterId.get(this.model.newsletter_id), this.batchUpdatedAt);
 
         this.membersList = this.membersSubscribeEventsByNewsletterId.get(this.model.newsletter_id).slice(0, Math.max(0, lastIndex - 1))
             .slice(this.batchIndex * 1000, (this.batchIndex + 1) * 1000)
@@ -164,7 +158,7 @@ class EmailRecipientsImporter extends TableImporter {
         }
 
         // The events are generated for a different time, so we need to move them to the batch time
-        timestamp = new Date(timestamp.getTime() - this.eventStartTimeUsed.getTime() + databaseDate.parse(this.batch.updated_at).getTime());
+        timestamp = new Date(timestamp.getTime() - this.eventStartTimeUsed.getTime() + this.batchUpdatedAt.getTime());
 
         if (timestamp > new Date()) {
             timestamp = new Date();
@@ -187,9 +181,7 @@ class EmailRecipientsImporter extends TableImporter {
 
         let deliveredTime;
         if (status === emailStatus.opened) {
-            const startDate = databaseDate.parse(this.batch.updated_at);
-            const endDate = timestamp;
-            deliveredTime = databaseDate.randomBetween(startDate, endDate);
+            deliveredTime = randomDateBetween(this.batchUpdatedAt, timestamp);
         }
 
         return {
@@ -198,10 +190,10 @@ class EmailRecipientsImporter extends TableImporter {
             email_id: this.model.id,
             batch_id: this.batch.id,
             member_id: member.id,
-            processed_at: databaseDate.dateToDatabaseString(this.batch.updated_at),
-            delivered_at: status === emailStatus.opened ? databaseDate.dateToDatabaseString(deliveredTime) : status === emailStatus.delivered ? databaseDate.dateToDatabaseString(timestamp) : null,
-            opened_at: status === emailStatus.opened ? databaseDate.dateToDatabaseString(timestamp) : null,
-            failed_at: status === emailStatus.failed ? databaseDate.dateToDatabaseString(timestamp) : null,
+            processed_at: this.batchProcessedAt,
+            delivered_at: status === emailStatus.opened ? toDatabaseDate(deliveredTime) : status === emailStatus.delivered ? toDatabaseDate(timestamp) : null,
+            opened_at: status === emailStatus.opened ? toDatabaseDate(timestamp) : null,
+            failed_at: status === emailStatus.failed ? toDatabaseDate(timestamp) : null,
             member_uuid: member.uuid,
             member_email: member.email,
             member_name: member.name

package/core/server/data/seeders/importers/emails-importer.js

@@ -2,7 +2,7 @@ const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const generateEvents = require('../utils/event-generator');
 const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class EmailsImporter extends TableImporter {
     static table = 'emails';
@@ -42,7 +42,7 @@ class EmailsImporter extends TableImporter {
                 : this.newsletters[1];
         }
 
-        const publishedAt = databaseDate.parse(this.model.published_at);
+        const publishedAt = fromDatabaseDate(this.model.published_at);
         const timestamp = luck(60)
             ? publishedAt
             : generateEvents({
@@ -55,7 +55,7 @@ class EmailsImporter extends TableImporter {
 
         const recipientCount = this.membersSubscribeEvents
             .filter(entry => entry.newsletter_id === newsletter.id)
-            .filter(entry => databaseDate.parse(entry.created_at) < timestamp).length;
+            .filter(entry => fromDatabaseDate(entry.created_at) < timestamp).length;
         const deliveredCount = Math.ceil(recipientCount * faker.number.float({
             max: 1,
             min: 0.9,
@@ -87,10 +87,10 @@ class EmailsImporter extends TableImporter {
             track_opens: true,
             track_clicks: true,
             feedback_enabled: true,
-            submitted_at: databaseDate.dateToDatabaseString(timestamp),
+            submitted_at: toDatabaseDate(timestamp),
             newsletter_id: newsletter.id,
-            created_at: databaseDate.dateToDatabaseString(timestamp),
-            updated_at: databaseDate.dateToDatabaseString(timestamp)
+            created_at: toDatabaseDate(timestamp),
+            updated_at: toDatabaseDate(timestamp)
         };
     }
 }

package/core/server/data/seeders/importers/labels-importer.js

@@ -2,7 +2,7 @@ const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const {slugify} = require('@tryghost/string');
 const {blogStartDate} = require('../utils/blog-info');
-const databaseDate = require('../utils/database-date');
+const {toDatabaseDate} = require('../../../lib/db-date');
 
 class LabelsImporter extends TableImporter {
     static table = 'labels';
@@ -30,8 +30,8 @@ class LabelsImporter extends TableImporter {
             id: this.fastFakeObjectId(),
             name: name,
             slug: `${slugify(name)}`,
-            created_at: databaseDate.dateToDatabaseString(blogStartDate),
-            updated_at: databaseDate.dateToDatabaseString(blogStartDate)
+            created_at: toDatabaseDate(blogStartDate),
+            updated_at: toDatabaseDate(blogStartDate)
         };
     }
 }

package/core/server/data/seeders/importers/members-click-events-importer.js

@@ -1,7 +1,7 @@
 const {TableImporter} = require('./table-importer');
 const {faker} = require('@faker-js/faker');
-const {luck} = require('../utils/random');
-const databaseDate = require('../utils/database-date');
+const {luck, randomDateBetween} = require('../utils/random');
+const {fromDatabaseDate, toDatabaseDate} = require('../../../lib/db-date');
 
 class MembersClickEventsImporter extends TableImporter {
     static table = 'members_click_events';
@@ -50,9 +50,9 @@ class MembersClickEventsImporter extends TableImporter {
         }
         this.amount -= 1;
 
-        const openedAt = databaseDate.parse(this.model.opened_at);
+        const openedAt = fromDatabaseDate(this.model.opened_at);
         const laterOn = new Date(openedAt.getTime() + 1000 * 60 * 15);
-        const clickTime = faker.date.between({from: openedAt.getTime(), to: laterOn.getTime()}); //added getTime here because it threw random errors
+        const clickTime = randomDateBetween(openedAt, laterOn);
 
         return {
             id: this.fastFakeObjectId(),
@@ -61,7 +61,7 @@ class MembersClickEventsImporter extends TableImporter {
                 min: 0,
                 max: this.redirectList.length - 1
             }))].id,
-            created_at: databaseDate.dateToDatabaseString(clickTime)
+            created_at: toDatabaseDate(clickTime)
         };
     }
 }