@oneuptime/common 12.0.22 → 12.0.24

package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.js

@@ -19,6 +19,41 @@ export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    /**
+     * Re-resolve and persist the schedule's roster after it is attached to, or
+     * detached from, an on-call policy.
+     *
+     * The persisted roster columns are derived state, and one of their inputs is
+     * WHICH policies escalate to the schedule: a schedule attached to exactly one
+     * policy is resolved in that policy's context, so its policy-scoped user
+     * overrides count, and a schedule attached to none or to several is resolved
+     * policy-blind (OnCallDutyPolicyScheduleService.getSingleAttachedPolicyId).
+     * Attaching or detaching therefore changes the correct answer, and every other
+     * input — layers, layer users, overrides — already refreshes on change.
+     *
+     * Without this the roster stayed on the pre-attach answer until the next
+     * natural hand-off, so the schedule page's "X is currently on the roster"
+     * banner and the "On Call Now" column named the originally-scheduled user for
+     * the whole override window while alert routing paged the substitute.
+     * https://github.com/OneUptime/oneuptime/issues/3411
+     *
+     * Best-effort: an attach must not fail because a roster could not be
+     * recomputed, and the refresh is idempotent (an unaffected schedule simply
+     * resolves to the same roster and diffs to "no change", so no duplicate
+     * hand-off notification is sent).
+     */
+    async refreshScheduleRoster(onCallDutyPolicyScheduleId) {
+        if (!onCallDutyPolicyScheduleId) {
+            return;
+        }
+        try {
+            await OnCallDutyPolicyScheduleService.refreshCurrentUserIdAndHandoffTimeInSchedule(onCallDutyPolicyScheduleId);
+        }
+        catch (err) {
+            logger.error("Error refreshing the roster after an on-call schedule was attached to or detached from a policy (best-effort).");
+            logger.error(err);
+        }
+    }
     async onCreateSuccess(_onCreate, createdItem) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const createdItemId = createdItem.id;
