@oneuptime/common 7.0.3699 → 7.0.3705

package/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts

@@ -35,7 +35,12 @@ import Alert from "./Alert";
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableAccessControl({
-  create: [],
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+  ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
@@ -58,7 +63,12 @@ import Alert from "./Alert";
 })
 export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -89,7 +99,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public project?: Project = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -114,7 +129,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public projectId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -146,7 +166,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public onCallDutyPolicy?: OnCallDutyPolicy = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -172,7 +197,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public onCallDutyPolicyId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -204,7 +234,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByIncident?: Incident = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -228,7 +263,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByIncidentId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -259,7 +299,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByAlert?: Alert = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -283,7 +328,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public triggeredByAlertId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -307,7 +357,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public status?: OnCallDutyPolicyStatus = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -331,7 +386,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public statusMessage?: string = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -355,7 +415,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public userNotificationEventType?: UserNotificationEventType = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -387,7 +452,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public createdByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -410,7 +480,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public createdByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -437,7 +512,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public deletedByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -460,7 +540,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public deletedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -493,7 +578,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByUser?: User = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -516,7 +606,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByUserId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -535,7 +630,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedAt?: Date = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -562,7 +662,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByTeam?: Team = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -585,7 +690,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public acknowledgedByTeamId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -604,7 +714,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastExecutedEscalationRuleOrder?: number = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -623,7 +738,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastEscalationRuleExecutedAt?: Date = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -655,7 +775,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
     undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
@@ -680,7 +805,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public lastExecutedEscalationRuleId?: ObjectID = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -700,7 +830,12 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   public executeNextEscalationRuleInMinutes?: number = undefined;
 
   @ColumnAccessControl({
-    create: [],
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
     read: [],
     update: [],
   })
@@ -719,4 +854,67 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
     default: 1,
   })
   public onCallPolicyExecutionRepeatCount?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Triggered by User",
+    description: "Relation to User who triggered on-clal policy",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByUserId" })
+  public triggeredByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLog,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Triggered by User ID",
+    description: "User ID who triggered this on-call policy",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByUserId?: ObjectID = undefined;
 }

package/Server/Infrastructure/Postgres/SchemaMigrations/1740430229844-MigrationName.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1740430229844 implements MigrationInterface {
+  public name = "MigrationName1740430229844";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLog" ADD "triggeredByUserId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLog" ADD CONSTRAINT "FK_0ed55adc637e8ed7a524f942b18" FOREIGN KEY ("triggeredByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLog" DROP CONSTRAINT "FK_0ed55adc637e8ed7a524f942b18"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLog" DROP COLUMN "triggeredByUserId"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -107,6 +107,7 @@ import { MigrationName1739374537088 } from "./1739374537088-MigrationName";
 import { MigrationName1739569321582 } from "./1739569321582-MigrationName";
 import { MigrationName1740164199817 } from "./1740164199817-MigrationName";
 import { MigrationName1740419151825 } from "./1740419151825-MigrationName";
+import { MigrationName1740430229844 } from "./1740430229844-MigrationName";
 
 export default [
   InitialMigration,
@@ -218,4 +219,5 @@ export default [
   MigrationName1739569321582,
   MigrationName1740164199817,
   MigrationName1740419151825,
+  MigrationName1740430229844,
 ];

package/Server/Services/OnCallDutyPolicyExecutionLogService.ts

@@ -33,6 +33,14 @@ export class Service extends DatabaseService<Model> {
       createBy.data.status = OnCallDutyPolicyStatus.Scheduled;
     }
 
+    if (!createBy.data.statusMessage) {
+      createBy.data.statusMessage = "Scheduled.";
+    }
+
+    if (createBy.props.userId) {
+      createBy.data.triggeredByUserId = createBy.props.userId;
+    }
+
     createBy.data.onCallPolicyExecutionRepeatCount = 1;
 
     return { createBy, carryForward: null };

package/Types/Date.ts

@@ -819,26 +819,36 @@ export default class OneUptimeDate {
     return moment(date).isBefore(endDate);
   }
 
-  public static getCurrentDateAsFormattedString(): string {
-    return this.getDateAsFormattedString(new Date());
+  public static getCurrentDateAsFormattedString(options?: {
+    onlyShowDate?: boolean;
+    showSeconds?: boolean;
+  }): string {
+    return this.getDateAsFormattedString(new Date(), options);
   }
 
   public static getDateAsFormattedString(
     date: string | Date,
-    onlyShowDate?: boolean,
+    options?: {
+      onlyShowDate?: boolean;
+      showSeconds?: boolean;
+    },
   ): string {
     date = this.fromString(date);
 
     let formatstring: string = "MMM DD YYYY, HH:mm";
 
-    if (onlyShowDate) {
+    if (options?.showSeconds) {
+      formatstring = "MMM DD YYYY, HH:mm:ss";
+    }
+
+    if (options?.onlyShowDate) {
       formatstring = "MMM DD, YYYY";
     }
 
     return (
       moment(date).format(formatstring) +
       " " +
-      (onlyShowDate ? "" : this.getCurrentTimezoneString())
+      (options?.onlyShowDate ? "" : this.getCurrentTimezoneString())
     );
   }
 

package/Types/Permission.ts

@@ -504,6 +504,7 @@ enum Permission {
 
   ReadProjectOnCallDutyPolicyExecutionLogTimeline = "ReadProjectOnCallDutyPolicyExecutionLogTimeline",
   ReadProjectOnCallDutyPolicyExecutionLog = "ReadProjectOnCallDutyPolicyExecutionLog",
+  CreateProjectOnCallDutyPolicyExecutionLog = "CreateProjectOnCallDutyPolicyExecutionLog",
 
   // Resource Permissions (Team Permission)
   CreateProjectOnCallDutyPolicyEscalationRule = "CreateProjectOnCallDutyPolicyEscalationRule",
@@ -2200,8 +2201,14 @@ export class PermissionHelper {
       {
         permission: Permission.ReadProjectOnCallDutyPolicyExecutionLog,
         title: "Read On-Call Duty Policy Execution Log",
-        description:
-          "This permission can read teams in on-call duty execution log.",
+        description: "This permission can read on-call duty execution log.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.CreateProjectOnCallDutyPolicyExecutionLog,
+        title: "Create On-Call Duty Policy Execution Log",
+        description: "This permission can create on-call duty execution log.",
         isAssignableToTenant: true,
         isAccessControlPermission: false,
       },