@oneuptime/common 13.0.6 → 13.0.8

package/Models/DatabaseModels/ScheduledMaintenanceOwnerUser.ts

@@ -13,6 +13,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -73,7 +74,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ScheduledMaintenanceOwnerUser",
 })
-@Index(["scheduledMaintenanceId", "userId", "projectId"])
+@Index(["scheduledMaintenanceId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["scheduledMaintenanceId", "userId", "projectId"],
+  "This user is already an owner of this scheduled maintenance event.",
+)
 export default class ScheduledMaintenanceOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerTeam.ts

@@ -13,6 +13,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -75,6 +76,13 @@ import ScheduledMaintenanceTemplate from "./ScheduledMaintenanceTemplate";
 @Entity({
   name: "ScheduledMaintenanceTemplateOwnerTeam",
 })
+@Index(["scheduledMaintenanceTemplateId", "teamId", "projectId"], {
+  unique: true,
+})
+@UniqueColumnsTogether(
+  ["scheduledMaintenanceTemplateId", "teamId", "projectId"],
+  "This team is already an owner of this scheduled maintenance template.",
+)
 export default class ScheduledMaintenanceTemplateOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser.ts

@@ -12,6 +12,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -74,6 +75,13 @@ import ScheduledMaintenanceTemplate from "./ScheduledMaintenanceTemplate";
 @Entity({
   name: "ScheduledMaintenanceTemplateOwnerUser",
 })
+@Index(["scheduledMaintenanceTemplateId", "userId", "projectId"], {
+  unique: true,
+})
+@UniqueColumnsTogether(
+  ["scheduledMaintenanceTemplateId", "userId", "projectId"],
+  "This user is already an owner of this scheduled maintenance template.",
+)
 export default class ScheduledMaintenanceTemplateOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServerlessFunctionOwnerTeam.ts

@@ -14,6 +14,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -74,6 +75,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServerlessFunctionOwnerTeam",
 })
+@Index(["serverlessFunctionId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serverlessFunctionId", "teamId", "projectId"],
+  "This team is already an owner of this serverless function.",
+)
 export default class ServerlessFunctionOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServerlessFunctionOwnerUser.ts

@@ -13,6 +13,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -73,6 +74,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServerlessFunctionOwnerUser",
 })
+@Index(["serverlessFunctionId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serverlessFunctionId", "userId", "projectId"],
+  "This user is already an owner of this serverless function.",
+)
 export default class ServerlessFunctionOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServiceLevelObjectiveOwnerTeam.ts

@@ -15,6 +15,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -81,7 +82,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServiceLevelObjectiveOwnerTeam",
 })
-@Index(["serviceLevelObjectiveId", "teamId", "projectId"])
+@Index(["serviceLevelObjectiveId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serviceLevelObjectiveId", "teamId", "projectId"],
+  "This team is already an owner of this service level objective.",
+)
 export default class ServiceLevelObjectiveOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServiceLevelObjectiveOwnerUser.ts

@@ -14,6 +14,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -80,7 +81,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServiceLevelObjectiveOwnerUser",
 })
-@Index(["serviceLevelObjectiveId", "userId", "projectId"])
+@Index(["serviceLevelObjectiveId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serviceLevelObjectiveId", "userId", "projectId"],
+  "This user is already an owner of this service level objective.",
+)
 export default class ServiceLevelObjectiveOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServiceOwnerTeam.ts

@@ -17,6 +17,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -78,6 +79,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServiceOwnerTeam",
 })
+@Index(["serviceId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serviceId", "teamId", "projectId"],
+  "This team is already an owner of this service.",
+)
 export default class ServiceOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/ServiceOwnerUser.ts

@@ -16,6 +16,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -77,6 +78,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "ServiceOwnerUser",
 })
+@Index(["serviceId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["serviceId", "userId", "projectId"],
+  "This user is already an owner of this service.",
+)
 export default class ServiceOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/StatusPageOwnerTeam.ts

@@ -17,6 +17,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -78,7 +79,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "StatusPageOwnerTeam",
 })
