@oneuptime/common 9.5.7 → 9.5.9

package/Models/DatabaseModels/Alert.ts

@@ -418,9 +418,8 @@ export default class Alert extends BaseModel {
   })
   @TableColumn({
     type: TableColumnType.ObjectID,
-    title: "Deleted by User ID",
-    description:
-      "User ID who deleted this object (if this object was deleted by a User)",
+    title: "Monitor ID",
+    description: "ID of the monitor this alert belongs to",
   })
   @Column({
     type: ColumnType.ObjectID,
@@ -453,9 +452,9 @@ export default class Alert extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: Monitor,
+    modelType: OnCallDutyPolicy,
     title: "On-Call Duty Policies",
-    description: "List of on-call duty policy affected by this alert.",
+    description: "List of on-call duty policies affected by this alert.",
   })
   @ManyToMany(
     () => {
@@ -466,15 +465,15 @@ export default class Alert extends BaseModel {
   @JoinTable({
     name: "AlertOnCallDutyPolicy",
     inverseJoinColumn: {
-      name: "monitorId",
+      name: "onCallDutyPolicyId",
       referencedColumnName: "_id",
     },
     joinColumn: {
-      name: "onCallDutyPolicyId",
+      name: "alertId",
       referencedColumnName: "_id",
     },
   })
-  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // monitors affected by this alert.
+  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // on-call duty policies affected by this alert.
 
   @ColumnAccessControl({
     create: [
@@ -701,7 +700,7 @@ export default class Alert extends BaseModel {
   @TableColumn({
     manyToOneRelationColumn: "monitorStatusWhenThisAlertWasCreatedId",
     type: TableColumnType.Entity,
-    modelType: AlertState,
+    modelType: MonitorStatus,
     title: "Monitor status when this alert was created",
     description: "Monitor status when this alert was created",
   })

package/Models/DatabaseModels/Incident.ts

@@ -493,9 +493,9 @@ export default class Incident extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: Monitor,
+    modelType: OnCallDutyPolicy,
     title: "On-Call Duty Policies",
-    description: "List of on-call duty policy affected by this incident.",
+    description: "List of on-call duty policies affected by this incident.",
   })
   @ManyToMany(
     () => {
@@ -506,15 +506,15 @@ export default class Incident extends BaseModel {
   @JoinTable({
     name: "IncidentOnCallDutyPolicy",
     inverseJoinColumn: {
-      name: "monitorId",
+      name: "onCallDutyPolicyId",
       referencedColumnName: "_id",
     },
     joinColumn: {
-      name: "onCallDutyPolicyId",
+      name: "incidentId",
       referencedColumnName: "_id",
     },
   })
-  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // monitors affected by this incident.
+  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // on-call duty policies affected by this incident.
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/IncidentTemplate.ts

@@ -522,9 +522,10 @@ export default class IncidentTemplate extends BaseModel {
   @TableColumn({
     required: false,
     type: TableColumnType.EntityArray,
-    modelType: Monitor,
+    modelType: OnCallDutyPolicy,
     title: "On-Call Duty Policies",
-    description: "List of on-call duty policy affected by this incident.",
+    description:
+      "List of on-call duty policies affected by this incident template.",
   })
   @ManyToMany(
     () => {
@@ -543,7 +544,7 @@ export default class IncidentTemplate extends BaseModel {
       referencedColumnName: "_id",
     },
   })
-  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // monitors affected by this incident.
+  public onCallDutyPolicies?: Array<OnCallDutyPolicy> = undefined; // on-call duty policies affected by this incident template.
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts

@@ -780,7 +780,7 @@ export default class OnCallDutyPolicyExecutionLog extends BaseModel {
   })
   @TableColumn({
     type: TableColumnType.ObjectID,
-    title: "Deleted by User ID",
+    title: "Acknowledged by User ID",
     description:
       "User ID who acknowledged this object (if this object was acknowledged by a User)",
     example: "c3d4e5f6-a7b8-9012-cdef-123456789012",

package/Models/DatabaseModels/UserOnCallLog.ts

@@ -766,7 +766,7 @@ export default class UserOnCallLog extends BaseModel {
   })
   @TableColumn({
     type: TableColumnType.ObjectID,
-    title: "Deleted by User ID",
+    title: "Acknowledged by User ID",
     description:
       "User ID who acknowledged this object (if this object was acknowledged by a User)",
     example: "7c9d8e0f-a1b2-4c3d-9e5f-8a7b9c0d1e2f",

package/Models/DatabaseModels/UserPush.ts

@@ -16,6 +16,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 
 @TenantColumn("projectId")
@@ -122,7 +123,7 @@ class UserPush extends BaseModel {
     unique: false,
     nullable: false,
   })
-  public deviceType?: "web" = "web" as const; // Only web support for now
+  public deviceType?: PushDeviceType = undefined;
 
   @ColumnAccessControl({
     create: [Permission.CurrentUser],

package/Server/API/UserPushAPI.ts

@@ -14,6 +14,7 @@ import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import UserPush from "../../Models/DatabaseModels/UserPush";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
 
@@ -39,11 +40,17 @@ export default class UserPushAPI extends BaseAPI<
             );
           }
 
-          if (!req.body.deviceType || req.body.deviceType !== "web") {
+          const validDeviceTypes: string[] = Object.values(PushDeviceType);
+          if (
+            !req.body.deviceType ||
+            !validDeviceTypes.includes(req.body.deviceType)
+          ) {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("Only web device type is supported"),
+              new BadDataException(
+                "Device type must be one of: " + validDeviceTypes.join(", "),
+              ),
             );
           }
 
@@ -86,7 +93,7 @@ export default class UserPushAPI extends BaseAPI<
           userPush.deviceToken = req.body.deviceToken;
           userPush.deviceType = req.body.deviceType;
           userPush.deviceName = req.body.deviceName || "Unknown Device";
-          userPush.isVerified = true; // For web push, we consider it verified immediately
+          userPush.isVerified = true; // Web, iOS, and Android devices are verified immediately
 
           const savedDevice: UserPush = await this.service.create({
             data: userPush,
@@ -105,6 +112,46 @@ export default class UserPushAPI extends BaseAPI<
       },
     );
 
+    this.router.post(
+      `/user-push/unregister`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          req = req as OneUptimeRequest;
+
+          if (!req.body.deviceToken) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Device token is required"),
+            );
+          }
+
+          const userId: ObjectID = (req as OneUptimeRequest).userAuthorization!
+            .userId!;
+
+          await this.service.deleteBy({
+            query: {
+              userId: userId,
+              deviceToken: req.body.deviceToken,
+            },
+            limit: 100,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          return Response.sendJsonObjectResponse(req, res, {
+            success: true,
+            message: "Device unregistered successfully",
+          });
+        } catch (error) {
+          return next(error);
+        }
+      },
+    );
+
     this.router.post(
       `/user-push/:deviceId/test-notification`,
       UserMiddleware.getUserMiddleware,
@@ -186,7 +233,7 @@ export default class UserPushAPI extends BaseAPI<
                   },
                 ],
                 message: testMessage,
-                deviceType: device.deviceType!,
+                deviceType: device.deviceType! as PushDeviceType,
               },
               {
                 isSensitive: false,

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

@@ -0,0 +1,156 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770833704656 implements MigrationInterface {
+  public name = "MigrationName1770833704656";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    /*
+     * AlertOnCallDutyPolicy: fix column names
+     * Original columns: onCallDutyPolicyId (FK → Alert._id), monitorId (FK → OnCallDutyPolicy._id)
+     * Target columns: alertId (FK → Alert._id), onCallDutyPolicyId (FK → OnCallDutyPolicy._id)
+     * Must rename onCallDutyPolicyId first to free the name, then rename monitorId.
+     */
+
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_0eca13d28cf4d2349406ddebc5c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_1ef6702995a8406630f75f06e28"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0eca13d28cf4d2349406ddebc5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_1ef6702995a8406630f75f06e2"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" RENAME COLUMN "onCallDutyPolicyId" TO "alertId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" RENAME COLUMN "monitorId" TO "onCallDutyPolicyId"`,
+    );
+
+    await queryRunner.query(
+      `CREATE INDEX "IDX_AlertOnCallDutyPolicy_alertId" ON "AlertOnCallDutyPolicy" ("alertId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_AlertOnCallDutyPolicy_onCallDutyPolicyId" ON "AlertOnCallDutyPolicy" ("onCallDutyPolicyId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_AlertOnCallDutyPolicy_alertId" FOREIGN KEY ("alertId") REFERENCES "Alert"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_AlertOnCallDutyPolicy_onCallDutyPolicyId" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+
+    /*
+     * IncidentOnCallDutyPolicy: fix column names
+     * Original columns: onCallDutyPolicyId (FK → Incident._id), monitorId (FK → OnCallDutyPolicy._id)
+     * Target columns: incidentId (FK → Incident._id), onCallDutyPolicyId (FK → OnCallDutyPolicy._id)
+     */
+
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_2d127b6da0e4fab9f905b4d332d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_f89b23e3cafd1c6a0bfd42c297d"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_2d127b6da0e4fab9f905b4d332"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_f89b23e3cafd1c6a0bfd42c297"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" RENAME COLUMN "onCallDutyPolicyId" TO "incidentId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" RENAME COLUMN "monitorId" TO "onCallDutyPolicyId"`,
+    );
+
+    await queryRunner.query(
+      `CREATE INDEX "IDX_IncidentOnCallDutyPolicy_incidentId" ON "IncidentOnCallDutyPolicy" ("incidentId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_IncidentOnCallDutyPolicy_onCallDutyPolicyId" ON "IncidentOnCallDutyPolicy" ("onCallDutyPolicyId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_IncidentOnCallDutyPolicy_incidentId" FOREIGN KEY ("incidentId") REFERENCES "Incident"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_IncidentOnCallDutyPolicy_onCallDutyPolicyId" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert IncidentOnCallDutyPolicy
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_IncidentOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_IncidentOnCallDutyPolicy_incidentId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_IncidentOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_IncidentOnCallDutyPolicy_incidentId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" RENAME COLUMN "onCallDutyPolicyId" TO "monitorId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" RENAME COLUMN "incidentId" TO "onCallDutyPolicyId"`,
+    );
+
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2d127b6da0e4fab9f905b4d332" ON "IncidentOnCallDutyPolicy" ("onCallDutyPolicyId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_f89b23e3cafd1c6a0bfd42c297" ON "IncidentOnCallDutyPolicy" ("monitorId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_2d127b6da0e4fab9f905b4d332d" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "Incident"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_f89b23e3cafd1c6a0bfd42c297d" FOREIGN KEY ("monitorId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+
+    // Revert AlertOnCallDutyPolicy
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_AlertOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_AlertOnCallDutyPolicy_alertId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_AlertOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_AlertOnCallDutyPolicy_alertId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" RENAME COLUMN "onCallDutyPolicyId" TO "monitorId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" RENAME COLUMN "alertId" TO "onCallDutyPolicyId"`,
+    );
+
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0eca13d28cf4d2349406ddebc5" ON "AlertOnCallDutyPolicy" ("onCallDutyPolicyId")`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_1ef6702995a8406630f75f06e2" ON "AlertOnCallDutyPolicy" ("monitorId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_0eca13d28cf4d2349406ddebc5c" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "Alert"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_1ef6702995a8406630f75f06e28" FOREIGN KEY ("monitorId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+}

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

@@ -0,0 +1,119 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770834237090 implements MigrationInterface {
+  public name = "MigrationName1770834237090";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_IncidentOnCallDutyPolicy_incidentId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_IncidentOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_AlertOnCallDutyPolicy_alertId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_AlertOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_IncidentOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_IncidentOnCallDutyPolicy_incidentId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_AlertOnCallDutyPolicy_alertId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_AlertOnCallDutyPolicy_onCallDutyPolicyId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_47b1a29b40fc779495dd7ba407" ON "IncidentOnCallDutyPolicy" ("incidentId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2d127b6da0e4fab9f905b4d332" ON "IncidentOnCallDutyPolicy" ("onCallDutyPolicyId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_359174b1e315a1600ddee16812" ON "AlertOnCallDutyPolicy" ("alertId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0eca13d28cf4d2349406ddebc5" ON "AlertOnCallDutyPolicy" ("onCallDutyPolicyId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_47b1a29b40fc779495dd7ba4076" FOREIGN KEY ("incidentId") REFERENCES "Incident"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_2d127b6da0e4fab9f905b4d332d" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_359174b1e315a1600ddee168129" FOREIGN KEY ("alertId") REFERENCES "Alert"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_0eca13d28cf4d2349406ddebc5c" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_0eca13d28cf4d2349406ddebc5c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" DROP CONSTRAINT "FK_359174b1e315a1600ddee168129"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_2d127b6da0e4fab9f905b4d332d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" DROP CONSTRAINT "FK_47b1a29b40fc779495dd7ba4076"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0eca13d28cf4d2349406ddebc5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_359174b1e315a1600ddee16812"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_2d127b6da0e4fab9f905b4d332"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_47b1a29b40fc779495dd7ba407"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_AlertOnCallDutyPolicy_onCallDutyPolicyId" ON "AlertOnCallDutyPolicy" ("onCallDutyPolicyId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_AlertOnCallDutyPolicy_alertId" ON "AlertOnCallDutyPolicy" ("alertId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_IncidentOnCallDutyPolicy_incidentId" ON "IncidentOnCallDutyPolicy" ("incidentId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_IncidentOnCallDutyPolicy_onCallDutyPolicyId" ON "IncidentOnCallDutyPolicy" ("onCallDutyPolicyId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_AlertOnCallDutyPolicy_onCallDutyPolicyId" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertOnCallDutyPolicy" ADD CONSTRAINT "FK_AlertOnCallDutyPolicy_alertId" FOREIGN KEY ("alertId") REFERENCES "Alert"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_IncidentOnCallDutyPolicy_onCallDutyPolicyId" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentOnCallDutyPolicy" ADD CONSTRAINT "FK_IncidentOnCallDutyPolicy_incidentId" FOREIGN KEY ("incidentId") REFERENCES "Incident"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+}

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

@@ -256,6 +256,8 @@ import { MigrationName1770407024682 } from "./1770407024682-MigrationName";
 import { MigrationName1770668054908 } from "./1770668054908-MigrationName";
 import { MigrationName1770728946893 } from "./1770728946893-MigrationName";
 import { MigrationName1770732721195 } from "./1770732721195-MigrationName";
+import { MigrationName1770833704656 } from "./1770833704656-MigrationName";
+import { MigrationName1770834237090 } from "./1770834237090-MigrationName";
 
 export default [
   InitialMigration,
@@ -516,4 +518,6 @@ export default [
   MigrationName1770668054908,
   MigrationName1770728946893,
   MigrationName1770732721195,
+  MigrationName1770833704656,
+  MigrationName1770834237090,
 ];

package/Server/Middleware/UserAuthorization.ts

@@ -64,18 +64,23 @@ export default class UserMiddleware {
   public static getAccessTokenFromExpressRequest(
     req: ExpressRequest,
   ): string | undefined {
-    let accessToken: string | undefined = undefined;
+    // 1. Try cookie (existing web dashboard flow)
+    const cookieToken: string | undefined =
+      CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getUserTokenKey());
 
-    if (
-      CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getUserTokenKey())
-    ) {
-      accessToken = CookieUtil.getCookieFromExpressRequest(
-        req,
-        CookieUtil.getUserTokenKey(),
-      );
+    if (cookieToken) {
+      return cookieToken;
     }
 
-    return accessToken;
+    // 2. Fallback: Check Authorization: Bearer <token> header (mobile app flow)
+    const authHeader: string | undefined = req.headers["authorization"] as
+      | string
+      | undefined;
+    if (authHeader && authHeader.startsWith("Bearer ")) {
+      return authHeader.substring(7);
+    }
+
+    return undefined;
   }
 
   @CaptureSpan()

package/Server/Services/AlertEpisodeFeedService.ts

@@ -9,6 +9,9 @@ import DatabaseService from "./DatabaseService";
 import Model, {
   AlertEpisodeFeedEventType,
 } from "../../Models/DatabaseModels/AlertEpisodeFeed";
+import WorkspaceNotificationRuleService, {
+  MessageBlocksByWorkspaceType,
+} from "./WorkspaceNotificationRuleService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export class Service extends DatabaseService<Model> {
@@ -30,6 +33,13 @@ export class Service extends DatabaseService<Model> {
     displayColor?: Color | undefined;
     userId?: ObjectID | undefined;
     postedAt?: Date | undefined;
+    workspaceNotification?:
+      | {
+          notifyUserId?: ObjectID | undefined;
+          sendWorkspaceNotification: boolean;
+          appendMessageBlocks?: Array<MessageBlocksByWorkspaceType> | undefined;
+        }
+      | undefined;
   }): Promise<void> {
     try {
       if (!data.alertEpisodeId) {
@@ -83,12 +93,52 @@ export class Service extends DatabaseService<Model> {
           isRoot: true,
         },
       });
+
+      try {
+        if (
+          data.workspaceNotification &&
+          data.workspaceNotification?.sendWorkspaceNotification
+        ) {
+          await this.sendWorkspaceNotification({
+            projectId: data.projectId,
+            alertEpisodeId: data.alertEpisodeId,
+            feedInfoInMarkdown: data.feedInfoInMarkdown,
+            workspaceNotification: data.workspaceNotification,
+          });
+        }
+      } catch (e) {
+        logger.error("Error in sending notification to slack and teams");
+        logger.error(e);
+      }
     } catch (error) {
       logger.error("AlertEpisodeFeedService.createAlertEpisodeFeedItem");
       logger.error(error);
       // we dont want to throw the error here, as this is a non-critical operation
     }
   }
+
+  @CaptureSpan()
+  public async sendWorkspaceNotification(data: {
+    projectId: ObjectID;
+    alertEpisodeId: ObjectID;
+    feedInfoInMarkdown: string;
+    workspaceNotification: {
+      notifyUserId?: ObjectID | undefined;
+      sendWorkspaceNotification: boolean;
+      appendMessageBlocks?: Array<MessageBlocksByWorkspaceType> | undefined;
+    };
+  }): Promise<void> {
+    return await WorkspaceNotificationRuleService.sendWorkspaceMarkdownNotification(
+      {
+        projectId: data.projectId,
+        notificationFor: {
+          alertEpisodeId: data.alertEpisodeId,
+        },
+        feedInfoInMarkdown: data.feedInfoInMarkdown,
+        workspaceNotification: data.workspaceNotification,
+      },
+    );
+  }
 }
 
 export default new Service();