@oneuptime/common 13.0.6 → 13.0.8

package/Server/Services/IncidentEpisodeService.ts

@@ -42,6 +42,7 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import WorkspaceType from "../../Types/Workspace/WorkspaceType";
 import IncidentEpisodeWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/IncidentEpisode";
+import OwnerRuleAssignment from "../Utils/Rules/OwnerRuleAssignment";
 import { MessageBlocksByWorkspaceType } from "./WorkspaceNotificationRuleService";
 import IncidentService from "./IncidentService";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
@@ -1147,81 +1148,20 @@ export class Service extends DatabaseService<Model> {
   }): Promise<void> {
     const { episodeId, projectId, userIds, teamIds, createdByUserId } = data;
 
-    // Add user owners
-    if (userIds && userIds.length > 0) {
-      for (const userId of userIds) {
-        // Check if already exists
-        const existing: IncidentEpisodeOwnerUser | null =
-          await IncidentEpisodeOwnerUserService.findOneBy({
-            query: {
-              incidentEpisodeId: episodeId,
-              userId: userId,
-            },
-            props: {
-              isRoot: true,
-            },
-            select: {
-              _id: true,
-            },
-          });
-
-        if (!existing) {
-          const ownerUser: IncidentEpisodeOwnerUser =
-            new IncidentEpisodeOwnerUser();
-          ownerUser.incidentEpisodeId = episodeId;
-          ownerUser.userId = userId;
-          ownerUser.projectId = projectId;
-          if (createdByUserId) {
-            ownerUser.createdByUserId = createdByUserId;
-          }
-
-          await IncidentEpisodeOwnerUserService.create({
-            data: ownerUser,
-            props: {
-              isRoot: true,
-            },
-          });
-        }
-      }
-    }
-
-    // Add team owners
-    if (teamIds && teamIds.length > 0) {
-      for (const teamId of teamIds) {
-        // Check if already exists
-        const existing: IncidentEpisodeOwnerTeam | null =
-          await IncidentEpisodeOwnerTeamService.findOneBy({
-            query: {
-              incidentEpisodeId: episodeId,
-              teamId: teamId,
-            },
-            props: {
-              isRoot: true,
-            },
-            select: {
-              _id: true,
-            },
-          });
-
-        if (!existing) {
-          const ownerTeam: IncidentEpisodeOwnerTeam =
-            new IncidentEpisodeOwnerTeam();
-          ownerTeam.incidentEpisodeId = episodeId;
-          ownerTeam.teamId = teamId;
-          ownerTeam.projectId = projectId;
-          if (createdByUserId) {
-            ownerTeam.createdByUserId = createdByUserId;
-          }
-
-          await IncidentEpisodeOwnerTeamService.create({
-            data: ownerTeam,
-            props: {
-              isRoot: true,
-            },
-          });
-        }
-      }
-    }
+    // Owners already on the episode are skipped, not added a second time.
+    await OwnerRuleAssignment.addOwners({
+      ownerUserService: IncidentEpisodeOwnerUserService,
+      ownerTeamService: IncidentEpisodeOwnerTeamService,
+      resourceIdColumn: "incidentEpisodeId",
+      resourceId: episodeId,
+      projectId: projectId,
+      userIds: userIds || [],
+      teamIds: teamIds || [],
+      createdByUserId: createdByUserId,
+      props: {
+        isRoot: true,
+      },
+    });
   }
 
   @CaptureSpan()

package/Server/Services/IncidentGroupingEngineService.ts

@@ -13,6 +13,7 @@ import Monitor from "../../Models/DatabaseModels/Monitor";
 import IncidentSeverity from "../../Models/DatabaseModels/IncidentSeverity";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger, { LogAttributes } from "../Utils/Logger";
+import OwnerRuleAssignment from "../Utils/Rules/OwnerRuleAssignment";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import OneUptimeDate from "../../Types/Date";
 import QueryHelper from "../Types/Database/QueryHelper";