@@ -54,6 +89,11 @@ export class Service extends DatabaseService {
         if (!createdModel.onCallDutyPolicyScheduleId) {
             throw new BadDataException("Created item does not have a onCallDutyPolicyScheduleId");
         }
+        /*
+         * Bring the persisted roster in line with the new policy attachment before
+         * anything below can return early. See refreshScheduleRoster.
+         */
+        await this.refreshScheduleRoster(createdModel.onCallDutyPolicyScheduleId);
         // send notification to the new current user.
         const userOnSchedule = await OnCallDutyPolicyScheduleService.getCurrentUserIdInSchedule(createdModel.onCallDutyPolicyScheduleId, {
             onCallDutyPolicyId: ((_a = createdModel.onCallDutyPolicy) === null || _a === void 0 ? void 0 : _a.id) || undefined,
@@ -243,11 +283,26 @@ export class Service extends DatabaseService {
         };
     }
     async onDeleteSuccess(onDelete, _itemIdsBeforeDelete) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const deletedItems = onDelete.carryForward.deletedItems;
+        /*
+         * Detaching changes the schedule's policy context just as attaching does, so
+         * its roster has to be re-resolved here too. Deduped by schedule: removing a
+         * schedule from several escalation rules of one policy is one context
+         * change, not several. See refreshScheduleRoster.
+         */
+        const refreshedScheduleIds = new Set();
+        for (const deletedItem of deletedItems) {
+            const scheduleId = (_a = deletedItem.onCallDutyPolicyScheduleId) === null || _a === void 0 ? void 0 : _a.toString();
+            if (!scheduleId || refreshedScheduleIds.has(scheduleId)) {
+                continue;
+            }
+            refreshedScheduleIds.add(scheduleId);
+            await this.refreshScheduleRoster(deletedItem.onCallDutyPolicyScheduleId);
+        }
         for (const deletedItem of deletedItems) {
             const userOnSchedule = await OnCallDutyPolicyScheduleService.getCurrentUserIdInSchedule(deletedItem.onCallDutyPolicyScheduleId, {
-                onCallDutyPolicyId: ((_a = deletedItem.onCallDutyPolicy) === null || _a === void 0 ? void 0 : _a.id) || undefined,
+                onCallDutyPolicyId: ((_b = deletedItem.onCallDutyPolicy) === null || _b === void 0 ? void 0 : _b.id) || undefined,
             });
             if (!userOnSchedule) {
                 continue;
@@ -260,8 +315,8 @@ export class Service extends DatabaseService {
              * rule left the log open forever, so the roster user kept showing as
              * on-call in reporting (audit F18).
              */
-            if (((_b = deletedItem.onCallDutyPolicy) === null || _b === void 0 ? void 0 : _b.id) &&
-                ((_c = deletedItem.onCallDutyPolicyEscalationRule) === null || _c === void 0 ? void 0 : _c.id) &&
+            if (((_c = deletedItem.onCallDutyPolicy) === null || _c === void 0 ? void 0 : _c.id) &&
+                ((_d = deletedItem.onCallDutyPolicyEscalationRule) === null || _d === void 0 ? void 0 : _d.id) &&
                 deletedItem.projectId) {
                 OnCallDutyPolicyTimeLogService.endTimeLogForUser({
                     projectId: deletedItem.projectId,
@@ -282,12 +337,12 @@ export class Service extends DatabaseService {
             if (!sendEmailToUserId) {
                 return onDelete;
             }
-            const scheduleName = ((_d = deletedItem.onCallDutyPolicySchedule) === null || _d === void 0 ? void 0 : _d.name) || "No name provided";
+            const scheduleName = ((_e = deletedItem.onCallDutyPolicySchedule) === null || _e === void 0 ? void 0 : _e.name) || "No name provided";
             const vars = {
-                onCallPolicyName: ((_e = deletedItem.onCallDutyPolicy) === null || _e === void 0 ? void 0 : _e.name) || "No name provided",
-                escalationRuleName: ((_f = deletedItem.onCallDutyPolicyEscalationRule) === null || _f === void 0 ? void 0 : _f.name) ||
+                onCallPolicyName: ((_f = deletedItem.onCallDutyPolicy) === null || _f === void 0 ? void 0 : _f.name) || "No name provided",
+                escalationRuleName: ((_g = deletedItem.onCallDutyPolicyEscalationRule) === null || _g === void 0 ? void 0 : _g.name) ||
                     "No name provided",
-                escalationRuleOrder: ((_h = (_g = deletedItem.onCallDutyPolicyEscalationRule) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.toString()) ||
+                escalationRuleOrder: ((_j = (_h = deletedItem.onCallDutyPolicyEscalationRule) === null || _h === void 0 ? void 0 : _h.order) === null || _j === void 0 ? void 0 : _j.toString()) ||
                     "No order provided",
                 reason: `You have been removed from the on-call duty policy escalation rule for schedule ${scheduleName}.`,
                 onCallPolicyViewLink: (await OnCallDutyPolicyService.getOnCallDutyPolicyLinkInDashboard(deletedItem.projectId, deletedItem.onCallDutyPolicy.id)).toString(),
@@ -296,26 +351,26 @@ export class Service extends DatabaseService {
             const emailMessage = {
                 templateType: EmailTemplateType.UserRemovedFromOnCallPolicy,
                 vars: vars,
-                subject: `You have been removed from the on-call duty policy ${(_j = deletedItem.onCallDutyPolicy) === null || _j === void 0 ? void 0 : _j.name} for schedule ${scheduleName}`,
+                subject: `You have been removed from the on-call duty policy ${(_k = deletedItem.onCallDutyPolicy) === null || _k === void 0 ? void 0 : _k.name} for schedule ${scheduleName}`,
             };
             const sms = {
-                message: `This is a message from OneUptime. You have been removed from the on-call duty policy ${(_k = deletedItem.onCallDutyPolicy) === null || _k === void 0 ? void 0 : _k.name} for schedule ${scheduleName} and escalation rule ${(_l = deletedItem.onCallDutyPolicyEscalationRule) === null || _l === void 0 ? void 0 : _l.name} with order ${(_m = deletedItem.onCallDutyPolicyEscalationRule) === null || _m === void 0 ? void 0 : _m.order}. To unsubscribe from this notification go to User Settings in OneUptime Dashboard.`,
+                message: `This is a message from OneUptime. You have been removed from the on-call duty policy ${(_l = deletedItem.onCallDutyPolicy) === null || _l === void 0 ? void 0 : _l.name} for schedule ${scheduleName} and escalation rule ${(_m = deletedItem.onCallDutyPolicyEscalationRule) === null || _m === void 0 ? void 0 : _m.name} with order ${(_o = deletedItem.onCallDutyPolicyEscalationRule) === null || _o === void 0 ? void 0 : _o.order}. To unsubscribe from this notification go to User Settings in OneUptime Dashboard.`,
             };
             const callMessage = {
                 data: [
                     {
-                        sayMessage: `This is a message from OneUptime. You have been removed from the on-call duty policy ${(_o = deletedItem.onCallDutyPolicy) === null || _o === void 0 ? void 0 : _o.name} for schedule ${scheduleName} and escalation rule ${(_p = deletedItem.onCallDutyPolicyEscalationRule) === null || _p === void 0 ? void 0 : _p.name} with order ${(_q = deletedItem.onCallDutyPolicyEscalationRule) === null || _q === void 0 ? void 0 : _q.order}. To unsubscribe from this notification go to User Settings in OneUptime Dashboard. Good Bye`,
+                        sayMessage: `This is a message from OneUptime. You have been removed from the on-call duty policy ${(_p = deletedItem.onCallDutyPolicy) === null || _p === void 0 ? void 0 : _p.name} for schedule ${scheduleName} and escalation rule ${(_q = deletedItem.onCallDutyPolicyEscalationRule) === null || _q === void 0 ? void 0 : _q.name} with order ${(_r = deletedItem.onCallDutyPolicyEscalationRule) === null || _r === void 0 ? void 0 : _r.order}. To unsubscribe from this notification go to User Settings in OneUptime Dashboard. Good Bye`,
                     },
                 ],
             };
             const pushMessage = PushNotificationUtil.createOnCallPolicyRemovedNotification({
-                policyName: ((_r = deletedItem.onCallDutyPolicy) === null || _r === void 0 ? void 0 : _r.name) || "No name provided",
+                policyName: ((_s = deletedItem.onCallDutyPolicy) === null || _s === void 0 ? void 0 : _s.name) || "No name provided",
             });
             const eventType = NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY;
             const whatsAppMessage = createWhatsAppMessageFromTemplate({
                 eventType,
                 templateVariables: {
-                    on_call_policy_name: ((_s = deletedItem.onCallDutyPolicy) === null || _s === void 0 ? void 0 : _s.name) || "No name provided",
+                    on_call_policy_name: ((_t = deletedItem.onCallDutyPolicy) === null || _t === void 0 ? void 0 : _t.name) || "No name provided",
                     schedule_name: scheduleName,
                     on_call_context: `schedule ${scheduleName}`,
                     policy_link: vars["onCallPolicyViewLink"] || "",

package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OnCallDutyPolicyEscalationRuleScheduleService.js","sourceRoot":"","sources":["../../../../Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OnCallDutyPolicyEscalationRuleScheduleService.js","sourceRoot":"","sources":["../../../../Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/OnCallDutyPolicyFeedService.js

@@ -20,7 +20,7 @@ export class Service extends DatabaseService {
     constructor() {
         super(OnCallDutyPolicyFeed);
         if (IsBillingEnabled) {
-            this.hardDeleteItemsOlderThanInDays("createdAt", 90);
+            this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365); // 3 years
         }
     }
     async createOnCallDutyPolicyFeedItem(data) {

package/build/dist/Server/Services/OnCallDutyPolicyFeedService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OnCallDutyPolicyFeedService.js","sourceRoot":"","sources":["../../../../Server/Services/OnCallDutyPolicyFeedService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,oBAEN,MAAM,kDAAkD,CAAC;AAC1D,OAAO,gCAEN,MAAM,oCAAoC,CAAC;AAC5C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAqC;IAChE;QACE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAE5B,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,8BAA8B,CAAC,IAiB3C;;QACC,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CACV,4DAA4D,EAC5D;gBACE,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CACnB,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;gBACjB,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;YAEpB,MAAM,oBAAoB,GACxB,IAAI,oBAAoB,EAAE,CAAC;YAE7B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,IAAI,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,IAAI,gBAAgB,CAAC,6BAA6B,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBACxC,MAAM,IAAI,gBAAgB,CAAC,wCAAwC,CAAC,CAAC;YACvE,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,MAAM,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;YACvD,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;YAC9B,CAAC;YAED,oBAAoB,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACtD,oBAAoB,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;YAClE,oBAAoB,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;YAClE,oBAAoB,CAAC,6BAA6B;gBAChD,IAAI,CAAC,6BAA6B,CAAC;YACrC,oBAAoB,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAEhD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,oBAAoB,CAAC,QAAQ,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;YACjE,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC5C,CAAC;YAED,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBACnC,oBAAoB,CAAC,yBAAyB;oBAC5C,IAAI,CAAC,yBAAyB,CAAC;YACnC,CAAC;YAED,MAAM,2BAA2B,GAC/B,MAAM,IAAI,CAAC,MAAM,CAAC;gBAChB,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEL,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;gBAC/C,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE;gBACxC,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;YAEpB,IAAI,CAAC;gBACH,uCAAuC;gBACvC,IACE,IAAI,CAAC,qBAAqB;qBAC1B,MAAA,IAAI,CAAC,qBAAqB,0CAAE,yBAAyB,CAAA,EACrD,CAAC;oBACD,MAAM,IAAI,CAAC,yBAAyB,CAAC;wBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;wBAC3C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;wBAC3C,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;qBAClD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE;oBAC/D,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;oBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;iBACvC,CAAC,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;oBACd,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;oBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;iBACvC,CAAC,CAAC;gBAEpB,yDAAyD;YAC3D,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACd,SAAS,EAAE,MAAA,IAAI,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACrC,kBAAkB,EAAE,MAAA,IAAI,CAAC,kBAAkB,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;YAEpB,yDAAyD;QAC3D,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,yBAAyB,CAAC,IAStC;QACC,OAAO,MAAM,gCAAgC,CAAC,iCAAiC,CAC7E;YACE,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE;gBACf,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;aAC5C;YACD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;SAClD,CACF,CAAC;IACJ,CAAC;CACF;AAxJc;IADZ,WAAW,EAAE;;;;6DAiIb;AAGY;IADZ,WAAW,EAAE;;;;wDAqBb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"OnCallDutyPolicyFeedService.js","sourceRoot":"","sources":["../../../../Server/Services/OnCallDutyPolicyFeedService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/ProjectService.js

@@ -13,8 +13,9 @@ import QueryHelper from "../Types/Database/QueryHelper";
 import logger from "../Utils/Logger";
 import Errors from "../Utils/Errors";
 import ProductAnalytics from "../Utils/ProductAnalytics";
-import MarketingEventUtil from "../Utils/Marketing/MarketingEventUtil";
+import MarketingEventUtil, { utmAnalyticsProperties, } from "../Utils/Marketing/MarketingEventUtil";
 import { MarketingEventType } from "../../Types/Marketing/MarketingEvent";
+import { UtmPropertyKeys, UtmUrlPropertyKey, } from "../../Types/Marketing/Attribution";
 import SessionReplayGateCacheStore from "../Utils/SessionReplay/SessionReplayGateCacheStore";
 import AccessTokenService from "./AccessTokenService";
 import BillingService from "./BillingService";
@@ -140,6 +141,10 @@ export class ProjectService extends DatabaseService {
                 utmMedium: true,
                 utmTerm: true,
                 utmContent: true,
+                utmId: true,
+                utmSourcePlatform: true,
+                utmCreativeFormat: true,
+                utmMarketingTactic: true,
                 utmUrl: true,
                 clickIds: true,
                 firstTouchAttribution: true,
@@ -250,13 +255,16 @@ export class ProjectService extends DatabaseService {
         data.data.createdOwnerEmail = user.email;
         data.data.createdOwnerPhone = user.companyPhoneNumber;
         data.data.createdOwnerCompanyName = user.companyName;
-        // UTM info.
-        data.data.utmCampaign = user.utmCampaign;
-        data.data.utmSource = user.utmSource;
-        data.data.utmMedium = user.utmMedium;
-        data.data.utmTerm = user.utmTerm;
-        data.data.utmContent = user.utmContent;
-        data.data.utmUrl = user.utmUrl;
+        /*
+         * UTM info, copied field by field off the shared contract rather than
+         * hand-listed. Hand-listing is how Project ended up with four columns
+         * (utmId and its GA4 siblings) that the schema had but nothing ever wrote.
+         */
+        const projectRow = data.data;
+        const userRow = user;
+        for (const propertyKey of [...UtmPropertyKeys, UtmUrlPropertyKey]) {
+            projectRow[propertyKey] = userRow[propertyKey];
+        }
         // Ad attribution info (click IDs + first touch).
         data.data.clickIds = user.clickIds;
         data.data.firstTouchAttribution = user.firstTouchAttribution;
@@ -409,6 +417,10 @@ export class ProjectService extends DatabaseService {
                 utmCampaign: true,
                 utmTerm: true,
                 utmContent: true,
+                utmId: true,
+                utmSourcePlatform: true,
+                utmCreativeFormat: true,
+                utmMarketingTactic: true,
                 utmUrl: true,
                 clickIds: true,
                 firstTouchAttribution: true,
@@ -679,23 +691,12 @@ These are no longer recorded against the project and have to be cancelled by han
         if (!planIsPaid) {
             return;
         }
-        const properties = {
-            project_id: ((_a = data.project.id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
-            new_plan: data.plan.getName(),
-            seats: data.seats,
+        const properties = Object.assign(Object.assign({ project_id: ((_a = data.project.id) === null || _a === void 0 ? void 0 : _a.toString()) || "", new_plan: data.plan.getName(), seats: data.seats, 
             /*
              * Always true. The project went straight from not existing to paying,
              * which is the acquisition this event exists to report.
              */
-            is_paid_conversion: true,
-            has_custom_pricing: data.plan.isCustomPricing(),
-            utm_source: data.project.utmSource || "",
-            utm_medium: data.project.utmMedium || "",
-            utm_campaign: data.project.utmCampaign || "",
-            utm_term: data.project.utmTerm || "",
-            utm_content: data.project.utmContent || "",
-            click_ids: data.project.clickIds || {},
-        };
+            is_paid_conversion: true, has_custom_pricing: data.plan.isCustomPricing() }, utmAnalyticsProperties(data.project)), { click_ids: data.project.clickIds || {} });
         if (monthlyAmountInUSD !== null) {
             properties["new_monthly_amount_in_usd"] = monthlyAmountInUSD;
             // Value for ROAS reporting: monthly recurring revenue at the start.
@@ -760,22 +761,9 @@ These are no longer recorded against the project and have to be cancelled by han
         const newPlanOrder = data.newPlan.getPlanOrder();
         const newPlanIsPaid = data.newPlan.isCustomPricing() ||
             (newMonthlyAmountInUSD !== null && newMonthlyAmountInUSD > 0);
-        const properties = {
-            project_id: ((_a = data.project.id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
-            old_plan: (oldPlan === null || oldPlan === void 0 ? void 0 : oldPlan.getName()) || "",
-            new_plan: data.newPlan.getName(),
-            seats: data.seats,
-            is_upgrade: oldPlanOrder !== null && newPlanOrder > oldPlanOrder,
-            is_downgrade: oldPlanOrder !== null && newPlanOrder < oldPlanOrder,
+        const properties = Object.assign(Object.assign({ project_id: ((_a = data.project.id) === null || _a === void 0 ? void 0 : _a.toString()) || "", old_plan: (oldPlan === null || oldPlan === void 0 ? void 0 : oldPlan.getName()) || "", new_plan: data.newPlan.getName(), seats: data.seats, is_upgrade: oldPlanOrder !== null && newPlanOrder > oldPlanOrder, is_downgrade: oldPlanOrder !== null && newPlanOrder < oldPlanOrder, 
             // Same tier, different plan id: monthly<->yearly billing switch.
-            is_interval_change: oldPlanOrder !== null && newPlanOrder === oldPlanOrder,
-            is_paid_conversion: oldMonthlyAmountInUSD === 0 && newPlanIsPaid,
-            has_custom_pricing: data.newPlan.isCustomPricing(),
-            utm_source: data.project.utmSource || "",
-            utm_medium: data.project.utmMedium || "",
-            utm_campaign: data.project.utmCampaign || "",
-            click_ids: data.project.clickIds || {},
-        };
+            is_interval_change: oldPlanOrder !== null && newPlanOrder === oldPlanOrder, is_paid_conversion: oldMonthlyAmountInUSD === 0 && newPlanIsPaid, has_custom_pricing: data.newPlan.isCustomPricing() }, utmAnalyticsProperties(data.project)), { click_ids: data.project.clickIds || {} });
         if (oldMonthlyAmountInUSD !== null) {
             properties["old_monthly_amount_in_usd"] = oldMonthlyAmountInUSD;
         }
@@ -1070,15 +1058,7 @@ These are no longer recorded against the project and have to be cancelled by han
             ProductAnalytics.capture({
                 event: "server/project_created",
                 distinctId: createdItem.createdOwnerEmail.toString(),
-                properties: {
-                    project_id: ((_a = createdItem.id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
-                    project_name: ((_b = createdItem.name) === null || _b === void 0 ? void 0 : _b.toString()) || "",
-                    plan: ((_c = createdItem.planName) === null || _c === void 0 ? void 0 : _c.toString()) || "",
-                    utm_source: createdItem.utmSource || "",
-                    utm_medium: createdItem.utmMedium || "",
-                    utm_campaign: createdItem.utmCampaign || "",
-                    click_ids: createdItem.clickIds || {},
-                },
+                properties: Object.assign(Object.assign({ project_id: ((_a = createdItem.id) === null || _a === void 0 ? void 0 : _a.toString()) || "", project_name: ((_b = createdItem.name) === null || _b === void 0 ? void 0 : _b.toString()) || "", plan: ((_c = createdItem.planName) === null || _c === void 0 ? void 0 : _c.toString()) || "" }, utmAnalyticsProperties(createdItem)), { click_ids: createdItem.clickIds || {} }),
             });
         }
         if (NotificationSlackWebhookOnCreateProject) {