backend-manager 5.0.161 → 5.0.163

package/CHANGELOG.md

@@ -14,6 +14,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+# [5.0.163] - 2026-03-18
+### Changed
+- Refactored campaign POST/PUT routes to generic field passthrough — schema-validated fields flow through automatically via shared `buildCampaignDoc()` utility, no manual field assignments needed
+- Extracted `normalizeSendAt()` and `DOC_LEVEL_FIELDS` into `routes/marketing/campaign/utils.js`
+
 # [5.0.161] - 2026-03-18
 ### Added
 - Port conflict detection in `serve` command — checks and kills blocking processes before starting Firebase server

package/TODO-2.md

@@ -0,0 +1,26 @@
+TODO
+* pdate deps LIKE WF, PP, ETC
+
+PAYMENT SYSTEM
+* Ensure attribution is working (utm but also the AD ID shit like from adwords, tiktok ads, meta etc)
+* ensure legacy plan RESOLVING is working
+
+payments/reactivate
+  * takes a subscription id and reactivates a cancelled subscription. this can only be done if the subscription is still within its billing period, otherwise the user would have to create a new subscription.
+payments/upgrade
+  * takes a subscription id and a new plan id and upgrades the user's subscription to the new plan. this can only be done if the user has an active subscription.
+
+TEST NEWSLETTER
+POST /admin/cron { id: 'daily/marketing-newsletter-generate' }
+
+Payment attribution
+* can you ensure the the user's attribution (utm etc) is assocaited with the purchase
+* mostly i am referring to the payent events sent to GA4, tiktok, meta
+* i think we should make it so if the attribution was set less than 30 days ago (the date is in the attribution) then it counts
+* it shouldbe attached to the payments-orders and then ALL FUTURE EVENTS should send that (thats a good idea right??)
+
+Payment disputes
+* automatic dispute handling
+* during bm_cron daily, we should check for open disputes for pypal stripe etc... we should then FILL THEM WITH INFORMATION USEFUL FOR WINNING
+* we should attach USAGE LOGS, IP logs, etc. you should take inspiration from my previous attmept at this (/Users/ian/Developer/Repositories/ITW-Creative-Works/subscription-profile-sync/main/disputes)
+* HOWEVER, i know for a fact i got a lot of it wrong. so JUST USE AS INSPO, you should recreate it full

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "5.0.161",
+  "version": "5.0.163",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/events/firestore/payments-webhooks/transitions/one-time/purchase-completed.js

@@ -8,7 +8,12 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
   const brandName = assistant.Manager.config.brand?.name || '';
   const productName = after.product?.name || '';
 
-  assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment?.resourceId}`);
+  // Pre-compute discount values for the email template
+  const price = parseFloat(after.payment?.price || 0);
+  const discount = order.discount;
+  const hasPromoDiscount = discount?.valid === true && discount?.percent > 0;
+
+  assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment?.resourceId}, discount=${hasPromoDiscount ? discount.code : 'none'}`);
 
   sendOrderEmail({
     template: 'main/order/confirmation',
@@ -21,6 +26,14 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
         ...order,
         _computed: {
           date: formatDate(new Date().toISOString()),
+          ...(hasPromoDiscount && {
+            promoCode: discount.code,
+            promoPercent: discount.percent,
+            promoSavings: (price * discount.percent / 100).toFixed(2),
+          }),
+          totalToday: hasPromoDiscount
+            ? (price - (price * discount.percent / 100)).toFixed(2)
+            : price.toFixed(2),
         },
       },
     },

package/src/manager/routes/marketing/campaign/post.js

@@ -9,9 +9,8 @@
  *
  * Content is markdown — converted to HTML at send time per provider.
  */
-const _ = require('lodash');
-const moment = require('moment');
 const pushid = require('pushid');
+const { buildCampaignDoc } = require('./utils');
 
 module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
 
@@ -24,55 +23,14 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
 
   const { admin } = Manager.libraries;
   const campaignId = settings.id || pushid();