@@ -948,8 +949,9 @@ class IncidentGroupingEngineServiceClass {
             ownerUser.projectId = incident.projectId!;
             ownerUser.incidentEpisodeId = createdEpisode.id;
             ownerUser.userId = user.id;
-            await IncidentEpisodeOwnerUserService.create({
-              data: ownerUser,
+            await OwnerRuleAssignment.createOwner({
+              ownerService: IncidentEpisodeOwnerUserService,
+              owner: ownerUser,
               props: {
                 isRoot: true,
               },
@@ -979,8 +981,9 @@ class IncidentGroupingEngineServiceClass {
             ownerTeam.projectId = incident.projectId!;
             ownerTeam.incidentEpisodeId = createdEpisode.id;
             ownerTeam.teamId = team.id;
-            await IncidentEpisodeOwnerTeamService.create({
-              data: ownerTeam,
+            await OwnerRuleAssignment.createOwner({
+              ownerService: IncidentEpisodeOwnerTeamService,
+              owner: ownerTeam,
               props: {
                 isRoot: true,
               },

package/Server/Services/IncidentService.ts

@@ -32,7 +32,6 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import { JSONObject } from "../../Types/JSON";
 import ObjectID from "../../Types/ObjectID";
 import PositiveNumber from "../../Types/PositiveNumber";
-import Typeof from "../../Types/Typeof";
 import { applyIncidentSelfPrivacyFilter } from "../Utils/Incident/IncidentPrivacyFilter";
 import ProjectScopedReferenceValidator, {
   resolveReferenceId,
@@ -100,6 +99,7 @@ import IncidentTemplateService from "./IncidentTemplateService";
 import IncidentTemplate from "../../Models/DatabaseModels/IncidentTemplate";
 import AIService, { AILogResponse } from "./AIService";
 import AIIncidentInvestigationRunner from "../Utils/AI/SRE/IncidentInvestigationRunner";
+import OwnerRuleAssignment from "../Utils/Rules/OwnerRuleAssignment";
 import IncidentAIContextBuilder, {
   AIGenerationContext,
   IncidentContextData,
@@ -1975,37 +1975,18 @@ ${incident.remediationNotes || "No remediation notes provided."}
     notifyOwners: boolean,
     props: DatabaseCommonInteractionProps,
   ): Promise<void> {
-    for (let teamId of teamIds) {
-      if (typeof teamId === Typeof.String) {
-        teamId = new ObjectID(teamId.toString());
-      }
-
-      const teamOwner: IncidentOwnerTeam = new IncidentOwnerTeam();
-      teamOwner.incidentId = incidentId;
-      teamOwner.projectId = projectId;
-      teamOwner.teamId = teamId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-
-      await IncidentOwnerTeamService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
-
-    for (let userId of userIds) {
-      if (typeof userId === Typeof.String) {
-        userId = new ObjectID(userId.toString());
-      }
-      const teamOwner: IncidentOwnerUser = new IncidentOwnerUser();
-      teamOwner.incidentId = incidentId;
-      teamOwner.projectId = projectId;
-      teamOwner.userId = userId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-      await IncidentOwnerUserService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
+    // Owners already on the incident are skipped, not added a second time.
+    await OwnerRuleAssignment.addOwners({
+      ownerUserService: IncidentOwnerUserService,
+      ownerTeamService: IncidentOwnerTeamService,
+      resourceIdColumn: "incidentId",
+      resourceId: incidentId,
+      projectId: projectId,
+      userIds: userIds,
+      teamIds: teamIds,
+      isOwnerNotified: !notifyOwners,
+      props: props,
+    });
   }
 
   @CaptureSpan()

package/Server/Services/IncidentTemplateService.ts

@@ -11,15 +11,13 @@ import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCom
 import LIMIT_MAX from "../../Types/Database/LimitMax";
 import Dictionary from "../../Types/Dictionary";
 import ObjectID from "../../Types/ObjectID";
-import Typeof from "../../Types/Typeof";
 import Model from "../../Models/DatabaseModels/IncidentTemplate";
-import IncidentTemplateOwnerTeam from "../../Models/DatabaseModels/IncidentTemplateOwnerTeam";
-import IncidentTemplateOwnerUser from "../../Models/DatabaseModels/IncidentTemplateOwnerUser";
 import ProjectScopedReferenceValidator, {
   ProjectScopedReference,
   resolveReferenceId,
 } from "../Utils/Database/ProjectScopedReferenceValidator";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import OwnerRuleAssignment from "../Utils/Rules/OwnerRuleAssignment";
 import QueryDeepPartialEntity from "../../Types/Database/PartialEntity";
 
 export class Service extends DatabaseService<Model> {
@@ -175,39 +173,18 @@ export class Service extends DatabaseService<Model> {
     notifyOwners: boolean,
     props: DatabaseCommonInteractionProps,
   ): Promise<void> {
-    for (let teamId of teamIds) {
-      if (typeof teamId === Typeof.String) {
-        teamId = new ObjectID(teamId.toString());
-      }
-
-      const teamOwner: IncidentTemplateOwnerTeam =
-        new IncidentTemplateOwnerTeam();
-      teamOwner.incidentTemplateId = incidentTemplateId;
-      teamOwner.projectId = projectId;
-      teamOwner.teamId = teamId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-
-      await IncidentTemplateOwnerTeamService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
-
-    for (let userId of userIds) {
-      if (typeof userId === Typeof.String) {
-        userId = new ObjectID(userId.toString());
-      }
-      const teamOwner: IncidentTemplateOwnerUser =
-        new IncidentTemplateOwnerUser();
-      teamOwner.incidentTemplateId = incidentTemplateId;
-      teamOwner.projectId = projectId;
-      teamOwner.userId = userId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-      await IncidentTemplateOwnerUserService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
+    // Owners already on the template are skipped, not added a second time.
+    await OwnerRuleAssignment.addOwners({
+      ownerUserService: IncidentTemplateOwnerUserService,
+      ownerTeamService: IncidentTemplateOwnerTeamService,
+      resourceIdColumn: "incidentTemplateId",
+      resourceId: incidentTemplateId,
+      projectId: projectId,
+      userIds: userIds,
+      teamIds: teamIds,
+      isOwnerNotified: !notifyOwners,
+      props: props,
+    });
   }
 }
 export default new Service();

package/Server/Services/IncomingCallPolicyOwnerRuleEngineService.ts

@@ -246,11 +246,15 @@ class IncomingCallPolicyOwnerRuleEngineServiceClass
         owner.projectId = policy.projectId;
         owner.userId = new ObjectID(userId);
         owner.isOwnerNotified = !notify;
-        await IncomingCallPolicyOwnerUserService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: IncomingCallPolicyOwnerUserService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
 
       for (const teamId of teamIds) {
@@ -260,11 +264,15 @@ class IncomingCallPolicyOwnerRuleEngineServiceClass
         owner.projectId = policy.projectId;
         owner.teamId = new ObjectID(teamId);
         owner.isOwnerNotified = !notify;
-        await IncomingCallPolicyOwnerTeamService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: IncomingCallPolicyOwnerTeamService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
     }
 

package/Server/Services/IoTFleetOwnerRuleEngineService.ts

@@ -243,11 +243,15 @@ class IoTFleetOwnerRuleEngineServiceClass
         owner.projectId = iotFleet.projectId;
         owner.userId = new ObjectID(userId);
         owner.isOwnerNotified = !notify;
-        await IoTFleetOwnerUserService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: IoTFleetOwnerUserService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
 
       for (const teamId of teamIds) {
@@ -256,11 +260,15 @@ class IoTFleetOwnerRuleEngineServiceClass
         owner.projectId = iotFleet.projectId;
         owner.teamId = new ObjectID(teamId);
         owner.isOwnerNotified = !notify;
-        await IoTFleetOwnerTeamService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: IoTFleetOwnerTeamService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
     }
 

package/Server/Services/KubernetesClusterOwnerRuleEngineService.ts

@@ -256,11 +256,15 @@ class KubernetesClusterOwnerRuleEngineServiceClass
         owner.projectId = kubernetesCluster.projectId;
         owner.userId = new ObjectID(userId);
         owner.isOwnerNotified = !notify;
-        await KubernetesClusterOwnerUserService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: KubernetesClusterOwnerUserService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
 
       for (const teamId of teamIds) {
@@ -270,11 +274,15 @@ class KubernetesClusterOwnerRuleEngineServiceClass
         owner.projectId = kubernetesCluster.projectId;
         owner.teamId = new ObjectID(teamId);
         owner.isOwnerNotified = !notify;
-        await KubernetesClusterOwnerTeamService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: KubernetesClusterOwnerTeamService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
     }
 

package/Server/Services/MonitorService.ts

@@ -47,7 +47,6 @@ import MonitorSteps from "../../Types/Monitor/MonitorSteps";
 import MonitorStep from "../../Types/Monitor/MonitorStep";
 import ObjectID from "../../Types/ObjectID";
 import PositiveNumber from "../../Types/PositiveNumber";
-import Typeof from "../../Types/Typeof";
 import Model from "../../Models/DatabaseModels/Monitor";
 import MonitorTemplate from "../../Models/DatabaseModels/MonitorTemplate";
 import MonitorOwnerTeam from "../../Models/DatabaseModels/MonitorOwnerTeam";
@@ -97,6 +96,7 @@ import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil
 import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 import MonitorTemplateService from "./MonitorTemplateService";
 import RelationIdUtil from "../Utils/Database/RelationIdUtil";
+import OwnerRuleAssignment from "../Utils/Rules/OwnerRuleAssignment";
 import NetworkDeviceMonitorTemplateUtil from "../../Utils/Monitor/NetworkDeviceMonitorTemplateUtil";
 
 const MONITOR_TEMPLATE_RELATION_KEYS: Array<string> = [
@@ -1985,37 +1985,18 @@ ${createdItem.description?.trim() || "No description provided."}
     notifyOwners: boolean,
     props: DatabaseCommonInteractionProps,
   ): Promise<void> {
-    for (let teamId of teamIds) {
-      if (typeof teamId === Typeof.String) {
-        teamId = new ObjectID(teamId.toString());
-      }
-
-      const teamOwner: MonitorOwnerTeam = new MonitorOwnerTeam();
-      teamOwner.monitorId = monitorId;
-      teamOwner.projectId = projectId;
-      teamOwner.teamId = teamId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-
-      await MonitorOwnerTeamService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
-
-    for (let userId of userIds) {
-      if (typeof userId === Typeof.String) {
-        userId = new ObjectID(userId.toString());
-      }
-      const teamOwner: MonitorOwnerUser = new MonitorOwnerUser();
-      teamOwner.monitorId = monitorId;
-      teamOwner.projectId = projectId;
-      teamOwner.userId = userId;
-      teamOwner.isOwnerNotified = !notifyOwners;
-      await MonitorOwnerUserService.create({
-        data: teamOwner,
-        props: props,
-      });
-    }
+    // Owners already on the monitor are skipped, not added a second time.
+    await OwnerRuleAssignment.addOwners({
+      ownerUserService: MonitorOwnerUserService,
+      ownerTeamService: MonitorOwnerTeamService,
+      resourceIdColumn: "monitorId",
+      resourceId: monitorId,
+      projectId: projectId,
+      userIds: userIds,
+      teamIds: teamIds,
+      isOwnerNotified: !notifyOwners,
+      props: props,
+    });
   }
 
   /*

package/Server/Services/NetworkDeviceOwnerRuleEngineService.ts

@@ -249,11 +249,15 @@ class NetworkDeviceOwnerRuleEngineServiceClass
         owner.projectId = networkDevice.projectId;
         owner.userId = new ObjectID(userId);
         owner.isOwnerNotified = !notify;
-        await NetworkDeviceOwnerUserService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: NetworkDeviceOwnerUserService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
 
       for (const teamId of teamIds) {
@@ -262,11 +266,15 @@ class NetworkDeviceOwnerRuleEngineServiceClass
         owner.projectId = networkDevice.projectId;
         owner.teamId = new ObjectID(teamId);
         owner.isOwnerNotified = !notify;
-        await NetworkDeviceOwnerTeamService.create({
-          data: owner,
-          props: { isRoot: true },
-        });
-        ownersAdded++;
+        if (
+          await OwnerRuleAssignment.createOwner({
+            ownerService: NetworkDeviceOwnerTeamService,
+            owner: owner,
+            props: { isRoot: true },
+          })
+        ) {
+          ownersAdded++;
+        }
       }
     }