@oneuptime/common 9.2.22 → 9.2.24

package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -44,6 +44,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     partitionKey: string;
     projections?: Array<Projection> | undefined;
     materializedViews?: Array<MaterializedView> | undefined;
+    enableMCP?: boolean | undefined;
   }) {
     super({
       tableColumns: data.tableColumns,
@@ -146,6 +147,7 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.partitionKey = data.partitionKey;
     this.projections = data.projections || [];
     this.materializedViews = data.materializedViews || [];
+    this.enableMCP = data.enableMCP || false;
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;
@@ -272,6 +274,14 @@ export default class AnalyticsBaseModel extends CommonModel {
     this._materializedViews = v;
   }
 
+  private _enableMCP: boolean = false;
+  public get enableMCP(): boolean {
+    return this._enableMCP;
+  }
+  public set enableMCP(v: boolean) {
+    this._enableMCP = v;
+  }
+
   public getTenantColumn(): AnalyticsTableColumn | null {
     const column: AnalyticsTableColumn | undefined = this.tableColumns.find(
       (column: AnalyticsTableColumn) => {

package/Models/DatabaseModels/Alert.ts

@@ -16,6 +16,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import MultiTenentQueryAllowed from "../../Types/Database/MultiTenentQueryAllowed";
 import TableColumn from "../../Types/Database/TableColumn";
@@ -39,6 +40,7 @@ import { TelemetryQuery } from "../../Types/Telemetry/TelemetryQuery";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @MultiTenentQueryAllowed(true)
 @TenantColumn("projectId")

package/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts

@@ -124,6 +124,8 @@ export default class DatabaseBaseModel extends BaseEntity {
   public enableDocumentation!: boolean;
   public isMasterAdminApiDocs!: boolean;
 
+  public enableMCP!: boolean;
+
   public currentUserCanAccessColumnBy!: string | null;
   public slugifyColumn!: string | null;
   public saveSlugToColumn!: string | null;

package/Models/DatabaseModels/Incident.ts

@@ -17,6 +17,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import MultiTenentQueryAllowed from "../../Types/Database/MultiTenentQueryAllowed";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
@@ -42,6 +43,7 @@ import { TelemetryQuery } from "../../Types/Telemetry/TelemetryQuery";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @MultiTenentQueryAllowed(true)
 @TenantColumn("projectId")

package/Models/DatabaseModels/IncidentState.ts

@@ -11,6 +11,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
@@ -31,6 +32,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @EnableDocumentation()
+@EnableMCP()
 @TenantColumn("projectId")
 @TableAccessControl({
   create: [

package/Models/DatabaseModels/Monitor.ts

@@ -11,6 +11,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
@@ -37,6 +38,7 @@ import {
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @TenantColumn("projectId")
 @TableAccessControl({

package/Models/DatabaseModels/MonitorStatus.ts

@@ -11,6 +11,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
@@ -31,6 +32,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @EnableDocumentation()
+@EnableMCP()
 @TenantColumn("projectId")
 @TableAccessControl({
   create: [

package/Models/DatabaseModels/OnCallDutyPolicy.ts

@@ -10,6 +10,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -32,6 +33,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @TenantColumn("projectId")
 @EnableWorkflow({

package/Models/DatabaseModels/ScheduledMaintenance.ts

@@ -14,6 +14,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import MultiTenentQueryAllowed from "../../Types/Database/MultiTenentQueryAllowed";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
@@ -39,6 +40,7 @@ import Recurring from "../../Types/Events/Recurring";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @MultiTenentQueryAllowed(true)
 @TenantColumn("projectId")

package/Models/DatabaseModels/StatusPage.ts

@@ -17,6 +17,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
@@ -43,6 +44,7 @@ import {
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
 
 @EnableDocumentation()
+@EnableMCP()
 @AccessControlColumn("labels")
 @TenantColumn("projectId")
 @TableAccessControl({

package/Models/DatabaseModels/Team.ts

@@ -10,6 +10,7 @@ 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 EnableMCP from "../../Types/Database/EnableMCP";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
@@ -28,6 +29,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   delete: PlanType.Free,
 })
 @EnableDocumentation()
+@EnableMCP()
 @TenantColumn("projectId")
 @TableAccessControl({
   create: [

package/Server/API/BaseAPI.ts

@@ -347,7 +347,9 @@ export default class BaseAPI<
     req: ExpressRequest,
     res: ExpressResponse,
   ): Promise<void> {
-    const objectId: ObjectID = new ObjectID(req.params["id"] as string);
+    const idParam: string = req.params["id"] as string;
+    ObjectID.validateUUID(idParam);
+    const objectId: ObjectID = new ObjectID(idParam);
     await this.onBeforeGet(req, res);
     let select: Select<BaseModel> = {};
 
@@ -372,7 +374,9 @@ export default class BaseAPI<
     res: ExpressResponse,
   ): Promise<void> {
     await this.onBeforeDelete(req, res);
-    const objectId: ObjectID = new ObjectID(req.params["id"] as string);
+    const idParam: string = req.params["id"] as string;
+    ObjectID.validateUUID(idParam);
+    const objectId: ObjectID = new ObjectID(idParam);
 
     await this.service.deleteOneById({
       id: objectId,
@@ -388,7 +392,9 @@ export default class BaseAPI<
     res: ExpressResponse,
   ): Promise<void> {
     await this.onBeforeUpdate(req, res);
-    const objectId: ObjectID = new ObjectID(req.params["id"] as string);
+    const idParam: string = req.params["id"] as string;
+    ObjectID.validateUUID(idParam);
+    const objectId: ObjectID = new ObjectID(idParam);
     const objectIdString: string = objectId.toString();
     const body: JSONObject = req.body;
 

package/Server/API/StatusPageAPI.ts

@@ -132,6 +132,7 @@ const resolveStatusPageIdOrThrow: ResolveStatusPageIdOrThrowFunction = async (
   }
 
   try {
+    ObjectID.validateUUID(statusPageIdOrDomain);
     return new ObjectID(statusPageIdOrDomain);
   } catch (err) {
     logger.error(
@@ -1399,12 +1400,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/overview/:statusPageId`,
+        ?.toString()}/overview/:statusPageIdOrDomain`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const statusPageId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const statusPageId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           await this.checkHasReadAccess({
@@ -1940,12 +1941,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/incidents/:statusPageId`,
+        ?.toString()}/incidents/:statusPageIdOrDomain`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const response: JSONObject = await this.getIncidents(
@@ -1964,12 +1965,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/scheduled-maintenance-events/:statusPageId`,
+        ?.toString()}/scheduled-maintenance-events/:statusPageIdOrDomain`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const response: JSONObject = await this.getScheduledMaintenanceEvents(
@@ -1989,12 +1990,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/announcements/:statusPageId`,
+        ?.toString()}/announcements/:statusPageIdOrDomain`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const response: JSONObject = await this.getAnnouncements(
@@ -2014,12 +2015,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/incidents/:statusPageId/:incidentId`,
+        ?.toString()}/incidents/:statusPageIdOrDomain/:incidentId`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const incidentId: ObjectID = new ObjectID(
@@ -2042,12 +2043,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/scheduled-maintenance-events/:statusPageId/:scheduledMaintenanceId`,
+        ?.toString()}/scheduled-maintenance-events/:statusPageIdOrDomain/:scheduledMaintenanceId`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const scheduledMaintenanceId: ObjectID = new ObjectID(
@@ -2071,12 +2072,12 @@ export default class StatusPageAPI extends BaseAPI<
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/announcements/:statusPageId/:announcementId`,
+        ?.toString()}/announcements/:statusPageIdOrDomain/:announcementId`,
       UserMiddleware.getUserMiddleware,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
-          const objectId: ObjectID = new ObjectID(
-            req.params["statusPageId"] as string,
+          const objectId: ObjectID = await resolveStatusPageIdOrThrow(
+            req.params["statusPageIdOrDomain"] as string,
           );
 
           const announcementId: ObjectID = new ObjectID(

package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts

@@ -30,8 +30,6 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
 import BadDataException from "../../../../Types/Exception/BadDataException";
 import ObjectID from "../../../../Types/ObjectID";
 import WorkspaceProjectAuthTokenService from "../../../Services/WorkspaceProjectAuthTokenService";
-import WorkspaceUserAuthTokenService from "../../../Services/WorkspaceUserAuthTokenService";
-import WorkspaceUserAuthToken from "../../../../Models/DatabaseModels/WorkspaceUserAuthToken";
 import WorkspaceProjectAuthToken, {
   MicrosoftTeamsMiscData,
   MicrosoftTeamsTeam,
@@ -2931,43 +2929,23 @@ All monitoring checks are passing normally.`;
         );
       }
 
-      // Try using user scoped token first when available
+      // Use app-scoped token to fetch user's teams
       let allTeams: Array<JSONObject> = [];
-      let usedAccessToken: string | null = null;
 
       try {
-        // If caller provided a userAccessToken directly, use it
-        if (data.userAccessToken) {
-          logger.debug(
-            "Using provided user access token to fetch joined teams",
-          );
-          usedAccessToken = data.userAccessToken;
+        // Fetch joined teams using app-scoped token
+        if (data.userId) {
+          logger.debug("Using app-scoped token to fetch joined teams for user");
           const userTeams: Record<string, { id: string; name: string }> =
-            await this.getUserJoinedTeams(usedAccessToken);
-          allTeams = Object.values(userTeams) as any;
-        } else if (data.userId) {
-          // Try to fetch stored user auth for this project + user
-          logger.debug("Looking up stored user auth token for provided userId");
-          const userAuth: WorkspaceUserAuthToken | null =
-            await WorkspaceUserAuthTokenService.getUserAuth({
+            await this.getUserJoinedTeams({
+              userId: data.userId.toString(),
               projectId: data.projectId,
-              userId: data.userId,
-              workspaceType: WorkspaceType.MicrosoftTeams,
             });
-
-          if (userAuth && userAuth.authToken) {
-            usedAccessToken = userAuth.authToken;
-            logger.debug(
-              "Found user auth token; using it to fetch joined teams",
-            );
-            const userTeams: Record<string, { id: string; name: string }> =
-              await this.getUserJoinedTeams(usedAccessToken);
-            allTeams = Object.values(userTeams) as any;
-          }
+          allTeams = Object.values(userTeams) as any;
         }
       } catch (err) {
         logger.warn(
-          "Failed to fetch teams using user-scoped token, falling back to app token:",
+          "Failed to fetch teams using app-scoped token, falling back to paginated fetch:",
         );
         logger.warn(err);
         allTeams = [];
@@ -3082,19 +3060,30 @@ All monitoring checks are passing normally.`;
     }
   }
 
-  // Method to get user's joined teams using user access token
+  // Method to get user's joined teams using app-scoped token
   @CaptureSpan()
-  public static async getUserJoinedTeams(
-    accessToken: string,
-  ): Promise<Record<string, { id: string; name: string }>> {
+  public static async getUserJoinedTeams(data: {
+    userId: string;
+    projectId: ObjectID;
+  }): Promise<Record<string, { id: string; name: string }>> {
     logger.debug("=== getUserJoinedTeams called ===");
+    logger.debug(`User ID: ${data.userId}`);
+    logger.debug(`Project ID: ${data.projectId.toString()}`);
 
     try {
-      // Get user's teams
+      // Get a valid app access token (refreshed if needed)
+      logger.debug("Refreshing app access token before fetching teams");
+      const accessToken: string = await this.getValidAccessToken({
+        authToken: "", // Not needed for app token refresh
+        projectId: data.projectId,
+      });
+      logger.debug("App access token refreshed successfully");
+
+      // Get user's teams using app-scoped token
       const teamsResponse: HTTPErrorResponse | HTTPResponse<JSONObject> =
         await API.get<JSONObject>({
           url: URL.fromString(
-            "https://graph.microsoft.com/v1.0/me/joinedTeams",
+            `https://graph.microsoft.com/v1.0/users/${data.userId}/joinedTeams`,
           ),
           headers: {
             Authorization: `Bearer ${accessToken}`,

package/Tests/Server/API/BaseAPI.test.ts

@@ -116,18 +116,24 @@ const res = {
   send: jest.fn().mockReturnThis(),
 } as any as ExpressResponse;
 
+// Valid UUIDs for test fixtures
+const TEST_DELETE_ID: string = "550e8400-e29b-41d4-a716-446655440001";
+const TEST_COUNT_ID: string = "550e8400-e29b-41d4-a716-446655440002";
+const TEST_GET_ID: string = "550e8400-e29b-41d4-a716-446655440003";
+const TEST_UPDATE_ID: string = "550e8400-e29b-41d4-a716-446655440004";
+
 const deleteRequest: OneUptimeRequest = {
-  params: { id: "delete-me" },
+  params: { id: TEST_DELETE_ID },
   headers: {},
 } as unknown as OneUptimeRequest;
 
 const countRequest: OneUptimeRequest = {
-  body: { query: { id: "count-me" } },
+  body: { query: { id: TEST_COUNT_ID } },
   headers: {},
 } as unknown as OneUptimeRequest;
 
 const getRequest: OneUptimeRequest = {
-  params: { id: "get-me" },
+  params: { id: TEST_GET_ID },
   headers: {},
 } as unknown as OneUptimeRequest;
 
@@ -524,7 +530,7 @@ describe("BaseAPI", () => {
       const countBySpy: jest.SpyInstance = jest.spyOn(TestService, "countBy");
       await baseApiInstance.count(countRequest, res);
       expect(countBySpy).toHaveBeenCalledWith({
-        query: { id: "count-me" },
+        query: { id: TEST_COUNT_ID },
         props: emptyDatabaseCommonInteractionProps,
       });
     });
@@ -533,7 +539,7 @@ describe("BaseAPI", () => {
       const findBySpy: jest.SpyInstance = jest.spyOn(TestService, "countBy");
       await baseApiInstance.count(countRequest, res);
       expect(findBySpy).toHaveBeenCalledWith({
-        query: { id: "count-me" },
+        query: { id: TEST_COUNT_ID },
         props: emptyDatabaseCommonInteractionProps,
       });
     });
@@ -568,7 +574,7 @@ describe("BaseAPI", () => {
       await baseApiInstance.getItem(getRequest, res);
       expect(findOneByIdSpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          id: new ObjectID("get-me"),
+          id: new ObjectID(TEST_GET_ID),
           props: emptyDatabaseCommonInteractionProps,
           select: {},
         }),
@@ -588,7 +594,7 @@ describe("BaseAPI", () => {
       await baseApiInstance.getItem(getRequestWithSelect, res);
       expect(findOneByIdSpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          id: new ObjectID("get-me"),
+          id: new ObjectID(TEST_GET_ID),
           props: emptyDatabaseCommonInteractionProps,
           select: { id: true },
         }),
@@ -630,7 +636,7 @@ describe("BaseAPI", () => {
 
       expect(deleteOneBySpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          id: new ObjectID("delete-me"),
+          id: new ObjectID(TEST_DELETE_ID),
           props: emptyDatabaseCommonInteractionProps,
         }),
       );
@@ -653,7 +659,7 @@ describe("BaseAPI", () => {
 
     beforeEach(() => {
       updateRequest = {
-        params: { id: "update-me" },
+        params: { id: TEST_UPDATE_ID },
         body: { data: { name: "updatedName" } },
         headers: {},
       } as unknown as OneUptimeRequest;
@@ -714,7 +720,7 @@ describe("BaseAPI", () => {
 
       expect(updateOneBySpy).toHaveBeenCalledWith(
         expect.objectContaining({
-          id: new ObjectID("update-me"),
+          id: new ObjectID(TEST_UPDATE_ID),
         }),
       );
     });
@@ -726,7 +732,7 @@ describe("BaseAPI", () => {
         "updateOneById",
       );
       expect(updateOneBySpy).toHaveBeenCalledWith({
-        id: new ObjectID("update-me"),
+        id: new ObjectID(TEST_UPDATE_ID),
         data: { name: "updatedName" },
         props: emptyProps,
       });

package/Types/Database/EnableMCP.ts

@@ -0,0 +1,7 @@
+import GenericFunction from "../GenericFunction";
+
+export default () => {
+  return (ctr: GenericFunction) => {
+    ctr.prototype.enableMCP = true;
+  };
+};

package/Types/ObjectID.ts

@@ -6,6 +6,10 @@ import { JSONObject, ObjectType } from "./JSON";
 import { FindOperator } from "typeorm";
 import Zod from "../Utils/Schema/Zod";
 
+// UUID validation regex - matches standard UUID format
+const UUID_REGEX: RegExp =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
 export default class ObjectID extends DatabaseProperty {
   private _id: string = "";
   public get id(): string {
@@ -112,6 +116,27 @@ export default class ObjectID extends DatabaseProperty {
     return new ObjectID(id);
   }
 
+  /**
+   * Check if a string is a valid UUID format
+   */
+  public static isValidUUID(id: string): boolean {
+    if (!id || typeof id !== "string") {
+      return false;
+    }
+    return UUID_REGEX.test(id);
+  }
+
+  /**
+   * Validate that a string is a valid UUID, throw BadDataException if not
+   */
+  public static validateUUID(id: string): void {
+    if (!ObjectID.isValidUUID(id.toString())) {
+      throw new BadDataException(
+        `Invalid ID format: "${id}". Expected a valid UUID (e.g., "550e8400-e29b-41d4-a716-446655440000").`,
+      );
+    }
+  }
+
   public static override getSchema(): any {
     return Zod.string().openapi({
       type: "string",

package/build/dist/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.js

@@ -20,6 +20,7 @@ export default class AnalyticsBaseModel extends CommonModel {
         this._tableName = "";
         this._projections = [];
         this._materializedViews = [];
+        this._enableMCP = false;
         this.tableName = data.tableName;
         const columns = [...data.tableColumns];
         if (data.tableEngine) {
@@ -87,6 +88,7 @@ export default class AnalyticsBaseModel extends CommonModel {
         this.partitionKey = data.partitionKey;
         this.projections = data.projections || [];
         this.materializedViews = data.materializedViews || [];
+        this.enableMCP = data.enableMCP || false;
     }
     get enableWorkflowOn() {
         return this._enableWorkflowOn;
@@ -178,6 +180,12 @@ export default class AnalyticsBaseModel extends CommonModel {
     set materializedViews(v) {
         this._materializedViews = v;
     }
+    get enableMCP() {
+        return this._enableMCP;
+    }
+    set enableMCP(v) {
+        this._enableMCP = v;
+    }
     getTenantColumn() {
         const column = this.tableColumns.find((column) => {
             return column.isTenantId;