feat(payments-next): Update email reminder logic

david1alvarez · david1alvarez · commit 86994856d9ec · 2026-02-10T11:55:38.000-08:00
Because:

* We need to send emails at 15 days prior to billing for annual plans
* We need to send emails at 7 days prior to billing for monthly plans that have an ending discount and are returning to full price

This commit:

* Updates the logic to check whether a customer has an persisting discount for a monthly plan, and does not send email reminders for those plans
* Renames the `hadDiscount` variable to `discountEnding` to better reflect its purpose

Closes #PAY-2291 (to follow after merge of PR in webservices-infra)
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.mjml b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.mjml
@@ -18,7 +18,7 @@
       </span>
     </mj-text>
 
-    <% if (locals.hadDiscount) { %>
+    <% if (locals.discountEnding) { %>
     <mj-text css-class="text-body">
       <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
         Because a previous discount has ended, your subscription will renew at the standard price.
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts
@@ -18,7 +18,7 @@ const data = {
   reminderLength: '7',
   subscriptionSupportUrl: 'http://localhost:3030/support',
   updateBillingUrl: 'http://localhost:3030/subscriptions',
-  hadDiscount: false,
+  discountEnding: false,
   hasDifferentDiscount: false,
 };
 
@@ -36,7 +36,7 @@ export const MonthlyPlanNoDiscount = createStory(
 
 export const MonthlyPlanDiscountEnding = createStory(
   {
-    hadDiscount: true,
+    discountEnding: true,
   },
   'Monthly Plan - Discount Ending'
 );
@@ -47,7 +47,7 @@ export const YearlyPlanNoDiscount = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$199.99',
-    hadDiscount: false,
+    discountEnding: false,
   },
   'Yearly Plan - No Discount'
 );
@@ -58,15 +58,15 @@ export const YearlyPlanDiscountEnding = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$199.99',
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: false,
   },
   'Yearly Plan - Discount Ending'
 );
 
 export const MonthlyPlanDiscountChanging = createStory(
   {
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: true,
     invoiceTotal: '$14.00',
   },
@@ -79,7 +79,7 @@ export const YearlyPlanDiscountChanging = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$139.99',
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: true,
   },
   'Yearly Plan - Discount Changing'
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.ts b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.ts
@@ -14,7 +14,7 @@ export type TemplateData = SubscriptionSupportContactTemplateData &
     reminderLength: string;
     subscriptionSupportUrl: string;
     updateBillingUrl: string;
-    hadDiscount?: boolean;
+    discountEnding?: boolean;
     hasDifferentDiscount?: boolean;
   };
 
diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.txt b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.txt
@@ -6,7 +6,7 @@ subscriptionRenewalReminder-content-greeting = "Dear <%- productName %> customer
 
 subscriptionRenewalReminder-content-intro = "Your current subscription is set to automatically renew in <%- reminderLength %> days."
 