-  const now = moment();
+  const { docFields, campaignSettings, now } = buildCampaignDoc(settings);
 
-  // Normalize sendAt → unix timestamp
-  const sendAt = normalizeSendAt(settings.sendAt, now);
-
-  // Build the campaign document (settings nested, like emails-queue)
-  const campaignSettings = {};
-
-  // Required
-  campaignSettings.name = settings.name;
-  campaignSettings.subject = settings.subject;
-
-  // Content
-  if (settings.preheader) { campaignSettings.preheader = settings.preheader; }
-  if (settings.template && settings.template !== 'default') { campaignSettings.template = settings.template; }
-  if (settings.content) { campaignSettings.content = settings.content; }
-  if (settings.data && Object.keys(settings.data).length) { campaignSettings.data = settings.data; }
-
-  // Targeting
-  if (settings.lists && settings.lists.length) { campaignSettings.lists = settings.lists; }
-  if (settings.segments && settings.segments.length) { campaignSettings.segments = settings.segments; }
-  if (settings.excludeSegments && settings.excludeSegments.length) { campaignSettings.excludeSegments = settings.excludeSegments; }
-  if (settings.all) { campaignSettings.all = true; }
-
-  // UTM
-  if (settings.utm && Object.keys(settings.utm).length) { campaignSettings.utm = settings.utm; }
-
-  // Config
-  if (settings.sender) { campaignSettings.sender = settings.sender; }
-  if (settings.providers && settings.providers.length) { campaignSettings.providers = settings.providers; }
-  if (settings.group) { campaignSettings.group = settings.group; }
-  if (settings.categories && settings.categories.length) { campaignSettings.categories = settings.categories; }
-
-  // Clone and clean undefined values for Firestore
-  const settingsCloned = _.cloneDeepWith(campaignSettings, (value) => {
-    if (typeof value === 'undefined') {
-      return null;
-    }
-  });
-
-  const isFuture = sendAt > now.unix();
-  const type = settings.type || 'email';
+  const isFuture = docFields.sendAt > now.unix();
 
   const doc = {
-    settings: settingsCloned,
-    sendAt,
+    ...docFields,
+    settings: campaignSettings,
     status: 'pending',
-    type,
-    ...(settings.recurrence ? { recurrence: settings.recurrence } : {}),
     metadata: {
       created: {
         timestamp: now.toISOString(),
@@ -88,12 +46,12 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
   // Save to Firestore
   await admin.firestore().doc(`marketing-campaigns/${campaignId}`).set(doc);
 
-  assistant.log('marketing/campaign created:', { campaignId, sendAt, isFuture, type });
+  assistant.log('marketing/campaign created:', { campaignId, sendAt: docFields.sendAt, isFuture, type: docFields.type });
 
   // If sendAt is now/past, fire immediately
   let results = null;
 
-  if (!isFuture && type === 'email') {
+  if (!isFuture && docFields.type === 'email') {
     const mailer = Manager.Email(assistant);
     results = await mailer.sendCampaign({ ...campaignSettings, sendAt: 'now' });
 
@@ -117,45 +75,14 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
   // Analytics
   analytics.event('marketing/campaign', {
     action: isFuture ? 'schedule' : 'send',
-    type,
+    type: docFields.type,
   });
 
   return assistant.respond({
     success: true,
     id: campaignId,
     status: isFuture ? 'pending' : (results ? 'sent' : 'pending'),
-    sendAt,
+    sendAt: docFields.sendAt,
     providers: results,
   });
 };
-
-/**
- * Normalize sendAt to unix timestamp.
- * Accepts: 'now', ISO string, unix timestamp (number or string), undefined/empty.
- * Defaults to now.
- */
-function normalizeSendAt(sendAt, now) {
-  if (!sendAt || sendAt === 'now') {
-    return now.unix();
-  }
-
-  // Unix timestamp (number)
-  if (typeof sendAt === 'number') {
-    return sendAt;
-  }
-
-  // Unix timestamp as string (all digits)
-  if (/^\d+$/.test(sendAt)) {
-    return parseInt(sendAt, 10);
-  }
-
-  // ISO string or other parseable date
-  const parsed = moment(sendAt);
-
-  if (parsed.isValid()) {
-    return parsed.unix();
-  }
-
-  // Fallback to now
-  return now.unix();
-}

package/src/manager/routes/marketing/campaign/put.js

@@ -5,8 +5,7 @@
  * Accepts any field from the POST schema. Only provided fields are updated.
  * Changing sendAt reschedules the campaign (if still pending).
  */
-const _ = require('lodash');
-const moment = require('moment');
+const { buildCampaignDoc } = require('./utils');
 
 module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
 
@@ -39,8 +38,11 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
     return assistant.respond(`Cannot edit campaign with status "${existing.status}"`, { code: 400 });
   }
 
-  // Build update — merge provided fields into existing settings
+  // Build update from provided fields using shared utility
+  const { docFields, campaignSettings } = buildCampaignDoc(settings);
+
   const update = {
+    ...docFields,
     metadata: {
       updated: {
         timestamp: new Date().toISOString(),
@@ -49,44 +51,9 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
     },
   };
 
-  // Update sendAt if provided
-  if (settings.sendAt !== undefined && settings.sendAt !== '') {
-    update.sendAt = normalizeSendAt(settings.sendAt);
-  }
-
-  // Update type if provided
-  if (settings.type) {
-    update.type = settings.type;
-  }
-
-  // Update recurrence if provided
-  if (settings.recurrence !== undefined) {
-    update.recurrence = settings.recurrence;
-  }
-
-  // Update settings fields — only merge what's provided
-  const settingsUpdate = {};
-  const settingsFields = [
-    'name', 'subject', 'preheader', 'template', 'content', 'data',
-    'lists', 'segments', 'excludeSegments', 'all',
-    'utm', 'sender', 'providers', 'group', 'categories',
-  ];
-
-  for (const field of settingsFields) {
-    if (settings[field] !== undefined && settings[field] !== '') {
-      settingsUpdate[field] = settings[field];
-    }
-  }
-
-  if (Object.keys(settingsUpdate).length) {
-    // Clean undefined values for Firestore
-    const cleaned = _.cloneDeepWith(settingsUpdate, (value) => {
-      if (typeof value === 'undefined') {
-        return null;
-      }
-    });
-
-    update.settings = { ...existing.settings, ...cleaned };
+  // Merge provided settings into existing
+  if (Object.keys(campaignSettings).length) {
+    update.settings = { ...existing.settings, ...campaignSettings };
   }
 
   await docRef.set(update, { merge: true });
@@ -103,20 +70,3 @@ module.exports = async ({ assistant, user, Manager, settings, analytics }) => {
     campaign: { id: campaignId, ...updated.data() },
   });
 };
-
-function normalizeSendAt(sendAt) {
-  if (!sendAt || sendAt === 'now') {
-    return Math.round(Date.now() / 1000);
-  }
-
-  if (typeof sendAt === 'number') {
-    return sendAt;
-  }
-
-  if (/^\d+$/.test(sendAt)) {
-    return parseInt(sendAt, 10);
-  }
-
-  const parsed = moment(sendAt);
-  return parsed.isValid() ? parsed.unix() : Math.round(Date.now() / 1000);
-}

package/src/manager/routes/marketing/campaign/utils.js

@@ -0,0 +1,58 @@
+/**
+ * Shared utilities for marketing campaign routes.
+ */
+const _ = require('lodash');
+const moment = require('moment');
+
+// Fields that live at the doc level, not inside doc.settings
+const DOC_LEVEL_FIELDS = ['id', 'sendAt', 'type', 'recurrence', 'generator'];
+
+/**
+ * Separate settings into doc-level fields and nested settings.
+ * Returns { docFields, campaignSettings }.
+ */
+function buildCampaignDoc(settings) {
+  const now = moment();
+
+  // Extract doc-level fields
+  const sendAt = normalizeSendAt(settings.sendAt, now);
+  const type = settings.type || 'email';
+
+  const docFields = {
+    sendAt,
+    type,
+    ...(settings.recurrence ? { recurrence: settings.recurrence } : {}),
+    ...(settings.generator ? { generator: settings.generator } : {}),
+  };
+
+  // Everything else goes into doc.settings — strip empties
+  const campaignSettings = _.omitBy(
+    _.omit(settings, DOC_LEVEL_FIELDS),
+    (v) => v === undefined || v === '' || (Array.isArray(v) && !v.length) || (_.isPlainObject(v) && !Object.keys(v).length),
+  );
+
+  return { docFields, campaignSettings, now };
+}
+
+/**
+ * Normalize sendAt to unix timestamp.
+ * Accepts: 'now', ISO string, unix timestamp (number or string), undefined/empty.
+ */
+function normalizeSendAt(sendAt, now) {
+  if (!sendAt || sendAt === 'now') {
+    return (now || moment()).unix();
+  }
+
+  if (typeof sendAt === 'number') {
+    return sendAt;
+  }
+
+  if (/^\d+$/.test(sendAt)) {
+    return parseInt(sendAt, 10);
+  }
+
+  const parsed = moment(sendAt);
+  return parsed.isValid() ? parsed.unix() : (now || moment()).unix();
+}
+
+module.exports = { DOC_LEVEL_FIELDS, buildCampaignDoc, normalizeSendAt };

package/TODO-MARKETING.md

@@ -1,56 +0,0 @@
-1. Determine name via AI on signup
-2. Add to sendgrid marketig cotacts
-3. then, develop a way to SYNC them to the marketing contacts. we coould sync on payment changes (liek newly subscribed, cancelled, etc) so we can segment them??
-
-
-When user sings up, use AI to generate first name, last name, company???
-When user doc is updated, sync with sendgrid and beehiiv?? like name, premium status, etc
-if admin is set to true from something else then we send an emergency critical email to alert us
-
-need to confirm we hv hooks/events setup properly
-      handlerPath = `${Manager.cwd}/events/${handlerName}.js`;
-liek bm_cronDaily, is it able to find the BEM path right? what about if we want to add our own per project?
-
-implement BEM hooks (removed in muddleware semantic system)
-
-https://firebase.google.com/docs/functions/2nd-gen-upgrade
-
-------------
-You are to extract the first name, last name, and company from the provided email.
-
-If you can get the company from the email domain, include that as well but DO NOT set the company to generic email providers like gmail, yahoo, etc.
-
-You may use a single initial if the email does not provide a full first name.
-
-For example:
-jonsnow123@gmail.com, jon.snow123@gmail.com
-First Name: Jon
-Last Name: Snow
-Company:
-
-jsnow123@gmail.com, j.snow123@gmail.com
-First Name: J
-Last Name: Snow
-Company:
-
-jon.snow@acme.com
-First Name: Jon
-Last Name: Snow
-Company: Acme
-
-jsnow@acme.com
-First Name: J
-Last Name: Snow
-Company: Acme
-
-jon123@gmail.com
-First Name: Jon
-Last Name:
-Company:
-
-every time we touch, cascada
-just dance, lady gaga
-over drake,
-Time, hans zimmer
-yellow, coldplay
-yess bitch,

package/TODO-PAYMENT-v2.md

@@ -1,74 +0,0 @@
-TODO payments
-
-would it be beneficial to... check the time on the event and the time in our datbase and skip if the time in oour database is nwer than the vent, indicatig that it is stale? or is this redundatn since we fetch the latest resource anyway?
-
-next, we need to do certain things based on the CHANGE thats happening to the resource (subscription or one time) that is different that simply updating the user doc and the payments-subscriptions or payments-one-time collection. For example:
-  * if a new subscription is created, we send a welcome email and grant access to the product (but this cant happen when a user fixes their payment method from a failed payment, only when a new subscription is created)
-  * if a subscription is cancelled, we send a cancellation email
-  * if a subscription payment fails, we send a paymetn failed "please update your payment method" email
-  * if a subscription payment succeeds after previously failing, we send a "payment successful, your access has been restored" email
-
-more endpoints to build
-payments/cancel
-  * takes a subscrition id and requests to cancel at the end of the billing period (not immediately). this can only be done if the user has an non cancelled subscription.
-  * there should be an accompanying frontend form that asks some outboardig quetsions
-    * Why are you cancelling (checkboxes + textbox) with randomzed order of the checkboes
-  * after doing this, users should still be able to reactivate it
-payments/manage
-  * fetches the customer portal link from the payment processor and redirects the user there
-  * acessible from the user's account page in biling setion
-  * only accessible if the user has a non cancelled subscription
-
-Note: * for managing and cancelling, they should be under a sinlge button/dropdown called "manage subscription".
-  * it could have links to the 2 pages as items in the dropdown, or we could take them to a dedicated page (or expand an accordian) that has more information about managing it
-  * we need to make it hard to cancel, buried in some info, and make it more prominent to manage it, since we want to encourage users to manage their subscription rather than cancelling it.
-
-payments/refund
-  * takes a subscription id and requests a refund to the payment processor
-  * we can only refund the most recent payment and we can only refund if the subscription is cancelled.
-  * we can only refund if the most recent payment in FULL was made less than 7 days ago, otherwise we can only refund a prorated amount based on how much time is left
-  * i want the subscription to be immediately revoked upon refund request
-  * generally, we dont modify the subscription DURING the http endpoint (such as payment intent, or cancel), rather we WAIT FOR THE WEBHOOOK. Can we do that here???
-
-payments/reactivate
-  * takes a subscription id and reactivates a cancelled subscription. this can only be done if the subscription is still within its billing period, otherwise the user would have to create a new subscription.
-payments/upgrade
-  * takes a subscription id and a new plan id and upgrades the user's subscription to the new plan. this can only be done if the user has an active subscription.
-
-
-trial support:
-when a peyment intent happens, we can only grant a trial if the user has never had a trial which involves checking the paymetns-subscriptions collection for the user to see if any exist. if any exist in any form, then we dont give a trial.
-we also need a test for this
-
-block multipl epayments
-check if user has a non-cancelled sub during payment intent creation, if so, block the payment intent from being created. this will prevent multiple payments from being made at the same time and causing issues. we can check the payments-subscriptions collection for ALL usbcriptions belonging to the UID. we can use this for the trial check as well (recycle the results).
-we also need a test for this
-
-
-
-also, can you check and confirm if the usage.js sends back the users current usage in th headers? i think it does? maybe it our tests we can check to ensure that the user is probably having their usage set this way?
-
-
-MANAGEMENT LINK
-we need an endpoint that returns a management link for the user to manage their subscription. this will involve us looking up the users current subscription, then calling the appropriate method on the payment processor to get a management link. we can only return a management link if the user has an active subscription.
-
-
-TODO
-
-* authorizations ystem that tries to charge the card to see if its valid?
-* bm_cronDaily task that doublechecks subscriptions??
-  * could check existing ones eveyr month to ensure they are still vlaud and not messed up from failed webhook processing or could check every day to ensure theres no users with multiple subscirptions active simultaneously?
-* bm_cronDaily yto handle disputes?
-  * automatically provide evidence?
-
-ATTRIBUTIONS!!!
-// Filter attribution entries older than 30 days
-const attribution = webManager.storage().get('attribution', {});
-const maxAge = 30 * 24 * 60 * 60 * 1000; // 30 days in ms
-const filtered = {};
-
-for (const [key, entry] of Object.entries(attribution)) {
-  if (!entry?.timestamp) continue;
-  if ((Date.now() - new Date(entry.timestamp).getTime()) < maxAge) {
-    filtered[key] = entry;
-  }