From 2e2ade0b169ec81e669d5cc83266ab28540e962d Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Mon, 5 Aug 2024 12:08:45 -0600 Subject: [PATCH] refactor: Update import statements for BaseModel in JSONFunctions and BaseModel in UserModel --- Common/Models/AnalyticsModels/Index.ts | 2 +- Common/Models/AnalyticsModels/Log.ts | 2 +- Common/Models/AnalyticsModels/Metric.ts | 2 +- .../AnalyticsModels/MonitorMetricsByMinute.ts | 2 +- .../NestedModels/KeyValueNestedModel.ts | 2 +- Common/Models/AnalyticsModels/Span.ts | 2 +- .../AnalyticsModels/TelemetryAttribute.ts | 2 +- .../Models/DatabaseModels/AcmeCertificate.ts | 2 +- Common/Models/DatabaseModels/AcmeChallenge.ts | 2 +- Common/Models/DatabaseModels/ApiKey.ts | 2 +- .../Models/DatabaseModels/ApiKeyPermission.ts | 2 +- .../Models/DatabaseModels/BillingInvoice.ts | 2 +- .../DatabaseModels/BillingPaymentMethod.ts | 2 +- Common/Models/DatabaseModels/CallLog.ts | 2 +- Common/Models/DatabaseModels/CopilotAction.ts | 2 +- .../DatabaseModels/CopilotCodeRepository.ts | 2 +- .../DatabaseModels/CopilotPullRequest.ts | 2 +- Common/Models/DatabaseModels/DataMigration.ts | 2 +- .../DatabaseBaseModel/DatabaseBaseModel.ts | 50 ++++++++++--------- Common/Models/DatabaseModels/Domain.ts | 2 +- Common/Models/DatabaseModels/EmailLog.ts | 2 +- .../DatabaseModels/EmailVerificationToken.ts | 2 +- Common/Models/DatabaseModels/File.ts | 2 +- .../DatabaseModels/GreenlockCertificate.ts | 2 +- .../DatabaseModels/GreenlockChallenge.ts | 2 +- Common/Models/DatabaseModels/Incident.ts | 2 +- .../DatabaseModels/IncidentCustomField.ts | 2 +- .../DatabaseModels/IncidentInternalNote.ts | 2 +- .../DatabaseModels/IncidentNoteTemplate.ts | 2 +- .../DatabaseModels/IncidentOwnerTeam.ts | 2 +- .../DatabaseModels/IncidentOwnerUser.ts | 2 +- .../DatabaseModels/IncidentPublicNote.ts | 2 +- .../Models/DatabaseModels/IncidentSeverity.ts | 2 +- Common/Models/DatabaseModels/IncidentState.ts | 2 +- .../DatabaseModels/IncidentStateTimeline.ts | 2 +- .../Models/DatabaseModels/IncidentTemplate.ts | 2 +- .../IncidentTemplateOwnerTeam.ts | 2 +- .../IncidentTemplateOwnerUser.ts | 2 +- Common/Models/DatabaseModels/Label.ts | 2 +- Common/Models/DatabaseModels/Monitor.ts | 2 +- .../DatabaseModels/MonitorCustomField.ts | 2 +- Common/Models/DatabaseModels/MonitorGroup.ts | 2 +- .../DatabaseModels/MonitorGroupOwnerTeam.ts | 2 +- .../DatabaseModels/MonitorGroupOwnerUser.ts | 2 +- .../DatabaseModels/MonitorGroupResource.ts | 2 +- .../Models/DatabaseModels/MonitorOwnerTeam.ts | 2 +- .../Models/DatabaseModels/MonitorOwnerUser.ts | 2 +- Common/Models/DatabaseModels/MonitorProbe.ts | 2 +- Common/Models/DatabaseModels/MonitorSecret.ts | 2 +- Common/Models/DatabaseModels/MonitorStatus.ts | 2 +- .../DatabaseModels/MonitorStatusTimeline.ts | 2 +- .../Models/DatabaseModels/OnCallDutyPolicy.ts | 2 +- .../OnCallDutyPolicyCustomField.ts | 2 +- .../OnCallDutyPolicyEscalationRule.ts | 2 +- .../OnCallDutyPolicyEscalationRuleSchedule.ts | 2 +- .../OnCallDutyPolicyEscalationRuleTeam.ts | 2 +- .../OnCallDutyPolicyEscalationRuleUser.ts | 2 +- .../OnCallDutyPolicyExecutionLog.ts | 2 +- .../OnCallDutyPolicyExecutionLogTimeline.ts | 2 +- .../OnCallDutyPolicySchedule.ts | 2 +- .../OnCallDutyPolicyScheduleLayer.ts | 2 +- .../OnCallDutyPolicyScheduleLayerUser.ts | 2 +- Common/Models/DatabaseModels/Probe.ts | 2 +- .../Models/DatabaseModels/ProbeOwnerTeam.ts | 2 +- .../Models/DatabaseModels/ProbeOwnerUser.ts | 2 +- .../DatabaseModels/ProjectCallSMSConfig.ts | 2 +- .../DatabaseModels/ProjectSmtpConfig.ts | 2 +- Common/Models/DatabaseModels/ProjectSso.ts | 2 +- Common/Models/DatabaseModels/PromoCode.ts | 2 +- Common/Models/DatabaseModels/Reseller.ts | 2 +- Common/Models/DatabaseModels/ResellerPlan.ts | 2 +- .../DatabaseModels/ScheduledMaintenance.ts | 2 +- .../ScheduledMaintenanceCustomField.ts | 2 +- .../ScheduledMaintenanceInternalNote.ts | 2 +- .../ScheduledMaintenanceNoteTemplate.ts | 2 +- .../ScheduledMaintenanceOwnerTeam.ts | 2 +- .../ScheduledMaintenanceOwnerUser.ts | 2 +- .../ScheduledMaintenancePublicNote.ts | 2 +- .../ScheduledMaintenanceState.ts | 2 +- .../ScheduledMaintenanceStateTimeline.ts | 2 +- .../Models/DatabaseModels/ServiceCatalog.ts | 2 +- .../ServiceCatalogDependency.ts | 2 +- .../DatabaseModels/ServiceCatalogMonitor.ts | 2 +- .../DatabaseModels/ServiceCatalogOwnerTeam.ts | 2 +- .../DatabaseModels/ServiceCatalogOwnerUser.ts | 2 +- .../ServiceCatalogTelemetryService.ts | 2 +- .../ServiceCopilotCodeRepository.ts | 2 +- Common/Models/DatabaseModels/ShortLink.ts | 2 +- Common/Models/DatabaseModels/SmsLog.ts | 2 +- Common/Models/DatabaseModels/StatusPage.ts | 2 +- .../DatabaseModels/StatusPageAnnouncement.ts | 2 +- .../DatabaseModels/StatusPageCustomField.ts | 2 +- .../Models/DatabaseModels/StatusPageDomain.ts | 2 +- .../DatabaseModels/StatusPageFooterLink.ts | 2 +- .../Models/DatabaseModels/StatusPageGroup.ts | 2 +- .../DatabaseModels/StatusPageHeaderLink.ts | 2 +- .../StatusPageHistoryChartBarColorRule.ts | 2 +- .../DatabaseModels/StatusPageOwnerTeam.ts | 2 +- .../DatabaseModels/StatusPageOwnerUser.ts | 2 +- .../DatabaseModels/StatusPagePrivateUser.ts | 2 +- .../DatabaseModels/StatusPageResource.ts | 2 +- Common/Models/DatabaseModels/StatusPageSso.ts | 2 +- .../DatabaseModels/StatusPageSubscriber.ts | 2 +- Common/Models/DatabaseModels/Team.ts | 2 +- Common/Models/DatabaseModels/TeamMember.ts | 2 +- .../Models/DatabaseModels/TeamPermission.ts | 2 +- .../DatabaseModels/TelemetryIngestionKey.ts | 2 +- .../Models/DatabaseModels/TelemetryService.ts | 2 +- .../DatabaseModels/TelemetryUsageBilling.ts | 2 +- Common/Models/DatabaseModels/User.ts | 2 +- Common/Models/DatabaseModels/UserCall.ts | 2 +- Common/Models/DatabaseModels/UserEmail.ts | 2 +- .../DatabaseModels/UserNotificationRule.ts | 2 +- .../DatabaseModels/UserNotificationSetting.ts | 2 +- Common/Models/DatabaseModels/UserOnCallLog.ts | 2 +- .../DatabaseModels/UserOnCallLogTimeline.ts | 2 +- Common/Models/DatabaseModels/UserSMS.ts | 2 +- .../DatabaseModels/UserTwoFactorAuth.ts | 2 +- Common/Models/DatabaseModels/Workflow.ts | 2 +- Common/Models/DatabaseModels/WorkflowLog.ts | 2 +- .../Models/DatabaseModels/WorkflowVariable.ts | 2 +- Common/Tests/AppModels/File.test.ts | 4 +- Common/Tests/Types/JSONFunctions.test.ts | 2 +- Common/Types/API/HTTPResponse.ts | 2 +- Common/Types/AnalyticsDatabase/TableColumn.ts | 2 +- .../AccessControl/ColumnAccessControl.ts | 2 +- .../ColumnBillingAccessControl.ts | 2 +- Common/Types/Database/TableColumn.ts | 4 +- Common/Types/Database/UniqueColumnBy.ts | 2 +- Common/Types/JSONFunctions.ts | 2 +- Common/Types/OnCallDutyPolicy/Layer.ts | 2 +- Common/Types/Workflow/Components/BaseModel.ts | 2 +- Common/Utils/API.ts | 2 +- Common/Utils/Uptime/UptimeUtil.ts | 6 +-- .../Permissions/AccessControlPermission.ts | 6 +-- .../Database/Permissions/BillingPermission.ts | 4 +- .../Database/Permissions/PublicPermission.ts | 6 +-- .../Database/Permissions/QueryPermission.ts | 6 +-- .../Database/Permissions/SelectPermission.ts | 4 +- .../Database/Permissions/TablePermission.ts | 8 +-- CommonServer/Types/Database/SelectUtil.ts | 4 +- CommonServer/Utils/Realtime.ts | 4 +- CommonServer/Utils/Response.ts | 6 +-- .../CustomFields/CustomFieldsDetail.tsx | 6 +-- CommonUI/src/Components/Forms/Types/Field.ts | 4 +- CommonUI/src/Components/ModelFilter/Filter.ts | 4 +- .../ModelTable/AnalyticsModelTable.tsx | 4 +- .../Components/ModelTable/BaseModelTable.tsx | 8 +-- .../src/Components/ModelTable/ModelTable.tsx | 4 +- .../NotificationMethod.tsx | 4 +- 150 files changed, 204 insertions(+), 202 deletions(-) diff --git a/Common/Models/AnalyticsModels/Index.ts b/Common/Models/AnalyticsModels/Index.ts index 0c7c529221..d8454acea0 100644 --- a/Common/Models/AnalyticsModels/Index.ts +++ b/Common/Models/AnalyticsModels/Index.ts @@ -1,8 +1,8 @@ +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Log from "./Log"; import Metric from "./Metric"; import MonitorMetricsByMinute from "./MonitorMetricsByMinute"; import Span from "./Span"; -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; import TelemetryAttribute from "./TelemetryAttribute"; const AnalyticsModels: Array = [ diff --git a/Common/Models/AnalyticsModels/Log.ts b/Common/Models/AnalyticsModels/Log.ts index 76f59a0f3d..163d585328 100644 --- a/Common/Models/AnalyticsModels/Log.ts +++ b/Common/Models/AnalyticsModels/Log.ts @@ -1,4 +1,4 @@ -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Route from "../../Types/API/Route"; import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; diff --git a/Common/Models/AnalyticsModels/Metric.ts b/Common/Models/AnalyticsModels/Metric.ts index 9fe3d48b41..f58c6327c4 100644 --- a/Common/Models/AnalyticsModels/Metric.ts +++ b/Common/Models/AnalyticsModels/Metric.ts @@ -1,4 +1,4 @@ -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Route from "../../Types/API/Route"; import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; diff --git a/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts b/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts index 1a64036498..5983d567e5 100644 --- a/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts +++ b/Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts @@ -1,4 +1,4 @@ -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Route from "../../Types/API/Route"; import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; diff --git a/Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts b/Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts index b23769334c..297ee2d66c 100644 --- a/Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts +++ b/Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts @@ -1,6 +1,6 @@ -import NestedModel from "../../BaseModels/AnalyticsBaseModel/NestedModel"; import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn"; import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType"; +import NestedModel from "../AnalyticsBaseModel/NestedModel"; export default class KeyValueNestedModel extends NestedModel { public constructor() { diff --git a/Common/Models/AnalyticsModels/Span.ts b/Common/Models/AnalyticsModels/Span.ts index 764c6cfd54..4fce909689 100644 --- a/Common/Models/AnalyticsModels/Span.ts +++ b/Common/Models/AnalyticsModels/Span.ts @@ -1,4 +1,4 @@ -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Route from "../../Types/API/Route"; import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; diff --git a/Common/Models/AnalyticsModels/TelemetryAttribute.ts b/Common/Models/AnalyticsModels/TelemetryAttribute.ts index d641f4b650..78d874b6ae 100644 --- a/Common/Models/AnalyticsModels/TelemetryAttribute.ts +++ b/Common/Models/AnalyticsModels/TelemetryAttribute.ts @@ -1,4 +1,4 @@ -import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel"; +import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel"; import Route from "../../Types/API/Route"; import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine"; import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; diff --git a/Common/Models/DatabaseModels/AcmeCertificate.ts b/Common/Models/DatabaseModels/AcmeCertificate.ts index 6a545e16d4..8d0d1e11ba 100644 --- a/Common/Models/DatabaseModels/AcmeCertificate.ts +++ b/Common/Models/DatabaseModels/AcmeCertificate.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import ColumnLength from "../../Types/Database/ColumnLength"; diff --git a/Common/Models/DatabaseModels/AcmeChallenge.ts b/Common/Models/DatabaseModels/AcmeChallenge.ts index a0a7d2c8ad..0345a39c3f 100644 --- a/Common/Models/DatabaseModels/AcmeChallenge.ts +++ b/Common/Models/DatabaseModels/AcmeChallenge.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import ColumnLength from "../../Types/Database/ColumnLength"; diff --git a/Common/Models/DatabaseModels/ApiKey.ts b/Common/Models/DatabaseModels/ApiKey.ts index f7ca44f0b4..2d58121cfe 100644 --- a/Common/Models/DatabaseModels/ApiKey.ts +++ b/Common/Models/DatabaseModels/ApiKey.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ApiKeyPermission.ts b/Common/Models/DatabaseModels/ApiKeyPermission.ts index 8404bf24db..06e91dd0e0 100644 --- a/Common/Models/DatabaseModels/ApiKeyPermission.ts +++ b/Common/Models/DatabaseModels/ApiKeyPermission.ts @@ -2,7 +2,7 @@ import ApiKey from "./ApiKey"; import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/BillingInvoice.ts b/Common/Models/DatabaseModels/BillingInvoice.ts index f80e48e2b5..fb366edef0 100644 --- a/Common/Models/DatabaseModels/BillingInvoice.ts +++ b/Common/Models/DatabaseModels/BillingInvoice.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; diff --git a/Common/Models/DatabaseModels/BillingPaymentMethod.ts b/Common/Models/DatabaseModels/BillingPaymentMethod.ts index ab9b729acd..9730905006 100644 --- a/Common/Models/DatabaseModels/BillingPaymentMethod.ts +++ b/Common/Models/DatabaseModels/BillingPaymentMethod.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/CallLog.ts b/Common/Models/DatabaseModels/CallLog.ts index 2662f583cf..0a34fa2537 100644 --- a/Common/Models/DatabaseModels/CallLog.ts +++ b/Common/Models/DatabaseModels/CallLog.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import CallStatus from "../../Types/Call/CallStatus"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/CopilotAction.ts b/Common/Models/DatabaseModels/CopilotAction.ts index 8d853c636d..360db862fb 100644 --- a/Common/Models/DatabaseModels/CopilotAction.ts +++ b/Common/Models/DatabaseModels/CopilotAction.ts @@ -3,7 +3,7 @@ import Project from "./Project"; import ServiceCatalog from "./ServiceCatalog"; import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import CopilotActionStatus from "../../Types/Copilot/CopilotActionStatus"; import CopilotActionType from "../../Types/Copilot/CopilotActionType"; diff --git a/Common/Models/DatabaseModels/CopilotCodeRepository.ts b/Common/Models/DatabaseModels/CopilotCodeRepository.ts index b54a8f2c11..38015abd7c 100644 --- a/Common/Models/DatabaseModels/CopilotCodeRepository.ts +++ b/Common/Models/DatabaseModels/CopilotCodeRepository.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CodeRepositoryType from "../../Types/CodeRepository/CodeRepositoryType"; diff --git a/Common/Models/DatabaseModels/CopilotPullRequest.ts b/Common/Models/DatabaseModels/CopilotPullRequest.ts index 5792fb97f2..583981b9c3 100644 --- a/Common/Models/DatabaseModels/CopilotPullRequest.ts +++ b/Common/Models/DatabaseModels/CopilotPullRequest.ts @@ -3,7 +3,7 @@ import Project from "./Project"; import ServiceCatalog from "./ServiceCatalog"; import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import PullRequestState from "../../Types/CodeRepository/PullRequestState"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/DataMigration.ts b/Common/Models/DatabaseModels/DataMigration.ts index 2270e50f95..d0d27f731f 100644 --- a/Common/Models/DatabaseModels/DataMigration.ts +++ b/Common/Models/DatabaseModels/DataMigration.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import ColumnLength from "../../Types/Database/ColumnLength"; diff --git a/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts b/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts index e1a9a4dbae..ab44dbee42 100644 --- a/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts +++ b/Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts @@ -34,7 +34,7 @@ import { VersionColumn, } from "typeorm"; -export type BaseModelType = { new (): BaseModel }; + export type DbTypes = | string @@ -49,7 +49,7 @@ export type DbTypes = | JSONArray | Buffer; -export default class BaseModel extends BaseEntity { +export default class DatabaseBaseModel extends BaseEntity { @TableColumn({ title: "ID", type: TableColumnType.ObjectID, @@ -348,7 +348,7 @@ export default class BaseModel extends BaseEntity { public getColumnValue( columnName: string, - ): JSONValue | BaseModel | Array | null { + ): JSONValue | DatabaseBaseModel | Array | null { if (getTableColumn(this, columnName) && (this as any)[columnName]) { return (this as any)[columnName] as JSONValue; } @@ -358,7 +358,7 @@ export default class BaseModel extends BaseEntity { public setColumnValue( columnName: string, - value: JSONValue | BaseModel | Array, + value: JSONValue | DatabaseBaseModel | Array, ): void { if (getTableColumn(this, columnName)) { return ((this as any)[columnName] = value as any); @@ -412,7 +412,7 @@ export default class BaseModel extends BaseEntity { return false; } - const fileModel: BaseModel = new tableColumnType.modelType(); + const fileModel: DatabaseBaseModel = new tableColumnType.modelType(); if (fileModel.isFileModel()) { return true; @@ -547,18 +547,18 @@ export default class BaseModel extends BaseEntity { return Text.pascalCaseToDashes(this.tableName as string); } - public static toJSON(model: BaseModel, modelType: BaseModelType): JSONObject { + public static toJSON(model: DatabaseBaseModel, modelType: DatabaseBaseModelType): JSONObject { const json: JSONObject = this.toJSONObject(model, modelType); return JSONFunctions.serialize(json); } public static toJSONObject( - model: BaseModel, - modelType: BaseModelType, + model: DatabaseBaseModel, + modelType: DatabaseBaseModelType, ): JSONObject { const json: JSONObject = {}; - const vanillaModel: BaseModel = new modelType(); + const vanillaModel: DatabaseBaseModel = new modelType(); for (const key of vanillaModel.getTableColumns().columns) { if ((model as any)[key] === undefined) { @@ -573,7 +573,7 @@ export default class BaseModel extends BaseEntity { (model as any)[key] && tableColumnMetadata.modelType && tableColumnMetadata.type === TableColumnType.Entity && - (model as any)[key] instanceof BaseModel + (model as any)[key] instanceof DatabaseBaseModel ) { (json as any)[key] = this.toJSONObject( (model as any)[key], @@ -587,7 +587,7 @@ export default class BaseModel extends BaseEntity { tableColumnMetadata.type === TableColumnType.EntityArray ) { (json as any)[key] = this.toJSONObjectArray( - (model as any)[key] as Array, + (model as any)[key] as Array, tableColumnMetadata.modelType, ); } else { @@ -600,8 +600,8 @@ export default class BaseModel extends BaseEntity { } public static toJSONObjectArray( - list: Array, - modelType: BaseModelType, + list: Array, + modelType: DatabaseBaseModelType, ): JSONArray { const array: JSONArray = []; @@ -613,8 +613,8 @@ export default class BaseModel extends BaseEntity { } public static toJSONArray( - list: Array, - modelType: BaseModelType, + list: Array, + modelType: DatabaseBaseModelType, ): JSONArray { const array: JSONArray = []; @@ -625,11 +625,11 @@ export default class BaseModel extends BaseEntity { return array; } - private static _fromJSON( + private static _fromJSON( json: JSONObject | T, type: { new (): T }, ): T { - if (json instanceof BaseModel) { + if (json instanceof DatabaseBaseModel) { return json; } @@ -679,15 +679,15 @@ export default class BaseModel extends BaseEntity { return baseModel as T; } - public static fromJSON( - json: JSONObject | JSONArray | BaseModel | Array, + public static fromJSON( + json: JSONObject | JSONArray | DatabaseBaseModel | Array, type: { new (): T }, ): T | Array { if (Array.isArray(json)) { const arr: Array = []; for (const item of json) { - if (item instanceof BaseModel) { + if (item instanceof DatabaseBaseModel) { arr.push(item as T); continue; } @@ -698,25 +698,25 @@ export default class BaseModel extends BaseEntity { return arr; } - if (json instanceof BaseModel) { + if (json instanceof DatabaseBaseModel) { return json as T; } return this._fromJSON(json, type); } - public static fromJSONObject( + public static fromJSONObject( json: JSONObject | T, type: { new (): T }, ): T { - if (json instanceof BaseModel) { + if (json instanceof DatabaseBaseModel) { return json; } return this.fromJSON(json, type) as T; } - public static fromJSONArray( + public static fromJSONArray( json: Array, type: { new (): T }, ): Array { @@ -729,3 +729,5 @@ export default class BaseModel extends BaseEntity { return arr; } } + +export type DatabaseBaseModelType = { new (): DatabaseBaseModel }; diff --git a/Common/Models/DatabaseModels/Domain.ts b/Common/Models/DatabaseModels/Domain.ts index cbdf19682f..75f621b74e 100644 --- a/Common/Models/DatabaseModels/Domain.ts +++ b/Common/Models/DatabaseModels/Domain.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/EmailLog.ts b/Common/Models/DatabaseModels/EmailLog.ts index feabf75e51..241336f3ef 100644 --- a/Common/Models/DatabaseModels/EmailLog.ts +++ b/Common/Models/DatabaseModels/EmailLog.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import ProjectSmtpConfig from "./ProjectSmtpConfig"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/EmailVerificationToken.ts b/Common/Models/DatabaseModels/EmailVerificationToken.ts index c82355f6e1..a1768c3691 100755 --- a/Common/Models/DatabaseModels/EmailVerificationToken.ts +++ b/Common/Models/DatabaseModels/EmailVerificationToken.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/File.ts b/Common/Models/DatabaseModels/File.ts index 4eb486b397..85e4200f8e 100644 --- a/Common/Models/DatabaseModels/File.ts +++ b/Common/Models/DatabaseModels/File.ts @@ -1,4 +1,4 @@ -import FileModel from "../BaseModels/BaseModel/FileModel"; +import FileModel from "./DatabaseBaseModel/FileModel"; import Route from "../../Types/API/Route"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint"; diff --git a/Common/Models/DatabaseModels/GreenlockCertificate.ts b/Common/Models/DatabaseModels/GreenlockCertificate.ts index 3aa453fe91..ff791f61ea 100644 --- a/Common/Models/DatabaseModels/GreenlockCertificate.ts +++ b/Common/Models/DatabaseModels/GreenlockCertificate.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import ColumnLength from "../../Types/Database/ColumnLength"; diff --git a/Common/Models/DatabaseModels/GreenlockChallenge.ts b/Common/Models/DatabaseModels/GreenlockChallenge.ts index 1c61d27616..145fd9e49a 100644 --- a/Common/Models/DatabaseModels/GreenlockChallenge.ts +++ b/Common/Models/DatabaseModels/GreenlockChallenge.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; import ColumnLength from "../../Types/Database/ColumnLength"; diff --git a/Common/Models/DatabaseModels/Incident.ts b/Common/Models/DatabaseModels/Incident.ts index 7cff97277b..de522127e2 100644 --- a/Common/Models/DatabaseModels/Incident.ts +++ b/Common/Models/DatabaseModels/Incident.ts @@ -7,7 +7,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy"; import Probe from "./Probe"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentCustomField.ts b/Common/Models/DatabaseModels/IncidentCustomField.ts index de1a11cccd..caa185b00b 100644 --- a/Common/Models/DatabaseModels/IncidentCustomField.ts +++ b/Common/Models/DatabaseModels/IncidentCustomField.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CustomFieldType from "../../Types/CustomField/CustomFieldType"; diff --git a/Common/Models/DatabaseModels/IncidentInternalNote.ts b/Common/Models/DatabaseModels/IncidentInternalNote.ts index c929660f98..edd2a16bda 100644 --- a/Common/Models/DatabaseModels/IncidentInternalNote.ts +++ b/Common/Models/DatabaseModels/IncidentInternalNote.ts @@ -1,7 +1,7 @@ import Incident from "./Incident"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentNoteTemplate.ts b/Common/Models/DatabaseModels/IncidentNoteTemplate.ts index 09c4454ce3..7bbffc40b7 100644 --- a/Common/Models/DatabaseModels/IncidentNoteTemplate.ts +++ b/Common/Models/DatabaseModels/IncidentNoteTemplate.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentOwnerTeam.ts b/Common/Models/DatabaseModels/IncidentOwnerTeam.ts index 0c6d2cbbd6..85050ca095 100644 --- a/Common/Models/DatabaseModels/IncidentOwnerTeam.ts +++ b/Common/Models/DatabaseModels/IncidentOwnerTeam.ts @@ -2,7 +2,7 @@ import Incident from "./Incident"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentOwnerUser.ts b/Common/Models/DatabaseModels/IncidentOwnerUser.ts index 3b1bcda007..00c6235aad 100644 --- a/Common/Models/DatabaseModels/IncidentOwnerUser.ts +++ b/Common/Models/DatabaseModels/IncidentOwnerUser.ts @@ -1,7 +1,7 @@ import Incident from "./Incident"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentPublicNote.ts b/Common/Models/DatabaseModels/IncidentPublicNote.ts index 51d73c5fdd..20e8af33cc 100644 --- a/Common/Models/DatabaseModels/IncidentPublicNote.ts +++ b/Common/Models/DatabaseModels/IncidentPublicNote.ts @@ -1,7 +1,7 @@ import Incident from "./Incident"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentSeverity.ts b/Common/Models/DatabaseModels/IncidentSeverity.ts index 5d0e710815..56c19306bb 100644 --- a/Common/Models/DatabaseModels/IncidentSeverity.ts +++ b/Common/Models/DatabaseModels/IncidentSeverity.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/IncidentState.ts b/Common/Models/DatabaseModels/IncidentState.ts index 8e24c8b4ff..bcfefb5d48 100644 --- a/Common/Models/DatabaseModels/IncidentState.ts +++ b/Common/Models/DatabaseModels/IncidentState.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/IncidentStateTimeline.ts b/Common/Models/DatabaseModels/IncidentStateTimeline.ts index 4feb1256fd..825eb31156 100644 --- a/Common/Models/DatabaseModels/IncidentStateTimeline.ts +++ b/Common/Models/DatabaseModels/IncidentStateTimeline.ts @@ -2,7 +2,7 @@ import Incident from "./Incident"; import IncidentState from "./IncidentState"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentTemplate.ts b/Common/Models/DatabaseModels/IncidentTemplate.ts index e1f8c8180b..b411b4faf0 100644 --- a/Common/Models/DatabaseModels/IncidentTemplate.ts +++ b/Common/Models/DatabaseModels/IncidentTemplate.ts @@ -6,7 +6,7 @@ import MonitorStatus from "./MonitorStatus"; import OnCallDutyPolicy from "./OnCallDutyPolicy"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts b/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts index d91d175db3..285472c11b 100644 --- a/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts +++ b/Common/Models/DatabaseModels/IncidentTemplateOwnerTeam.ts @@ -2,7 +2,7 @@ import IncidentTemplate from "./IncidentTemplate"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts b/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts index 81498b03d0..a7dabf7309 100644 --- a/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts +++ b/Common/Models/DatabaseModels/IncidentTemplateOwnerUser.ts @@ -1,7 +1,7 @@ import IncidentTemplate from "./IncidentTemplate"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/Label.ts b/Common/Models/DatabaseModels/Label.ts index a15c3d907e..aef3791aec 100644 --- a/Common/Models/DatabaseModels/Label.ts +++ b/Common/Models/DatabaseModels/Label.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import AccessControlModel from "../BaseModels/BaseModel/AccessControlModel"; +import AccessControlModel from "./DatabaseBaseModel/AccessControlModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/Monitor.ts b/Common/Models/DatabaseModels/Monitor.ts index 72f7476241..076a3dce26 100644 --- a/Common/Models/DatabaseModels/Monitor.ts +++ b/Common/Models/DatabaseModels/Monitor.ts @@ -2,7 +2,7 @@ import Label from "./Label"; import MonitorStatus from "./MonitorStatus"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorCustomField.ts b/Common/Models/DatabaseModels/MonitorCustomField.ts index 447cfef442..1c118a7a1e 100644 --- a/Common/Models/DatabaseModels/MonitorCustomField.ts +++ b/Common/Models/DatabaseModels/MonitorCustomField.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CustomFieldType from "../../Types/CustomField/CustomFieldType"; diff --git a/Common/Models/DatabaseModels/MonitorGroup.ts b/Common/Models/DatabaseModels/MonitorGroup.ts index a3ca28eb60..0be1982fab 100644 --- a/Common/Models/DatabaseModels/MonitorGroup.ts +++ b/Common/Models/DatabaseModels/MonitorGroup.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts b/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts index 9c874d0932..418b10ce14 100644 --- a/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts +++ b/Common/Models/DatabaseModels/MonitorGroupOwnerTeam.ts @@ -2,7 +2,7 @@ import MonitorGroup from "./MonitorGroup"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorGroupOwnerUser.ts b/Common/Models/DatabaseModels/MonitorGroupOwnerUser.ts index 0b3381fbd2..bfe30fffed 100644 --- a/Common/Models/DatabaseModels/MonitorGroupOwnerUser.ts +++ b/Common/Models/DatabaseModels/MonitorGroupOwnerUser.ts @@ -1,7 +1,7 @@ import MonitorGroup from "./MonitorGroup"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorGroupResource.ts b/Common/Models/DatabaseModels/MonitorGroupResource.ts index 145ca212a1..4e5db420b7 100644 --- a/Common/Models/DatabaseModels/MonitorGroupResource.ts +++ b/Common/Models/DatabaseModels/MonitorGroupResource.ts @@ -2,7 +2,7 @@ import Monitor from "./Monitor"; import MonitorGroup from "./MonitorGroup"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorOwnerTeam.ts b/Common/Models/DatabaseModels/MonitorOwnerTeam.ts index 76fafb6ba4..939b6dda05 100644 --- a/Common/Models/DatabaseModels/MonitorOwnerTeam.ts +++ b/Common/Models/DatabaseModels/MonitorOwnerTeam.ts @@ -2,7 +2,7 @@ import Monitor from "./Monitor"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorOwnerUser.ts b/Common/Models/DatabaseModels/MonitorOwnerUser.ts index 3e742a20ff..0dcdd9d556 100644 --- a/Common/Models/DatabaseModels/MonitorOwnerUser.ts +++ b/Common/Models/DatabaseModels/MonitorOwnerUser.ts @@ -1,7 +1,7 @@ import Monitor from "./Monitor"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorProbe.ts b/Common/Models/DatabaseModels/MonitorProbe.ts index 9975cd4a76..2467463bae 100644 --- a/Common/Models/DatabaseModels/MonitorProbe.ts +++ b/Common/Models/DatabaseModels/MonitorProbe.ts @@ -2,7 +2,7 @@ import Monitor from "./Monitor"; import Probe from "./Probe"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorSecret.ts b/Common/Models/DatabaseModels/MonitorSecret.ts index ac209694f4..5eff475df0 100644 --- a/Common/Models/DatabaseModels/MonitorSecret.ts +++ b/Common/Models/DatabaseModels/MonitorSecret.ts @@ -1,7 +1,7 @@ import Monitor from "./Monitor"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/MonitorStatus.ts b/Common/Models/DatabaseModels/MonitorStatus.ts index 3a73ee34af..ca1880713a 100644 --- a/Common/Models/DatabaseModels/MonitorStatus.ts +++ b/Common/Models/DatabaseModels/MonitorStatus.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/MonitorStatusTimeline.ts b/Common/Models/DatabaseModels/MonitorStatusTimeline.ts index 159a2947bd..0777c949c0 100644 --- a/Common/Models/DatabaseModels/MonitorStatusTimeline.ts +++ b/Common/Models/DatabaseModels/MonitorStatusTimeline.ts @@ -2,7 +2,7 @@ import Monitor from "./Monitor"; import MonitorStatus from "./MonitorStatus"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicy.ts b/Common/Models/DatabaseModels/OnCallDutyPolicy.ts index 9a9916e9f2..b36e3ccc86 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicy.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicy.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyCustomField.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyCustomField.ts index 2a3358dc36..24621535c7 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyCustomField.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyCustomField.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CustomFieldType from "../../Types/CustomField/CustomFieldType"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule.ts index 7f53f9227c..1a309c2f1e 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule.ts @@ -1,7 +1,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule.ts index f2695653ef..e67f82df6c 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule.ts @@ -3,7 +3,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule"; import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam.ts index 62e7b41921..bb97c47c3a 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam.ts @@ -3,7 +3,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser.ts index abb3a5613e..6420e49077 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser.ts @@ -2,7 +2,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy"; import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts index 91f1973d8a..93cf76092d 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog.ts @@ -4,7 +4,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts index a0516b1712..4447e86329 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts @@ -6,7 +6,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicySchedule.ts b/Common/Models/DatabaseModels/OnCallDutyPolicySchedule.ts index d1c04b9a00..12132a4b3b 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicySchedule.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicySchedule.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer.ts index ddd8acf488..e0a3b1f613 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer.ts @@ -1,7 +1,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser.ts b/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser.ts index 50bde15f82..354f489388 100644 --- a/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser.ts +++ b/Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser.ts @@ -2,7 +2,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule"; import OnCallDutyPolicyScheduleLayer from "./OnCallDutyPolicyScheduleLayer"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/Probe.ts b/Common/Models/DatabaseModels/Probe.ts index f856d4d247..839b547d20 100755 --- a/Common/Models/DatabaseModels/Probe.ts +++ b/Common/Models/DatabaseModels/Probe.ts @@ -1,7 +1,7 @@ import File from "./File"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ProbeOwnerTeam.ts b/Common/Models/DatabaseModels/ProbeOwnerTeam.ts index b7c6f571c9..7f3b6fb5aa 100644 --- a/Common/Models/DatabaseModels/ProbeOwnerTeam.ts +++ b/Common/Models/DatabaseModels/ProbeOwnerTeam.ts @@ -2,7 +2,7 @@ import Probe from "./Probe"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ProbeOwnerUser.ts b/Common/Models/DatabaseModels/ProbeOwnerUser.ts index 28467116be..28a073ce4c 100644 --- a/Common/Models/DatabaseModels/ProbeOwnerUser.ts +++ b/Common/Models/DatabaseModels/ProbeOwnerUser.ts @@ -1,7 +1,7 @@ import Probe from "./Probe"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ProjectCallSMSConfig.ts b/Common/Models/DatabaseModels/ProjectCallSMSConfig.ts index 84ec777608..96a920b826 100644 --- a/Common/Models/DatabaseModels/ProjectCallSMSConfig.ts +++ b/Common/Models/DatabaseModels/ProjectCallSMSConfig.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ProjectSmtpConfig.ts b/Common/Models/DatabaseModels/ProjectSmtpConfig.ts index 30966a5402..890796be0b 100755 --- a/Common/Models/DatabaseModels/ProjectSmtpConfig.ts +++ b/Common/Models/DatabaseModels/ProjectSmtpConfig.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Hostname from "../../Types/API/Hostname"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; diff --git a/Common/Models/DatabaseModels/ProjectSso.ts b/Common/Models/DatabaseModels/ProjectSso.ts index 1c84eeba5d..ff7cd64dc5 100644 --- a/Common/Models/DatabaseModels/ProjectSso.ts +++ b/Common/Models/DatabaseModels/ProjectSso.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; diff --git a/Common/Models/DatabaseModels/PromoCode.ts b/Common/Models/DatabaseModels/PromoCode.ts index d5a7b269cb..3be0d31884 100644 --- a/Common/Models/DatabaseModels/PromoCode.ts +++ b/Common/Models/DatabaseModels/PromoCode.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import Reseller from "./Reseller"; import ResellerPlan from "./ResellerPlan"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/Reseller.ts b/Common/Models/DatabaseModels/Reseller.ts index a0c8c68d21..f49d41fc2c 100644 --- a/Common/Models/DatabaseModels/Reseller.ts +++ b/Common/Models/DatabaseModels/Reseller.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ResellerPlan.ts b/Common/Models/DatabaseModels/ResellerPlan.ts index e7e2f8879a..f46ea70f3b 100644 --- a/Common/Models/DatabaseModels/ResellerPlan.ts +++ b/Common/Models/DatabaseModels/ResellerPlan.ts @@ -1,6 +1,6 @@ import Reseller from "./Reseller"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenance.ts b/Common/Models/DatabaseModels/ScheduledMaintenance.ts index 9d98f61560..a6664dc418 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenance.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenance.ts @@ -5,7 +5,7 @@ import Project from "./Project"; import ScheduledMaintenanceState from "./ScheduledMaintenanceState"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceCustomField.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceCustomField.ts index 40af1d6539..332253ab1b 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceCustomField.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceCustomField.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CustomFieldType from "../../Types/CustomField/CustomFieldType"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote.ts index 0ea28d2d39..cd23a81b0e 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import ScheduledMaintenance from "./ScheduledMaintenance"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate.ts index ed16b44034..014f6075dd 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam.ts index 19bdb436b3..ff2ddb9f45 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import ScheduledMaintenance from "./ScheduledMaintenance"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser.ts index 49499d48ca..8b01e31be2 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import ScheduledMaintenance from "./ScheduledMaintenance"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts b/Common/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts index a6a98d275e..4b7e3f4217 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import ScheduledMaintenance from "./ScheduledMaintenance"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceState.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceState.ts index ccce69baea..dc58f5c4df 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceState.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceState.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts b/Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts index e12bf69295..28e1d40441 100644 --- a/Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts +++ b/Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import ScheduledMaintenance from "./ScheduledMaintenance"; import ScheduledMaintenanceState from "./ScheduledMaintenanceState"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCatalog.ts b/Common/Models/DatabaseModels/ServiceCatalog.ts index 0d3a163350..24a369e277 100644 --- a/Common/Models/DatabaseModels/ServiceCatalog.ts +++ b/Common/Models/DatabaseModels/ServiceCatalog.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/ServiceCatalogDependency.ts b/Common/Models/DatabaseModels/ServiceCatalogDependency.ts index 045db43442..1bdd3b8614 100644 --- a/Common/Models/DatabaseModels/ServiceCatalogDependency.ts +++ b/Common/Models/DatabaseModels/ServiceCatalogDependency.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCatalogMonitor.ts b/Common/Models/DatabaseModels/ServiceCatalogMonitor.ts index b8ab93dbaf..48759c6913 100644 --- a/Common/Models/DatabaseModels/ServiceCatalogMonitor.ts +++ b/Common/Models/DatabaseModels/ServiceCatalogMonitor.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCatalogOwnerTeam.ts b/Common/Models/DatabaseModels/ServiceCatalogOwnerTeam.ts index f8273483df..b7a4c0baba 100644 --- a/Common/Models/DatabaseModels/ServiceCatalogOwnerTeam.ts +++ b/Common/Models/DatabaseModels/ServiceCatalogOwnerTeam.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import ServiceCatalog from "./ServiceCatalog"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCatalogOwnerUser.ts b/Common/Models/DatabaseModels/ServiceCatalogOwnerUser.ts index b22da986bb..4d1e1532f2 100644 --- a/Common/Models/DatabaseModels/ServiceCatalogOwnerUser.ts +++ b/Common/Models/DatabaseModels/ServiceCatalogOwnerUser.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import ServiceCatalog from "./ServiceCatalog"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCatalogTelemetryService.ts b/Common/Models/DatabaseModels/ServiceCatalogTelemetryService.ts index 1e1da707c5..8ceb6a2381 100644 --- a/Common/Models/DatabaseModels/ServiceCatalogTelemetryService.ts +++ b/Common/Models/DatabaseModels/ServiceCatalogTelemetryService.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ServiceCopilotCodeRepository.ts b/Common/Models/DatabaseModels/ServiceCopilotCodeRepository.ts index 11d0bf2a47..2dfa6a970c 100644 --- a/Common/Models/DatabaseModels/ServiceCopilotCodeRepository.ts +++ b/Common/Models/DatabaseModels/ServiceCopilotCodeRepository.ts @@ -2,7 +2,7 @@ import CodeRepository from "./CopilotCodeRepository"; import Project from "./Project"; import ServiceCatalog from "./ServiceCatalog"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/ShortLink.ts b/Common/Models/DatabaseModels/ShortLink.ts index 03ee891930..9f76595a6d 100644 --- a/Common/Models/DatabaseModels/ShortLink.ts +++ b/Common/Models/DatabaseModels/ShortLink.ts @@ -1,5 +1,5 @@ import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/SmsLog.ts b/Common/Models/DatabaseModels/SmsLog.ts index 7ae83bff03..1e479796d1 100644 --- a/Common/Models/DatabaseModels/SmsLog.ts +++ b/Common/Models/DatabaseModels/SmsLog.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPage.ts b/Common/Models/DatabaseModels/StatusPage.ts index d02ba2bf53..e2d6472037 100755 --- a/Common/Models/DatabaseModels/StatusPage.ts +++ b/Common/Models/DatabaseModels/StatusPage.ts @@ -5,7 +5,7 @@ import Project from "./Project"; import ProjectCallSMSConfig from "./ProjectCallSMSConfig"; import ProjectSmtpConfig from "./ProjectSmtpConfig"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Color from "../../Types/Color"; diff --git a/Common/Models/DatabaseModels/StatusPageAnnouncement.ts b/Common/Models/DatabaseModels/StatusPageAnnouncement.ts index c96eb39e49..94303274f6 100644 --- a/Common/Models/DatabaseModels/StatusPageAnnouncement.ts +++ b/Common/Models/DatabaseModels/StatusPageAnnouncement.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageCustomField.ts b/Common/Models/DatabaseModels/StatusPageCustomField.ts index 8815c75f54..fa348f972d 100644 --- a/Common/Models/DatabaseModels/StatusPageCustomField.ts +++ b/Common/Models/DatabaseModels/StatusPageCustomField.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import CustomFieldType from "../../Types/CustomField/CustomFieldType"; diff --git a/Common/Models/DatabaseModels/StatusPageDomain.ts b/Common/Models/DatabaseModels/StatusPageDomain.ts index 1862475238..a582a15da6 100644 --- a/Common/Models/DatabaseModels/StatusPageDomain.ts +++ b/Common/Models/DatabaseModels/StatusPageDomain.ts @@ -2,7 +2,7 @@ import Domain from "./Domain"; import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageFooterLink.ts b/Common/Models/DatabaseModels/StatusPageFooterLink.ts index f7b9e6f00b..1ec848a30b 100644 --- a/Common/Models/DatabaseModels/StatusPageFooterLink.ts +++ b/Common/Models/DatabaseModels/StatusPageFooterLink.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageGroup.ts b/Common/Models/DatabaseModels/StatusPageGroup.ts index 4384009af2..5b9b0c694e 100644 --- a/Common/Models/DatabaseModels/StatusPageGroup.ts +++ b/Common/Models/DatabaseModels/StatusPageGroup.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageHeaderLink.ts b/Common/Models/DatabaseModels/StatusPageHeaderLink.ts index fa5fb80671..4f7c0f7bd2 100644 --- a/Common/Models/DatabaseModels/StatusPageHeaderLink.ts +++ b/Common/Models/DatabaseModels/StatusPageHeaderLink.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule.ts b/Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule.ts index 8b20caebce..00ca248022 100644 --- a/Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule.ts +++ b/Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule.ts @@ -2,7 +2,7 @@ import MonitorStatus from "./MonitorStatus"; import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import Color from "../../Types/Color"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageOwnerTeam.ts b/Common/Models/DatabaseModels/StatusPageOwnerTeam.ts index 6252b27c5f..225538a6d0 100644 --- a/Common/Models/DatabaseModels/StatusPageOwnerTeam.ts +++ b/Common/Models/DatabaseModels/StatusPageOwnerTeam.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageOwnerUser.ts b/Common/Models/DatabaseModels/StatusPageOwnerUser.ts index a64ede770f..a10675457c 100644 --- a/Common/Models/DatabaseModels/StatusPageOwnerUser.ts +++ b/Common/Models/DatabaseModels/StatusPageOwnerUser.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPagePrivateUser.ts b/Common/Models/DatabaseModels/StatusPagePrivateUser.ts index f4df859009..1f93211492 100644 --- a/Common/Models/DatabaseModels/StatusPagePrivateUser.ts +++ b/Common/Models/DatabaseModels/StatusPagePrivateUser.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageResource.ts b/Common/Models/DatabaseModels/StatusPageResource.ts index 3d30cf7486..cfb84a7e9b 100644 --- a/Common/Models/DatabaseModels/StatusPageResource.ts +++ b/Common/Models/DatabaseModels/StatusPageResource.ts @@ -4,7 +4,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import StatusPageGroup from "./StatusPageGroup"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/StatusPageSso.ts b/Common/Models/DatabaseModels/StatusPageSso.ts index 92bb134eef..f9fc917851 100644 --- a/Common/Models/DatabaseModels/StatusPageSso.ts +++ b/Common/Models/DatabaseModels/StatusPageSso.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; diff --git a/Common/Models/DatabaseModels/StatusPageSubscriber.ts b/Common/Models/DatabaseModels/StatusPageSubscriber.ts index ad49f9f216..981f43fbc0 100644 --- a/Common/Models/DatabaseModels/StatusPageSubscriber.ts +++ b/Common/Models/DatabaseModels/StatusPageSubscriber.ts @@ -2,7 +2,7 @@ import Project from "./Project"; import StatusPage from "./StatusPage"; import StatusPageResource from "./StatusPageResource"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/Team.ts b/Common/Models/DatabaseModels/Team.ts index d2fc6f3d1b..b83780e794 100644 --- a/Common/Models/DatabaseModels/Team.ts +++ b/Common/Models/DatabaseModels/Team.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/TeamMember.ts b/Common/Models/DatabaseModels/TeamMember.ts index d81ec1cf78..0cbc22ab03 100644 --- a/Common/Models/DatabaseModels/TeamMember.ts +++ b/Common/Models/DatabaseModels/TeamMember.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/TeamPermission.ts b/Common/Models/DatabaseModels/TeamPermission.ts index 6e7291b3a9..87a587e8b5 100644 --- a/Common/Models/DatabaseModels/TeamPermission.ts +++ b/Common/Models/DatabaseModels/TeamPermission.ts @@ -2,7 +2,7 @@ import Label from "./Label"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/TelemetryIngestionKey.ts b/Common/Models/DatabaseModels/TelemetryIngestionKey.ts index a287f21bdc..b2fbd67d05 100644 --- a/Common/Models/DatabaseModels/TelemetryIngestionKey.ts +++ b/Common/Models/DatabaseModels/TelemetryIngestionKey.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/TelemetryService.ts b/Common/Models/DatabaseModels/TelemetryService.ts index 949dbf14db..682e55083c 100644 --- a/Common/Models/DatabaseModels/TelemetryService.ts +++ b/Common/Models/DatabaseModels/TelemetryService.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import Color from "../../Types/Color"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/TelemetryUsageBilling.ts b/Common/Models/DatabaseModels/TelemetryUsageBilling.ts index d5342036c9..db3c46ac8c 100644 --- a/Common/Models/DatabaseModels/TelemetryUsageBilling.ts +++ b/Common/Models/DatabaseModels/TelemetryUsageBilling.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import TelemetryService from "./TelemetryService"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/User.ts b/Common/Models/DatabaseModels/User.ts index 56e6713839..9b0e102909 100644 --- a/Common/Models/DatabaseModels/User.ts +++ b/Common/Models/DatabaseModels/User.ts @@ -1,5 +1,5 @@ import File from "./File"; -import UserModel from "../../Models/BaseModels/BaseModel/UserModel"; +import UserModel from "../../Models/DatabaseModels/DatabaseBaseModel/UserModel"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import CompanySize from "../../Types/Company/CompanySize"; diff --git a/Common/Models/DatabaseModels/UserCall.ts b/Common/Models/DatabaseModels/UserCall.ts index bbcaa4b938..f28a9bfc42 100644 --- a/Common/Models/DatabaseModels/UserCall.ts +++ b/Common/Models/DatabaseModels/UserCall.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserEmail.ts b/Common/Models/DatabaseModels/UserEmail.ts index 5b4e8a549e..ac593829d1 100644 --- a/Common/Models/DatabaseModels/UserEmail.ts +++ b/Common/Models/DatabaseModels/UserEmail.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserNotificationRule.ts b/Common/Models/DatabaseModels/UserNotificationRule.ts index 829889f0df..362ecdd629 100644 --- a/Common/Models/DatabaseModels/UserNotificationRule.ts +++ b/Common/Models/DatabaseModels/UserNotificationRule.ts @@ -4,7 +4,7 @@ import User from "./User"; import UserCall from "./UserCall"; import UserEmail from "./UserEmail"; import UserSMS from "./UserSMS"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserNotificationSetting.ts b/Common/Models/DatabaseModels/UserNotificationSetting.ts index a22491b7c7..dc8933269a 100644 --- a/Common/Models/DatabaseModels/UserNotificationSetting.ts +++ b/Common/Models/DatabaseModels/UserNotificationSetting.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserOnCallLog.ts b/Common/Models/DatabaseModels/UserOnCallLog.ts index aea2be94f3..43350a5ec7 100644 --- a/Common/Models/DatabaseModels/UserOnCallLog.ts +++ b/Common/Models/DatabaseModels/UserOnCallLog.ts @@ -7,7 +7,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule"; import Project from "./Project"; import Team from "./Team"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserOnCallLogTimeline.ts b/Common/Models/DatabaseModels/UserOnCallLogTimeline.ts index 38b140f1b9..e94c24b01e 100644 --- a/Common/Models/DatabaseModels/UserOnCallLogTimeline.ts +++ b/Common/Models/DatabaseModels/UserOnCallLogTimeline.ts @@ -11,7 +11,7 @@ import UserEmail from "./UserEmail"; import UserNotificationRule from "./UserNotificationRule"; import UserOnCallLog from "./UserOnCallLog"; import UserSMS from "./UserSMS"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserSMS.ts b/Common/Models/DatabaseModels/UserSMS.ts index 47fb913e18..6237df4adb 100644 --- a/Common/Models/DatabaseModels/UserSMS.ts +++ b/Common/Models/DatabaseModels/UserSMS.ts @@ -1,6 +1,6 @@ import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/UserTwoFactorAuth.ts b/Common/Models/DatabaseModels/UserTwoFactorAuth.ts index 7ea58a5fc7..34eed924a5 100644 --- a/Common/Models/DatabaseModels/UserTwoFactorAuth.ts +++ b/Common/Models/DatabaseModels/UserTwoFactorAuth.ts @@ -1,4 +1,4 @@ -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import User from "./User"; import Route from "../../Types/API/Route"; import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid"; diff --git a/Common/Models/DatabaseModels/Workflow.ts b/Common/Models/DatabaseModels/Workflow.ts index 3e235e6b96..574ba32c88 100644 --- a/Common/Models/DatabaseModels/Workflow.ts +++ b/Common/Models/DatabaseModels/Workflow.ts @@ -1,7 +1,7 @@ import Label from "./Label"; import Project from "./Project"; import User from "./User"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Models/DatabaseModels/WorkflowLog.ts b/Common/Models/DatabaseModels/WorkflowLog.ts index 8ab5c6ae23..98174a66b1 100644 --- a/Common/Models/DatabaseModels/WorkflowLog.ts +++ b/Common/Models/DatabaseModels/WorkflowLog.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import User from "./User"; import Workflow from "./Workflow"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl"; diff --git a/Common/Models/DatabaseModels/WorkflowVariable.ts b/Common/Models/DatabaseModels/WorkflowVariable.ts index de92791a7e..eb02457ab8 100644 --- a/Common/Models/DatabaseModels/WorkflowVariable.ts +++ b/Common/Models/DatabaseModels/WorkflowVariable.ts @@ -1,7 +1,7 @@ import Project from "./Project"; import User from "./User"; import Workflow from "./Workflow"; -import BaseModel from "../BaseModels/BaseModel/BaseModel"; +import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel"; import Route from "../../Types/API/Route"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl"; diff --git a/Common/Tests/AppModels/File.test.ts b/Common/Tests/AppModels/File.test.ts index 034b2f7db6..d217a40b28 100644 --- a/Common/Tests/AppModels/File.test.ts +++ b/Common/Tests/AppModels/File.test.ts @@ -1,6 +1,6 @@ -import File from "../../Models/BaseModels/BaseModel/FileModel"; +import File from "../../Models/DatabaseModels/File"; import { describe, expect, it } from "@jest/globals"; -import BaseModel from "../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; describe("File", () => { diff --git a/Common/Tests/Types/JSONFunctions.test.ts b/Common/Tests/Types/JSONFunctions.test.ts index 43a26dde3c..6a735f6db7 100644 --- a/Common/Tests/Types/JSONFunctions.test.ts +++ b/Common/Tests/Types/JSONFunctions.test.ts @@ -1,5 +1,5 @@ import { JSONObject } from "../../Types/JSON"; -import BaseModel from "../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import JSONFunctions from "../../Types/JSONFunctions"; describe("JSONFunctions Class", () => { diff --git a/Common/Types/API/HTTPResponse.ts b/Common/Types/API/HTTPResponse.ts index f1f606f6de..4e530d4693 100644 --- a/Common/Types/API/HTTPResponse.ts +++ b/Common/Types/API/HTTPResponse.ts @@ -1,5 +1,5 @@ import AnalyticsBaseModel from "../../Models/BaseModels/AnalyticsBaseModel/BaseModel"; -import BaseModel from "../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { JSONArray, JSONObject, JSONObjectOrArray } from "../JSON"; import JSONFunctions from "../JSONFunctions"; import Typeof from "../Typeof"; diff --git a/Common/Types/AnalyticsDatabase/TableColumn.ts b/Common/Types/AnalyticsDatabase/TableColumn.ts index f897c0c38a..d65a7a6445 100644 --- a/Common/Types/AnalyticsDatabase/TableColumn.ts +++ b/Common/Types/AnalyticsDatabase/TableColumn.ts @@ -1,4 +1,4 @@ -import NestedModel from "../../Models/BaseModels/AnalyticsBaseModel/NestedModel"; +import NestedModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/NestedModel"; import TableColumnType from "../AnalyticsDatabase/TableColumnType"; import { ColumnAccessControl } from "../BaseDatabase/AccessControl"; import ColumnBillingAccessControl from "../BaseDatabase/ColumnBillingAccessControl"; diff --git a/Common/Types/Database/AccessControl/ColumnAccessControl.ts b/Common/Types/Database/AccessControl/ColumnAccessControl.ts index 64723a4744..0d20805835 100644 --- a/Common/Types/Database/AccessControl/ColumnAccessControl.ts +++ b/Common/Types/Database/AccessControl/ColumnAccessControl.ts @@ -1,4 +1,4 @@ -import BaseModel from "../../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { ColumnAccessControl } from "../../BaseDatabase/AccessControl"; import Dictionary from "../../Dictionary"; import { ReflectionMetadataType } from "../../Reflection"; diff --git a/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts b/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts index 789c996faf..d770997280 100644 --- a/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts +++ b/Common/Types/Database/AccessControl/ColumnBillingAccessControl.ts @@ -1,4 +1,4 @@ -import BaseModel from "../../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import ColumnBillingAccessControl from "../../BaseDatabase/ColumnBillingAccessControl"; import Dictionary from "../../Dictionary"; import { ReflectionMetadataType } from "../../Reflection"; diff --git a/Common/Types/Database/TableColumn.ts b/Common/Types/Database/TableColumn.ts index 8e44bec0af..c6024f046c 100644 --- a/Common/Types/Database/TableColumn.ts +++ b/Common/Types/Database/TableColumn.ts @@ -1,4 +1,4 @@ -import BaseModel, { BaseModelType } from "../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import Dictionary from "../Dictionary"; import { ReflectionMetadataType } from "../Reflection"; import TableColumnType from "./TableColumnType"; @@ -18,7 +18,7 @@ export interface TableColumnMetadata { manyToOneRelationColumn?: string; type: TableColumnType; canReadOnRelationQuery?: boolean; - modelType?: BaseModelType; + modelType?: DatabaseBaseModelType; forceGetDefaultValueOnCreate?: () => string | number | boolean; // overwrites any value that is being passed and generates a new one. Useful for generating OTPs, etc. } diff --git a/Common/Types/Database/UniqueColumnBy.ts b/Common/Types/Database/UniqueColumnBy.ts index bb5c6b41de..6bcc3fdb47 100644 --- a/Common/Types/Database/UniqueColumnBy.ts +++ b/Common/Types/Database/UniqueColumnBy.ts @@ -1,4 +1,4 @@ -import BaseModel from "../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import Dictionary from "../Dictionary"; import { ReflectionMetadataType } from "../Reflection"; import "reflect-metadata"; diff --git a/Common/Types/JSONFunctions.ts b/Common/Types/JSONFunctions.ts index a4bd0e1fc4..b92bc4fbdd 100644 --- a/Common/Types/JSONFunctions.ts +++ b/Common/Types/JSONFunctions.ts @@ -1,4 +1,4 @@ -import BaseModel from "../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import DatabaseProperty from "./Database/DatabaseProperty"; import OneUptimeDate from "./Date"; import DiskSize from "./DiskSize"; diff --git a/Common/Types/OnCallDutyPolicy/Layer.ts b/Common/Types/OnCallDutyPolicy/Layer.ts index 2bc04300bb..7ae75c4a6b 100644 --- a/Common/Types/OnCallDutyPolicy/Layer.ts +++ b/Common/Types/OnCallDutyPolicy/Layer.ts @@ -1,4 +1,4 @@ -import UserModel from "../../Models/BaseModels/BaseModel/UserModel"; +import UserModel from "../../Models/DatabaseModels/User"; import CalendarEvent from "../Calendar/CalendarEvent"; import OneUptimeDate from "../Date"; import DayOfWeek from "../Day/DayOfWeek"; diff --git a/Common/Types/Workflow/Components/BaseModel.ts b/Common/Types/Workflow/Components/BaseModel.ts index c5409a52fa..8202bb09db 100644 --- a/Common/Types/Workflow/Components/BaseModel.ts +++ b/Common/Types/Workflow/Components/BaseModel.ts @@ -1,4 +1,4 @@ -import BaseModel from "../../../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import IconProp from "../../Icon/IconProp"; import Text from "../../Text"; import ComponentMetadata, { diff --git a/Common/Utils/API.ts b/Common/Utils/API.ts index d008d83f7f..d14e3e2849 100644 --- a/Common/Utils/API.ts +++ b/Common/Utils/API.ts @@ -1,5 +1,5 @@ import AnalyticsBaseModel from "../Models/BaseModels/AnalyticsBaseModel/BaseModel"; -import BaseModel from "../Models/BaseModels/BaseModel/BaseModel"; +import BaseModel from "../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import HTTPErrorResponse from "../Types/API/HTTPErrorResponse"; import HTTPMethod from "../Types/API/HTTPMethod"; import HTTPResponse from "../Types/API/HTTPResponse"; diff --git a/Common/Utils/Uptime/UptimeUtil.ts b/Common/Utils/Uptime/UptimeUtil.ts index 9b6345ec80..e1fefc20f5 100644 --- a/Common/Utils/Uptime/UptimeUtil.ts +++ b/Common/Utils/Uptime/UptimeUtil.ts @@ -3,9 +3,9 @@ import MonitorEvent from "./MonitorEvent"; import { Green } from "../../Types/BrandColors"; import OneUptimeDate from "../../Types/Date"; import ObjectID from "../../Types/ObjectID"; -import MonitorStatus from "../../Models/Models/MonitorStatus"; -import MonitorStatusTimeline from "../../Models/Models/MonitorStatusTimeline"; -import { UptimePrecision } from "../../Models/Models/StatusPageResource"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; +import { UptimePrecision } from "../../Models/DatabaseModels/StatusPageResource"; export default class UptimeUtil { /** diff --git a/CommonServer/Types/Database/Permissions/AccessControlPermission.ts b/CommonServer/Types/Database/Permissions/AccessControlPermission.ts index 51a679aa34..4c871937a2 100644 --- a/CommonServer/Types/Database/Permissions/AccessControlPermission.ts +++ b/CommonServer/Types/Database/Permissions/AccessControlPermission.ts @@ -3,7 +3,7 @@ import Query from "../Query"; import Select from "../Select"; import TablePermission from "./TablePermission"; import AccessControlModel from "Common/Models/AccessControlModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import ArrayUtil from "Common/Types/ArrayUtil"; import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; @@ -235,7 +235,7 @@ export default class AccessControlPermission { } public static getAccessControlIdsForModel( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, props: DatabaseCommonInteractionProps, type: DatabaseRequestType, ): Array { @@ -259,7 +259,7 @@ export default class AccessControlPermission { } public static getAccessControlIdsForQuery( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, query: Query, select: Select | null, props: DatabaseCommonInteractionProps, diff --git a/CommonServer/Types/Database/Permissions/BillingPermission.ts b/CommonServer/Types/Database/Permissions/BillingPermission.ts index 56dfdb3b36..4c48752181 100644 --- a/CommonServer/Types/Database/Permissions/BillingPermission.ts +++ b/CommonServer/Types/Database/Permissions/BillingPermission.ts @@ -1,13 +1,13 @@ import { IsBillingEnabled, getAllEnvVars } from "../../../EnvironmentConfig"; import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; import PaymentRequiredException from "Common/Types/Exception/PaymentRequiredException"; export default class BillingPermissions { public static checkBillingPermissions( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, props: DatabaseCommonInteractionProps, type: DatabaseRequestType, ): void { diff --git a/CommonServer/Types/Database/Permissions/PublicPermission.ts b/CommonServer/Types/Database/Permissions/PublicPermission.ts index 068928b0b9..d57bf97a73 100644 --- a/CommonServer/Types/Database/Permissions/PublicPermission.ts +++ b/CommonServer/Types/Database/Permissions/PublicPermission.ts @@ -1,6 +1,6 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import TablePermission from "./TablePermission"; -import { BaseModelType } from "Common/Models/BaseModel"; +import { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; import Permission from "Common/Types/Permission"; @@ -8,7 +8,7 @@ import UserType from "Common/Types/UserType"; export default class PublicPermission { public static isPublicPermissionAllowed( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, type: DatabaseRequestType, ): boolean { let isPublicAllowed: boolean = false; @@ -20,7 +20,7 @@ export default class PublicPermission { } public static checkIfUserIsLoggedIn( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, props: DatabaseCommonInteractionProps, type: DatabaseRequestType, ): void { diff --git a/CommonServer/Types/Database/Permissions/QueryPermission.ts b/CommonServer/Types/Database/Permissions/QueryPermission.ts index 747310c175..11770f9a75 100644 --- a/CommonServer/Types/Database/Permissions/QueryPermission.ts +++ b/CommonServer/Types/Database/Permissions/QueryPermission.ts @@ -2,7 +2,7 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import Query from "../Query"; import Select from "../Select"; import ColumnPermissions from "./ColumnPermission"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, @@ -21,7 +21,7 @@ import Typeof from "Common/Types/Typeof"; export default class QueryPermission { public static checkRelationQueryPermission( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, select: Select, props: DatabaseCommonInteractionProps, ): void { @@ -120,7 +120,7 @@ export default class QueryPermission { } public static checkQueryPermission( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, query: Query, props: DatabaseCommonInteractionProps, ): void { diff --git a/CommonServer/Types/Database/Permissions/SelectPermission.ts b/CommonServer/Types/Database/Permissions/SelectPermission.ts index 0ffe1a9471..c9164ffce0 100644 --- a/CommonServer/Types/Database/Permissions/SelectPermission.ts +++ b/CommonServer/Types/Database/Permissions/SelectPermission.ts @@ -1,7 +1,7 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import Select from "../Select"; import ColumnPermissions from "./ColumnPermission"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, @@ -13,7 +13,7 @@ import { PermissionHelper, UserPermission } from "Common/Types/Permission"; export default class SelectPermission { public static checkSelectPermission( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, select: Select, props: DatabaseCommonInteractionProps, ): void { diff --git a/CommonServer/Types/Database/Permissions/TablePermission.ts b/CommonServer/Types/Database/Permissions/TablePermission.ts index 0410ed301c..a2431f99be 100644 --- a/CommonServer/Types/Database/Permissions/TablePermission.ts +++ b/CommonServer/Types/Database/Permissions/TablePermission.ts @@ -1,7 +1,7 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import BillingPermissions from "./BillingPermission"; import PublicPermission from "./PublicPermission"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, @@ -14,7 +14,7 @@ import Permission, { export default class TablePermission { public static getTablePermission( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, type: DatabaseRequestType, ): Array { let modelPermissions: Array = []; @@ -40,7 +40,7 @@ export default class TablePermission { } public static checkTableLevelPermissions( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, props: DatabaseCommonInteractionProps, type: DatabaseRequestType, ): void { @@ -79,7 +79,7 @@ export default class TablePermission { } public static checkTableLevelBlockPermissions( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, props: DatabaseCommonInteractionProps, type: DatabaseRequestType, ): void { diff --git a/CommonServer/Types/Database/SelectUtil.ts b/CommonServer/Types/Database/SelectUtil.ts index 7d4149c5cb..5149fd726f 100644 --- a/CommonServer/Types/Database/SelectUtil.ts +++ b/CommonServer/Types/Database/SelectUtil.ts @@ -1,12 +1,12 @@ import RelationSelect from "./RelationSelect"; import Select from "./Select"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import { JSONObject } from "Common/Types/JSON"; import Typeof from "Common/Types/Typeof"; export default class SelectUtil { public static sanitizeSelect( - modelType: BaseModelType, + modelType: DatabaseBaseModelType, select: Select, ): { select: Select; diff --git a/CommonServer/Utils/Realtime.ts b/CommonServer/Utils/Realtime.ts index 9581952cb0..a67090a920 100644 --- a/CommonServer/Utils/Realtime.ts +++ b/CommonServer/Utils/Realtime.ts @@ -3,7 +3,7 @@ import logger from "./Logger"; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from "Common/AnalyticsModels/BaseModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import DatabaseType from "Common/Types/BaseDatabase/DatabaseType"; import BadDataException from "Common/Types/Exception/BadDataException"; import { JSONObject } from "Common/Types/JSON"; @@ -122,7 +122,7 @@ export default abstract class Realtime { if (data.model instanceof BaseModel) { jsonObject = BaseModel.toJSON( data.model, - data.modelType as BaseModelType, + data.modelType as DatabaseBaseModelType, ); } diff --git a/CommonServer/Utils/Response.ts b/CommonServer/Utils/Response.ts index 7573c25e20..59d80fdb94 100644 --- a/CommonServer/Utils/Response.ts +++ b/CommonServer/Utils/Response.ts @@ -9,7 +9,7 @@ import logger from "./Logger"; import AnalyticsDataModel, { AnalyticsBaseModelType, } from "Common/AnalyticsModels/BaseModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import FileModel from "Common/Models/FileModel"; import EmptyResponse from "Common/Types/API/EmptyResponse"; import StatusCode from "Common/Types/API/StatusCode"; @@ -112,7 +112,7 @@ export default class Response { if (model instanceof BaseModel) { jsonArray = BaseModel.toJSONArray( list as Array, - modelType as BaseModelType, + modelType as DatabaseBaseModelType, ); } @@ -140,7 +140,7 @@ export default class Response { let response: JSONObject = {}; if (item && item instanceof BaseModel) { - response = BaseModel.toJSON(item, modelType as BaseModelType); + response = BaseModel.toJSON(item, modelType as DatabaseBaseModelType); } if (item && item instanceof AnalyticsDataModel) { diff --git a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx index 299855e75e..8e1d43f2bf 100644 --- a/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx +++ b/CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx @@ -6,7 +6,7 @@ import ComponentLoader from "../ComponentLoader/ComponentLoader"; import Detail from "../Detail/Detail"; import ErrorMessage from "../ErrorMessage/ErrorMessage"; import BasicFormModal from "../FormModal/BasicFormModal"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; import IconProp from "Common/Types/Icon/IconProp"; @@ -19,8 +19,8 @@ export interface ComponentProps { title: string; description: string; modelId: ObjectID; - modelType: BaseModelType; - customFieldType: BaseModelType; + modelType: DatabaseBaseModelType; + customFieldType: DatabaseBaseModelType; projectId: ObjectID; name: string; } diff --git a/CommonUI/src/Components/Forms/Types/Field.ts b/CommonUI/src/Components/Forms/Types/Field.ts index 0b41c71002..6da8c8a1b6 100644 --- a/CommonUI/src/Components/Forms/Types/Field.ts +++ b/CommonUI/src/Components/Forms/Types/Field.ts @@ -7,7 +7,7 @@ import { DropdownOption } from "../../Dropdown/Dropdown"; import { RadioButton } from "../../RadioButtons/GroupRadioButtons"; import FormFieldSchemaType from "./FormFieldSchemaType"; import FormValues from "./FormValues"; -import { BaseModelType } from "Common/Models/BaseModel"; +import { DatabaseBaseModelType } from "Common/Models/BaseModel"; import Route from "Common/Types/API/Route"; import URL from "Common/Types/API/URL"; import MimeType from "Common/Types/File/MimeType"; @@ -54,7 +54,7 @@ export default interface Field { | ((item: FormValues) => Promise>) | undefined; dropdownModal?: { - type: BaseModelType; + type: DatabaseBaseModelType; labelField: string; valueField: string; }; diff --git a/CommonUI/src/Components/ModelFilter/Filter.ts b/CommonUI/src/Components/ModelFilter/Filter.ts index 57c4015d63..857abbbecf 100644 --- a/CommonUI/src/Components/ModelFilter/Filter.ts +++ b/CommonUI/src/Components/ModelFilter/Filter.ts @@ -5,7 +5,7 @@ import FieldType from "../Types/FieldType"; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from "Common/AnalyticsModels/BaseModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; export default interface Filter< TEntity extends BaseModel | AnalyticsBaseModel, @@ -13,7 +13,7 @@ export default interface Filter< title: string; type: FieldType; field: SelectEntityField; - filterEntityType?: BaseModelType | AnalyticsBaseModelType | undefined; + filterEntityType?: DatabaseBaseModelType | AnalyticsBaseModelType | undefined; filterQuery?: Query | undefined; filterDropdownField?: | { diff --git a/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx b/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx index 90fe78864f..d8842312fd 100644 --- a/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/AnalyticsModelTable.tsx @@ -8,7 +8,7 @@ import BaseModelTable, { BaseTableProps, ModalType } from "./BaseModelTable"; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from "Common/AnalyticsModels/BaseModel"; -import { BaseModelType } from "Common/Models/BaseModel"; +import { DatabaseBaseModelType } from "Common/Models/BaseModel"; import NotImplementedException from "Common/Types/Exception/NotImplementedException"; import { JSONObject } from "Common/Types/JSON"; import ObjectID from "Common/Types/ObjectID"; @@ -65,7 +65,7 @@ const AnalyticsModelTable: ( }, getList: async (data: { - modelType: BaseModelType | AnalyticsBaseModelType; + modelType: DatabaseBaseModelType | AnalyticsBaseModelType; query: Query; groupBy?: GroupBy | undefined; limit: number; diff --git a/CommonUI/src/Components/ModelTable/BaseModelTable.tsx b/CommonUI/src/Components/ModelTable/BaseModelTable.tsx index f44b654f22..43322f26ba 100644 --- a/CommonUI/src/Components/ModelTable/BaseModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/BaseModelTable.tsx @@ -48,7 +48,7 @@ import Columns from "./Columns"; import AnalyticsBaseModel, { AnalyticsBaseModelType, } from "Common/AnalyticsModels/BaseModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import Route from "Common/Types/API/Route"; import URL from "Common/Types/API/URL"; import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl"; @@ -96,7 +96,7 @@ export interface BaseTableCallbacks< getJSONFromModel: (item: TBaseModel) => JSONObject; addSlugToSelect: (select: Select) => Select; getList: (data: { - modelType: BaseModelType | AnalyticsBaseModelType; + modelType: DatabaseBaseModelType | AnalyticsBaseModelType; query: Query; groupBy?: GroupBy | undefined; limit: number; @@ -623,7 +623,7 @@ const BaseModelTable: ( try { const listResult: ListResult = await props.callbacks.getList({ - modelType: props.modelType as BaseModelType | AnalyticsBaseModelType, + modelType: props.modelType as DatabaseBaseModelType | AnalyticsBaseModelType, query: { ...query, ...props.query, @@ -660,7 +660,7 @@ const BaseModelTable: ( try { const listResult: ListResult = await props.callbacks.getList({ - modelType: props.modelType as BaseModelType | AnalyticsBaseModelType, + modelType: props.modelType as DatabaseBaseModelType | AnalyticsBaseModelType, query: { ...query, ...props.query, diff --git a/CommonUI/src/Components/ModelTable/ModelTable.tsx b/CommonUI/src/Components/ModelTable/ModelTable.tsx index f31a46400a..bdc6fe7e1e 100644 --- a/CommonUI/src/Components/ModelTable/ModelTable.tsx +++ b/CommonUI/src/Components/ModelTable/ModelTable.tsx @@ -7,7 +7,7 @@ import { FormType, ModelField } from "../Forms/ModelForm"; import ModelFormModal from "../ModelFormModal/ModelFormModal"; import BaseModelTable, { BaseTableProps, ModalType } from "./BaseModelTable"; import { AnalyticsBaseModelType } from "Common/AnalyticsModels/BaseModel"; -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import Dictionary from "Common/Types/Dictionary"; import { JSONObject } from "Common/Types/JSON"; import ObjectID from "Common/Types/ObjectID"; @@ -49,7 +49,7 @@ const ModelTable: ( }, getList: async (data: { - modelType: BaseModelType | AnalyticsBaseModelType; + modelType: DatabaseBaseModelType | AnalyticsBaseModelType; query: Query; groupBy?: GroupBy | undefined; limit: number; diff --git a/Dashboard/src/Components/NotificationMethods/NotificationMethod.tsx b/Dashboard/src/Components/NotificationMethods/NotificationMethod.tsx index 357b280078..3ffb0333bb 100644 --- a/Dashboard/src/Components/NotificationMethods/NotificationMethod.tsx +++ b/Dashboard/src/Components/NotificationMethods/NotificationMethod.tsx @@ -1,10 +1,10 @@ -import BaseModel, { BaseModelType } from "Common/Models/BaseModel"; +import BaseModel, { DatabaseBaseModelType } from "Common/Models/BaseModel"; import { JSONObject } from "Common/Types/JSON"; import React, { FunctionComponent, ReactElement } from "react"; export interface ComponentProps { item: BaseModel; - modelType: BaseModelType; + modelType: DatabaseBaseModelType; } const NotificationMethodView: FunctionComponent = (