@oneuptime/common 13.0.1 → 13.0.4

package/Models/DatabaseModels/IncidentEpisodePrivacyRule.ts

@@ -2,7 +2,7 @@ import IncidentSeverity from "./IncidentSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically marking matching incident episodes as private",
 })
-export default class IncidentEpisodePrivacyRule extends BaseModel {
+export default class IncidentEpisodePrivacyRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentGroupingRule.ts

@@ -6,7 +6,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -100,7 +100,7 @@ export interface EpisodeMemberRoleAssignment {
   tableDescription:
     "Configure rules for automatically grouping related incidents into episodes",
 })
-export default class IncidentGroupingRule extends BaseModel {
+export default class IncidentGroupingRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentLabelRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to incidents — including labels inherited from the incident's monitors and hosts — when matching incidents are created",
 })
-export default class IncidentLabelRule extends BaseModel {
+export default class IncidentLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentOnCallRule.ts

@@ -4,7 +4,7 @@ import Monitor from "./Monitor";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -77,7 +77,7 @@ import {
   tableDescription:
     "Configure rules for automatically executing on-call duty policies when matching incidents are created",
 })
-export default class IncidentOnCallRule extends BaseModel {
+export default class IncidentOnCallRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentOwnerRule.ts

@@ -4,7 +4,7 @@ import Monitor from "./Monitor";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -77,7 +77,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching incidents are created",
 })
-export default class IncidentOwnerRule extends BaseModel {
+export default class IncidentOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentPrivacyRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure rules for automatically marking matching incidents as private",
 })
-export default class IncidentPrivacyRule extends BaseModel {
+export default class IncidentPrivacyRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncidentReminderRule.ts

@@ -2,7 +2,7 @@ import IncidentSeverity from "./IncidentSeverity";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RelationOnlyRuleBaseModel from "./DatabaseBaseModel/RelationOnlyRuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -21,6 +21,7 @@ import Permission from "../../Types/Permission";
 import ReminderStopState from "../../Types/Reminder/ReminderStopState";
 import {
   Column,
+  Check,
   Entity,
   Index,
   JoinColumn,
@@ -59,6 +60,7 @@ import {
   ],
 })
 @CrudApiEndpoint(new Route("/incident-reminder-rule"))
+@Check(`"criteria" IS NULL OR "isEnabled" IS DISTINCT FROM true`)
 @Entity({
   name: "IncidentReminderRule",
 })
@@ -76,7 +78,7 @@ import {
   tableDescription:
     "Configure reminder rules to periodically notify incident owners while an incident is still open",
 })
-export default class IncidentReminderRule extends BaseModel {
+export default class IncidentReminderRule extends RelationOnlyRuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
@@ -294,10 +296,10 @@ export default class IncidentReminderRule extends BaseModel {
   })
   @Column({
     type: ColumnType.Boolean,
-    nullable: false,
+    nullable: true,
     default: true,
   })
-  public isEnabled?: boolean = undefined;
+  public isEnabled?: boolean | null = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/IncidentSlaRule.ts

@@ -3,7 +3,7 @@ import Label from "./Label";
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -76,7 +76,7 @@ import {
   tableDescription:
     "Configure SLA rules to define response and resolution time targets for incidents",
 })
-export default class IncidentSlaRule extends BaseModel {
+export default class IncidentSlaRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncomingCallPolicy.ts

@@ -90,10 +90,9 @@ import EnableWorkflow from "../../Types/Database/EnableWorkflow";
     "Manage incoming call routing policies with escalation rules for on-call teams",
 })
 /*
- * A routing phone number may belong to at most one active policy. The inbound
- * /voice webhook looks up the policy by routingPhoneNumber and assumes a single
- * match, so this uniqueness is enforced at the DB level (partial index in the
- * migration; NULLs are allowed for policies without a number yet).
+ * These scalar fields remain as the oldest-number compatibility mirror while
+ * phone-number child rows are authoritative. Keep the mirror unique so the
+ * scalar-only webhook fallback stays unambiguous during rolling upgrades.
  */
 @Index(
   "IDX_INCOMING_CALL_POLICY_ROUTING_PHONE_UNIQUE",

package/Models/DatabaseModels/IncomingCallPolicyLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -74,7 +74,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to incoming call policies when matching policies are created",
 })