-<% if (locals.hadDiscount) { %>
+<% if (locals.discountEnding) { %>
 subscriptionRenewalReminder-content-discount-ending = "Because a previous discount has ended, your subscription will renew at the standard price."
 <% } else if (locals.hasDifferentDiscount) { %>
 subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
diff --git a/packages/fxa-auth-server/lib/payments/subscription-reminders.ts b/packages/fxa-auth-server/lib/payments/subscription-reminders.ts
@@ -331,14 +331,6 @@ export class SubscriptionReminders {
     }
     try {
       const account = await this.db.account(uid);
-      this.log.info('sendSubscriptionRenewalReminderEmail', {
-        message: 'Sending a renewal reminder email.',
-        subscriptionId: subscription.id,
-        currentPeriodStart: subscription.current_period_start,
-        currentPeriodEnd: subscription.current_period_end,
-        currentDateMs: Date.now(),
-        reminderLength: effectiveReminderDuration.as('days'),
-      });
       const { email } = account;
       const formattedSubscription =
         await this.stripeHelper.formatSubscriptionForEmail(subscription);
@@ -368,10 +360,30 @@ export class SubscriptionReminders {
         : null;
 
       // Detect if discount is ending
-      const hadDiscount = this.hasDiscountEnding(currentDiscountId, upcomingDiscountId);
+      const discountEnding = this.hasDiscountEnding(currentDiscountId, upcomingDiscountId);
       // Detect if renewal has a different discount
       const hasDifferentDiscount = this.hasDifferentDiscount(currentDiscountId, upcomingDiscountId);
 
+      // Business rule: Monthly subscriptions only receive renewal reminders when a discount is ending,
+      // to avoid notification fatigue for standard monthly renewals.
+      if (interval === 'month' && !discountEnding) {
+        this.log.info('sendSubscriptionRenewalReminderEmail.skippingMonthlyNoDiscount', {
+          subscriptionId: subscription.id,
+          planId,
+        });
+        return false;
+      }
+
+      // If we reach here, we're sending the email
+      this.log.info('sendSubscriptionRenewalReminderEmail', {
+        message: 'Sending a renewal reminder email.',
+        subscriptionId: subscription.id,
+        currentPeriodStart: subscription.current_period_start,
+        currentPeriodEnd: subscription.current_period_end,
+        currentDateMs: Date.now(),
+        reminderLength: effectiveReminderDuration.as('days'),
+      });
+
       await this.mailer.sendSubscriptionRenewalReminderEmail(
         account.emails,
         account,
@@ -388,7 +400,7 @@ export class SubscriptionReminders {
           invoiceTotalCurrency: invoicePreview.currency,
           productMetadata: formattedSubscription.productMetadata,
           planConfig: formattedSubscription.planConfig,
-          hadDiscount,
+          discountEnding,
           hasDifferentDiscount,
         }
       );
@@ -488,8 +500,8 @@ export class SubscriptionReminders {
    * Sends a reminder email for all active subscriptions for all plans
    * as long or longer than `planLength`:
    *   1. Get a list of all plans of sufficient `planLength`
-   *   2. Send 30-day reminders for yearly plans (if enabled)
-   *   3. Send 14-day reminders for all plans
+   *   2. Send 15-day reminders for yearly plans (if enabled)
+   *   3. Send 7-day reminders for monthly plans
    *   4. If enabled, send subscription ending reminder emails if one
    *      hasn't already been sent.
    */
diff --git a/packages/fxa-auth-server/lib/senders/email.js b/packages/fxa-auth-server/lib/senders/email.js
@@ -3252,7 +3252,7 @@ module.exports = function (log, config, bounces, statsd) {
           message.invoiceTotalCurrency,
           message.acceptLanguage
         ),
-        hadDiscount: message.hadDiscount || false,
+        discountEnding: message.discountEnding || false,
         hasDifferentDiscount: message.hasDifferentDiscount || false,
       },
     });
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.mjml b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.mjml
@@ -18,7 +18,7 @@
       </span>
     </mj-text>
 
-    <% if (hadDiscount) { %>
+    <% if (discountEnding) { %>
     <mj-text css-class="text-body">
       <span data-l10n-id="subscriptionRenewalReminder-content-discount-ending">
         Because a previous discount has ended, your subscription will renew at the standard price.
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts
@@ -20,7 +20,7 @@ const createStory = subplatStoryWithProps(
     reminderLength: '7',
     subscriptionSupportUrl: 'http://localhost:3030/support',
     updateBillingUrl: 'http://localhost:3030/subscriptions',
-    hadDiscount: false,
+    discountEnding: false,
     hasDifferentDiscount: false,
   }
 );
@@ -32,7 +32,7 @@ export const MonthlyPlanNoDiscount = createStory(
 
 export const MonthlyPlanDiscountEnding = createStory(
   {
-    hadDiscount: true,
+    discountEnding: true,
   },
   'Monthly Plan - Discount Ending'
 );
@@ -43,7 +43,7 @@ export const YearlyPlanNoDiscount = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$199.99',
-    hadDiscount: false,
+    discountEnding: false,
   },
   'Yearly Plan - No Discount'
 );
@@ -54,15 +54,15 @@ export const YearlyPlanDiscountEnding = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$199.99',
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: false,
   },
   'Yearly Plan - Discount Ending'
 );
 
 export const MonthlyPlanDiscountChanging = createStory(
   {
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: true,
     invoiceTotal: '$14.00',
   },
@@ -75,7 +75,7 @@ export const YearlyPlanDiscountChanging = createStory(
     planIntervalCount: '1',
     reminderLength: '15',
     invoiceTotal: '$139.99',
-    hadDiscount: true,
+    discountEnding: true,
     hasDifferentDiscount: true,
   },
   'Yearly Plan - Discount Changing'
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.txt b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.txt
@@ -6,7 +6,7 @@ subscriptionRenewalReminder-content-greeting = "Dear <%- productName %> customer
 
 subscriptionRenewalReminder-content-intro = "Your current subscription is set to automatically renew in <%- reminderLength %> days."
 
-<% if (hadDiscount) { %>
+<% if (discountEnding) { %>
 subscriptionRenewalReminder-content-discount-ending = "Because a previous discount has ended, your subscription will renew at the standard price."
 <% } else if (hasDifferentDiscount) { %>
 subscriptionRenewalReminder-content-discount-change = "Your next invoice reflects a change in pricing, as a previous discount has ended and a new discount has been applied."
diff --git a/packages/fxa-auth-server/scripts/subscription-reminders.ts b/packages/fxa-auth-server/scripts/subscription-reminders.ts
@@ -37,7 +37,7 @@ async function init() {
       DEFAULT_PLAN_LENGTH.toString()
     )
     .option(
-      '-r, --reminder-length [days]',
+      '-r, --monthly-renewal-reminder-length [days]',
       'Reminder length in days before the renewal date to send the reminder email for monthly plans. Defaults to 7.',
       DEFAULT_REMINDER_LENGTH.toString()
     )
diff --git a/packages/fxa-auth-server/test/local/payments/subscription-reminders.js b/packages/fxa-auth-server/test/local/payments/subscription-reminders.js
diff --git a/packages/fxa-auth-server/test/local/senders/emails.ts b/packages/fxa-auth-server/test/local/senders/emails.ts

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ async function init() {`
`37`	`37`	`DEFAULT_PLAN_LENGTH.toString()`
`38`	`38`	`)`
`39`	`39`	`.option(`
`40`		`- '-r, --reminder-length [days]',`
	`40`	`+ '-r, --monthly-renewal-reminder-length [days]',`
`41`	`41`	`'Reminder length in days before the renewal date to send the reminder email for monthly plans. Defaults to 7.',`
`42`	`42`	`DEFAULT_REMINDER_LENGTH.toString()`
`43`	`43`	`)`