@oneuptime/common 7.0.2976 → 7.0.2981

package/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts

@@ -9,6 +9,7 @@ import LessThan from "../../../Types/BaseDatabase/LessThan";
 import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
 import NotEqual from "../../../Types/BaseDatabase/NotEqual";
 import Search from "../../../Types/BaseDatabase/Search";
+import { CompareType } from "../../../Types/Database/CompareBase";
 import OneUptimeDate from "../../../Types/Date";
 import BadDataException from "../../../Types/Exception/BadDataException";
 import { JSONArray, JSONObject, JSONValue } from "../../../Types/JSON";
@@ -21,15 +22,15 @@ export type RecordValue =
   | number
   | boolean
   | Date
-  | Search
-  | NotEqual
-  | GreaterThan
-  | InBetween
+  | Search<string>
+  | NotEqual<CompareType>
+  | GreaterThan<CompareType>
+  | InBetween<CompareType>
   | Includes
   | Date
-  | LessThan
-  | LessThanOrEqual
-  | GreaterThanOrEqual
+  | LessThan<CompareType>
+  | LessThanOrEqual<CompareType>
+  | GreaterThanOrEqual<CompareType>
   | Array<number>
   | Array<string>
   | Array<ObjectID>

package/Models/DatabaseModels/Monitor.ts

@@ -709,6 +709,42 @@ export default class Monitor extends BaseModel {
   })
   public incomingRequestReceivedAt?: Date = undefined;
 
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectMonitor,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectMonitor,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateProjectMonitor,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.Date,
+    required: false,
+    isDefaultValueColumn: false,
+    title:
+      "When was the last time we checked the heartbeat for incoming request?",
+    description:
+      "This field is for Incoming Request monitor only. When was the last time we checked the heartbeat?",
+  })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public incomingRequestMonitorHeartbeatCheckedAt?: Date = undefined;
+
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,

package/Server/API/BaseAnalyticsAPI.ts

@@ -234,9 +234,7 @@ export default class BaseAnalyticsAPI<
     let groupBy: GroupBy<AnalyticsDataModel> = {};
 
     if (req.body) {
-      query = JSONFunctions.deserialize(
-        req.body["query"],
-      ) as Query<AnalyticsDataModel>;
+      query = JSONFunctions.deserialize(req.body["query"]) as Query<any>;
 
       select = JSONFunctions.deserialize(
         req.body["select"],
@@ -316,9 +314,7 @@ export default class BaseAnalyticsAPI<
     await this.onBeforeCount(req, res);
 
     if (req.body) {
-      query = JSONFunctions.deserialize(
-        req.body["query"],
-      ) as Query<AnalyticsDataModel>;
+      query = JSONFunctions.deserialize(req.body["query"]) as Query<any>;
     }
 
     const databaseProps: DatabaseCommonInteractionProps =

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

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1724078044172 implements MigrationInterface {
+  public name = "MigrationName1724078044172";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" ADD "incomingRequestMonitorHeartbeatCheckedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_62cf90e5fbcd9f3742ed35a2bb" ON "Monitor" ("incomingRequestMonitorHeartbeatCheckedAt") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_62cf90e5fbcd9f3742ed35a2bb"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" DROP COLUMN "incomingRequestMonitorHeartbeatCheckedAt"`,
+    );
+  }
+}

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

@@ -40,6 +40,7 @@ import { MigrationName1722543640526 } from "./1722543640526-MigrationName";
 import { MigrationName1722892318363 } from "./1722892318363-MigrationName";
 import { MigrationName1723825511054 } from "./1723825511054-MigrationName";
 import { MigrationName1723828588502 } from "./1723828588502-MigrationName";
+import { MigrationName1724078044172 } from "./1724078044172-MigrationName";
 
 export default [
   InitialMigration,
@@ -84,4 +85,5 @@ export default [
   MigrationName1722892318363,
   MigrationName1723825511054,
   MigrationName1723828588502,
+  MigrationName1724078044172,
 ];

package/Server/Services/AnalyticsDatabaseService.ts

@@ -208,8 +208,8 @@ export default class AnalyticsDatabaseService<
         aggregateBy.limit = 10;
       }
 
