ghost 6.55.0 → 6.56.0

package/core/server/services/gifts/gift.ts

@@ -1,7 +1,7 @@
 import {GIFT_EXPIRY_DAYS} from './constants';
+import type {GiftCadence, GiftData, GiftStatus} from './gift-schema';
 
-export type GiftStatus = 'purchased' | 'redeemed' | 'consumed' | 'expired' | 'refunded';
-export type GiftCadence = 'month' | 'year';
+export type {GiftCadence, GiftStatus} from './gift-schema';
 
 export type RedeemableCheckFailureReason = 'redeemed' | 'consumed' | 'expired' | 'refunded' | 'paid-member';
 export type RedeemableCheckResult =
@@ -13,43 +13,20 @@ export type ReassignableCheckResult =
     | {reassignable: true}
     | {reassignable: false; reason: ReassignableCheckFailureReason};
 
-interface GiftData {
-    token: string;
-    buyerEmail: string;
-    buyerMemberId: string | null;
-    redeemerMemberId: string | null;
-    tierId: string;
-    cadence: GiftCadence;
-    duration: number;
-    currency: string;
-    amount: number;
-    stripeCheckoutSessionId: string;
-    stripePaymentIntentId: string;
-    consumesAt: Date | null;
-    expiresAt: Date;
-    status: GiftStatus;
-    purchasedAt: Date;
-    redeemedAt: Date | null;
-    consumedAt: Date | null;
-    expiredAt: Date | null;
-    refundedAt: Date | null;
-    consumesSoonReminderSentAt: Date | null;
-}
-
-export interface GiftFromPurchaseData {
-    token: string;
-    buyerEmail: string;
-    buyerMemberId: string | null;
-    tierId: string;
-    cadence: GiftCadence;
-    duration: number;
-    currency: string;
-    amount: number;
-    stripeCheckoutSessionId: string;
-    stripePaymentIntentId: string;
-}
-
-export class Gift {
+export type GiftFromPurchaseData = Pick<GiftData,
+    | 'token'
+    | 'buyerEmail'
+    | 'buyerMemberId'
+    | 'tierId'
+    | 'cadence'
+    | 'duration'
+    | 'currency'
+    | 'amount'
+    | 'stripeCheckoutSessionId'
+    | 'stripePaymentIntentId'
+>;
+
+export class Gift implements GiftData {
     token: string;
     buyerEmail: string;
     buyerMemberId: string | null;

package/core/server/services/link-tracking/link-click-repository.js

@@ -32,7 +32,12 @@ module.exports = class LinkClickRepository {
 
         // Memoize the findOne function
         this.memoizedFindOne = _.memoize(async (uuid, options) => {
-            return await this.#Member.findOne({uuid}, options);
+            try {
+                return await this.#Member.findOne({uuid}, options);
+            } catch (error) {
+                this.memoizedFindOne.cache.delete(uuid);
+                throw error;
+            }
         });
     }
 

package/core/server/services/link-tracking/link-click-tracking-service.js

@@ -4,6 +4,7 @@ const PostLink = require('./post-link');
 const ObjectID = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const nql = require('@tryghost/nql');
+const {escapeNqlString} = require('@tryghost/nql-string');
 const _ = require('lodash');
 const tpl = require('@tryghost/tpl');
 const moment = require('moment');
@@ -174,7 +175,11 @@ class LinkClickTrackingService {
 
         // manages transformation of current url to relative for comparision
         const transformedOldUrl = this.#urlUtils.absoluteToTransformReady(redirectUrl.href);
-        const filterQuery = `post_id:'${postId}'+to:'${transformedOldUrl}'`;
+        // the url is re-serialised into NQL here, so it needs escaping again -
+        // quotes are legal in a URL and would otherwise break the filter.
+        // postId is String()d because nql parses an unquoted `post_id:123` to a
+        // number, and escapeNqlString operates on strings
+        const filterQuery = `post_id:${escapeNqlString(String(postId))}+to:${escapeNqlString(transformedOldUrl)}`;
 
         const updatedFilterOptions = {
             ...filterOptions,
@@ -245,13 +250,15 @@ class LinkClickTrackingService {
      * Add first-party tracking to a URL in an automation email
      * @param {Readonly<URL>} url
      * @param {string} automationActionRevisionId
+     * @param {string} automationRunStepId
      * @param {string} memberUuid
      * @return {Promise<URL>}
      */
-    async addAutomationTrackingToUrl(url, automationActionRevisionId, memberUuid) {
+    async addAutomationTrackingToUrl(url, automationActionRevisionId, automationRunStepId, memberUuid) {
         const redirect = await this.#linkRedirectService.getOrAddAutomationRedirect(automationActionRevisionId, url);
         const trackedUrl = new URL(redirect.from.href);
         trackedUrl.searchParams.set('m', memberUuid);
+        trackedUrl.searchParams.set('step', automationRunStepId);
         return trackedUrl;
     }
 
@@ -269,7 +276,8 @@ class LinkClickTrackingService {
             });
 
             const automationActionRevisionId = event.data.link.automationActionRevisionId;
-            if (!automationActionRevisionId) {
+            const automationRunStepId = event.data.url.searchParams.get('step');
+            if (!automationActionRevisionId || !automationRunStepId) {
                 await this.#linkClickRepository.save(click);
                 return;
             }
@@ -282,6 +290,7 @@ class LinkClickTrackingService {
 
                 await this.#automationsApi.trackEmailClicked({
                     automationActionRevisionId,
+                    automationRunStepId,
                     memberId,
                     clickedAt: event.timestamp
                 }, {transacting});

package/core/server/services/member-welcome-emails/member-welcome-email-renderer.js

@@ -119,9 +119,10 @@ class MemberWelcomeEmailRenderer {
      * @param {string} [options.unsubscribeUrl] - When set, the footer shows an "Unsubscribe from these emails" link instead of "Manage your preferences"
      * @param {boolean} [options.trackClicks]
      * @param {string | null} [options.automationActionRevisionId]
+     * @param {string | null} [options.automationRunStepId]
      * @returns {Promise<{html: string, text: string, subject: string}>}
      */
-    async render({lexical, subject, designSettings, member, siteSettings, unsubscribeUrl, trackClicks = false, automationActionRevisionId = null}) {
+    async render({lexical, subject, designSettings, member, siteSettings, unsubscribeUrl, trackClicks = false, automationActionRevisionId = null, automationRunStepId = null}) {
         designSettings = designSettings || {};
 
         const design = emailDesign.getEmailDesign({
@@ -171,9 +172,9 @@ class MemberWelcomeEmailRenderer {
                 return originalPath;
             }
             const isTrackable = ['http:', 'https:'].includes(url.protocol);
-            if (trackClicks && automationActionRevisionId && member.uuid && isTrackable) {
+            if (trackClicks && automationActionRevisionId && automationRunStepId && member.uuid && isTrackable) {
                 await linkTracking.init();
-                return await linkTracking.service.addAutomationTrackingToUrl(url, automationActionRevisionId, member.uuid);
+                return await linkTracking.service.addAutomationTrackingToUrl(url, automationActionRevisionId, automationRunStepId, member.uuid);
             }
             return url;
         }, {base: siteSettings.url});

package/core/server/services/member-welcome-emails/service.js

@@ -370,10 +370,11 @@ class MemberWelcomeEmailService {
      * @param {boolean} [options.trackOpens]
      * @param {boolean} [options.trackClicks]
      * @param {string | null} [options.automationActionRevisionId]
+     * @param {string | null} [options.automationRunStepId]
      * @param {null | {url: string, oneClickUrl: string}} [options.unsubscribe] - When set, the footer links to an unsubscribe URL and the email carries one-click List-Unsubscribe headers
      * @returns {Promise<unknown>}
      */
-    async #sendEmail({member, memberStatus, email, emailType, trackOpens, trackClicks = false, automationActionRevisionId = null, unsubscribe = null}) {
+    async #sendEmail({member, memberStatus, email, emailType, trackOpens, trackClicks = false, automationActionRevisionId = null, automationRunStepId = null, unsubscribe = null}) {
         if (!member.email) {
             throw new errors.IncorrectUsageError({
                 message: MESSAGES.MISSING_RECIPIENT_EMAIL
@@ -400,7 +401,8 @@ class MemberWelcomeEmailService {
             siteSettings: this.#getSiteSettings(),
             unsubscribeUrl: unsubscribe?.url,
             trackClicks,
-            automationActionRevisionId
+            automationActionRevisionId,
+            automationRunStepId
         });
 
         const senderOptions = await this.#getEffectiveSenderOptions(
@@ -480,9 +482,10 @@ class MemberWelcomeEmailService {
      * @param {boolean} options.trackOpens
      * @param {boolean} options.trackClicks
      * @param {string} options.automationActionRevisionId
+     * @param {string} options.automationRunStepId
      * @returns {Promise<unknown>}
      */
-    async sendAutomationEmail({email, member, memberStatus, trackOpens, trackClicks, automationActionRevisionId}) {
+    async sendAutomationEmail({email, member, memberStatus, trackOpens, trackClicks, automationActionRevisionId, automationRunStepId}) {
         const designSettings = email.designSettingId ?
             await EmailDesignSetting.findOne({id: email.designSettingId}) :
             null;
@@ -510,6 +513,7 @@ class MemberWelcomeEmailService {
             trackOpens,
             trackClicks,
             automationActionRevisionId,
+            automationRunStepId,
             unsubscribe
         });
     }

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

@@ -244,8 +244,7 @@ function createApiInstance(config) {
             EmailSpamComplaintEvent: models.EmailSpamComplaintEvent,
             Automation: models.Automation,
             WelcomeEmailAutomationRun: models.WelcomeEmailAutomationRun,
-            AutomatedEmailRecipient: models.AutomatedEmailRecipient,
-            Gift: models.Gift
+            AutomatedEmailRecipient: models.AutomatedEmailRecipient
         },
         stripeAPIService: stripeService.api,
         tiersService: tiersService,

package/core/server/services/members/import-export/import/importer.ts

@@ -82,7 +82,7 @@ interface StripeSubscriptions {
 
 // Gifts: reassigning a redeemed gift to the imported member.
 export interface GiftService {
-    reassignRedeemer(giftId: string, memberId: string, options: object): Promise<void>;
+    reassignRedeemer(giftId: string, memberId: string, options: {transacting?: Knex.Transaction}): Promise<void>;
 }
 
 // The completion email concern: who it goes to, the links it carries, and sending
@@ -99,7 +99,8 @@ type CustomFieldPlan = unknown;
 // The custom fields collaborator as the import needs it. activeFields is the field set a
 // custom_fields.* column is read against, empty when the feature is off; planWrite
 // validates a row's values (throwing so the row fails whole) and applyWrite persists
-// them, both on the row's transaction.
+// them, merging a composite's sub-fields into whatever is already stored, both on the
+// row's transaction.
 export interface CustomFieldsImport {
     activeFields(): Promise<CsvField[]>;
     planWrite(values: Record<string, unknown>): Promise<CustomFieldPlan[]>;

package/core/server/services/members/import-export/index.js

@@ -40,7 +40,11 @@ function makeImporter(deps) {
     // Gifts is initialised at boot and always present at request time; the getter
     // resolves it lazily so the ready service is picked up whenever a row uses it.
     const gifts = {
-        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer(giftId, memberId, options)
+        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer({
+            giftId,
+            memberId,
+            transacting: options.transacting
+        })
     };
     // Gated by the same labs flag as the export, so the two halves round-trip or stay
     // silent together: off, activeFields resolves empty and every custom_fields.* column
@@ -48,7 +52,11 @@ function makeImporter(deps) {
     const customFields = {
         activeFields: async () => (labs.isSet('membersCustomFields') ? deps.customFields.definitions.browse() : []),
         planWrite: values => deps.customFields.values.planWrite(values),
-        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor)
+        // mergeComposites: a sub-field is a field, so a row writes the sub-fields it fills
+        // and leaves the rest alone, the same rule a blank `name` column follows. Without
+        // it a file naming one address column would replace the whole address, clearing
+        // five sub-fields it never mentioned.
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor, { mergeComposites: true })
     };
     return new importer_1.default({
         knex: deps.knex,

package/core/server/services/members/import-export/index.ts

@@ -18,7 +18,9 @@ interface ImporterServices {
     getMembersRepository(): Promise<Omit<MembersRepository, 'getImportLabel'>>;
     getDefaultTier(): Promise<Tier>;
     getTierByName(name: string): Promise<Tier | null>;
-    getGiftService(): GiftService;
+    getGiftService(): {
+        reassignRedeemer(input: {giftId: string; memberId: string; transacting?: Knex.Transaction}): Promise<void>;
+    };
     sendEmail: EmailNotifications['send'];
     urlFor: EmailNotifications['urlFor'];
     addJob(job: {job: () => Promise<void>; offloaded: boolean; name: string}): void;
@@ -31,7 +33,7 @@ interface ImporterServices {
         definitions: {browse(): Promise<CsvField[]>};
         values: {
             planWrite(values: Record<string, unknown>): Promise<unknown[]>;
-            applyWrite(memberId: string, plan: unknown[], executor: Knex): Promise<void>;
+            applyWrite(memberId: string, plan: unknown[], executor: Knex, options?: {mergeComposites?: boolean}): Promise<void>;
         };
     };
 }
@@ -72,7 +74,11 @@ export function makeImporter(deps: ImporterServices) {
     // Gifts is initialised at boot and always present at request time; the getter
     // resolves it lazily so the ready service is picked up whenever a row uses it.
     const gifts: GiftService = {
-        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer(giftId, memberId, options)
+        reassignRedeemer: (giftId, memberId, options) => deps.getGiftService().reassignRedeemer({
+            giftId,
+            memberId,
+            transacting: options.transacting
+        })
     };
 
     // Gated by the same labs flag as the export, so the two halves round-trip or stay
@@ -81,7 +87,11 @@ export function makeImporter(deps: ImporterServices) {
     const customFields: CustomFieldsImport = {
         activeFields: async () => (labs.isSet('membersCustomFields') ? deps.customFields.definitions.browse() : []),
         planWrite: values => deps.customFields.values.planWrite(values),
-        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor)
+        // mergeComposites: a sub-field is a field, so a row writes the sub-fields it fills
+        // and leaves the rest alone, the same rule a blank `name` column follows. Without
+        // it a file naming one address column would replace the whole address, clearing
+        // five sub-fields it never mentioned.
+        applyWrite: (memberId, plan, executor) => deps.customFields.values.applyWrite(memberId, plan, executor, {mergeComposites: true})
     };
 
     return new MembersCSVImporter({

package/core/server/services/members/members-api/controllers/router-controller.js

@@ -525,7 +525,7 @@ module.exports = class RouterController {
      * @param {string} options.cancelUrl URL to redirect to after cancelled checkout
      * @param {string} [options.email] Email address of the customer
      * @param {object} [options.member] Currently authenticated member OR member associated with the email address
-     * @param {object} [options.gift] Active gift subscription for the member
+     * @param {number|null} [options.giftTrialDays] Stable continuation decision from gift subscriptions
      * @param {boolean} options.isAuthenticated
      * @param {object} options.metadata Metadata to be passed to Stripe
      * @returns
@@ -680,9 +680,11 @@ module.exports = class RouterController {
 
     /**
      * @param {object} options
-     * @param {object} options.tier
-     * @param {'month'|'year'} options.cadence
-     * @param {string} options.email
+     * @param {string} options.tierId
+     * @param {string} [options.offerId]
+     * @param {string} [options.cadence]
+     * @param {number} [options.duration]
+     * @param {string} [options.email]
      * @param {string} options.successUrl
      * @param {string} options.cancelUrl
      * @param {object} options.metadata
@@ -698,10 +700,26 @@ module.exports = class RouterController {
         }
 
         try {
-            const paymentLink = await this._paymentsService.getGiftPaymentLink(options);
-
-            return {url: paymentLink};
+            return await this._giftService.service.startCheckout({
+                tierId: options.tierId,
+                offerId: options.offerId,
+                cadence: options.cadence,
+                duration: options.duration,
+                metadata: options.metadata,
+                successUrl: options.successUrl,
+                cancelUrl: options.cancelUrl,
+                buyer: {
+                    memberId: options.member?.id ?? null,
+                    email: options.member?.get('email') ?? options.email ?? null,
+                    name: options.member?.get('name') ?? null,
+                    isAuthenticated: options.isAuthenticated
+                }
+            });
         } catch (err) {
+            if (err instanceof BadRequestError || err instanceof NoPermissionError) {
+                throw err;
+            }
+
             logging.error(err);
             this._sentry?.captureException?.(err);
             throw new BadRequestError({
@@ -788,7 +806,7 @@ module.exports = class RouterController {
             let tier;
             let cadence;
             let offer;
-            let gift;
+            let giftTrialDays;
 
             if (req.body.continueFromGift) {
                 if (!isAuthenticated || !member) {
@@ -796,25 +814,16 @@ module.exports = class RouterController {
                         message: tpl(messages.signInRequired)
                     });
                 }
-                if (member.get('status') !== 'gift') {
-                    throw new BadRequestError({
-                        message: tpl(messages.badRequest),
-                        context: 'Member does not have an active gift subscription'
-                    });
-                }
-
-                gift = await this._giftService.service.getActiveByMember(member.id);
-                if (!gift) {
-                    throw new BadRequestError({
-                        message: tpl(messages.badRequest),
-                        context: 'No active gift subscription found for member'
-                    });
-                }
+                const continuation = await this._giftService.service.preparePaidContinuation({
+                    memberId: member.id,
+                    memberStatus: member.get('status')
+                });
 
                 ({tier, cadence} = await this._getSubscriptionCheckoutData({
-                    tierId: gift.tierId,
-                    cadence: gift.cadence
+                    tierId: continuation.tierId,
+                    cadence: continuation.cadence
                 }));
+                giftTrialDays = continuation.trialDays;
             } else {
                 ({tier, cadence, offer} = await this._getSubscriptionCheckoutData(req.body));
             }
@@ -825,7 +834,7 @@ module.exports = class RouterController {
                 tier,
                 cadence,
                 offer,
-                gift
+                giftTrialDays
             });
 
             // Add welcome_page_url to the response if available and member is authenticated
@@ -842,19 +851,12 @@ module.exports = class RouterController {
                 });
             }
 
-            if (req.body.offerId) {
-                throw new BadRequestError({
-                    message: tpl(messages.badRequest),
-                    context: 'Offers cannot be applied to gift subscriptions'
-                });
-            }
-
-            const data = await this._getSubscriptionCheckoutData(req.body);
-
             response = await this._createGiftCheckoutSession({
                 ...options,
-                ...data,
-                duration: 1, // gifts are currently 1 month or 1 year only
+                tierId: req.body.tierId,
+                offerId: req.body.offerId,
+                cadence: req.body.cadence,
+                duration: req.body.duration,
                 successUrl: siteUrl,
                 cancelUrl: options.cancelUrl || siteUrl
             });

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

@@ -67,8 +67,7 @@ module.exports = function MembersAPI({
         MemberFeedback,
         Automation,
         WelcomeEmailAutomationRun,
-        AutomatedEmailRecipient,
-        Gift
+        AutomatedEmailRecipient
     },
     tiersService,
     stripeAPIService,
@@ -142,7 +141,7 @@ module.exports = function MembersAPI({
         memberAttributionService,
         MemberEmailChangeEvent,
         AutomatedEmailRecipient,
-        Gift
+        giftSubscriptions: giftService
     });
 
     const nextPaymentCalculator = new NextPaymentCalculator();
@@ -192,8 +191,7 @@ module.exports = function MembersAPI({
         Offer,
         offersAPI,
         stripeAPIService,
-        settingsCache,
-        giftService
+        settingsCache
     });
 
     const memberController = new MemberController({
@@ -283,7 +281,10 @@ module.exports = function MembersAPI({
             }
 
             if (giftToken) {
-                await giftService.service.redeem(giftToken, member.id);
+                await giftService.service.redeem({
+                    token: giftToken,
+                    memberId: member.id
+                });
             }
 
             await MemberLoginEvent.add({member_id: member.id});
@@ -316,7 +317,12 @@ module.exports = function MembersAPI({
                     {name, email, labels, newsletters, attribution, geolocation, status: 'gift'},
                     {transacting}
                 );
-                await giftService.service.redeem(giftToken, created.id, {transacting, newMember: true});
+                await giftService.service.redeem({
+                    token: giftToken,
+                    memberId: created.id,
+                    transacting,
+                    newMember: true
+                });
                 return created;
             });
         } else {

package/core/server/services/members/members-api/repositories/event-repository.js

@@ -37,7 +37,7 @@ module.exports = class EventRepository {
         urlService,
         MemberEmailChangeEvent,
         AutomatedEmailRecipient,
-        Gift
+        giftSubscriptions
     }) {
         this._DonationPaymentEvent = DonationPaymentEvent;
         this._MemberSubscribeEvent = MemberSubscribeEvent;
@@ -57,7 +57,7 @@ module.exports = class EventRepository {
         this._memberAttributionService = memberAttributionService;
         this._MemberEmailChangeEvent = MemberEmailChangeEvent;
         this._AutomatedEmailRecipient = AutomatedEmailRecipient;
-        this._Gift = Gift;
+        this._giftSubscriptions = giftSubscriptions;
         this._knex = db.knex;
     }
 
@@ -462,101 +462,11 @@ module.exports = class EventRepository {
     }
 
     async getGiftPurchaseEvents(options = {}, filter) {
-        options = {
-            ...options,
-            withRelated: ['buyer', 'tier'],
-            filter: 'buyer_member_id:-null+custom:true',
-            useBasicCount: true,
-            mongoTransformer: chainTransformers(
-                // First set the filter manually
-                replaceCustomFilterTransformer(filter),
-
-                // Map the used keys in that filter
-                ...mapKeys({
-                    'data.created_at': 'purchased_at',
-                    'data.member_id': 'buyer_member_id'
-                })
-            )
-        };
-
-        if (options.order) {
-            options.order = options.order.replace(/created_at/g, 'purchased_at');
-        }
-
-        const {data: models, meta} = await this._Gift.findPage(options);
-
-        const data = models.map((model) => {
-            const json = model.toJSON(options);
-
-            return {
-                type: 'gift_purchase_event',
-                data: {
-                    id: json.id,
-                    member: json.buyer || null,
-                    member_id: json.buyer_member_id,
-                    tier_name: json.tier?.name,
-                    cadence: json.cadence,
-                    duration: json.duration,
-                    amount: json.amount,
-                    currency: json.currency,
-                    created_at: json.purchased_at
-                }
-            };
-        });
-
-        return {
-            data,
-            meta
-        };
+        return this._giftSubscriptions.service.browsePurchaseEvents(options, filter);
     }
 
     async getGiftRedemptionEvents(options = {}, filter) {
-        options = {
-            ...options,
-            withRelated: ['redeemer', 'tier'],
-            filter: 'redeemer_member_id:-null+custom:true',
-            useBasicCount: true,
-            mongoTransformer: chainTransformers(
-                // First set the filter manually
-                replaceCustomFilterTransformer(filter),
-
-                // Map the used keys in that filter
-                ...mapKeys({
-                    'data.created_at': 'redeemed_at',
-                    'data.member_id': 'redeemer_member_id'
-                })
-            )
-        };
-
-        if (options.order) {
-            options.order = options.order.replace(/created_at/g, 'redeemed_at');
-        }
-
-        const {data: models, meta} = await this._Gift.findPage(options);
-
-        const data = models.map((model) => {
-            const json = model.toJSON(options);
-
-            return {
-                type: 'gift_redemption_event',
-                data: {
-                    id: json.id,
-                    member: json.redeemer || null,
-                    member_id: json.redeemer_member_id,
-                    tier_name: json.tier?.name,
-                    cadence: json.cadence,
-                    duration: json.duration,
-                    amount: json.amount,
-                    currency: json.currency,
-                    created_at: json.redeemed_at
-                }
-            };
-        });
-
-        return {
-            data,
-            meta
-        };
+        return this._giftSubscriptions.service.browseRedemptionEvents(options, filter);
     }
 
     async getGiftEndedEvents(options = {}, filter) {

package/core/server/services/members/members-api/services/member-bread-service.js

@@ -34,7 +34,7 @@ const CUSTOM_FIELDS_EDITED_ACTION = 'custom_fields_edited';
 
 /**
  * @typedef {object} IGiftServiceWrapper
- * @prop {{getActiveByMembers: (memberIds: string[]) => Promise<Map<string, {cadence: 'month' | 'year', currency: string, amount: number}>>}} service
+ * @prop {{getMemberPresentations: (memberIds: string[]) => Promise<Map<string, {cadence: 'month' | 'year', currency: string, amount: number}>>}} service
  */
 
 module.exports = class MemberBREADService {
@@ -347,7 +347,7 @@ module.exports = class MemberBREADService {
      * @private
      * Fetches active redeemed gifts for any gift-status members in the input list.
      * @param {import('bookshelf').Model[]} members - Bookshelf member models
-     * @returns {Promise<Map<string, {cadence: 'month' | 'year', currency: string, amount: number}>>} keyed by member.id → active Gift
+     * @returns {Promise<Map<string, {cadence: 'month' | 'year', currency: string, amount: number}>>} keyed by member.id → stable gift presentation
      */
     async fetchActiveGiftsForMembers(members) {
         const giftMemberIds = members
@@ -359,7 +359,7 @@ module.exports = class MemberBREADService {
         }
 
         try {
-            return await this.giftService.service.getActiveByMembers(giftMemberIds);
+            return await this.giftService.service.getMemberPresentations(giftMemberIds);
         } catch (e) {
             logging.error(`Failed to load active gifts for members - ${giftMemberIds.join(', ')}.`);
             logging.error(e);