-@Index(["statusPageId", "teamId", "projectId"])
+@Index(["statusPageId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["statusPageId", "teamId", "projectId"],
+  "This team is already an owner of this status page.",
+)
 export default class StatusPageOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/StatusPageOwnerUser.ts

@@ -16,6 +16,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -77,7 +78,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "StatusPageOwnerUser",
 })
-@Index(["statusPageId", "userId", "projectId"])
+@Index(["statusPageId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["statusPageId", "userId", "projectId"],
+  "This user is already an owner of this status page.",
+)
 export default class StatusPageOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/UserOnCallCalendarFeed.ts

@@ -258,7 +258,7 @@ export default class UserOnCallCalendarFeed extends BaseModel {
 
   @ColumnAccessControl({
     create: [],
-    read: [],
+    read: [Permission.CurrentUser],
     update: [],
   })
   @TableColumn({

package/Models/DatabaseModels/VMwareVCenterOwnerTeam.ts

@@ -14,6 +14,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -74,6 +75,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "VMwareVCenterOwnerTeam",
 })
+@Index(["vmwareVCenterId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["vmwareVCenterId", "teamId", "projectId"],
+  "This team is already an owner of this vCenter.",
+)
 export default class VMwareVCenterOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/VMwareVCenterOwnerUser.ts

@@ -13,6 +13,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -73,6 +74,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "VMwareVCenterOwnerUser",
 })
+@Index(["vmwareVCenterId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["vmwareVCenterId", "userId", "projectId"],
+  "This user is already an owner of this vCenter.",
+)
 export default class VMwareVCenterOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/WorkflowOwnerTeam.ts

@@ -14,6 +14,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -74,7 +75,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "WorkflowOwnerTeam",
 })