-      if (!aggregateBy.aggregateBy) {
-        throw new BadDataException("aggregateBy is required");
+      if (!aggregateBy.aggregationType) {
+        throw new BadDataException("aggregationType is required");
       }
 
       if (!aggregateBy.aggregationTimestampColumnName) {

package/Server/Services/DatabaseService.ts

@@ -18,7 +18,7 @@ import {
 } from "../Types/Database/Hooks";
 import ModelPermission from "../Types/Database/Permissions/Index";
 import { CheckReadPermissionType } from "../Types/Database/Permissions/ReadPermission";
-import Query, { FindWhere } from "../Types/Database/Query";
+import Query from "../Types/Database/Query";
 import QueryHelper from "../Types/Database/QueryHelper";
 import RelationSelect from "../Types/Database/RelationSelect";
 import SearchBy from "../Types/Database/SearchBy";
@@ -60,6 +60,7 @@ import API from "Common/Utils/API";
 import Slug from "Common/Utils/Slug";
 import { DataSource, Repository, SelectQueryBuilder } from "typeorm";
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
+import { FindWhere } from "../../Types/BaseDatabase/Query";
 
 class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
   public modelType!: { new (): TBaseModel };
@@ -691,7 +692,6 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
           [totalItemsColumnName]:
             createdBy.data.getColumnValue(totalItemsColumnName),
         } as FindWhere<TBaseModel>,
-
         skip: 0,
         limit: LIMIT_MAX,
         props: {

package/Server/Services/MonitorService.ts

@@ -49,6 +49,7 @@ import { SMSMessage } from "../../Types/SMS/SMS";
 import { CallRequestMessage } from "../../Types/Call/CallRequest";
 import UserNotificationSettingService from "./UserNotificationSettingService";
 import NotificationSettingEventType from "../../Types/NotificationSetting/NotificationSettingEventType";
+import Query from "../Types/Database/Query";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -126,6 +127,14 @@ export class Service extends DatabaseService<Model> {
     return { updateBy, carryForward: null };
   }
 
+  public getEnabledMonitorQuery(): Query<Model> {
+    return {
+      disableActiveMonitoring: false, // do not fetch if disabled is true.
+      disableActiveMonitoringBecauseOfManualIncident: false,
+      disableActiveMonitoringBecauseOfScheduledMaintenanceEvent: false,
+    };
+  }
+
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {

package/Server/Services/ProjectService.ts

@@ -48,8 +48,8 @@ import Team from "Common/Models/DatabaseModels/Team";
 import TeamMember from "Common/Models/DatabaseModels/TeamMember";
 import TeamPermission from "Common/Models/DatabaseModels/TeamPermission";
 import User from "Common/Models/DatabaseModels/User";
-import { In } from "typeorm";
 import Select from "../Types/Database/Select";
+import Query from "../Types/Database/Query";
 
 export interface CurrentPlan {
   plan: PlanType | null;
@@ -886,7 +886,7 @@ export class ProjectService extends DatabaseService<Model> {
       findBy.props.userGlobalAccessPermission?.projectIds.length === 0
     ) {
       findBy.props.isRoot = true;
-      findBy.query._id = In([]); // should not get any projects.
+      findBy.query._id = ObjectID.getZeroObjectID().toString(); // should not get any projects.
     }
 
     return { findBy, carryForward: null };
@@ -1114,6 +1114,20 @@ export class ProjectService extends DatabaseService<Model> {
     });
   }
 
+  public getActiveProjectStatusQuery(): Query<Model> {
+    return {
+      // get only active projects
+      paymentProviderSubscriptionStatus: QueryHelper.equalToOrNull([
+        SubscriptionStatus.Active,
+        SubscriptionStatus.Trialing,
+      ]),
+      paymentProviderMeteredSubscriptionStatus: QueryHelper.equalToOrNull([
+        SubscriptionStatus.Active,
+        SubscriptionStatus.Trialing,
+      ]),
+    };
+  }
+
   public async isSMSNotificationsEnabled(
     projectId: ObjectID,
   ): Promise<boolean> {

package/Server/Services/StatusPageHeaderLinkService.ts

@@ -192,7 +192,7 @@ export class Service extends DatabaseService<Model> {
     // get status page resource with this order.
     const resources: Array<Model> = await this.findBy({
       query: {
-        order: QueryHelper.greaterThanEqualTo(currentOrder),
+        order: QueryHelper.greaterThanEqualTo<number>(currentOrder),
         statusPageId: statusPageId,
       },
       limit: LIMIT_MAX,

package/Server/Types/AnalyticsDatabase/QueryHelper.ts

@@ -3,9 +3,10 @@ import InBetween from "Common/Types/BaseDatabase/InBetween";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import LessThan from "Common/Types/BaseDatabase/LessThan";
 import ObjectID from "Common/Types/ObjectID";
+import { CompareType } from "../../../Types/Database/CompareBase";
 
 export default class QueryHelper {
-  public static lessThan(value: Date | number): LessThan {
+  public static lessThan<T extends CompareType>(value: T): LessThan<T> {
     return new LessThan(value);
   }
 
@@ -13,14 +14,14 @@ export default class QueryHelper {
     return new Includes(values);
   }
 
-  public static greaterThan(value: Date | number): GreaterThan {
-    return new GreaterThan(value);
+  public static greaterThan<T extends CompareType>(value: T): GreaterThan<T> {
+    return new GreaterThan<T>(value);
   }
 
-  public static inBetween(
-    startValue: Date | number,
-    endValue: Date | number,
-  ): InBetween {
+  public static inBetween<T extends CompareType>(
+    startValue: T,
+    endValue: T,
+  ): InBetween<T> {
     return new InBetween(startValue, endValue);
   }
 }

package/Server/Types/Database/Query.ts

@@ -1,25 +1,11 @@
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import DatabaseProperty from "Common/Types/Database/DatabaseProperty";
-import { FindOperator, FindOptionsWhereProperty } from "typeorm";
+import BaseQuery, {
+  OrQuery as BaseQueryOrQuery,
+} from "../../../Types/BaseDatabase/Query";
 
-export declare type FindWhereProperty<Property> =
-  Property extends DatabaseProperty
-    ? Property | FindOperator<Property> | Array<Property>
-    : FindOptionsWhereProperty<Property>;
-/**
- * :
- * Used for find operations.
- */
-export declare type FindWhere<Entity> = {
-  [P in keyof Entity]?:
-    | FindWhereProperty<NonNullable<Entity[P]>>
-    | FindOperator<NonNullable<Entity[P]>>;
-};
+export declare type OrQuery<TBaseModel extends BaseModel> =
+  BaseQueryOrQuery<TBaseModel>;
 
-declare type Query<TBaseModel extends BaseModel> = FindWhere<TBaseModel>;
-
-export declare type OrQuery<TBaseModel extends BaseModel> = Array<
-  Query<TBaseModel>
->;
+declare type Query<TBaseModel extends BaseModel> = BaseQuery<TBaseModel>;
 
 export default Query;

package/Server/Types/Database/QueryHelper.ts

@@ -5,9 +5,12 @@ import ObjectID from "Common/Types/ObjectID";
 import Text from "Common/Types/Text";
 import Typeof from "Common/Types/Typeof";
 import { FindOperator, Raw } from "typeorm";
+import { FindWhereProperty } from "../../../Types/BaseDatabase/Query";
 
 export default class QueryHelper {
-  public static findWithSameText(text: string | number): FindOperator<any> {
+  public static findWithSameText(
+    text: string | number,
+  ): FindWhereProperty<any> {
     let isString: boolean = false;
 
     if (typeof text === Typeof.String) {
@@ -41,7 +44,7 @@ export default class QueryHelper {
 
   public static equalToOrNull(
     value: string | ObjectID | Array<string | ObjectID>,
-  ): FindOperator<any> {
+  ): FindWhereProperty<any> {
     const rid: Array<string> = [];
     const valuesObj: Dictionary<string> = {};
 
@@ -85,7 +88,7 @@ export default class QueryHelper {
     );
   }
 
-  public static notEquals(value: string | ObjectID): FindOperator<any> {
+  public static notEquals(value: string | ObjectID): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -97,7 +100,7 @@ export default class QueryHelper {
     );
   }
 
-  public static search(name: string): FindOperator<any> {
+  public static search(name: string): FindWhereProperty<any> {
     name = name.toLowerCase().trim();
     const rid: string = Text.generateRandomText(10);
     return Raw(
@@ -110,7 +113,7 @@ export default class QueryHelper {
     );
   }
 
-  public static all(values: Array<string | ObjectID>): FindOperator<any> {
+  public static all(values: Array<string | ObjectID>): FindWhereProperty<any> {
     values = values.map((value: string | ObjectID) => {
       return value.toString();
     });
@@ -134,13 +137,13 @@ export default class QueryHelper {
 
   public static any(
     values: Array<string | ObjectID | number>,
-  ): FindOperator<any> {
+  ): FindWhereProperty<any> {
     return this.in(values); // any and in are the same
   }
 
   private static in(
     values: Array<string | ObjectID | number>,
-  ): FindOperator<any> {
+  ): FindWhereProperty<any> {
     values = values.map((value: string | ObjectID | number) => {
       return value.toString();
     });
@@ -162,7 +165,9 @@ export default class QueryHelper {
     );
   }
 
-  public static notIn(values: Array<string | ObjectID>): FindOperator<any> {
+  public static notIn(
+    values: Array<string | ObjectID>,
+  ): FindWhereProperty<any> {
     values = values.map((value: string | ObjectID) => {
       return value.toString();
     });
@@ -186,7 +191,7 @@ export default class QueryHelper {
 
   public static notInOrNull(
     values: Array<string | ObjectID>,
-  ): FindOperator<any> {
+  ): FindWhereProperty<any> {
     values = values.map((value: string | ObjectID) => {
       return value.toString();
     });
@@ -220,7 +225,7 @@ export default class QueryHelper {
     });
   }
 
-  public static equalTo(value: string): FindOperator<any> {
+  public static equalTo(value: string): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -232,7 +237,9 @@ export default class QueryHelper {
     );
   }
 
-  public static greaterThanEqualTo(value: number | Date): FindOperator<any> {
+  public static greaterThanEqualTo<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -241,12 +248,12 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static greaterThanEqualToOrNull(
-    value: number | Date,
-  ): FindOperator<any> {
+  public static greaterThanEqualToOrNull<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -255,10 +262,12 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static lessThanEqualTo(value: number | Date): FindOperator<any> {
+  public static lessThanEqualTo<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -267,10 +276,12 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static lessThanEqualToOrNull(value: number | Date): FindOperator<any> {
+  public static lessThanEqualToOrNull<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -279,10 +290,12 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static greaterThan(value: number | Date): FindOperator<any> {
+  public static greaterThan<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<number | Date> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -291,10 +304,12 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static greaterThanOrNull(value: number | Date): FindOperator<any> {
+  public static greaterThanOrNull<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -303,13 +318,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static inBetween(
-    startValue: number | Date,
-    endValue: number | Date,
-  ): FindOperator<any> {
+  public static inBetween<T extends number | Date>(
+    startValue: T,
+    endValue: T,
+  ): FindWhereProperty<T> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -320,13 +335,13 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static inBetweenOrNull(
-    startValue: number | Date,
-    endValue: number | Date,
-  ): FindOperator<any> {
+  public static inBetweenOrNull<T extends number | Date>(
+    startValue: T,
+    endValue: T,
+  ): FindWhereProperty<T> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -337,13 +352,13 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static notInBetween(
-    startValue: number | Date,
-    endValue: number | Date,
-  ): FindOperator<any> {
+  public static notInBetween<T extends number | Date>(
+    startValue: T,
+    endValue: T,
+  ): FindWhereProperty<T> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -354,10 +369,10 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 
-  public static queryJson(value: JSONObject): FindOperator<any> {
+  public static queryJson(value: JSONObject): FindWhereProperty<any> {
     // seed random text
     const values: JSONObject = {};
 
@@ -407,7 +422,9 @@ export default class QueryHelper {
     }, values);
   }
 
-  public static lessThan(value: number | Date): FindOperator<any> {
+  public static lessThan<T extends number | Date>(
+    value: T,
+  ): FindWhereProperty<T> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -416,6 +433,6 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    );
+    ) as FindWhereProperty<T>;
   }
 }

package/Server/Types/Database/QueryUtil.ts

@@ -18,6 +18,7 @@ import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
 import Typeof from "Common/Types/Typeof";
 import { FindOperator } from "typeorm/find-options/FindOperator";
+import { CompareType } from "../../../Types/Database/CompareBase";
 
 export default class QueryUtil {
   public static serializeQuery<TBaseModel extends BaseModel>(
@@ -95,7 +96,7 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.search(
-          (query[key] as Search).toString() as any,
+          (query[key] as Search<string>).toString() as any,
         ) as any;
       } else if (
         query[key] &&
@@ -103,7 +104,7 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.lessThan(
-          (query[key] as LessThan).toString() as any,
+          (query[key] as LessThan<CompareType>).toString() as any,
         ) as any;
       } else if (
         query[key] &&
@@ -117,8 +118,8 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.inBetween(
-          (query[key] as InBetween).startValue as any,
-          (query[key] as InBetween).endValue as any,
+          (query[key] as InBetween<CompareType>).startValue as any,
+          (query[key] as InBetween<CompareType>).endValue as any,
         ) as any;
       } else if (
         query[key] &&
@@ -126,7 +127,7 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.greaterThan(
-          (query[key] as GreaterThan).toString() as any,
+          (query[key] as GreaterThan<CompareType>).toString() as any,
         ) as any;
       } else if (
         query[key] &&
@@ -147,7 +148,7 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.greaterThanEqualTo(
-          (query[key] as GreaterThanOrEqual).toString() as any,
+          (query[key] as GreaterThanOrEqual<CompareType>).toString() as any,
         ) as any;
       } else if (
         query[key] &&
@@ -155,7 +156,7 @@ export default class QueryUtil {
         tableColumnMetadata
       ) {
         query[key] = QueryHelper.lessThanEqualTo(
-          (query[key] as LessThanOrEqual).toString() as any,
+          (query[key] as LessThanOrEqual<CompareType>).toString() as any,
         ) as any;
       } else if (
         query[key] &&

package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts

@@ -538,7 +538,7 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
     const selectStatement: Statement = new Statement();
 
     const aggregationMethod: string =
-      aggregateBy.aggregateBy.toLocaleLowerCase();
+      aggregateBy.aggregationType.toLocaleLowerCase();
     const aggregationInterval: string = AggregateUtil.getAggregationInterval({
       startDate: aggregateBy.startTimestamp!,
       endDate: aggregateBy.endTimestamp!,