-export default class IncomingCallPolicyLabelRule extends BaseModel {
+export default class IncomingCallPolicyLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncomingCallPolicyOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching incoming call policies are created",
 })
-export default class IncomingCallPolicyOwnerRule extends BaseModel {
+export default class IncomingCallPolicyOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IncomingCallPolicyPhoneNumber.ts

@@ -0,0 +1,254 @@
+import IncomingCallPolicy from "./IncomingCallPolicy";
+import Project from "./Project";
+import ProjectCallSMSConfig from "./ProjectCallSMSConfig";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import CanAccessIfCanReadOn from "../../Types/Database/CanAccessIfCanReadOn";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import Phone from "../../Types/Phone";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+const readPermissions: Array<Permission> = [
+  Permission.ProjectOwner,
+  Permission.ProjectAdmin,
+  Permission.ProjectMember,
+  Permission.Viewer,
+  Permission.SettingsAdmin,
+  Permission.SettingsMember,
+  Permission.SettingsViewer,
+  Permission.ReadProjectIncomingCallPolicy,
+];
+
+@EnableDocumentation()
+@CanAccessIfCanReadOn("incomingCallPolicy")
+@TenantColumn("projectId")
+@TableAccessControl({
+  create: [],
+  read: readPermissions,
+  delete: [],
+  update: [],
+})
+@CrudApiEndpoint(new Route("/incoming-call-policy-phone-number"))
+@TableMetadata({
+  tableName: "IncomingCallPolicyPhoneNumber",
+  singularName: "Incoming Call Policy Phone Number",
+  pluralName: "Incoming Call Policy Phone Numbers",
+  icon: IconProp.Call,
+  tableDescription:
+    "Phone numbers that route incoming calls to an incoming call policy.",
+})
+@Entity({
+  name: "IncomingCallPolicyPhoneNumber",
+})
+@Index("IDX_INCOMING_CALL_POLICY_PHONE_NUMBER_UNIQUE", ["phoneNumber"], {
+  unique: true,
+  where: '"deletedAt" IS NULL',
+})
+@Index(
+  "IDX_INCOMING_CALL_POLICY_PROVIDER_PHONE_NUMBER_UNIQUE",
+  ["projectCallSMSConfigId", "callProviderPhoneNumberId"],
+  {
+    unique: true,
+    where: '"deletedAt" IS NULL',
+  },
+)
+@Index(["incomingCallPolicyId", "projectId"])
+export default class IncomingCallPolicyPhoneNumber extends BaseModel {
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Project that owns this incoming call phone number.",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of the project that owns this phone number.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    manyToOneRelationColumn: "incomingCallPolicyId",
+    type: TableColumnType.Entity,
+    modelType: IncomingCallPolicy,
+    title: "Incoming Call Policy",
+    description: "Incoming call policy that receives calls to this number.",
+  })
+  @ManyToOne(
+    () => {
+      return IncomingCallPolicy;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "incomingCallPolicyId" })
+  public incomingCallPolicy?: IncomingCallPolicy = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Incoming Call Policy ID",
+    description: "ID of the policy that receives calls to this number.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public incomingCallPolicyId?: ObjectID = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    manyToOneRelationColumn: "projectCallSMSConfigId",
+    type: TableColumnType.Entity,
+    modelType: ProjectCallSMSConfig,
+    title: "Project Call/SMS Config",
+    description: "Call provider configuration that owns this phone number.",
+  })
+  @ManyToOne(
+    () => {
+      return ProjectCallSMSConfig;
+    },
+    {
+      eager: false,
+      nullable: false,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectCallSMSConfigId" })
+  public projectCallSMSConfig?: ProjectCallSMSConfig = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project Call/SMS Config ID",
+    description: "ID of the call provider configuration that owns this number.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectCallSMSConfigId?: ObjectID = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Phone,
+    canReadOnRelationQuery: true,
+    title: "Phone Number",
+    description: "Phone number that routes calls to the policy.",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Phone,
+    length: ColumnLength.Phone,
+    transformer: Phone.getDatabaseTransformer(),
+  })
+  public phoneNumber?: Phone = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    canReadOnRelationQuery: true,
+    title: "Call Provider Phone Number ID",
+    description: "The call provider identifier for this phone number.",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public callProviderPhoneNumberId?: string = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Country Code",
+    description: "Country code associated with this phone number.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public countryCode?: string = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.ShortText,
+    title: "Area Code",
+    description: "Area code associated with this phone number.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+  })
+  public areaCode?: string = undefined;
+
+  @ColumnAccessControl({ create: [], read: readPermissions, update: [] })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Purchased At",
+    description: "When this phone number was attached to the policy.",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Date,
+  })
+  public phoneNumberPurchasedAt?: Date = undefined;
+}