-@Index(["workflowId", "teamId", "projectId"])
+@Index(["workflowId", "teamId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["workflowId", "teamId", "projectId"],
+  "This team is already an owner of this workflow.",
+)
 export default class WorkflowOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/WorkflowOwnerUser.ts

@@ -13,6 +13,7 @@ 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 UniqueColumnsTogether from "../../Types/Database/UniqueColumnsTogether";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
@@ -73,7 +74,11 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 @Entity({
   name: "WorkflowOwnerUser",
 })
-@Index(["workflowId", "userId", "projectId"])
+@Index(["workflowId", "userId", "projectId"], { unique: true })
+@UniqueColumnsTogether(
+  ["workflowId", "userId", "projectId"],
+  "This user is already an owner of this workflow.",
+)
 export default class WorkflowOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [

package/Scripts/benchmark-fanin-capacity.js

@@ -2,13 +2,13 @@
  * Isolated fan-in admission benchmark against the actual writer source.
  * Run with the supported Node runtime from the repository root:
  *
- *   node --expose-gc Common/Scripts/benchmark-fanin-capacity.js
+ *   node --expose-gc packages/Common/Scripts/benchmark-fanin-capacity.js
  *
  * Compare in separate processes, extracting the previous source without
  * modifying the checkout (the revision is the pre-change master):
  *
  *   git show 0b23baed11:Common/Server/Utils/Telemetry/TelemetryFanInWriter.ts > /tmp/oneuptime-fanin-before.ts
- *   node --expose-gc Common/Scripts/benchmark-fanin-capacity.js /tmp/oneuptime-fanin-before.ts
+ *   node --expose-gc packages/Common/Scripts/benchmark-fanin-capacity.js /tmp/oneuptime-fanin-before.ts
  *
  * 200 producers submit chunks sequentially and await all their acceptance
  * acknowledgements at the end, as ingest jobs do. ClickHouse remains blocked

package/Server/API/AIAgentDataAPI.ts

@@ -134,7 +134,7 @@ export default class AIAgentDataAPI {
   private initRoutes(): void {
     /*
      * Server-mediated LLM completion for the in-house code-fix agent (B4
-     * Tier 0, Internal/Roadmap/CodeFixSandboxDesign.md). One call = one
+     * Tier 0, Docs/Internal/Roadmap/CodeFixSandboxDesign.md). One call = one
      * completion of the worker's tool loop, executed through
      * AIService.executeWithLogging: metered, LlmLog-linked to the run,
      * inside the G4 daily budget, and under per-run loop budgets (max

package/Server/API/AIBillingAPI.ts

@@ -20,6 +20,7 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
   "/ai/recharge",
   UserMiddleware.getUserMiddleware,
+  UserMiddleware.requireUserAuthentication,
   async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
     try {
       if (!IsBillingEnabled) {

package/Server/API/AIChatAPI.ts

@@ -164,10 +164,12 @@ router.post(
        * (an incident, a monitor, the logs explorer, …). It is a hint for the
        * system prompt, so an invalid payload is dropped, never an error.
        */
-      const pageContext: AIChatPageContext | undefined =
-        AIChatPageContextHelper.sanitize(
-          req.body["pageContext"] as JSONObject | undefined,
-        );
+      const pageContext: AIChatPageContext | null | undefined =
+        req.body["pageContext"] === null
+          ? null // Explicitly detaching also clears the conversation's subject.
+          : AIChatPageContextHelper.sanitize(
+              req.body["pageContext"] as JSONObject | undefined,
+            );
 
       // Plan gate: custom endpoints get no automatic billing check.
       if (

package/Server/API/AIInsightAPI.ts

@@ -10,7 +10,6 @@ import Response from "../Utils/Response";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import ObjectID from "../../Types/ObjectID";
 import BadDataException from "../../Types/Exception/BadDataException";
-import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
 import { JSONArray, JSONObject } from "../../Types/JSON";
 import AIInsightStatus from "../../Types/AI/AIInsightStatus";
 import AIInsightHumanVerdict from "../../Types/AI/AIInsightHumanVerdict";
@@ -42,9 +41,7 @@ async function getLoggedInProps(
   const props: DatabaseCommonInteractionProps =
     await CommonAPI.getDatabaseCommonInteractionProps(req);
 
-  if (!props.userId) {
-    throw new NotAuthorizedException("A logged-in user session is required.");
-  }
+  CommonAPI.assertAuthenticatedUser(props);
 
   return props;
 }

package/Server/API/AIInvestigationAPI.ts

@@ -1,3 +1,4 @@
+import InvestigationEligibility from "../Utils/AI/SRE/InvestigationEligibility";
 import UserMiddleware from "../Middleware/UserAuthorization";
 import CommonAPI from "./CommonAPI";
 import Express, {
@@ -10,7 +11,6 @@ import Response from "../Utils/Response";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import ObjectID from "../../Types/ObjectID";
 import BadDataException from "../../Types/Exception/BadDataException";
-import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import Query from "../../Types/BaseDatabase/Query";
 import { JSONArray, JSONObject } from "../../Types/JSON";
@@ -183,9 +183,7 @@ async function getLoggedInProps(
   const props: DatabaseCommonInteractionProps =
     await CommonAPI.getDatabaseCommonInteractionProps(req);
 
-  if (!props.userId) {
-    throw new NotAuthorizedException("A logged-in user session is required.");
-  }
+  CommonAPI.assertAuthenticatedUser(props);
 
   return props;
 }
@@ -348,6 +346,11 @@ async function sendLatestInvestigation(
   if (!run) {
     Response.sendJsonObjectResponse(req, res, {
       run: null,
+      notInvestigatedReason:
+        (await InvestigationEligibility.getNotStartedReason({
+          projectId: viewer.projectId,
+          ...subject,
+        })) as unknown as JSONObject,
       events: [],
       analysisMarkdown: null,
       analysisTldr: null,
@@ -459,6 +462,7 @@ async function sendLatestInvestigation(
 
   Response.sendJsonObjectResponse(req, res, {
     run: runJson || null,
+    notInvestigatedReason: null,
     events: eventsJson,
     analysisMarkdown,
     analysisTldr,

package/Server/API/AIReadinessAPI.ts

@@ -49,11 +49,10 @@ router.post(
        * because it loads the exception with the caller's props first, and
        * derives the project from that authorized row.
        */
-      if (!props.userId) {
-        throw new NotAuthorizedException(
-          "AI readiness requires a logged-in user session.",
-        );
-      }
+      CommonAPI.assertAuthenticatedUser(
+        props,
+        "AI readiness requires a logged-in user session.",
+      );
 
       if (!props.tenantId) {
         throw new BadDataException("Project ID is required (tenantid header).");

package/Server/API/AlertAPI.ts

@@ -38,6 +38,7 @@ export default class AlertAPI extends BaseAPI<Alert, AlertServiceType> {
     this.router.post(
       `${new this.entityType().getCrudApiPath()?.toString()}/generate-note-from-ai/:alertId`,
       UserMiddleware.getUserMiddleware,
+      UserMiddleware.requireUserAuthentication,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
           await this.generateNoteFromAI(req, res);

package/Server/API/AutoRemediationAPI.ts

@@ -11,7 +11,6 @@ import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCom
 import ObjectID from "../../Types/ObjectID";
 import OneUptimeDate from "../../Types/Date";
 import BadDataException from "../../Types/Exception/BadDataException";
-import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
 import AutoRemediationSuggestionStatus from "../../Types/AutoRemediation/AutoRemediationSuggestionStatus";
 import AutoRemediationSuggestionType from "../../Types/AutoRemediation/AutoRemediationSuggestionType";
 import AutoRemediationVerificationStatus from "../../Types/AutoRemediation/AutoRemediationVerificationStatus";
@@ -65,9 +64,7 @@ async function getLoggedInProps(
   const props: DatabaseCommonInteractionProps =
     await CommonAPI.getDatabaseCommonInteractionProps(req);
 
-  if (!props.userId) {
-    throw new NotAuthorizedException("A logged-in user session is required.");
-  }
+  CommonAPI.assertAuthenticatedUser(props);
 
   return props;
 }

package/Server/API/BaseAPI.ts

@@ -553,6 +553,19 @@ export default class BaseAPI<
       this.entityType,
     ) as TBaseModel;
 
+    /*
+     * A create builds a brand-new row, so it must not carry the row's own
+     * primary key. getRepository().save() treats an entity that already has an
+     * id as an update of the existing row rather than an insert, so a stray
+     * `_id` (or the `id` spelling, which BaseModel.fromJSON has already folded
+     * into `_id`) would make a "create" modify an existing record instead.
+     * updateItem strips `_id` for a related reason; do it here too. Only the
+     * top-level primary key is removed - nested `_id`s inside relation
+     * objects/arrays reference existing related rows and are left untouched.
+     */
+    delete (item as any)["_id"];
+    delete (item as any)["id"];
+
     const miscDataProps: JSONObject = JSONFunctions.deserialize(
       body["miscDataProps"] as JSONObject,
     );

package/Server/API/BaseAnalyticsAPI.ts

@@ -3,6 +3,9 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import AnalyticsDatabaseService from "../Services/AnalyticsDatabaseService";
 import CreateBy from "../Types/AnalyticsDatabase/CreateBy";
 import GroupBy from "../Types/AnalyticsDatabase/GroupBy";
+import ModelPermission, {
+  CheckReadPermissionType,
+} from "../Types/AnalyticsDatabase/ModelPermission";
 import Query from "../Types/AnalyticsDatabase/Query";
 import Select from "../Types/AnalyticsDatabase/Select";
 import Sort from "../Types/AnalyticsDatabase/Sort";
@@ -39,11 +42,9 @@ import logger from "../Utils/Logger";
  * widgets loading on the same page) onto a single ClickHouse query
  * while still looking real-time to humans.
  *
- * Project-scoped only: analytics data is project-wide and the
- * service layer enforces project-scoped read permissions, so
- * caching across users within the same project is safe. Endpoints
- * with row-level access scoping should override `getAggregate` to
- * skip the cache (or shape the key to include the access scope).
+ * A cache hit never reaches the service, which is where the read
+ * check lives, so getAggregateCacheKey runs that check itself and
+ * keys the slot on the permission-scoped query — see there.
  */
 const ANALYTICS_AGGREGATE_CACHE_TTL_SECONDS: number = 8;
 
@@ -396,11 +397,11 @@ export default class BaseAnalyticsAPI<
      * burst. On cache outage (Redis down, parse error, …) we fall
      * through to a live query so behavior degrades to today's.
      */
-    const projectId: string | undefined = databaseProps.tenantId?.toString();
     const cacheNamespace: string = `${this.getEntityName()}-aggregate`;
-    const cacheKey: string | null = projectId
-      ? `${projectId}:${this.buildAggregateCacheKey(aggregateBy)}`
-      : null;
+    const cacheKey: string | null = await this.getAggregateCacheKey(
+      aggregateBy,
+      databaseProps,
+    );
 
     if (cacheKey) {
       try {
@@ -438,6 +439,76 @@ export default class BaseAnalyticsAPI<
     return Response.sendJsonObjectResponse(req, res, responseBody);
   }
 
+  /*
+   * A cached aggregate is answered BEFORE service.aggregateBy runs, and
+   * service.aggregateBy is where the read check lives. So a hit has to
+   * clear that same check first — otherwise anyone who can name a project
+   * in the `tenantid` header (getUserMiddleware accepts it even from an
+   * anonymous caller) reads whatever someone else aggregated there in the
+   * last few seconds.
+   *
+   * checkReadPermission runs here on a copy of the query, with the same
+   * select the service passes. It throws for an anonymous caller (401) and
+   * for one without read permission on the model or the queried columns
+   * (422), and it returns the query the live path would send to
+   * ClickHouse. That scoped query goes into the key because it carries
+   * everything that makes one caller's result differ from another's: the
+   * tenant, the Owned / label-restricted `IN (...)` filter on the owning
+   * resource, and for a multi-tenant request the caller's own list of
+   * projects.
+   *
+   * The caller's raw query stays in the key next to it. Scoping overwrites
+   * projectId, but a service can still plan from the raw query —
+   * MetricService picks point-type and rollup routing from the projectId
+   * the caller sent, before its own check rewrites it — so two requests
+   * that scope to the same query can still compute different results.
+   * Callers share a slot only when both their request and their access
+   * scope are identical.
+   *
+   * Returns null (skip the cache) without a tenant, and for a request the
+   * service's own validation is about to reject, so that request gets the
+   * service's error message rather than one from the check here.
+   */
+  protected async getAggregateCacheKey(
+    aggregateBy: AggregateBy<AnalyticsDataModel>,
+    props: DatabaseCommonInteractionProps,
+  ): Promise<string | null> {
+    if (!props.tenantId) {
+      return null;
+    }
+
+    const aggregateColumnName: string | undefined =
+      aggregateBy.aggregateColumnName?.toString();
+    const timestampColumnName: string | undefined =
+      aggregateBy.aggregationTimestampColumnName?.toString();
+    const model: TAnalyticsDataModel = new this.entityType();
+
+    if (
+      !aggregateColumnName ||
+      !timestampColumnName ||
+      !model.getTableColumn(aggregateColumnName) ||
+      !model.getTableColumn(timestampColumnName)
+    ) {
+      return null;
+    }
+
+    const scoped: CheckReadPermissionType<TAnalyticsDataModel> =
+      await ModelPermission.checkReadPermission(
+        this.entityType,
+        { ...(aggregateBy.query || {}) } as Query<TAnalyticsDataModel>,
+        {
+          [aggregateColumnName]: true,
+          [timestampColumnName]: true,
+        } as Select<TAnalyticsDataModel>,
+        props,
+      );
+
+    return `${props.tenantId.toString()}:${this.buildAggregateCacheKey({
+      ...aggregateBy,
+      scopedQuery: scoped.query,
+    } as AggregateBy<AnalyticsDataModel>)}`;
+  }
+
   /*
    * Stable serialization for the aggregate cache key. Date instances
    * are normalized to ISO so two logically-equal time windows hit