ghost 5.19.3 → 5.21.0

package/core/server/models/member-paid-subscription-event.js

@@ -8,6 +8,10 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    stripeSubscription() {
+        return this.belongsTo('StripeCustomerSubscription', 'subscription_id', 'id');
+    },
+
     subscriptionCreatedEvent() {
         return this.belongsTo('SubscriptionCreatedEvent', 'subscription_id', 'subscription_id');
     },
@@ -25,6 +29,21 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
                 .groupByRaw('currency, DATE(created_at)')
                 .orderByRaw('DATE(created_at)');
         }
+    },
+
+    filterRelations() {
+        return {
+            subscriptionCreatedEvent: {
+                // Mongo-knex doesn't support belongsTo relations
+                tableName: 'members_subscription_created_events',
+                tableNameAs: 'subscriptionCreatedEvent',
+                type: 'manyToMany',
+                joinTable: 'members_paid_subscription_events',
+                joinFrom: 'id',
+                joinToForeign: 'subscription_id',
+                joinTo: 'subscription_id'
+            }
+        };
     }
 }, {
     permittedOptions(methodName) {

package/core/server/models/member.js

@@ -114,6 +114,12 @@ const Member = ghostBookshelf.Model.extend({
                 joinTable: 'email_recipients',
                 joinFrom: 'member_id',
                 joinTo: 'email_id'
+            },
+            feedback: {
+                tableName: 'members_feedback',
+                tableNameAs: 'feedback',
+                type: 'oneToOne',
+                joinFrom: 'member_id'
             }
         };
     },

package/core/server/models/post.js

@@ -236,6 +236,17 @@ Post = ghostBookshelf.Model.extend({
     },
 
     orderRawQuery: function orderRawQuery(field, direction, withRelated) {
+        if (field === 'sentiment') {
+            if (withRelated.includes('count.sentiment')) {
+                // Internally sentiment can be included via the count.sentiment relation. We can do a quick optimisation of the query in that case.
+                return {
+                    orderByRaw: `count__sentiment ${direction}`
+                };
+            }
+            return {
+                orderByRaw: `(select AVG(score) from \`members_feedback\` where posts.id = members_feedback.post_id) ${direction}`
+            };
+        }
         if (field === 'email.open_rate' && withRelated && withRelated.indexOf('email') > -1) {
             return {
                 // *1.0 is needed on one of the columns to prevent sqlite from
@@ -1346,6 +1357,26 @@ Post = ghostBookshelf.Model.extend({
                         .as('count__paid_conversions');
                 });
             },
+            /**
+             * Combination of sigups and paid conversions, but unique per member
+             */
+            conversions(modelOrCollection) {
+                modelOrCollection.query('columns', 'posts.*', (qb) => {
+                    qb.count('*')
+                        .from('k')
+                        .with('k', (q) => {
+                            q.select('member_id')
+                                .from('members_subscription_created_events')
+                                .whereRaw('posts.id = members_subscription_created_events.attribution_id')
+                                .union(function () {
+                                    this.select('member_id')
+                                        .from('members_created_events')
+                                        .whereRaw('posts.id = members_created_events.attribution_id');
+                                });
+                        })
+                        .as('count__conversions');
+                });
+            },
             clicks(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
                     qb.countDistinct('members_click_events.member_id')
@@ -1357,7 +1388,7 @@ Post = ghostBookshelf.Model.extend({
             },
             sentiment(modelOrCollection) {
                 modelOrCollection.query('columns', 'posts.*', (qb) => {
-                    qb.select(qb.client.raw('ROUND(AVG(score) * 100)'))
+                    qb.select(qb.client.raw('COALESCE(ROUND(AVG(score) * 100), 0)'))
                         .from('members_feedback')
                         .whereRaw('posts.id = members_feedback.post_id')
                         .as('count__sentiment');
@@ -1368,7 +1399,7 @@ Post = ghostBookshelf.Model.extend({
                     qb.count('*')
                         .from('members_feedback')
                         .whereRaw('posts.id = members_feedback.post_id AND members_feedback.score = 0')
-                        .as('count__positive_feedback');
+                        .as('count__negative_feedback');
                 });
             },
             positive_feedback(modelOrCollection) {

package/core/server/models/redirect.js

@@ -53,6 +53,7 @@ const Redirect = ghostBookshelf.Model.extend({
                     qb.countDistinct('members_click_events.member_id')
                         .from('members_click_events')
                         .whereRaw('redirects.id = members_click_events.redirect_id')
+                        .whereRaw('redirects.updated_at <= members_click_events.created_at')
                         .as('count__clicks');
                 });
             }

package/core/server/models/subscription-created-event.js

@@ -8,6 +8,13 @@ const SubscriptionCreatedEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    /**
+     * The member created event that happend at the same time (if any)
+     */
+    memberCreatedEvent() {
+        return this.belongsTo('MemberCreatedEvent', 'batch_id', 'batch_id');
+    },
+
     subscription() {
         return this.belongsTo('StripeCustomerSubscription', 'subscription_id', 'id');
     },

package/core/server/services/audience-feedback/index.js

@@ -1,4 +1,5 @@
 const urlUtils = require('../../../shared/url-utils');
+const urlService = require('../../services/url');
 const FeedbackRepository = require('./FeedbackRepository');
 
 class AudienceFeedbackServiceWrapper {
@@ -22,6 +23,7 @@ class AudienceFeedbackServiceWrapper {
 
         // Expose the service
         this.service = new AudienceFeedbackService({
+            urlService,
             config: {
                 baseURL: new URL(urlUtils.urlFor('home', true))
             }

package/core/server/services/link-redirection/LinkRedirectRepository.js

@@ -18,7 +18,7 @@ module.exports = class LinkRedirectRepository {
     }
 
     /**
-     * @param {InstanceType<LinkRedirect>} linkRedirect 
+     * @param {InstanceType<LinkRedirect>} linkRedirect
      * @returns {Promise<void>}
      */
     async save(linkRedirect) {
@@ -36,10 +36,14 @@ module.exports = class LinkRedirectRepository {
     }
 
     fromModel(model) {
+        // Store if link has been edited
+        const edited = model.get('created_at')?.getTime() !== model.get('updated_at')?.getTime();
+
         return new LinkRedirect({
             id: model.id,
             from: new URL(this.#trimLeadingSlash(model.get('from')), this.#urlUtils.urlFor('home', true)),
-            to: new URL(model.get('to'))
+            to: new URL(model.get('to')),
+            edited
         });
     }
 
@@ -55,10 +59,17 @@ module.exports = class LinkRedirectRepository {
         return result;
     }
 
+    async getFilteredIds(options) {
+        const linkRows = await this.#LinkRedirect.getFilteredCollectionQuery(options)
+            .select('redirects.id')
+            .distinct();
+        return linkRows.map(row => row.id);
+    }
+
     /**
-     * 
-     * @param {URL} url 
-     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} linkRedirect 
+     *
+     * @param {URL} url
+     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} linkRedirect
      */
     async getByURL(url) {
         // Strip subdirectory from path

package/core/server/services/link-tracking/PostLinkRepository.js

@@ -1,4 +1,5 @@
 const {FullPostLink} = require('@tryghost/link-tracking');
+const _ = require('lodash');
 
 /**
  * @typedef {import('bson-objectid').default} ObjectID
@@ -22,8 +23,8 @@ module.exports = class PostLinkRepository {
     }
 
     /**
-     * 
-     * @param {*} options 
+     *
+     * @param {*} options
      * @returns {Promise<InstanceType<FullPostLink>[]>}
      */
     async getAll(options) {
@@ -48,6 +49,29 @@ module.exports = class PostLinkRepository {
         return result;
     }
 
+    async updateLinks(linkIds, updateData, options) {
+        const bulkUpdateOptions = _.pick(options, ['transacting']);
+
+        const bulkActionResult = await this.#LinkRedirect.bulkEdit(linkIds, 'redirects', {
+            ...bulkUpdateOptions,
+            data: updateData
+        });
+
+        return {
+            bulk: {
+                action: 'updateLink',
+                meta: {
+                    stats: {
+                        successful: bulkActionResult.successful,
+                        unsuccessful: bulkActionResult.unsuccessful
+                    },
+                    errors: bulkActionResult.errors,
+                    unsuccessfulData: bulkActionResult.unsuccessfulData
+                }
+            }
+        };
+    }
+
     /**
      * @param {PostLink} postLink
      * @returns {Promise<void>}

package/core/server/services/link-tracking/index.js

@@ -1,6 +1,7 @@
 const LinkClickRepository = require('./LinkClickRepository');
 const PostLinkRepository = require('./PostLinkRepository');
 const errors = require('@tryghost/errors');
+const urlUtils = require('../../../shared/url-utils');
 
 class LinkTrackingServiceWrapper {
     async init() {
@@ -38,7 +39,8 @@ class LinkTrackingServiceWrapper {
             linkRedirectService: linkRedirection.service,
             linkClickRepository: this.linkClickRepository,
             postLinkRepository,
-            DomainEvents
+            DomainEvents,
+            urlUtils
         });
 
         await this.service.init();

package/core/server/services/mega/feedback-buttons.js

@@ -18,20 +18,32 @@ const generateLinks = (postId, uuid, html) => {
         0
     );
 
-    html = html.replace(templateStrings.like, positiveLink.href);
-    html = html.replace(templateStrings.dislike, negativeLink.href);
+    html = html.replace(new RegExp(templateStrings.like, 'g'), positiveLink.href);
+    html = html.replace(new RegExp(templateStrings.dislike, 'g'), negativeLink.href);
 
     return html;
 };
 
 const getTemplate = (accentColor) => {
-    const likeButtonHtml = getButtonHtml(templateStrings.like, 'More like this', accentColor);
-    const dislikeButtonHtml = getButtonHtml(templateStrings.dislike, 'Less like this', accentColor);
+    const likeButtonHtml = getButtonHtml(
+        templateStrings.like,
+        'More like this',
+        accentColor,
+        'like-icon',
+        'https://static.ghost.org/v5.0.0/images/thumbs-up.png'
+    );
+    const dislikeButtonHtml = getButtonHtml(
+        templateStrings.dislike,
+        'Less like this',
+        accentColor,
+        'dislike-icon',
+        'https://static.ghost.org/v5.0.0/images/thumbs-down.png'
+    );
 
     return (`
         <tr>
             <td dir="ltr" width="100%" style="background-color: #ffffff; text-align: center; padding: 40px 4px; border-bottom: 1px solid #e5eff5" align="center">
-                <h3 style="text-align: center; margin-bottom: 22px; font-size: 17px; letter-spacing: -0.2px; margin-top: 0 !important;">What did you think of this post?</h3>
+                <h3 style="text-align: center; margin-bottom: 22px; font-size: 17px; letter-spacing: -0.2px; margin-top: 0 !important;">Give feedback on this post</h3>
                 <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="margin: auto; width: auto !important;">
                     <tr>
                         ${likeButtonHtml}
@@ -43,19 +55,44 @@ const getTemplate = (accentColor) => {
     `);
 };
 
-function getButtonHtml(href, buttonText, accentColor) {
-    const color = new Color(accentColor);
-    const bgColor = `${accentColor}10`;
-    const textColor = color.darken(0.6).hex();
+function getButtonHtml(href, buttonText, accentColor, className, iconUrl) {
+    const bgColor = getButtonLightTheme(accentColor).backgroundColor;
+    const textColor = getButtonLightTheme(accentColor).color;
 
     return (`
-        <td dir="ltr" valign="top" align="center" style="font-family: inherit; font-size: 14px; text-align: center;" nowrap>
-            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" style="width: auto !important;">
+         <td dir="ltr" valign="top" align="center" style="vertical-align: top; color: ${textColor}; font-family: inherit; font-size: 14px; text-align: center; padding: 0 8px;" nowrap>
+            <table class="feedback-buttons" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" style="background-color: ${bgColor}; overflow: hidden; border-radius: 22px;border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                 <tr>
-                    <td style="padding: 0 6px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
-                        <a href=${href} style="background-color: ${bgColor}; color: ${textColor}; border-radius: 22px; font-family: inherit; padding: 12px 20px; border: none; font-size: 14px; font-weight: bold; line-height: 100%; text-decoration: none; display: block;">
-                            ${buttonText}
-                        </a>
+                    <td width="16" height="38" style="paddig-left:10px;"></td>
+                    <td class=${className} background=${iconUrl} bgcolor="${textColor}" width="24" height="38" valign="top" style="background-image: url(${iconUrl});vertical-align: middle; text-align: center;background-size: cover; background-position: 0 50%; background-repeat:no-repeat;">
+                        <!--[if gte mso 9]>
+                        <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:24px;height:38px;">
+                            <v:fill origin="0.5, 0.5" position="0.5, 0.5" type="tile" src=${iconUrl} color="${textColor}" size="1,1" aspect="atleast" />
+                            <v:textbox inset="0,0,0,0">
+                        <![endif]-->
+                        <div>
+                            <a style="background-color: ${bgColor};border: none; width: 24px; height: 38px; display: block" href=${href} target="_blank"></a>
+                        </div>
+                        <!--[if gte mso 9]>
+                        </v:textbox>
+                        </v:rect>
+                        <![endif]-->
+                    </td>
+                    <td style="text-align: right;font-size: 18px; vertical-align: middle; color: ${textColor}!important; background-position: 0; padding: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
+                        <div style="color: ${textColor}"><!--[if mso]>
+                            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href=${href} style="height:38px;v-text-anchor:middle;width:120px;" stroke="f">
+                                <w:anchorlock/>
+                                <center>
+                            <![endif]-->
+                            <a
+                              href=${href}
+                              target="_blank"
+                              style="padding: 0 8px 0 8px;border-radius: 0 22px 22px 0;color:${textColor}!important;display:inline-block;font-family: inherit;font-size:14px;font-weight:bold;line-height:38px;text-align:left;text-decoration:none;width:100px;-webkit-text-size-adjust:none;">
+                              ${buttonText}</a>
+                            <!--[if mso]>
+                            </center>
+                            </v:rect>
+                            <![endif]--></div>
                     </td>
                 </tr>
             </table>
@@ -63,7 +100,41 @@ function getButtonHtml(href, buttonText, accentColor) {
     `);
 }
 
+function getButtonLightTheme(accentColor) {
+    const color = new Color(accentColor);
+    const backgroundColor = `${accentColor}10`;
+    const textColor = color.darken(0.6).hex();
+
+    return {
+        color: textColor,
+        backgroundColor
+    };
+}
+
+function getButtonsHeadStyles() {
+    return (`
+        .like-icon {
+            mix-blend-mode: darken;
+        }
+
+        .dislike-icon {
+            mix-blend-mode: darken;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            .like-icon {
+                mix-blend-mode: initial !important;
+            }
+
+            .dislike-icon {
+                mix-blend-mode: initial !important;
+            }
+        }
+`);
+}
+
 module.exports = {
     generateLinks,
-    getTemplate
+    getTemplate,
+    getButtonsHeadStyles
 };

package/core/server/services/mega/mega.js

@@ -240,6 +240,7 @@ const addEmail = async (postModel, options) => {
             submitted_at: moment().toDate(),
             track_opens: !!settingsCache.get('email_track_opens'),
             track_clicks: !!settingsCache.get('email_track_clicks'),
+            feedback_enabled: !!newsletter.get('feedback_enabled'),
             recipient_filter: emailRecipientFilter,
             newsletter_id: newsletter.id
         }, knexOptions);

package/core/server/services/mega/template.js

@@ -37,6 +37,7 @@ module.exports = ({post, site, newsletter, templateSettings}) => {
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
 <title>${cleanPost.title}</title>
 <style>
 /* -------------------------------------
@@ -1161,6 +1162,8 @@ ${ templateSettings.showBadge ? `
 }
 ` : ''}
 
+${iff(templateSettings.feedbackEnabled, feedbackButtons.getButtonsHeadStyles(templateSettings.accentColor), '')}
+
 </style>
 </head>
 

package/core/server/services/member-attribution/index.js

@@ -1,5 +1,6 @@
 const urlService = require('../url');
 const urlUtils = require('../../../shared/url-utils');
+const settingsCache = require('../../../shared/settings-cache');
 
 class MemberAttributionServiceWrapper {
     init() {
@@ -38,7 +39,8 @@ class MemberAttributionServiceWrapper {
                 SubscriptionCreatedEvent: models.SubscriptionCreatedEvent,
                 Integration: models.Integration
             },
-            attributionBuilder: this.attributionBuilder
+            attributionBuilder: this.attributionBuilder,
+            isTrackingEnabled: !!settingsCache.get('members_track_sources')
         });
     }
 }

package/core/server/services/members/api.js

@@ -13,6 +13,7 @@ const SingleUseTokenProvider = require('./SingleUseTokenProvider');
 const urlUtils = require('../../../shared/url-utils');
 const labsService = require('../../../shared/labs');
 const offersService = require('../offers');
+const tiersService = require('../tiers');
 const newslettersService = require('../newsletters');
 const memberAttributionService = require('../member-attribution');
 
@@ -194,9 +195,11 @@ function createApiInstance(config) {
             StripePrice: models.StripePrice,
             Product: models.Product,
             Settings: models.Settings,
-            Comment: models.Comment
+            Comment: models.Comment,
+            MemberFeedback: models.MemberFeedback
         },
         stripeAPIService: stripeService.api,
+        tiersService: tiersService,
         offersAPI: offersService.api,
         labsService: labsService,
         newslettersService: newslettersService,

package/core/server/services/members/service.js

@@ -16,6 +16,7 @@ const config = require('../../../shared/config');
 const models = require('../../models');
 const {GhostMailer} = require('../mail');
 const jobsService = require('../jobs');
+const tiersService = require('../tiers');
 const VerificationTrigger = require('@tryghost/verification-trigger');
 const DatabaseInfo = require('@tryghost/database-info');
 const settingsHelpers = require('../settings-helpers');
@@ -47,7 +48,13 @@ let verificationTrigger;
 const membersImporter = new MembersCSVImporter({
     storagePath: config.getContentPath('data'),
     getTimezone: () => settingsCache.get('timezone'),
-    getMembersApi: () => module.exports.api,
+    getMembersRepository: async () => {
+        const api = await module.exports.api;
+        return api.members;
+    },
+    getDefaultTier: () => {
+        return tiersService.api.readDefaultTier();
+    },
     sendEmail: ghostMailer.send.bind(ghostMailer),
     isSet: labsService.isSet.bind(labsService),
     addJob: jobsService.addJob.bind(jobsService),

package/core/server/services/newsletters/index.js

@@ -4,6 +4,7 @@ const mail = require('../mail');
 const models = require('../../models');
 const urlUtils = require('../../../shared/url-utils');
 const limitService = require('../limits');
+const labs = require('../../../shared/labs');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 
@@ -13,5 +14,6 @@ module.exports = new NewslettersService({
     mail,
     singleUseTokenProvider: new SingleUseTokenProvider(models.SingleUseToken, MAGIC_LINK_TOKEN_VALIDITY),
     urlUtils,
-    limitService
+    limitService,
+    labs
 });

package/core/server/services/newsletters/service.js

@@ -21,13 +21,16 @@ class NewslettersService {
      * @param {Object} options.singleUseTokenProvider
      * @param {Object} options.urlUtils
      * @param {ILimitService} options.limitService
+     * @param {Object} options.labs
      */
-    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService}) {
+    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService, labs}) {
         this.NewsletterModel = NewsletterModel;
         this.MemberModel = MemberModel;
         this.urlUtils = urlUtils;
         /** @private */
         this.limitService = limitService;
+        /** @private */
+        this.labs = labs;
 
         /* email verification setup */
 
@@ -251,6 +254,13 @@ class NewslettersService {
             }
         }
 
+        if (cleanedAttrs.feedback_enabled) {
+            if (!this.labs.isSet('audienceFeedback')) {
+                // Not allowed to set to true
+                cleanedAttrs.feedback_enabled = false;
+            }
+        }
+
         return {cleanedAttrs, emailsToVerify};
     }
 

package/core/server/services/tiers/TierRepository.js

@@ -0,0 +1,116 @@
+const {Tier} = require('@tryghost/tiers');
+
+/**
+ * @typedef {import('@tryghost/tiers/lib/TiersAPI').ITierRepository} ITierRepository
+ */
+
+/**
+ * @implements {ITierRepository}
+ */
+module.exports = class TierRepository {
+    /** @type {Object} */
+    #ProductModel;
+
+    /** @type {import('@tryghost/domain-events')} */
+    #DomainEvents;
+
+    /**
+     * @param {object} deps
+     * @param {object} deps.ProductModel Bookshelf Model
+     * @param {import('@tryghost/domain-events')} deps.DomainEvents
+     */
+    constructor(deps) {
+        this.#ProductModel = deps.ProductModel;
+        this.#DomainEvents = deps.DomainEvents;
+    }
+
+    /**
+     * @private
+     */
+    mapToTier(model) {
+        const json = model.toJSON();
+        return {
+            id: json.id,
+            name: json.name,
+            slug: json.slug,
+            status: json.active ? 'active' : 'archived',
+            welcomePageURL: json.welcome_page_url,
+            visibility: json.visibility,
+            trialDays: json.trial_days,
+            description: json.description,
+            type: json.type,
+            currency: json.currency,
+            monthlyPrice: json.monthly_price,
+            yearlyPrice: json.yearly_price,
+            createdAt: json.created_at,
+            updatedAt: json.updated_at,
+            benefits: json.benefits.map(item => item.name)
+        };
+    }
+
+    /**
+     * @param {object} [options]
+     * @param {string} [options.filter]
+     * @returns {Promise<import('@tryghost/tiers/lib/Tier')[]>}
+     */
+    async getAll(options = {}) {
+        const collection = await this.#ProductModel.findAll({...options, withRelated: ['benefits']});
+
+        const result = [];
+
+        for (const model of collection.models) {
+            const tier = await Tier.create(this.mapToTier(model));
+            result.push(tier);
+        }
+
+        return result;
+    }
+
+    /**
+     * @param {import('bson-objectid').default} id
+     * @returns {Promise<import('@tryghost/tiers/lib/Tier')>}
+     */
+    async getById(id) {
+        const model = await this.#ProductModel.findOne({id: id.toHexString()}, {withRelated: ['benefits']});
+
+        return await Tier.create(this.mapToTier(model));
+    }
+
+    /**
+     * @param {import('@tryghost/tiers/lib/Tier')} tier
+     * @returns {Promise<void>}
+     */
+    async save(tier) {
+        const data = {
+            id: tier.id.toHexString(),
+            name: tier.name,
+            slug: tier.slug,
+            active: tier.status === 'active',
+            welcome_page_url: tier.welcomePageURL,
+            visibility: tier.visibility,
+            trial_days: tier.trialDays,
+            description: tier.description,
+            type: tier.type,
+            currency: tier.currency,
+            monthly_price: tier.monthlyPrice,
+            yearly_price: tier.yearlyPrice,
+            created_at: tier.createdAt,
+            updated_at: tier.updatedAt,
+            benefits: tier.benefits.map(name => ({name}))
+        };
+
+        const existing = await this.#ProductModel.findOne({id: data.id}, {require: false});
+
+        if (!existing) {
+            await this.#ProductModel.add(data);
+        } else {
+            await this.#ProductModel.edit(data, {
+                id: data.id
+            });
+        }
+
+        for (const event of tier.events) {
+            this.#DomainEvents.dispatch(event);
+        }
+    }
+};

package/core/server/services/tiers/index.js

@@ -0,0 +1 @@
+module.exports = require('./service');