backend-manager 5.0.162 → 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/package.json

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

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 };