package/Models/DatabaseModels/Index.ts

@@ -196,6 +196,7 @@ import OnCallDutyPolicyTimeLog from "./OnCallDutyPolicyTimeLog";
 // Incoming Call Policy
 import IncomingCallPolicy from "./IncomingCallPolicy";
 import IncomingCallPolicyEscalationRule from "./IncomingCallPolicyEscalationRule";
+import IncomingCallPolicyPhoneNumber from "./IncomingCallPolicyPhoneNumber";
 import IncomingCallLog from "./IncomingCallLog";
 import IncomingCallLogItem from "./IncomingCallLogItem";
 
@@ -528,6 +529,7 @@ const AllModelTypes: Array<{
   // Incoming Call Policy
   IncomingCallPolicy,
   IncomingCallPolicyEscalationRule,
+  IncomingCallPolicyPhoneNumber,
   IncomingCallLog,
   IncomingCallLogItem,
 

package/Models/DatabaseModels/IoTFleetLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to IoT fleets when matching IoT fleets are created",
 })
-export default class IoTFleetLabelRule extends BaseModel {
+export default class IoTFleetLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/IoTFleetOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching IoT fleets are created",
 })
-export default class IoTFleetOwnerRule extends BaseModel {
+export default class IoTFleetOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/KubernetesClusterLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to Kubernetes clusters when matching Kubernetes clusters are created",
 })
-export default class KubernetesClusterLabelRule extends BaseModel {
+export default class KubernetesClusterLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/KubernetesClusterOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -72,7 +72,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching Kubernetes clusters are created",
 })
-export default class KubernetesClusterOwnerRule extends BaseModel {
+export default class KubernetesClusterOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/MonitorLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -74,7 +74,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to monitors when matching monitors are created",
 })
-export default class MonitorLabelRule extends BaseModel {
+export default class MonitorLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/MonitorOwnerRule.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -75,7 +75,7 @@ import {
   tableDescription:
     "Configure rules for automatically assigning owner users and teams when matching monitors are created",
 })
-export default class MonitorOwnerRule extends BaseModel {
+export default class MonitorOwnerRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/NetworkDeviceAutoImportRule.ts

@@ -2,7 +2,7 @@ import MonitorTemplate from "./MonitorTemplate";
 import NetworkDeviceOidTemplate from "./NetworkDeviceOidTemplate";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -91,7 +91,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
  * keeps the readable names and costs no migration; the alternative was an
  * ALTER that renamed seven objects on every installation to hashes.
  */
-export default class NetworkDeviceAutoImportRule extends BaseModel {
+export default class NetworkDeviceAutoImportRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Models/DatabaseModels/NetworkDeviceLabelRule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import RuleBaseModel from "./DatabaseBaseModel/RuleBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
@@ -71,7 +71,7 @@ import {
   tableDescription:
     "Configure rules for automatically attaching labels to network devices when matching network devices are created",
 })
-export default class NetworkDeviceLabelRule extends BaseModel {
+export default class NetworkDeviceLabelRule extends RuleBaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,