From 54c526ffed14c41a4e54e4c931ca2ee4ce2cab9e Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 21 May 2025 13:55:49 +0100 Subject: [PATCH] Refactor import paths in utility files to use relative paths instead of absolute paths. This change enhances module resolution and maintains consistency across the codebase. Updated imports in Execute.ts, Express.ts, Greenlock.ts, JsonToCsv.ts, JsonWebToken.ts, LocalFile.ts, Logger.ts, various Monitor criteria files, Realtime.ts, Response.ts, StartServer.ts, Stream.ts, Telemetry.ts, TwoFactorAuth.ts, VMAPI.ts, VMRunner.ts, and Workspace files. --- Common/Server/API/BaseAPI.ts | 20 ++--- Common/Server/API/BaseAnalyticsAPI.ts | 22 +++--- Common/Server/API/BillingInvoiceAPI.ts | 12 +-- Common/Server/API/BillingPaymentMethodAPI.ts | 8 +- Common/Server/API/CommonAPI.ts | 6 +- Common/Server/API/CopilotActionAPI.ts | 10 +-- Common/Server/API/CopilotCodeRepositoryAPI.ts | 12 +-- Common/Server/API/CopilotPullRequestAPI.ts | 12 +-- Common/Server/API/FileAPI.ts | 6 +- Common/Server/API/GlobalConfigAPI.ts | 2 +- Common/Server/API/MonitorAPI.ts | 2 +- Common/Server/API/MonitorGroupAPI.ts | 12 +-- Common/Server/API/NotificationAPI.ts | 12 +-- Common/Server/API/OnCallDutyPolicyAPI.ts | 10 +-- Common/Server/API/ProbeAPI.ts | 6 +- Common/Server/API/ProjectAPI.ts | 12 +-- Common/Server/API/ProjectSSO.ts | 10 +-- Common/Server/API/ResellerPlanAPI.ts | 18 ++--- Common/Server/API/ShortLinkAPI.ts | 4 +- Common/Server/API/StatusAPI.ts | 4 +- Common/Server/API/StatusPageAPI.ts | 78 +++++++++---------- Common/Server/API/StatusPageDomainAPI.ts | 10 +-- Common/Server/API/StatusPageSubscriberAPI.ts | 2 +- Common/Server/API/TelemetryAPI.ts | 6 +- Common/Server/API/UserCallAPI.ts | 6 +- Common/Server/API/UserEmailAPI.ts | 4 +- Common/Server/API/UserOnCallLogTimelineAPI.ts | 20 ++--- Common/Server/API/UserSmsAPI.ts | 4 +- Common/Server/API/UserTwoFactorAuthAPI.ts | 8 +- .../API/WorkspaceNotificationRuleAPI.ts | 4 +- Common/Server/DatabaseConfig.ts | 16 ++-- Common/Server/EnvironmentConfig.ts | 18 ++--- .../Infrastructure/ClickhouseDatabase.ts | 4 +- Common/Server/Infrastructure/GlobalCache.ts | 10 +-- Common/Server/Infrastructure/LocalCache.ts | 6 +- .../Postgres/DataSourceOptions.ts | 4 +- .../Server/Infrastructure/PostgresDatabase.ts | 2 +- Common/Server/Infrastructure/Queue.ts | 4 +- Common/Server/Infrastructure/QueueWorker.ts | 4 +- Common/Server/Infrastructure/Redis.ts | 2 +- Common/Server/Infrastructure/SocketIO.ts | 4 +- Common/Server/Infrastructure/Status.ts | 2 +- .../Middleware/BearerTokenAuthorization.ts | 4 +- .../Middleware/ClusterKeyAuthorization.ts | 4 +- .../Middleware/CodeRepositoryAuthorization.ts | 6 +- .../Middleware/NotificationMiddleware.ts | 6 +- .../Server/Middleware/ProjectAuthorization.ts | 18 ++--- .../Server/Middleware/SlackAuthorization.ts | 2 +- Common/Server/Middleware/UserAuthorization.ts | 30 +++---- Common/Server/Services/AccessTokenService.ts | 6 +- .../Server/Services/AcmeCertificateService.ts | 2 +- .../Server/Services/AcmeChallengeService.ts | 2 +- .../Services/AlertCustomFieldService.ts | 2 +- Common/Server/Services/AlertFeedService.ts | 2 +- .../Services/AlertInternalNoteService.ts | 2 +- .../Services/AlertNoteTemplateService.ts | 2 +- .../Server/Services/AlertOwnerTeamService.ts | 2 +- .../Server/Services/AlertOwnerUserService.ts | 2 +- Common/Server/Services/AlertService.ts | 12 +-- .../Server/Services/AlertSeverityService.ts | 2 +- Common/Server/Services/AlertStateService.ts | 2 +- .../Services/AlertStateTimelineService.ts | 4 +- .../Services/AnalyticsDatabaseService.ts | 6 +- .../Services/ApiKeyPermissionService.ts | 2 +- Common/Server/Services/ApiKeyService.ts | 2 +- .../Server/Services/BillingInvoiceService.ts | 4 +- .../Services/BillingPaymentMethodService.ts | 4 +- Common/Server/Services/CallLogService.ts | 2 +- Common/Server/Services/CallService.ts | 2 +- .../Server/Services/CopilotActionService.ts | 2 +- .../CopilotActionTypePriorityService.ts | 2 +- .../Services/CopilotCodeRepositoryService.ts | 2 +- .../Services/CopilotPullRequestService.ts | 2 +- Common/Server/Services/DashboardService.ts | 2 +- .../Server/Services/DataMigrationService.ts | 2 +- Common/Server/Services/DatabaseService.ts | 8 +- Common/Server/Services/DomainService.ts | 2 +- Common/Server/Services/EmailLogService.ts | 2 +- .../Services/EmailVerificationTokenService.ts | 2 +- .../Services/ExceptionInstanceService.ts | 2 +- Common/Server/Services/FileService.ts | 2 +- Common/Server/Services/GlobalConfigService.ts | 2 +- .../Services/GreenlockCertificateService.ts | 2 +- .../Services/GreenlockChallengeService.ts | 2 +- .../Services/IncidentCustomFieldService.ts | 2 +- Common/Server/Services/IncidentFeedService.ts | 2 +- .../Services/IncidentInternalNoteService.ts | 2 +- .../Services/IncidentNoteTemplateService.ts | 2 +- .../Services/IncidentOwnerTeamService.ts | 2 +- .../Services/IncidentOwnerUserService.ts | 2 +- .../Services/IncidentPublicNoteService.ts | 2 +- Common/Server/Services/IncidentService.ts | 20 ++--- .../Services/IncidentSeverityService.ts | 2 +- .../Server/Services/IncidentStateService.ts | 2 +- .../Services/IncidentStateTimelineService.ts | 8 +- .../IncidentTemplateOwnerTeamService.ts | 2 +- .../IncidentTemplateOwnerUserService.ts | 2 +- .../Services/IncidentTemplateService.ts | 6 +- Common/Server/Services/Index.ts | 2 +- Common/Server/Services/LabelService.ts | 2 +- Common/Server/Services/LogService.ts | 2 +- Common/Server/Services/MailService.ts | 2 +- Common/Server/Services/MetricService.ts | 2 +- Common/Server/Services/MetricTypeService.ts | 2 +- .../Services/MonitorCustomFieldService.ts | 2 +- Common/Server/Services/MonitorFeedService.ts | 2 +- .../Services/MonitorGroupOwnerTeamService.ts | 2 +- .../Services/MonitorGroupOwnerUserService.ts | 2 +- .../Services/MonitorGroupResourceService.ts | 2 +- Common/Server/Services/MonitorGroupService.ts | 8 +- Common/Server/Services/MonitorLogService.ts | 2 +- .../Services/MonitorOwnerTeamService.ts | 2 +- .../Services/MonitorOwnerUserService.ts | 2 +- Common/Server/Services/MonitorProbeService.ts | 2 +- .../Server/Services/MonitorSecretService.ts | 2 +- Common/Server/Services/MonitorService.ts | 16 ++-- .../Server/Services/MonitorStatusService.ts | 2 +- .../Services/MonitorStatusTimelineService.ts | 2 +- Common/Server/Services/MonitorTestService.ts | 2 +- Common/Server/Services/NotificationService.ts | 2 +- .../OnCallDutyPolicyCustomFieldService.ts | 2 +- ...DutyPolicyEscalationRuleScheduleService.ts | 2 +- .../OnCallDutyPolicyEscalationRuleService.ts | 12 +-- ...CallDutyPolicyEscalationRuleTeamService.ts | 2 +- ...CallDutyPolicyEscalationRuleUserService.ts | 2 +- .../OnCallDutyPolicyExecutionLogService.ts | 4 +- ...llDutyPolicyExecutionLogTimelineService.ts | 2 +- .../Services/OnCallDutyPolicyFeedService.ts | 2 +- .../OnCallDutyPolicyOwnerTeamService.ts | 2 +- .../OnCallDutyPolicyOwnerUserService.ts | 2 +- .../OnCallDutyPolicyScheduleLayerService.ts | 2 +- ...nCallDutyPolicyScheduleLayerUserService.ts | 2 +- .../OnCallDutyPolicyScheduleService.ts | 8 +- .../Services/OnCallDutyPolicyService.ts | 4 +- .../OnCallDutyPolicyTimeLogService.ts | 2 +- .../Services/OpenTelemetryIngestService.ts | 26 +++---- .../Server/Services/ProbeOwnerTeamService.ts | 2 +- .../Server/Services/ProbeOwnerUserService.ts | 2 +- Common/Server/Services/ProbeService.ts | 8 +- .../Services/ProjectCallSMSConfigService.ts | 2 +- Common/Server/Services/ProjectService.ts | 22 +++--- .../Services/ProjectSmtpConfigService.ts | 2 +- Common/Server/Services/ProjectSsoService.ts | 2 +- Common/Server/Services/ProjectUserService.ts | 2 +- Common/Server/Services/PromoCodeService.ts | 2 +- Common/Server/Services/ResellerPlanService.ts | 2 +- Common/Server/Services/ResellerService.ts | 2 +- .../ScheduledMaintenanceCustomFieldService.ts | 2 +- .../ScheduledMaintenanceFeedService.ts | 2 +- ...ScheduledMaintenanceInternalNoteService.ts | 2 +- ...ScheduledMaintenanceNoteTemplateService.ts | 2 +- .../ScheduledMaintenanceOwnerTeamService.ts | 2 +- .../ScheduledMaintenanceOwnerUserService.ts | 2 +- .../ScheduledMaintenancePublicNoteService.ts | 2 +- .../Services/ScheduledMaintenanceService.ts | 48 ++++++------ .../ScheduledMaintenanceStateService.ts | 2 +- ...cheduledMaintenanceStateTimelineService.ts | 14 ++-- ...uledMaintenanceTemplateOwnerTeamService.ts | 2 +- ...uledMaintenanceTemplateOwnerUserService.ts | 2 +- .../ScheduledMaintenanceTemplateService.ts | 6 +- .../ServiceCatalogDependencyService.ts | 2 +- .../Services/ServiceCatalogMonitorService.ts | 2 +- .../ServiceCatalogOwnerTeamService.ts | 2 +- .../ServiceCatalogOwnerUserService.ts | 2 +- .../Server/Services/ServiceCatalogService.ts | 2 +- .../ServiceCatalogTelemetryServiceService.ts | 2 +- .../ServiceCopilotCodeRepositoryService.ts | 2 +- Common/Server/Services/ShortLinkService.ts | 4 +- Common/Server/Services/SmsLogService.ts | 2 +- Common/Server/Services/SmsService.ts | 2 +- Common/Server/Services/SpanService.ts | 2 +- .../Services/StatusPageAnnouncementService.ts | 2 +- .../Services/StatusPageCertificateService.ts | 2 +- .../Services/StatusPageCustomFieldService.ts | 2 +- .../Services/StatusPageDomainService.ts | 8 +- .../Services/StatusPageFooterLinkService.ts | 2 +- .../Server/Services/StatusPageGroupService.ts | 2 +- .../Services/StatusPageHeaderLinkService.ts | 2 +- ...atusPageHistoryChartBarColorRuleService.ts | 2 +- .../Services/StatusPageOwnerTeamService.ts | 2 +- .../Services/StatusPageOwnerUserService.ts | 2 +- .../Services/StatusPagePrivateUserService.ts | 6 +- .../Services/StatusPageResourceService.ts | 2 +- Common/Server/Services/StatusPageService.ts | 24 +++--- .../Server/Services/StatusPageSsoService.ts | 2 +- .../Services/StatusPageSubscriberService.ts | 8 +- Common/Server/Services/TableViewService.ts | 2 +- Common/Server/Services/TeamMemberService.ts | 8 +- .../Server/Services/TeamPermissionService.ts | 6 +- Common/Server/Services/TeamService.ts | 2 +- .../Services/TelemetryAttributeService.ts | 2 +- .../Services/TelemetryExceptionService.ts | 2 +- .../Services/TelemetryIngestionKeyService.ts | 2 +- .../Services/TelemetryServiceService.ts | 2 +- .../Services/TelemetryUsageBillingService.ts | 2 +- Common/Server/Services/UserCallService.ts | 4 +- Common/Server/Services/UserEmailService.ts | 2 +- .../Services/UserNotificationRuleService.ts | 16 ++-- .../UserNotificationSettingService.ts | 8 +- .../Server/Services/UserOnCallLogService.ts | 6 +- .../Services/UserOnCallLogTimelineService.ts | 4 +- Common/Server/Services/UserService.ts | 10 +-- Common/Server/Services/UserSmsService.ts | 4 +- .../Services/UserTwoFactorAuthService.ts | 4 +- Common/Server/Services/WorkflowLogService.ts | 2 +- Common/Server/Services/WorkflowService.ts | 4 +- .../Services/WorkflowVariableService.ts | 2 +- .../WorkspaceCommunicationTools/Slack.ts | 0 .../WorkspaceCommunicationTools/Teams.ts | 0 .../WorkspaceCommunicationBaseService.ts | 0 .../WorkspaceNotificationRuleService.ts | 2 +- .../WorkspaceProjectAuthTokenService.ts | 2 +- .../Services/WorkspaceSettingService.ts | 2 +- .../Services/WorkspaceUserAuthTokenService.ts | 2 +- .../Types/AnalyticsDatabase/AggregateBy.ts | 8 +- .../Server/Types/AnalyticsDatabase/CountBy.ts | 6 +- .../Types/AnalyticsDatabase/CreateBy.ts | 4 +- .../Types/AnalyticsDatabase/CreateManyBy.ts | 4 +- .../Types/AnalyticsDatabase/DeleteBy.ts | 4 +- .../Server/Types/AnalyticsDatabase/FindBy.ts | 4 +- .../Types/AnalyticsDatabase/FindOneBy.ts | 4 +- .../Types/AnalyticsDatabase/FindOneByID.ts | 6 +- .../Server/Types/AnalyticsDatabase/Hooks.ts | 2 +- .../AnalyticsDatabase/ModelPermission.ts | 28 +++---- .../Server/Types/AnalyticsDatabase/Query.ts | 4 +- .../Types/AnalyticsDatabase/QueryHelper.ts | 10 +-- .../Server/Types/AnalyticsDatabase/Select.ts | 4 +- Common/Server/Types/AnalyticsDatabase/Sort.ts | 4 +- .../Types/AnalyticsDatabase/UpdateBy.ts | 4 +- .../Types/AnalyticsDatabase/UpdateByID.ts | 4 +- .../ActiveMonitoringMeteredPlan.ts | 10 +-- .../Billing/MeteredPlan/AllMeteredPlans.ts | 4 +- .../Billing/MeteredPlan/ServerMeteredPlan.ts | 8 +- .../MeteredPlan/TelemetryMeteredPlan.ts | 10 +-- Common/Server/Types/Database/CountBy.ts | 6 +- Common/Server/Types/Database/CreateBy.ts | 6 +- Common/Server/Types/Database/DeleteBy.ts | 4 +- Common/Server/Types/Database/DeleteById.ts | 6 +- Common/Server/Types/Database/DeleteOneBy.ts | 6 +- Common/Server/Types/Database/FindBy.ts | 4 +- Common/Server/Types/Database/FindOneBy.ts | 4 +- Common/Server/Types/Database/FindOneByID.ts | 6 +- Common/Server/Types/Database/HardDeleteBy.ts | 4 +- Common/Server/Types/Database/Hooks.ts | 2 +- .../Permissions/AccessControlPermission.ts | 20 ++--- .../Database/Permissions/BasePermission.ts | 10 +-- .../Database/Permissions/BillingPermission.ts | 8 +- .../Database/Permissions/ColumnPermission.ts | 26 +++---- .../Database/Permissions/CreatePermission.ts | 4 +- .../Database/Permissions/DeletePermission.ts | 4 +- .../Types/Database/Permissions/Index.ts | 4 +- .../Database/Permissions/PermissionsUtil.ts | 4 +- .../Database/Permissions/PublicPermission.ts | 10 +-- .../Database/Permissions/QueryPermission.ts | 22 +++--- .../Database/Permissions/ReadPermission.ts | 10 +-- .../Database/Permissions/SelectPermission.ts | 14 ++-- .../Database/Permissions/TablePermission.ts | 10 +-- .../Database/Permissions/TenantPermission.ts | 10 +-- .../Database/Permissions/UpdatePermission.ts | 6 +- .../Database/Permissions/UserPermission.ts | 8 +- Common/Server/Types/Database/Query.ts | 2 +- Common/Server/Types/Database/QueryHelper.ts | 12 +-- Common/Server/Types/Database/QueryUtil.ts | 34 ++++---- .../Server/Types/Database/RelationSelect.ts | 4 +- Common/Server/Types/Database/SearchBy.ts | 6 +- Common/Server/Types/Database/SearchResult.ts | 4 +- Common/Server/Types/Database/Select.ts | 2 +- Common/Server/Types/Database/SelectUtil.ts | 6 +- Common/Server/Types/Database/Sort.ts | 6 +- Common/Server/Types/Database/UpdateBy.ts | 4 +- Common/Server/Types/Database/UpdateByID.ts | 6 +- .../Types/Database/UpdateByIDAndFetch.ts | 2 +- Common/Server/Types/Database/UpdateOneBy.ts | 6 +- Common/Server/Types/Domain.ts | 4 +- Common/Server/Types/Workflow/ComponentCode.ts | 10 +-- .../Types/Workflow/Components/API/Delete.ts | 20 ++--- .../Types/Workflow/Components/API/Get.ts | 20 ++--- .../Types/Workflow/Components/API/Patch.ts | 20 ++--- .../Types/Workflow/Components/API/Post.ts | 20 ++--- .../Types/Workflow/Components/API/Put.ts | 20 ++--- .../Types/Workflow/Components/API/Utils.ts | 14 ++-- .../BaseModel/CreateManyBaseModel.ts | 14 ++-- .../BaseModel/CreateOneBaseModel.ts | 16 ++-- .../BaseModel/DeleteManyBaseModel.ts | 18 ++--- .../BaseModel/DeleteOneBaseModel.ts | 14 ++-- .../Components/BaseModel/FindManyBaseModel.ts | 18 ++--- .../Components/BaseModel/FindOneBaseModel.ts | 14 ++-- .../Components/BaseModel/OnCreateBaseModel.ts | 2 +- .../Components/BaseModel/OnDeleteBaseModel.ts | 2 +- .../BaseModel/OnTriggerBaseModel.ts | 20 ++--- .../Components/BaseModel/OnUpdateBaseModel.ts | 2 +- .../BaseModel/UpdateManyBaseModel.ts | 20 ++--- .../BaseModel/UpdateOneBaseModel.ts | 16 ++-- .../Workflow/Components/Conditions/IfElse.ts | 12 +-- .../Server/Types/Workflow/Components/Email.ts | 10 +-- .../Server/Types/Workflow/Components/Index.ts | 8 +- .../Workflow/Components/JSON/JsonToText.ts | 12 +-- .../Workflow/Components/JSON/MergeJson.ts | 12 +-- .../Workflow/Components/JSON/TextToJson.ts | 12 +-- .../Types/Workflow/Components/JavaScript.ts | 12 +-- .../Server/Types/Workflow/Components/Log.ts | 10 +-- .../Types/Workflow/Components/Manual.ts | 8 +- .../MicrosoftTeams/SendMessageToChannel.ts | 20 ++--- .../Types/Workflow/Components/Schedule.ts | 16 ++-- .../Components/Slack/SendMessageToChannel.ts | 18 ++--- .../Types/Workflow/Components/Webhook.ts | 12 +-- Common/Server/Types/Workflow/TriggerCode.ts | 8 +- Common/Server/Types/Workflow/Workflow.ts | 4 +- Common/Server/Utils/Airtable.ts | 4 +- .../Utils/AnalyticsDatabase/Statement.ts | 22 +++--- .../AnalyticsDatabase/StatementGenerator.ts | 36 ++++----- Common/Server/Utils/BasicCron.ts | 2 +- .../Utils/CodeRepository/CodeRepository.ts | 2 +- .../Utils/CodeRepository/GitHub/GitHub.ts | 16 ++-- .../HostedCodeRepository.ts | 8 +- Common/Server/Utils/Cookie.ts | 12 +-- Common/Server/Utils/CronTab.ts | 2 +- Common/Server/Utils/Environment.ts | 2 +- Common/Server/Utils/Execute.ts | 2 +- Common/Server/Utils/Express.ts | 16 ++-- Common/Server/Utils/Greenlock/Greenlock.ts | 18 ++--- Common/Server/Utils/JsonToCsv.ts | 2 +- Common/Server/Utils/JsonWebToken.ts | 20 ++--- Common/Server/Utils/LocalFile.ts | 2 +- Common/Server/Utils/Logger.ts | 4 +- .../Monitor/Criteria/APIRequestCriteria.ts | 8 +- .../Utils/Monitor/Criteria/CompareCriteria.ts | 4 +- .../Criteria/CustomCodeMonitorCriteria.ts | 4 +- .../Monitor/Criteria/EvaluateOverTime.ts | 10 +-- .../Criteria/IncomingRequestCriteria.ts | 12 +-- .../Monitor/Criteria/LogMonitorCriteria.ts | 4 +- .../Monitor/Criteria/MetricMonitorCriteria.ts | 2 +- .../Monitor/Criteria/SSLMonitorCriteria.ts | 8 +- .../Monitor/Criteria/ServerMonitorCriteria.ts | 10 +-- .../Monitor/Criteria/SyntheticMonitor.ts | 4 +- .../Monitor/Criteria/TraceMonitorCriteria.ts | 2 +- Common/Server/Utils/Monitor/DataToProcess.ts | 10 +-- .../Server/Utils/Monitor/MonitorResource.ts | 48 ++++++------ Common/Server/Utils/Realtime.ts | 14 ++-- Common/Server/Utils/Response.ts | 24 +++--- Common/Server/Utils/StartServer.ts | 18 ++--- Common/Server/Utils/Stream.ts | 2 +- Common/Server/Utils/Telemetry.ts | 4 +- Common/Server/Utils/TwoFactorAuth.ts | 2 +- Common/Server/Utils/VM/VMAPI.ts | 16 ++-- Common/Server/Utils/VM/VMRunner.ts | 8 +- .../MicrosoftTeams/MicrosoftTeams.ts | 10 +-- Common/Server/Utils/Workspace/Slack/Slack.ts | 10 +-- .../Server/Utils/Workspace/WorkspaceBase.ts | 2 +- Common/package-lock.json | 5 -- 350 files changed, 1211 insertions(+), 1216 deletions(-) delete mode 100644 Common/Server/Services/WorkspaceCommunicationTools/Slack.ts delete mode 100644 Common/Server/Services/WorkspaceCommunicationTools/Teams.ts delete mode 100644 Common/Server/Services/WorkspaceCommunicationTools/WorkspaceCommunicationBaseService.ts diff --git a/Common/Server/API/BaseAPI.ts b/Common/Server/API/BaseAPI.ts index ac62e725bf..e2278fcc05 100644 --- a/Common/Server/API/BaseAPI.ts +++ b/Common/Server/API/BaseAPI.ts @@ -15,19 +15,19 @@ import Express, { import Response from "../Utils/Response"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import CommonAPI from "./CommonAPI"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import { DEFAULT_LIMIT, LIMIT_PER_PROJECT, -} from "Common/Types/Database/LimitMax"; -import PartialEntity from "Common/Types/Database/PartialEntity"; -import BadRequestException from "Common/Types/Exception/BadRequestException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ObjectID from "Common/Types/ObjectID"; -import { UserPermission } from "Common/Types/Permission"; -import PositiveNumber from "Common/Types/PositiveNumber"; +} from "../../Types/Database/LimitMax"; +import PartialEntity from "../../Types/Database/PartialEntity"; +import BadRequestException from "../../Types/Exception/BadRequestException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ObjectID from "../../Types/ObjectID"; +import { UserPermission } from "../../Types/Permission"; +import PositiveNumber from "../../Types/PositiveNumber"; export default class BaseAPI< TBaseModel extends BaseModel, diff --git a/Common/Server/API/BaseAnalyticsAPI.ts b/Common/Server/API/BaseAnalyticsAPI.ts index ddb830ac36..3fde1ff97e 100644 --- a/Common/Server/API/BaseAnalyticsAPI.ts +++ b/Common/Server/API/BaseAnalyticsAPI.ts @@ -1,4 +1,4 @@ -import AggregateBy from "Common/Types/BaseDatabase/AggregateBy"; +import AggregateBy from "../../Types/BaseDatabase/AggregateBy"; import UserMiddleware from "../Middleware/UserAuthorization"; import AnalyticsDatabaseService from "../Services/AnalyticsDatabaseService"; import CreateBy from "../Types/AnalyticsDatabase/CreateBy"; @@ -15,19 +15,19 @@ import Express, { } from "../Utils/Express"; import Response from "../Utils/Response"; import CommonAPI from "./CommonAPI"; -import AnalyticsDataModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import AnalyticsDataModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import { DEFAULT_LIMIT, LIMIT_PER_PROJECT, -} from "Common/Types/Database/LimitMax"; -import BadRequestException from "Common/Types/Exception/BadRequestException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ObjectID from "Common/Types/ObjectID"; -import { UserPermission } from "Common/Types/Permission"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult"; +} from "../../Types/Database/LimitMax"; +import BadRequestException from "../../Types/Exception/BadRequestException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ObjectID from "../../Types/ObjectID"; +import { UserPermission } from "../../Types/Permission"; +import PositiveNumber from "../../Types/PositiveNumber"; +import AggregatedResult from "../../Types/BaseDatabase/AggregatedResult"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class BaseAnalyticsAPI< diff --git a/Common/Server/API/BillingInvoiceAPI.ts b/Common/Server/API/BillingInvoiceAPI.ts index 14c6a73c3c..face4b3295 100644 --- a/Common/Server/API/BillingInvoiceAPI.ts +++ b/Common/Server/API/BillingInvoiceAPI.ts @@ -13,14 +13,14 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import Permission, { UserPermission } from "Common/Types/Permission"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import Permission, { UserPermission } from "../../Types/Permission"; import BillingInvoice, { InvoiceStatus, -} from "Common/Models/DatabaseModels/BillingInvoice"; -import Project from "Common/Models/DatabaseModels/Project"; +} from "../../Models/DatabaseModels/BillingInvoice"; +import Project from "../../Models/DatabaseModels/Project"; export default class UserAPI extends BaseAPI< BillingInvoice, diff --git a/Common/Server/API/BillingPaymentMethodAPI.ts b/Common/Server/API/BillingPaymentMethodAPI.ts index 6fea427aee..84d865ce6c 100644 --- a/Common/Server/API/BillingPaymentMethodAPI.ts +++ b/Common/Server/API/BillingPaymentMethodAPI.ts @@ -12,10 +12,10 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import Permission, { UserPermission } from "Common/Types/Permission"; -import BillingPaymentMethod from "Common/Models/DatabaseModels/BillingPaymentMethod"; -import Project from "Common/Models/DatabaseModels/Project"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Permission, { UserPermission } from "../../Types/Permission"; +import BillingPaymentMethod from "../../Models/DatabaseModels/BillingPaymentMethod"; +import Project from "../../Models/DatabaseModels/Project"; export default class UserAPI extends BaseAPI< BillingPaymentMethod, diff --git a/Common/Server/API/CommonAPI.ts b/Common/Server/API/CommonAPI.ts index 96ef29b6ab..8a9e0f8f6f 100644 --- a/Common/Server/API/CommonAPI.ts +++ b/Common/Server/API/CommonAPI.ts @@ -1,9 +1,9 @@ import { IsBillingEnabled } from "../EnvironmentConfig"; import ProjectService from "../Services/ProjectService"; import { ExpressRequest, OneUptimeRequest } from "../Utils/Express"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import { PlanType } from "Common/Types/Billing/SubscriptionPlan"; -import UserType from "Common/Types/UserType"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import { PlanType } from "../../Types/Billing/SubscriptionPlan"; +import UserType from "../../Types/UserType"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class CommonAPI { diff --git a/Common/Server/API/CopilotActionAPI.ts b/Common/Server/API/CopilotActionAPI.ts index 06a2b734c5..b79b07b7fa 100644 --- a/Common/Server/API/CopilotActionAPI.ts +++ b/Common/Server/API/CopilotActionAPI.ts @@ -1,4 +1,4 @@ -import CopilotCodeRepository from "Common/Models/DatabaseModels/CopilotCodeRepository"; +import CopilotCodeRepository from "../../Models/DatabaseModels/CopilotCodeRepository"; import CopilotActionService, { Service as CopilotActionServiceType, } from "../Services/CopilotActionService"; @@ -9,10 +9,10 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import CopilotAction from "Common/Models/DatabaseModels/CopilotAction"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import CopilotAction from "../../Models/DatabaseModels/CopilotAction"; import CopilotCodeRepositoryService from "../Services/CopilotCodeRepositoryService"; import CodeRepositoryAuthorization from "../Middleware/CodeRepositoryAuthorization"; import CopilotActionStatus from "../../Types/Copilot/CopilotActionStatus"; diff --git a/Common/Server/API/CopilotCodeRepositoryAPI.ts b/Common/Server/API/CopilotCodeRepositoryAPI.ts index bbbd5a5406..a5aee1290a 100644 --- a/Common/Server/API/CopilotCodeRepositoryAPI.ts +++ b/Common/Server/API/CopilotCodeRepositoryAPI.ts @@ -1,4 +1,4 @@ -import OneUptimeDate from "Common/Types/Date"; +import OneUptimeDate from "../../Types/Date"; import CodeRepositoryAuthorization from "../Middleware/CodeRepositoryAuthorization"; import CopilotCodeRepositoryService, { Service as CopilotCodeRepositoryServiceType, @@ -11,11 +11,11 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import CopilotCodeRepository from "Common/Models/DatabaseModels/CopilotCodeRepository"; -import ServiceCopilotCodeRepository from "Common/Models/DatabaseModels/ServiceCopilotCodeRepository"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import CopilotCodeRepository from "../../Models/DatabaseModels/CopilotCodeRepository"; +import ServiceCopilotCodeRepository from "../../Models/DatabaseModels/ServiceCopilotCodeRepository"; export default class CopilotCodeRepositoryAPI extends BaseAPI< CopilotCodeRepository, diff --git a/Common/Server/API/CopilotPullRequestAPI.ts b/Common/Server/API/CopilotPullRequestAPI.ts index 05d61c3c67..8d570f1888 100644 --- a/Common/Server/API/CopilotPullRequestAPI.ts +++ b/Common/Server/API/CopilotPullRequestAPI.ts @@ -1,4 +1,4 @@ -import CopilotCodeRepository from "Common/Models/DatabaseModels/CopilotCodeRepository"; +import CopilotCodeRepository from "../../Models/DatabaseModels/CopilotCodeRepository"; import CopilotPullRequestService, { Service as CopilotPullRequestServiceType, } from "../Services/CopilotPullRequestService"; @@ -9,13 +9,13 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; import CopilotCodeRepositoryService from "../Services/CopilotCodeRepositoryService"; import CodeRepositoryAuthorization from "../Middleware/CodeRepositoryAuthorization"; -import CopilotPullRequest from "Common/Models/DatabaseModels/CopilotPullRequest"; -import PullRequestState from "Common/Types/CodeRepository/PullRequestState"; +import CopilotPullRequest from "../../Models/DatabaseModels/CopilotPullRequest"; +import PullRequestState from "../../Types/CodeRepository/PullRequestState"; export default class CopilotPullRequestAPI extends BaseAPI< CopilotPullRequest, diff --git a/Common/Server/API/FileAPI.ts b/Common/Server/API/FileAPI.ts index 955815e3d5..bbbc05145c 100644 --- a/Common/Server/API/FileAPI.ts +++ b/Common/Server/API/FileAPI.ts @@ -8,9 +8,9 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import NotFoundException from "Common/Types/Exception/NotFoundException"; -import ObjectID from "Common/Types/ObjectID"; -import File from "Common/Models/DatabaseModels/File"; +import NotFoundException from "../../Types/Exception/NotFoundException"; +import ObjectID from "../../Types/ObjectID"; +import File from "../../Models/DatabaseModels/File"; export default class FileAPI extends BaseAPI { public constructor() { diff --git a/Common/Server/API/GlobalConfigAPI.ts b/Common/Server/API/GlobalConfigAPI.ts index 9995b63fa6..aea6cae811 100644 --- a/Common/Server/API/GlobalConfigAPI.ts +++ b/Common/Server/API/GlobalConfigAPI.ts @@ -8,7 +8,7 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig"; +import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig"; // import ObjectID from 'Common/Types/ObjectID'; diff --git a/Common/Server/API/MonitorAPI.ts b/Common/Server/API/MonitorAPI.ts index f2ecc04e67..e096bbf247 100644 --- a/Common/Server/API/MonitorAPI.ts +++ b/Common/Server/API/MonitorAPI.ts @@ -9,7 +9,7 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import Monitor from "Common/Models/DatabaseModels/Monitor"; +import Monitor from "../../Models/DatabaseModels/Monitor"; import ObjectID from "../../Types/ObjectID"; export default class MonitorAPI extends BaseAPI { diff --git a/Common/Server/API/MonitorGroupAPI.ts b/Common/Server/API/MonitorGroupAPI.ts index ef416c29e7..0b332cf25a 100644 --- a/Common/Server/API/MonitorGroupAPI.ts +++ b/Common/Server/API/MonitorGroupAPI.ts @@ -10,12 +10,12 @@ import { import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import CommonAPI from "./CommonAPI"; -import OneUptimeDate from "Common/Types/Date"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import MonitorGroup from "Common/Models/DatabaseModels/MonitorGroup"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import MonitorGroup from "../../Models/DatabaseModels/MonitorGroup"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; export default class MonitorGroupAPI extends BaseAPI< MonitorGroup, diff --git a/Common/Server/API/NotificationAPI.ts b/Common/Server/API/NotificationAPI.ts index 6408fad44b..d7c88a8798 100644 --- a/Common/Server/API/NotificationAPI.ts +++ b/Common/Server/API/NotificationAPI.ts @@ -7,12 +7,12 @@ import Express, { OneUptimeRequest, } from "../Utils/Express"; import Response from "../Utils/Response"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import Exception from "Common/Types/Exception/Exception"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ObjectID from "Common/Types/ObjectID"; -import Permission, { UserPermission } from "Common/Types/Permission"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Exception from "../../Types/Exception/Exception"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ObjectID from "../../Types/ObjectID"; +import Permission, { UserPermission } from "../../Types/Permission"; +import PositiveNumber from "../../Types/PositiveNumber"; const router: ExpressRouter = Express.getRouter(); diff --git a/Common/Server/API/OnCallDutyPolicyAPI.ts b/Common/Server/API/OnCallDutyPolicyAPI.ts index be6ade0e1a..2be269537d 100644 --- a/Common/Server/API/OnCallDutyPolicyAPI.ts +++ b/Common/Server/API/OnCallDutyPolicyAPI.ts @@ -10,14 +10,14 @@ import { import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import CommonAPI from "./CommonAPI"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy"; import OnCallDutyPolicyEscalationRuleUser from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser"; import OnCallDutyPolicyEscalationRuleTeam from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam"; import OnCallDutyPolicyEscalationRuleSchedule from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnCallDutyPolicyAPI extends BaseAPI< OnCallDutyPolicy, diff --git a/Common/Server/API/ProbeAPI.ts b/Common/Server/API/ProbeAPI.ts index 8b5b2e15d5..7bf25198c6 100644 --- a/Common/Server/API/ProbeAPI.ts +++ b/Common/Server/API/ProbeAPI.ts @@ -9,9 +9,9 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Probe from "Common/Models/DatabaseModels/Probe"; +import LIMIT_MAX from "../../Types/Database/LimitMax"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Probe from "../../Models/DatabaseModels/Probe"; export default class ProbeAPI extends BaseAPI { public constructor() { diff --git a/Common/Server/API/ProjectAPI.ts b/Common/Server/API/ProjectAPI.ts index 9b657a45f4..358a4c1f3c 100644 --- a/Common/Server/API/ProjectAPI.ts +++ b/Common/Server/API/ProjectAPI.ts @@ -14,12 +14,12 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Project from "Common/Models/DatabaseModels/Project"; -import Reseller from "Common/Models/DatabaseModels/Reseller"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Project from "../../Models/DatabaseModels/Project"; +import Reseller from "../../Models/DatabaseModels/Reseller"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; export default class ProjectAPI extends BaseAPI { public constructor() { diff --git a/Common/Server/API/ProjectSSO.ts b/Common/Server/API/ProjectSSO.ts index a009b9c46f..faae146862 100644 --- a/Common/Server/API/ProjectSSO.ts +++ b/Common/Server/API/ProjectSSO.ts @@ -4,11 +4,11 @@ import ProjectSsoService, { import { ExpressRequest, ExpressResponse } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import ProjectSSO from "Common/Models/DatabaseModels/ProjectSso"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import PositiveNumber from "../../Types/PositiveNumber"; +import ProjectSSO from "../../Models/DatabaseModels/ProjectSso"; export default class ProjectSsoAPI extends BaseAPI< ProjectSSO, diff --git a/Common/Server/API/ResellerPlanAPI.ts b/Common/Server/API/ResellerPlanAPI.ts index 7069260b2c..97b173c45e 100644 --- a/Common/Server/API/ResellerPlanAPI.ts +++ b/Common/Server/API/ResellerPlanAPI.ts @@ -13,15 +13,15 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import StatusCode from "Common/Types/API/StatusCode"; -import URL from "Common/Types/API/URL"; -import { PlanType } from "Common/Types/Billing/SubscriptionPlan"; -import Email from "Common/Types/Email"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import Project from "Common/Models/DatabaseModels/Project"; -import PromoCode from "Common/Models/DatabaseModels/PromoCode"; -import ResellerPlan from "Common/Models/DatabaseModels/ResellerPlan"; +import StatusCode from "../../Types/API/StatusCode"; +import URL from "../../Types/API/URL"; +import { PlanType } from "../../Types/Billing/SubscriptionPlan"; +import Email from "../../Types/Email"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import Project from "../../Models/DatabaseModels/Project"; +import PromoCode from "../../Models/DatabaseModels/PromoCode"; +import ResellerPlan from "../../Models/DatabaseModels/ResellerPlan"; export default class ResellerPlanAPI extends BaseAPI< ResellerPlan, diff --git a/Common/Server/API/ShortLinkAPI.ts b/Common/Server/API/ShortLinkAPI.ts index 49837c1482..103b1f0c99 100644 --- a/Common/Server/API/ShortLinkAPI.ts +++ b/Common/Server/API/ShortLinkAPI.ts @@ -4,8 +4,8 @@ import ShortLinkService, { import { ExpressRequest, ExpressResponse } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ShortLink from "Common/Models/DatabaseModels/ShortLink"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ShortLink from "../../Models/DatabaseModels/ShortLink"; export default class ShortLinkAPI extends BaseAPI< ShortLink, diff --git a/Common/Server/API/StatusAPI.ts b/Common/Server/API/StatusAPI.ts index b763d5df04..3cd183c1e5 100644 --- a/Common/Server/API/StatusAPI.ts +++ b/Common/Server/API/StatusAPI.ts @@ -8,8 +8,8 @@ import Express, { import logger from "../Utils/Logger"; import Response from "../Utils/Response"; import Telemetry, { TelemetryCounter } from "../Utils/Telemetry"; -import Exception from "Common/Types/Exception/Exception"; -import ServerException from "Common/Types/Exception/ServerException"; +import Exception from "../../Types/Exception/Exception"; +import ServerException from "../../Types/Exception/ServerException"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export interface StatusAPIOptions { diff --git a/Common/Server/API/StatusPageAPI.ts b/Common/Server/API/StatusPageAPI.ts index 3cb4fd8c16..30e8cc268f 100644 --- a/Common/Server/API/StatusPageAPI.ts +++ b/Common/Server/API/StatusPageAPI.ts @@ -35,51 +35,51 @@ import logger from "../Utils/Logger"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import CommonAPI from "./CommonAPI"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import ArrayUtil from "Common/Utils/Array"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import SortOrder from "Common/Types/BaseDatabase/SortOrder"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import OneUptimeDate from "Common/Types/Date"; -import Dictionary from "Common/Types/Dictionary"; -import Email from "Common/Types/Email"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; -import NotFoundException from "Common/Types/Exception/NotFoundException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ObjectID from "Common/Types/ObjectID"; -import Phone from "Common/Types/Phone"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import AcmeChallenge from "Common/Models/DatabaseModels/AcmeChallenge"; -import Incident from "Common/Models/DatabaseModels/Incident"; -import IncidentPublicNote from "Common/Models/DatabaseModels/IncidentPublicNote"; -import IncidentState from "Common/Models/DatabaseModels/IncidentState"; -import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline"; -import MonitorGroupResource from "Common/Models/DatabaseModels/MonitorGroupResource"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; -import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance"; -import ScheduledMaintenancePublicNote from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; -import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; -import StatusPage from "Common/Models/DatabaseModels/StatusPage"; -import StatusPageAnnouncement from "Common/Models/DatabaseModels/StatusPageAnnouncement"; -import StatusPageDomain from "Common/Models/DatabaseModels/StatusPageDomain"; -import StatusPageFooterLink from "Common/Models/DatabaseModels/StatusPageFooterLink"; -import StatusPageGroup from "Common/Models/DatabaseModels/StatusPageGroup"; -import StatusPageHeaderLink from "Common/Models/DatabaseModels/StatusPageHeaderLink"; -import StatusPageHistoryChartBarColorRule from "Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule"; -import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource"; -import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso"; -import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscriber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import ArrayUtil from "../../Utils/Array"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import OneUptimeDate from "../../Types/Date"; +import Dictionary from "../../Types/Dictionary"; +import Email from "../../Types/Email"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException"; +import NotFoundException from "../../Types/Exception/NotFoundException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ObjectID from "../../Types/ObjectID"; +import Phone from "../../Types/Phone"; +import PositiveNumber from "../../Types/PositiveNumber"; +import AcmeChallenge from "../../Models/DatabaseModels/AcmeChallenge"; +import Incident from "../../Models/DatabaseModels/Incident"; +import IncidentPublicNote from "../../Models/DatabaseModels/IncidentPublicNote"; +import IncidentState from "../../Models/DatabaseModels/IncidentState"; +import IncidentStateTimeline from "../../Models/DatabaseModels/IncidentStateTimeline"; +import MonitorGroupResource from "../../Models/DatabaseModels/MonitorGroupResource"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; +import ScheduledMaintenance from "../../Models/DatabaseModels/ScheduledMaintenance"; +import ScheduledMaintenancePublicNote from "../../Models/DatabaseModels/ScheduledMaintenancePublicNote"; +import ScheduledMaintenanceState from "../../Models/DatabaseModels/ScheduledMaintenanceState"; +import ScheduledMaintenanceStateTimeline from "../../Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; +import StatusPage from "../../Models/DatabaseModels/StatusPage"; +import StatusPageAnnouncement from "../../Models/DatabaseModels/StatusPageAnnouncement"; +import StatusPageDomain from "../../Models/DatabaseModels/StatusPageDomain"; +import StatusPageFooterLink from "../../Models/DatabaseModels/StatusPageFooterLink"; +import StatusPageGroup from "../../Models/DatabaseModels/StatusPageGroup"; +import StatusPageHeaderLink from "../../Models/DatabaseModels/StatusPageHeaderLink"; +import StatusPageHistoryChartBarColorRule from "../../Models/DatabaseModels/StatusPageHistoryChartBarColorRule"; +import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource"; +import StatusPageSSO from "../../Models/DatabaseModels/StatusPageSso"; +import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber"; import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType"; import StatusPageResourceUptimeUtil from "../../Utils/StatusPage/ResourceUptime"; import UptimePrecision from "../../Types/StatusPage/UptimePrecision"; import { Green } from "../../Types/BrandColors"; import UptimeUtil from "../../Utils/Uptime/UptimeUtil"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; -import URL from "Common/Types/API/URL"; +import URL from "../../Types/API/URL"; import SMS from "../../Types/SMS/SMS"; import SmsService from "../Services/SmsService"; import ProjectCallSMSConfigService from "../Services/ProjectCallSMSConfigService"; diff --git a/Common/Server/API/StatusPageDomainAPI.ts b/Common/Server/API/StatusPageDomainAPI.ts index 1cf643c24d..3002237eb7 100644 --- a/Common/Server/API/StatusPageDomainAPI.ts +++ b/Common/Server/API/StatusPageDomainAPI.ts @@ -12,11 +12,11 @@ import logger from "../Utils/Logger"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import CommonAPI from "./CommonAPI"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import StatusPageDomain from "Common/Models/DatabaseModels/StatusPageDomain"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import PositiveNumber from "../../Types/PositiveNumber"; +import StatusPageDomain from "../../Models/DatabaseModels/StatusPageDomain"; export default class StatusPageDomainAPI extends BaseAPI< StatusPageDomain, diff --git a/Common/Server/API/StatusPageSubscriberAPI.ts b/Common/Server/API/StatusPageSubscriberAPI.ts index d8ab123a8e..d597df94f3 100644 --- a/Common/Server/API/StatusPageSubscriberAPI.ts +++ b/Common/Server/API/StatusPageSubscriberAPI.ts @@ -8,7 +8,7 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscriber"; +import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber"; export default class StatusPageSubscriberAPI extends BaseAPI< StatusPageSubscriber, diff --git a/Common/Server/API/TelemetryAPI.ts b/Common/Server/API/TelemetryAPI.ts index ab9999411a..01b91f77b9 100644 --- a/Common/Server/API/TelemetryAPI.ts +++ b/Common/Server/API/TelemetryAPI.ts @@ -6,10 +6,10 @@ import Express, { NextFunction, } from "../Utils/Express"; import Response from "../Utils/Response"; -import BadDataException from "Common/Types/Exception/BadDataException"; +import BadDataException from "../../Types/Exception/BadDataException"; import CommonAPI from "./CommonAPI"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import TelemetryType from "Common/Types/Telemetry/TelemetryType"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import TelemetryType from "../../Types/Telemetry/TelemetryType"; import TelemetryAttributeService from "../Services/TelemetryAttributeService"; const router: ExpressRouter = Express.getRouter(); diff --git a/Common/Server/API/UserCallAPI.ts b/Common/Server/API/UserCallAPI.ts index 8f9c324518..ba7382a8e9 100644 --- a/Common/Server/API/UserCallAPI.ts +++ b/Common/Server/API/UserCallAPI.ts @@ -9,9 +9,9 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import UserCall from "Common/Models/DatabaseModels/UserCall"; -import UserSMS from "Common/Models/DatabaseModels/UserSMS"; +import BadDataException from "../../Types/Exception/BadDataException"; +import UserCall from "../../Models/DatabaseModels/UserCall"; +import UserSMS from "../../Models/DatabaseModels/UserSMS"; export default class UserCallAPI extends BaseAPI< UserCall, diff --git a/Common/Server/API/UserEmailAPI.ts b/Common/Server/API/UserEmailAPI.ts index e46f2e98fb..ec092ab15b 100644 --- a/Common/Server/API/UserEmailAPI.ts +++ b/Common/Server/API/UserEmailAPI.ts @@ -9,8 +9,8 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import UserEmail from "Common/Models/DatabaseModels/UserEmail"; +import BadDataException from "../../Types/Exception/BadDataException"; +import UserEmail from "../../Models/DatabaseModels/UserEmail"; export default class UserEmailAPI extends BaseAPI< UserEmail, diff --git a/Common/Server/API/UserOnCallLogTimelineAPI.ts b/Common/Server/API/UserOnCallLogTimelineAPI.ts index 9d464d5319..1c336cea93 100644 --- a/Common/Server/API/UserOnCallLogTimelineAPI.ts +++ b/Common/Server/API/UserOnCallLogTimelineAPI.ts @@ -10,16 +10,16 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import { AppApiRoute, DashboardRoute } from "Common/ServiceRoute"; -import Hostname from "Common/Types/API/Hostname"; -import Protocol from "Common/Types/API/Protocol"; -import URL from "Common/Types/API/URL"; -import OneUptimeDate from "Common/Types/Date"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import UserNotificationStatus from "Common/Types/UserNotification/UserNotificationStatus"; -import UserOnCallLogTimeline from "Common/Models/DatabaseModels/UserOnCallLogTimeline"; +import { AppApiRoute, DashboardRoute } from "../../ServiceRoute"; +import Hostname from "../../Types/API/Hostname"; +import Protocol from "../../Types/API/Protocol"; +import URL from "../../Types/API/URL"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import UserNotificationStatus from "../../Types/UserNotification/UserNotificationStatus"; +import UserOnCallLogTimeline from "../../Models/DatabaseModels/UserOnCallLogTimeline"; import Route from "../../Types/API/Route"; export default class UserNotificationLogTimelineAPI extends BaseAPI< diff --git a/Common/Server/API/UserSmsAPI.ts b/Common/Server/API/UserSmsAPI.ts index 8088185069..cf07391544 100644 --- a/Common/Server/API/UserSmsAPI.ts +++ b/Common/Server/API/UserSmsAPI.ts @@ -9,8 +9,8 @@ import { } from "../Utils/Express"; import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import UserSMS from "Common/Models/DatabaseModels/UserSMS"; +import BadDataException from "../../Types/Exception/BadDataException"; +import UserSMS from "../../Models/DatabaseModels/UserSMS"; export default class UserSMSAPI extends BaseAPI { public constructor() { diff --git a/Common/Server/API/UserTwoFactorAuthAPI.ts b/Common/Server/API/UserTwoFactorAuthAPI.ts index 16929b24ba..224e70c3b1 100644 --- a/Common/Server/API/UserTwoFactorAuthAPI.ts +++ b/Common/Server/API/UserTwoFactorAuthAPI.ts @@ -1,4 +1,4 @@ -import ObjectID from "Common/Types/ObjectID"; +import ObjectID from "../../Types/ObjectID"; import UserMiddleware from "../Middleware/UserAuthorization"; import UserTwoFactorAuthService, { Service as UserTwoFactorAuthServiceType, @@ -10,11 +10,11 @@ import { OneUptimeRequest, } from "../Utils/Express"; import BaseAPI from "./BaseAPI"; -import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth"; -import BadDataException from "Common/Types/Exception/BadDataException"; +import UserTwoFactorAuth from "../../Models/DatabaseModels/UserTwoFactorAuth"; +import BadDataException from "../../Types/Exception/BadDataException"; import TwoFactorAuth from "../Utils/TwoFactorAuth"; import Response from "../Utils/Response"; -import User from "Common/Models/DatabaseModels/User"; +import User from "../../Models/DatabaseModels/User"; import UserService from "../Services/UserService"; export default class UserTwoFactorAuthAPI extends BaseAPI< diff --git a/Common/Server/API/WorkspaceNotificationRuleAPI.ts b/Common/Server/API/WorkspaceNotificationRuleAPI.ts index a18f1091e7..3897bca1b2 100644 --- a/Common/Server/API/WorkspaceNotificationRuleAPI.ts +++ b/Common/Server/API/WorkspaceNotificationRuleAPI.ts @@ -10,8 +10,8 @@ import { import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import CommonAPI from "./CommonAPI"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import WorkspaceNotificationRule from "Common/Models/DatabaseModels/WorkspaceNotificationRule"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import WorkspaceNotificationRule from "../../Models/DatabaseModels/WorkspaceNotificationRule"; import ObjectID from "../../Types/ObjectID"; export default class WorkspaceNotificationRuleAPI extends BaseAPI< diff --git a/Common/Server/DatabaseConfig.ts b/Common/Server/DatabaseConfig.ts index d653db1cde..d505e886b8 100644 --- a/Common/Server/DatabaseConfig.ts +++ b/Common/Server/DatabaseConfig.ts @@ -1,12 +1,12 @@ import GlobalConfigService from "./Services/GlobalConfigService"; -import { AccountsRoute, DashboardRoute } from "Common/ServiceRoute"; -import Hostname from "Common/Types/API/Hostname"; -import Protocol from "Common/Types/API/Protocol"; -import URL from "Common/Types/API/URL"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONValue } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig"; +import { AccountsRoute, DashboardRoute } from "../../ServiceRoute"; +import Hostname from "../../Types/API/Hostname"; +import Protocol from "../../Types/API/Protocol"; +import URL from "../../Types/API/URL"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONValue } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig"; import CaptureSpan from "./Utils/Telemetry/CaptureSpan"; export default class DatabaseConfig { diff --git a/Common/Server/EnvironmentConfig.ts b/Common/Server/EnvironmentConfig.ts index dddc4d698e..1659fe6b10 100644 --- a/Common/Server/EnvironmentConfig.ts +++ b/Common/Server/EnvironmentConfig.ts @@ -4,16 +4,16 @@ import { DashboardRoute, AppApiRoute, StatusPageApiRoute, -} from "Common/ServiceRoute"; +} from "../../ServiceRoute"; import BillingConfig from "./BillingConfig"; -import Hostname from "Common/Types/API/Hostname"; -import Protocol from "Common/Types/API/Protocol"; -import URL from "Common/Types/API/URL"; -import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; -import Email from "Common/Types/Email"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import Port from "Common/Types/Port"; +import Hostname from "../../Types/API/Hostname"; +import Protocol from "../../Types/API/Protocol"; +import URL from "../../Types/API/URL"; +import SubscriptionPlan from "../../Types/Billing/SubscriptionPlan"; +import Email from "../../Types/Email"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import Port from "../../Types/Port"; export enum ConfigLogLevel { INFO = "INFO", diff --git a/Common/Server/Infrastructure/ClickhouseDatabase.ts b/Common/Server/Infrastructure/ClickhouseDatabase.ts index 6d42c71a4f..ca1ca5dcb2 100644 --- a/Common/Server/Infrastructure/ClickhouseDatabase.ts +++ b/Common/Server/Infrastructure/ClickhouseDatabase.ts @@ -5,8 +5,8 @@ import { testDataSourceOptions, } from "./ClickhouseConfig"; import { PingResult, createClient, ClickHouseClient } from "@clickhouse/client"; -import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException"; -import Sleep from "Common/Types/Sleep"; +import DatabaseNotConnectedException from "../../Types/Exception/DatabaseNotConnectedException"; +import Sleep from "../../Types/Sleep"; import API from "../../Utils/API"; import URL from "../../Types/API/URL"; import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; diff --git a/Common/Server/Infrastructure/GlobalCache.ts b/Common/Server/Infrastructure/GlobalCache.ts index 852bd708bd..e19b80c309 100644 --- a/Common/Server/Infrastructure/GlobalCache.ts +++ b/Common/Server/Infrastructure/GlobalCache.ts @@ -1,10 +1,10 @@ import logger from "../Utils/Logger"; import Redis, { ClientType } from "./Redis"; -import OneUptimeDate from "Common/Types/Date"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException"; -import { JSONArray, JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import DatabaseNotConnectedException from "../../Types/Exception/DatabaseNotConnectedException"; +import { JSONArray, JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default abstract class GlobalCache { diff --git a/Common/Server/Infrastructure/LocalCache.ts b/Common/Server/Infrastructure/LocalCache.ts index f7c9f49b46..b4ed4bcc52 100644 --- a/Common/Server/Infrastructure/LocalCache.ts +++ b/Common/Server/Infrastructure/LocalCache.ts @@ -1,6 +1,6 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Dictionary from "Common/Types/Dictionary"; -import { JSONValue } from "Common/Types/JSON"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import Dictionary from "../../Types/Dictionary"; +import { JSONValue } from "../../Types/JSON"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default abstract class LocalCache { diff --git a/Common/Server/Infrastructure/Postgres/DataSourceOptions.ts b/Common/Server/Infrastructure/Postgres/DataSourceOptions.ts index 1ebe1841fb..ea9db7ec05 100644 --- a/Common/Server/Infrastructure/Postgres/DataSourceOptions.ts +++ b/Common/Server/Infrastructure/Postgres/DataSourceOptions.ts @@ -11,8 +11,8 @@ import { ShouldDatabaseSslEnable, } from "../../../Server/EnvironmentConfig"; import Migrations from "./SchemaMigrations/Index"; -import DatabaseType from "Common/Types/DatabaseType"; -import Entities from "Common/Models/DatabaseModels/Index"; +import DatabaseType from "../../Types/DatabaseType"; +import Entities from "../../Models/DatabaseModels/Index"; import { DataSourceOptions } from "typeorm"; const dataSourceOptions: DataSourceOptions = { diff --git a/Common/Server/Infrastructure/PostgresDatabase.ts b/Common/Server/Infrastructure/PostgresDatabase.ts index 435f2ef5d4..f7cd7f45e4 100644 --- a/Common/Server/Infrastructure/PostgresDatabase.ts +++ b/Common/Server/Infrastructure/PostgresDatabase.ts @@ -1,6 +1,6 @@ import logger from "../Utils/Logger"; import DatabaseDataSourceOptions from "./Postgres/DataSourceOptions"; -import Sleep from "Common/Types/Sleep"; +import Sleep from "../../Types/Sleep"; import { DataSource, DataSourceOptions } from "typeorm"; import { createDatabase, dropDatabase } from "typeorm-extension"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Infrastructure/Queue.ts b/Common/Server/Infrastructure/Queue.ts index 09cdb1e0d9..7643947621 100644 --- a/Common/Server/Infrastructure/Queue.ts +++ b/Common/Server/Infrastructure/Queue.ts @@ -4,8 +4,8 @@ import { RedisPassword, RedisPort, } from "../EnvironmentConfig"; -import Dictionary from "Common/Types/Dictionary"; -import { JSONObject } from "Common/Types/JSON"; +import Dictionary from "../../Types/Dictionary"; +import { JSONObject } from "../../Types/JSON"; import { Queue as BullQueue, Job, JobsOptions } from "bullmq"; import { ExpressAdapter } from "@bull-board/express"; import { createBullBoard } from "@bull-board/api"; diff --git a/Common/Server/Infrastructure/QueueWorker.ts b/Common/Server/Infrastructure/QueueWorker.ts index e398ebaa91..4923e6c6a2 100644 --- a/Common/Server/Infrastructure/QueueWorker.ts +++ b/Common/Server/Infrastructure/QueueWorker.ts @@ -1,11 +1,11 @@ import { RedisHostname, RedisPassword, RedisPort } from "../EnvironmentConfig"; import { QueueJob, QueueName } from "./Queue"; -import TimeoutException from "Common/Types/Exception/TimeoutException"; +import TimeoutException from "../../Types/Exception/TimeoutException"; import { PromiseRejectErrorFunction, PromiseVoidFunction, VoidFunction, -} from "Common/Types/FunctionTypes"; +} from "../../Types/FunctionTypes"; import { Worker } from "bullmq"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Infrastructure/Redis.ts b/Common/Server/Infrastructure/Redis.ts index 0a73755d47..fc5399820b 100644 --- a/Common/Server/Infrastructure/Redis.ts +++ b/Common/Server/Infrastructure/Redis.ts @@ -12,7 +12,7 @@ import { ShouldRedisTlsEnable, } from "../EnvironmentConfig"; import logger from "../Utils/Logger"; -import Sleep from "Common/Types/Sleep"; +import Sleep from "../../Types/Sleep"; import { Redis as RedisClient, RedisOptions } from "ioredis"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Infrastructure/SocketIO.ts b/Common/Server/Infrastructure/SocketIO.ts index b61db16415..1e0c3875f2 100644 --- a/Common/Server/Infrastructure/SocketIO.ts +++ b/Common/Server/Infrastructure/SocketIO.ts @@ -1,7 +1,7 @@ import Express from "../Utils/Express"; import Redis from "./Redis"; -import { RealtimeRoute } from "Common/ServiceRoute"; -import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException"; +import { RealtimeRoute } from "../../ServiceRoute"; +import DatabaseNotConnectedException from "../../Types/Exception/DatabaseNotConnectedException"; import http from "http"; import SocketIO from "socket.io"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Infrastructure/Status.ts b/Common/Server/Infrastructure/Status.ts index 4440394f55..67f4253070 100644 --- a/Common/Server/Infrastructure/Status.ts +++ b/Common/Server/Infrastructure/Status.ts @@ -4,7 +4,7 @@ import logger from "../Utils/Logger"; import { ClickhouseAppInstance } from "./ClickhouseDatabase"; import PostgresAppInstance from "./PostgresDatabase"; import Redis from "./Redis"; -import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException"; +import DatabaseNotConnectedException from "../../Types/Exception/DatabaseNotConnectedException"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class InfrastructureStatus { diff --git a/Common/Server/Middleware/BearerTokenAuthorization.ts b/Common/Server/Middleware/BearerTokenAuthorization.ts index e931568e6a..70f5e5c4cb 100644 --- a/Common/Server/Middleware/BearerTokenAuthorization.ts +++ b/Common/Server/Middleware/BearerTokenAuthorization.ts @@ -5,8 +5,8 @@ import { OneUptimeRequest, } from "../Utils/Express"; import JSONWebToken from "../Utils/JsonWebToken"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; -import { JSONObject } from "Common/Types/JSON"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; +import { JSONObject } from "../../Types/JSON"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class BearerTokenAuthorization { diff --git a/Common/Server/Middleware/ClusterKeyAuthorization.ts b/Common/Server/Middleware/ClusterKeyAuthorization.ts index bdb159e2c1..9ffd7ad6a9 100644 --- a/Common/Server/Middleware/ClusterKeyAuthorization.ts +++ b/Common/Server/Middleware/ClusterKeyAuthorization.ts @@ -5,8 +5,8 @@ import { NextFunction, } from "../Utils/Express"; import Response from "../Utils/Response"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class ClusterKeyAuthorization { diff --git a/Common/Server/Middleware/CodeRepositoryAuthorization.ts b/Common/Server/Middleware/CodeRepositoryAuthorization.ts index 7dcdd5c87d..f6a47eb556 100644 --- a/Common/Server/Middleware/CodeRepositoryAuthorization.ts +++ b/Common/Server/Middleware/CodeRepositoryAuthorization.ts @@ -1,12 +1,12 @@ -import BadDataException from "Common/Types/Exception/BadDataException"; +import BadDataException from "../../Types/Exception/BadDataException"; import { ExpressRequest, ExpressResponse, NextFunction, } from "../Utils/Express"; -import CopilotCodeRepository from "Common/Models/DatabaseModels/CopilotCodeRepository"; +import CopilotCodeRepository from "../../Models/DatabaseModels/CopilotCodeRepository"; import CopilotCodeRepositoryService from "../Services/CopilotCodeRepositoryService"; -import ObjectID from "Common/Types/ObjectID"; +import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export default class CopilotCodeRepositoryAuthorization { diff --git a/Common/Server/Middleware/NotificationMiddleware.ts b/Common/Server/Middleware/NotificationMiddleware.ts index daac0b0b7d..c25f886e70 100644 --- a/Common/Server/Middleware/NotificationMiddleware.ts +++ b/Common/Server/Middleware/NotificationMiddleware.ts @@ -6,9 +6,9 @@ import { } from "../Utils/Express"; import JSONWebToken from "../Utils/JsonWebToken"; import Response from "../Utils/Response"; -import { OnCallInputRequest } from "Common/Types/Call/CallRequest"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import JSONFunctions from "Common/Types/JSONFunctions"; +import { OnCallInputRequest } from "../../Types/Call/CallRequest"; +import BadDataException from "../../Types/Exception/BadDataException"; +import JSONFunctions from "../../Types/JSONFunctions"; import VoiceResponse from "twilio/lib/twiml/VoiceResponse"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Middleware/ProjectAuthorization.ts b/Common/Server/Middleware/ProjectAuthorization.ts index d9979b9262..79ef11a37c 100644 --- a/Common/Server/Middleware/ProjectAuthorization.ts +++ b/Common/Server/Middleware/ProjectAuthorization.ts @@ -8,15 +8,15 @@ import { NextFunction, OneUptimeRequest, } from "../Utils/Express"; -import OneUptimeDate from "Common/Types/Date"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ObjectID from "Common/Types/ObjectID"; -import { UserTenantAccessPermission } from "Common/Types/Permission"; -import UserType from "Common/Types/UserType"; -import ApiKey from "Common/Models/DatabaseModels/ApiKey"; -import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig"; -import User from "Common/Models/DatabaseModels/User"; +import OneUptimeDate from "../../Types/Date"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; +import { UserTenantAccessPermission } from "../../Types/Permission"; +import UserType from "../../Types/UserType"; +import ApiKey from "../../Models/DatabaseModels/ApiKey"; +import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig"; +import User from "../../Models/DatabaseModels/User"; import APIKeyAccessPermission from "../Utils/APIKey/AccessPermission"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Middleware/SlackAuthorization.ts b/Common/Server/Middleware/SlackAuthorization.ts index b8415218aa..0d77356717 100644 --- a/Common/Server/Middleware/SlackAuthorization.ts +++ b/Common/Server/Middleware/SlackAuthorization.ts @@ -4,7 +4,7 @@ import { OneUptimeRequest, } from "../Utils/Express"; import Response from "../Utils/Response"; -import BadDataException from "Common/Types/Exception/BadDataException"; +import BadDataException from "../../Types/Exception/BadDataException"; import { SlackAppSigningSecret } from "../EnvironmentConfig"; import crypto from "crypto"; import logger from "../Utils/Logger"; diff --git a/Common/Server/Middleware/UserAuthorization.ts b/Common/Server/Middleware/UserAuthorization.ts index eeab007a7e..025d031e82 100644 --- a/Common/Server/Middleware/UserAuthorization.ts +++ b/Common/Server/Middleware/UserAuthorization.ts @@ -14,24 +14,24 @@ import JSONWebToken from "../Utils/JsonWebToken"; import logger from "../Utils/Logger"; import Response from "../Utils/Response"; import ProjectMiddleware from "./ProjectAuthorization"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import OneUptimeDate from "Common/Types/Date"; -import Dictionary from "Common/Types/Dictionary"; -import Exception from "Common/Types/Exception/Exception"; -import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; -import SsoAuthorizationException from "Common/Types/Exception/SsoAuthorizationException"; -import TenantNotFoundException from "Common/Types/Exception/TenantNotFoundException"; -import HashedString from "Common/Types/HashedString"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import JSONWebTokenData from "Common/Types/JsonWebTokenData"; -import ObjectID from "Common/Types/ObjectID"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import OneUptimeDate from "../../Types/Date"; +import Dictionary from "../../Types/Dictionary"; +import Exception from "../../Types/Exception/Exception"; +import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException"; +import SsoAuthorizationException from "../../Types/Exception/SsoAuthorizationException"; +import TenantNotFoundException from "../../Types/Exception/TenantNotFoundException"; +import HashedString from "../../Types/HashedString"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import JSONWebTokenData from "../../Types/JsonWebTokenData"; +import ObjectID from "../../Types/ObjectID"; import { UserGlobalAccessPermission, UserTenantAccessPermission, -} from "Common/Types/Permission"; -import UserType from "Common/Types/UserType"; -import Project from "Common/Models/DatabaseModels/Project"; +} from "../../Types/Permission"; +import UserType from "../../Types/UserType"; +import Project from "../../Models/DatabaseModels/Project"; import UserPermissionUtil from "../Utils/UserPermission/UserPermission"; export default class UserMiddleware { diff --git a/Common/Server/Services/AccessTokenService.ts b/Common/Server/Services/AccessTokenService.ts index 5dae01419f..f6ba053208 100644 --- a/Common/Server/Services/AccessTokenService.ts +++ b/Common/Server/Services/AccessTokenService.ts @@ -10,9 +10,9 @@ import Permission, { UserPermission, UserTenantAccessPermission, } from "../../Types/Permission"; -import Label from "Common/Models/DatabaseModels/Label"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; -import TeamPermission from "Common/Models/DatabaseModels/TeamPermission"; +import Label from "../../Models/DatabaseModels/Label"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; +import TeamPermission from "../../Models/DatabaseModels/TeamPermission"; import UserPermissionUtil from "../Utils/UserPermission/UserPermission"; import PermissionNamespace from "../Types/Permission/PermissionNamespace"; import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; diff --git a/Common/Server/Services/AcmeCertificateService.ts b/Common/Server/Services/AcmeCertificateService.ts index a68fb368b4..f98368e5e9 100644 --- a/Common/Server/Services/AcmeCertificateService.ts +++ b/Common/Server/Services/AcmeCertificateService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AcmeCertificate"; +import Model from "../../Models/DatabaseModels/AcmeCertificate"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/AcmeChallengeService.ts b/Common/Server/Services/AcmeChallengeService.ts index 5cf97a039d..b61697aee8 100644 --- a/Common/Server/Services/AcmeChallengeService.ts +++ b/Common/Server/Services/AcmeChallengeService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AcmeChallenge"; +import Model from "../../Models/DatabaseModels/AcmeChallenge"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/AlertCustomFieldService.ts b/Common/Server/Services/AlertCustomFieldService.ts index 7540371663..7c9f553ccb 100644 --- a/Common/Server/Services/AlertCustomFieldService.ts +++ b/Common/Server/Services/AlertCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AlertCustomField"; +import Model from "../../Models/DatabaseModels/AlertCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/AlertFeedService.ts b/Common/Server/Services/AlertFeedService.ts index 2aaadbfd18..3aa2a211c4 100644 --- a/Common/Server/Services/AlertFeedService.ts +++ b/Common/Server/Services/AlertFeedService.ts @@ -8,7 +8,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import Model, { AlertFeedEventType, -} from "Common/Models/DatabaseModels/AlertFeed"; +} from "../../Models/DatabaseModels/AlertFeed"; import WorkspaceNotificationRuleService, { MessageBlocksByWorkspaceType, } from "./WorkspaceNotificationRuleService"; diff --git a/Common/Server/Services/AlertInternalNoteService.ts b/Common/Server/Services/AlertInternalNoteService.ts index b2d6d5a9d1..a5cec1cfdf 100644 --- a/Common/Server/Services/AlertInternalNoteService.ts +++ b/Common/Server/Services/AlertInternalNoteService.ts @@ -1,6 +1,6 @@ import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AlertInternalNote"; +import Model from "../../Models/DatabaseModels/AlertInternalNote"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import AlertFeedService from "./AlertFeedService"; import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed"; diff --git a/Common/Server/Services/AlertNoteTemplateService.ts b/Common/Server/Services/AlertNoteTemplateService.ts index 3cebd04ddb..0064384364 100644 --- a/Common/Server/Services/AlertNoteTemplateService.ts +++ b/Common/Server/Services/AlertNoteTemplateService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AlertNoteTemplate"; +import Model from "../../Models/DatabaseModels/AlertNoteTemplate"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/AlertOwnerTeamService.ts b/Common/Server/Services/AlertOwnerTeamService.ts index b3c45466d4..259ac3df1c 100644 --- a/Common/Server/Services/AlertOwnerTeamService.ts +++ b/Common/Server/Services/AlertOwnerTeamService.ts @@ -3,7 +3,7 @@ import ObjectID from "../../Types/ObjectID"; import DeleteBy from "../Types/Database/DeleteBy"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AlertOwnerTeam"; +import Model from "../../Models/DatabaseModels/AlertOwnerTeam"; import TeamService from "./TeamService"; import AlertFeedService from "./AlertFeedService"; import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed"; diff --git a/Common/Server/Services/AlertOwnerUserService.ts b/Common/Server/Services/AlertOwnerUserService.ts index 502469e42b..aae844d571 100644 --- a/Common/Server/Services/AlertOwnerUserService.ts +++ b/Common/Server/Services/AlertOwnerUserService.ts @@ -3,7 +3,7 @@ import ObjectID from "../../Types/ObjectID"; import DeleteBy from "../Types/Database/DeleteBy"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/AlertOwnerUser"; +import Model from "../../Models/DatabaseModels/AlertOwnerUser"; import UserService from "./UserService"; import AlertFeedService from "./AlertFeedService"; import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed"; diff --git a/Common/Server/Services/AlertService.ts b/Common/Server/Services/AlertService.ts index 0004a55d19..20bb92f3fa 100644 --- a/Common/Server/Services/AlertService.ts +++ b/Common/Server/Services/AlertService.ts @@ -21,12 +21,12 @@ import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Typeof from "../../Types/Typeof"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; -import Model from "Common/Models/DatabaseModels/Alert"; -import AlertOwnerTeam from "Common/Models/DatabaseModels/AlertOwnerTeam"; -import AlertOwnerUser from "Common/Models/DatabaseModels/AlertOwnerUser"; -import AlertState from "Common/Models/DatabaseModels/AlertState"; -import AlertStateTimeline from "Common/Models/DatabaseModels/AlertStateTimeline"; -import User from "Common/Models/DatabaseModels/User"; +import Model from "../../Models/DatabaseModels/Alert"; +import AlertOwnerTeam from "../../Models/DatabaseModels/AlertOwnerTeam"; +import AlertOwnerUser from "../../Models/DatabaseModels/AlertOwnerUser"; +import AlertState from "../../Models/DatabaseModels/AlertState"; +import AlertStateTimeline from "../../Models/DatabaseModels/AlertStateTimeline"; +import User from "../../Models/DatabaseModels/User"; import { IsBillingEnabled } from "../EnvironmentConfig"; import TelemetryType from "../../Types/Telemetry/TelemetryType"; import logger from "../Utils/Logger"; diff --git a/Common/Server/Services/AlertSeverityService.ts b/Common/Server/Services/AlertSeverityService.ts index 139edad874..a48e7ba1bc 100644 --- a/Common/Server/Services/AlertSeverityService.ts +++ b/Common/Server/Services/AlertSeverityService.ts @@ -8,7 +8,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/AlertSeverity"; +import Model from "../../Models/DatabaseModels/AlertSeverity"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/AlertStateService.ts b/Common/Server/Services/AlertStateService.ts index ecbd6f55f8..567d23f5e7 100644 --- a/Common/Server/Services/AlertStateService.ts +++ b/Common/Server/Services/AlertStateService.ts @@ -9,7 +9,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import AlertState from "Common/Models/DatabaseModels/AlertState"; +import AlertState from "../../Models/DatabaseModels/AlertState"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/AlertStateTimelineService.ts b/Common/Server/Services/AlertStateTimelineService.ts index 0c4cc23969..471c3bf347 100644 --- a/Common/Server/Services/AlertStateTimelineService.ts +++ b/Common/Server/Services/AlertStateTimelineService.ts @@ -11,8 +11,8 @@ import OneUptimeDate from "../../Types/Date"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import AlertState from "Common/Models/DatabaseModels/AlertState"; -import AlertStateTimeline from "Common/Models/DatabaseModels/AlertStateTimeline"; +import AlertState from "../../Models/DatabaseModels/AlertState"; +import AlertStateTimeline from "../../Models/DatabaseModels/AlertStateTimeline"; import { IsBillingEnabled } from "../EnvironmentConfig"; import { JSONObject } from "../../Types/JSON"; import AlertInternalNote from "../../Models/DatabaseModels/AlertInternalNote"; diff --git a/Common/Server/Services/AnalyticsDatabaseService.ts b/Common/Server/Services/AnalyticsDatabaseService.ts index 484e6799bb..0e1accabbf 100644 --- a/Common/Server/Services/AnalyticsDatabaseService.ts +++ b/Common/Server/Services/AnalyticsDatabaseService.ts @@ -31,8 +31,8 @@ import Realtime from "../Utils/Realtime"; import StreamUtil from "../Utils/Stream"; import BaseService from "./BaseService"; import { ExecResult, ResponseJSON, ResultSet } from "@clickhouse/client"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import { WorkflowRoute } from "Common/ServiceRoute"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import { WorkflowRoute } from "../../ServiceRoute"; import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; @@ -47,7 +47,7 @@ import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Text from "../../Types/Text"; import Typeof from "../../Types/Typeof"; -import API from "Common/Utils/API"; +import API from "../../Utils/API"; import { Stream } from "node:stream"; import AggregateBy from "../Types/AnalyticsDatabase/AggregateBy"; import AggregatedResult from "../../Types/BaseDatabase/AggregatedResult"; diff --git a/Common/Server/Services/ApiKeyPermissionService.ts b/Common/Server/Services/ApiKeyPermissionService.ts index 16cfba6659..43201c1c66 100644 --- a/Common/Server/Services/ApiKeyPermissionService.ts +++ b/Common/Server/Services/ApiKeyPermissionService.ts @@ -4,7 +4,7 @@ import UpdateBy from "../Types/Database/UpdateBy"; import DatabaseService from "./DatabaseService"; import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/ApiKeyPermission"; +import Model from "../../Models/DatabaseModels/ApiKeyPermission"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ApiKeyService.ts b/Common/Server/Services/ApiKeyService.ts index e6fa951b8f..ab119e5676 100644 --- a/Common/Server/Services/ApiKeyService.ts +++ b/Common/Server/Services/ApiKeyService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/ApiKey"; +import Model from "../../Models/DatabaseModels/ApiKey"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/BillingInvoiceService.ts b/Common/Server/Services/BillingInvoiceService.ts index a1967738f3..afaf1ca210 100644 --- a/Common/Server/Services/BillingInvoiceService.ts +++ b/Common/Server/Services/BillingInvoiceService.ts @@ -8,8 +8,8 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import Model, { InvoiceStatus, -} from "Common/Models/DatabaseModels/BillingInvoice"; -import Project from "Common/Models/DatabaseModels/Project"; +} from "../../Models/DatabaseModels/BillingInvoice"; +import Project from "../../Models/DatabaseModels/Project"; import SubscriptionStatus from "../../Types/Billing/SubscriptionStatus"; import ObjectID from "../../Types/ObjectID"; import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore"; diff --git a/Common/Server/Services/BillingPaymentMethodService.ts b/Common/Server/Services/BillingPaymentMethodService.ts index 0ffd1e7d8c..f21ea7ee53 100644 --- a/Common/Server/Services/BillingPaymentMethodService.ts +++ b/Common/Server/Services/BillingPaymentMethodService.ts @@ -6,8 +6,8 @@ import DatabaseService from "./DatabaseService"; import ProjectService from "./ProjectService"; import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/BillingPaymentMethod"; -import Project from "Common/Models/DatabaseModels/Project"; +import Model from "../../Models/DatabaseModels/BillingPaymentMethod"; +import Project from "../../Models/DatabaseModels/Project"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/CallLogService.ts b/Common/Server/Services/CallLogService.ts index 29a4922ca0..41ace9108d 100644 --- a/Common/Server/Services/CallLogService.ts +++ b/Common/Server/Services/CallLogService.ts @@ -1,6 +1,6 @@ import { IsBillingEnabled } from "../EnvironmentConfig"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/CallLog"; +import Model from "../../Models/DatabaseModels/CallLog"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/CallService.ts b/Common/Server/Services/CallService.ts index d608cc8abb..3d92dc5969 100644 --- a/Common/Server/Services/CallService.ts +++ b/Common/Server/Services/CallService.ts @@ -10,7 +10,7 @@ import CallRequest from "../../Types/Call/CallRequest"; import TwilioConfig from "../../Types/CallAndSMS/TwilioConfig"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; -import API from "Common/Utils/API"; +import API from "../../Utils/API"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class CallService extends BaseService { diff --git a/Common/Server/Services/CopilotActionService.ts b/Common/Server/Services/CopilotActionService.ts index b12145363d..96157cd9e4 100644 --- a/Common/Server/Services/CopilotActionService.ts +++ b/Common/Server/Services/CopilotActionService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/CopilotAction"; +import Model from "../../Models/DatabaseModels/CopilotAction"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/CopilotActionTypePriorityService.ts b/Common/Server/Services/CopilotActionTypePriorityService.ts index c8f7d4a050..05668fcff2 100644 --- a/Common/Server/Services/CopilotActionTypePriorityService.ts +++ b/Common/Server/Services/CopilotActionTypePriorityService.ts @@ -4,7 +4,7 @@ import ObjectID from "../../Types/ObjectID"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/CopilotActionTypePriority"; +import Model from "../../Models/DatabaseModels/CopilotActionTypePriority"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/CopilotCodeRepositoryService.ts b/Common/Server/Services/CopilotCodeRepositoryService.ts index 920b8770ec..54a10e4c9d 100644 --- a/Common/Server/Services/CopilotCodeRepositoryService.ts +++ b/Common/Server/Services/CopilotCodeRepositoryService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/CopilotCodeRepository"; +import Model from "../../Models/DatabaseModels/CopilotCodeRepository"; import { CopilotActionTypeData, CopilotActionTypeUtil, diff --git a/Common/Server/Services/CopilotPullRequestService.ts b/Common/Server/Services/CopilotPullRequestService.ts index 2dc902b89e..6126801126 100644 --- a/Common/Server/Services/CopilotPullRequestService.ts +++ b/Common/Server/Services/CopilotPullRequestService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/CopilotPullRequest"; +import Model from "../../Models/DatabaseModels/CopilotPullRequest"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/DashboardService.ts b/Common/Server/Services/DashboardService.ts index 1ba504b9cc..8956706dc9 100644 --- a/Common/Server/Services/DashboardService.ts +++ b/Common/Server/Services/DashboardService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/Dashboard"; +import Model from "../../Models/DatabaseModels/Dashboard"; import { IsBillingEnabled } from "../EnvironmentConfig"; import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import DashboardViewConfigUtil from "../../Utils/Dashboard/DashboardViewConfig"; diff --git a/Common/Server/Services/DataMigrationService.ts b/Common/Server/Services/DataMigrationService.ts index d672cf5c91..4d0cfce420 100644 --- a/Common/Server/Services/DataMigrationService.ts +++ b/Common/Server/Services/DataMigrationService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/DataMigration"; +import Model from "../../Models/DatabaseModels/DataMigration"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/DatabaseService.ts b/Common/Server/Services/DatabaseService.ts index f4e779303c..617c47003d 100644 --- a/Common/Server/Services/DatabaseService.ts +++ b/Common/Server/Services/DatabaseService.ts @@ -31,8 +31,8 @@ import UpdateOneBy from "../Types/Database/UpdateOneBy"; import Encryption from "../Utils/Encryption"; import logger from "../Utils/Logger"; import BaseService from "./BaseService"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { WorkflowRoute } from "Common/ServiceRoute"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { WorkflowRoute } from "../../ServiceRoute"; import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; @@ -56,8 +56,8 @@ import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Text from "../../Types/Text"; import Typeof from "../../Types/Typeof"; -import API from "Common/Utils/API"; -import Slug from "Common/Utils/Slug"; +import API from "../../Utils/API"; +import Slug from "../../Utils/Slug"; import { DataSource, Repository, SelectQueryBuilder } from "typeorm"; import { FindWhere } from "../../Types/BaseDatabase/Query"; import Realtime from "../Utils/Realtime"; diff --git a/Common/Server/Services/DomainService.ts b/Common/Server/Services/DomainService.ts index e02a193938..ad43a97d73 100644 --- a/Common/Server/Services/DomainService.ts +++ b/Common/Server/Services/DomainService.ts @@ -5,7 +5,7 @@ import Domain from "../Types/Domain"; import DatabaseService from "./DatabaseService"; import BadDataException from "../../Types/Exception/BadDataException"; import Text from "../../Types/Text"; -import Model from "Common/Models/DatabaseModels/Domain"; +import Model from "../../Models/DatabaseModels/Domain"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/EmailLogService.ts b/Common/Server/Services/EmailLogService.ts index 0af13c444e..630a2ced19 100644 --- a/Common/Server/Services/EmailLogService.ts +++ b/Common/Server/Services/EmailLogService.ts @@ -1,6 +1,6 @@ import { IsBillingEnabled } from "../EnvironmentConfig"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/EmailLog"; +import Model from "../../Models/DatabaseModels/EmailLog"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/EmailVerificationTokenService.ts b/Common/Server/Services/EmailVerificationTokenService.ts index 28d8896996..503c2b76a8 100644 --- a/Common/Server/Services/EmailVerificationTokenService.ts +++ b/Common/Server/Services/EmailVerificationTokenService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/EmailVerificationToken"; +import Model from "../../Models/DatabaseModels/EmailVerificationToken"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ExceptionInstanceService.ts b/Common/Server/Services/ExceptionInstanceService.ts index ded93388f0..4dff3a990f 100644 --- a/Common/Server/Services/ExceptionInstanceService.ts +++ b/Common/Server/Services/ExceptionInstanceService.ts @@ -1,6 +1,6 @@ import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance"; +import ExceptionInstance from "../../Models/AnalyticsModels/ExceptionInstance"; export class ExceptionInstanceService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/Common/Server/Services/FileService.ts b/Common/Server/Services/FileService.ts index dcab4a89c3..f54ac652b7 100644 --- a/Common/Server/Services/FileService.ts +++ b/Common/Server/Services/FileService.ts @@ -4,7 +4,7 @@ import { OnDelete, OnFind, OnUpdate } from "../Types/Database/Hooks"; import UpdateBy from "../Types/Database/UpdateBy"; import DatabaseService from "./DatabaseService"; import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; -import File from "Common/Models/DatabaseModels/File"; +import File from "../../Models/DatabaseModels/File"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/GlobalConfigService.ts b/Common/Server/Services/GlobalConfigService.ts index a3293979cb..1450b9a04e 100644 --- a/Common/Server/Services/GlobalConfigService.ts +++ b/Common/Server/Services/GlobalConfigService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/GlobalConfig"; +import Model from "../../Models/DatabaseModels/GlobalConfig"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/GreenlockCertificateService.ts b/Common/Server/Services/GreenlockCertificateService.ts index e8eeec226a..ee76f53023 100644 --- a/Common/Server/Services/GreenlockCertificateService.ts +++ b/Common/Server/Services/GreenlockCertificateService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/GreenlockCertificate"; +import Model from "../../Models/DatabaseModels/GreenlockCertificate"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/GreenlockChallengeService.ts b/Common/Server/Services/GreenlockChallengeService.ts index dead11698f..1e8271dd13 100644 --- a/Common/Server/Services/GreenlockChallengeService.ts +++ b/Common/Server/Services/GreenlockChallengeService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/GreenlockChallenge"; +import Model from "../../Models/DatabaseModels/GreenlockChallenge"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentCustomFieldService.ts b/Common/Server/Services/IncidentCustomFieldService.ts index c16507b552..2e0c7691a5 100644 --- a/Common/Server/Services/IncidentCustomFieldService.ts +++ b/Common/Server/Services/IncidentCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentCustomField"; +import Model from "../../Models/DatabaseModels/IncidentCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentFeedService.ts b/Common/Server/Services/IncidentFeedService.ts index 558d1f27a0..7ded5af753 100644 --- a/Common/Server/Services/IncidentFeedService.ts +++ b/Common/Server/Services/IncidentFeedService.ts @@ -8,7 +8,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import IncidentFeed, { IncidentFeedEventType, -} from "Common/Models/DatabaseModels/IncidentFeed"; +} from "../../Models/DatabaseModels/IncidentFeed"; import WorkspaceNotificationRuleService, { MessageBlocksByWorkspaceType, } from "./WorkspaceNotificationRuleService"; diff --git a/Common/Server/Services/IncidentInternalNoteService.ts b/Common/Server/Services/IncidentInternalNoteService.ts index b58c68df19..fcf3fda3e9 100644 --- a/Common/Server/Services/IncidentInternalNoteService.ts +++ b/Common/Server/Services/IncidentInternalNoteService.ts @@ -1,6 +1,6 @@ import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentInternalNote"; +import Model from "../../Models/DatabaseModels/IncidentInternalNote"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; diff --git a/Common/Server/Services/IncidentNoteTemplateService.ts b/Common/Server/Services/IncidentNoteTemplateService.ts index 4f236338d1..887bd5ba16 100644 --- a/Common/Server/Services/IncidentNoteTemplateService.ts +++ b/Common/Server/Services/IncidentNoteTemplateService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentNoteTemplate"; +import Model from "../../Models/DatabaseModels/IncidentNoteTemplate"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentOwnerTeamService.ts b/Common/Server/Services/IncidentOwnerTeamService.ts index fe7a909ea6..f453aacc0d 100644 --- a/Common/Server/Services/IncidentOwnerTeamService.ts +++ b/Common/Server/Services/IncidentOwnerTeamService.ts @@ -1,7 +1,7 @@ import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentOwnerTeam"; +import Model from "../../Models/DatabaseModels/IncidentOwnerTeam"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/IncidentOwnerUserService.ts b/Common/Server/Services/IncidentOwnerUserService.ts index b346563736..1ca783749d 100644 --- a/Common/Server/Services/IncidentOwnerUserService.ts +++ b/Common/Server/Services/IncidentOwnerUserService.ts @@ -1,6 +1,6 @@ import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentOwnerUser"; +import Model from "../../Models/DatabaseModels/IncidentOwnerUser"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/IncidentPublicNoteService.ts b/Common/Server/Services/IncidentPublicNoteService.ts index f94327b06f..8d2698e6c7 100644 --- a/Common/Server/Services/IncidentPublicNoteService.ts +++ b/Common/Server/Services/IncidentPublicNoteService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import OneUptimeDate from "../../Types/Date"; -import Model from "Common/Models/DatabaseModels/IncidentPublicNote"; +import Model from "../../Models/DatabaseModels/IncidentPublicNote"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; import { Blue500, Indigo500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/IncidentService.ts b/Common/Server/Services/IncidentService.ts index 1625e8a887..08c4cf4c77 100644 --- a/Common/Server/Services/IncidentService.ts +++ b/Common/Server/Services/IncidentService.ts @@ -24,15 +24,15 @@ import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Typeof from "../../Types/Typeof"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; -import Model from "Common/Models/DatabaseModels/Incident"; -import IncidentOwnerTeam from "Common/Models/DatabaseModels/IncidentOwnerTeam"; -import IncidentOwnerUser from "Common/Models/DatabaseModels/IncidentOwnerUser"; -import IncidentState from "Common/Models/DatabaseModels/IncidentState"; -import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline"; -import Monitor from "Common/Models/DatabaseModels/Monitor"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; -import User from "Common/Models/DatabaseModels/User"; +import Model from "../../Models/DatabaseModels/Incident"; +import IncidentOwnerTeam from "../../Models/DatabaseModels/IncidentOwnerTeam"; +import IncidentOwnerUser from "../../Models/DatabaseModels/IncidentOwnerUser"; +import IncidentState from "../../Models/DatabaseModels/IncidentState"; +import IncidentStateTimeline from "../../Models/DatabaseModels/IncidentStateTimeline"; +import Monitor from "../../Models/DatabaseModels/Monitor"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; +import User from "../../Models/DatabaseModels/User"; import { IsBillingEnabled } from "../EnvironmentConfig"; import MetricService from "./MetricService"; import IncidentMetricType from "../../Types/Incident/IncidentMetricType"; @@ -46,7 +46,7 @@ import TelemetryType from "../../Types/Telemetry/TelemetryType"; import logger from "../Utils/Logger"; import Semaphore, { SemaphoreMutex, -} from "Common/Server/Infrastructure/Semaphore"; +} from "../../Server/Infrastructure/Semaphore"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/IncidentSeverityService.ts b/Common/Server/Services/IncidentSeverityService.ts index c39238a337..6aca03b176 100644 --- a/Common/Server/Services/IncidentSeverityService.ts +++ b/Common/Server/Services/IncidentSeverityService.ts @@ -8,7 +8,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/IncidentSeverity"; +import Model from "../../Models/DatabaseModels/IncidentSeverity"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentStateService.ts b/Common/Server/Services/IncidentStateService.ts index 0f06259552..97664384a2 100644 --- a/Common/Server/Services/IncidentStateService.ts +++ b/Common/Server/Services/IncidentStateService.ts @@ -9,7 +9,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import IncidentState from "Common/Models/DatabaseModels/IncidentState"; +import IncidentState from "../../Models/DatabaseModels/IncidentState"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/IncidentStateTimelineService.ts b/Common/Server/Services/IncidentStateTimelineService.ts index 90a17b506f..bb9c848599 100644 --- a/Common/Server/Services/IncidentStateTimelineService.ts +++ b/Common/Server/Services/IncidentStateTimelineService.ts @@ -13,10 +13,10 @@ import BadDataException from "../../Types/Exception/BadDataException"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Incident from "Common/Models/DatabaseModels/Incident"; -import IncidentPublicNote from "Common/Models/DatabaseModels/IncidentPublicNote"; -import IncidentState from "Common/Models/DatabaseModels/IncidentState"; -import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline"; +import Incident from "../../Models/DatabaseModels/Incident"; +import IncidentPublicNote from "../../Models/DatabaseModels/IncidentPublicNote"; +import IncidentState from "../../Models/DatabaseModels/IncidentState"; +import IncidentStateTimeline from "../../Models/DatabaseModels/IncidentStateTimeline"; import { IsBillingEnabled } from "../EnvironmentConfig"; import logger from "../Utils/Logger"; import IncidentFeedService from "./IncidentFeedService"; diff --git a/Common/Server/Services/IncidentTemplateOwnerTeamService.ts b/Common/Server/Services/IncidentTemplateOwnerTeamService.ts index 6991b50bdf..508f2efc7e 100644 --- a/Common/Server/Services/IncidentTemplateOwnerTeamService.ts +++ b/Common/Server/Services/IncidentTemplateOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentTemplateOwnerTeam"; +import Model from "../../Models/DatabaseModels/IncidentTemplateOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentTemplateOwnerUserService.ts b/Common/Server/Services/IncidentTemplateOwnerUserService.ts index 24024e552a..e2b47d4456 100644 --- a/Common/Server/Services/IncidentTemplateOwnerUserService.ts +++ b/Common/Server/Services/IncidentTemplateOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/IncidentTemplateOwnerUser"; +import Model from "../../Models/DatabaseModels/IncidentTemplateOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/IncidentTemplateService.ts b/Common/Server/Services/IncidentTemplateService.ts index a02e263b01..35641287a8 100644 --- a/Common/Server/Services/IncidentTemplateService.ts +++ b/Common/Server/Services/IncidentTemplateService.ts @@ -5,9 +5,9 @@ import IncidentTemplateOwnerUserService from "./IncidentTemplateOwnerUserService import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import ObjectID from "../../Types/ObjectID"; import Typeof from "../../Types/Typeof"; -import Model from "Common/Models/DatabaseModels/IncidentTemplate"; -import IncidentTemplateOwnerTeam from "Common/Models/DatabaseModels/IncidentTemplateOwnerTeam"; -import IncidentTemplateOwnerUser from "Common/Models/DatabaseModels/IncidentTemplateOwnerUser"; +import Model from "../../Models/DatabaseModels/IncidentTemplate"; +import IncidentTemplateOwnerTeam from "../../Models/DatabaseModels/IncidentTemplateOwnerTeam"; +import IncidentTemplateOwnerUser from "../../Models/DatabaseModels/IncidentTemplateOwnerUser"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/Index.ts b/Common/Server/Services/Index.ts index 392f2f9d9a..60038abfa3 100644 --- a/Common/Server/Services/Index.ts +++ b/Common/Server/Services/Index.ts @@ -127,7 +127,7 @@ import WorkflowLogService from "./WorkflowLogService"; // Workflows. import WorkflowService from "./WorkflowService"; import WorkflowVariablesService from "./WorkflowVariableService"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import CopilotPullRequestService from "./CopilotPullRequestService"; import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService"; import TelemetryAttributeService from "./TelemetryAttributeService"; diff --git a/Common/Server/Services/LabelService.ts b/Common/Server/Services/LabelService.ts index 163d0b4170..91e57b14c8 100644 --- a/Common/Server/Services/LabelService.ts +++ b/Common/Server/Services/LabelService.ts @@ -3,7 +3,7 @@ import { OnCreate } from "../Types/Database/Hooks"; import QueryHelper from "../Types/Database/QueryHelper"; import DatabaseService from "./DatabaseService"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/Label"; +import Model from "../../Models/DatabaseModels/Label"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/LogService.ts b/Common/Server/Services/LogService.ts index 132040bacf..d214c8b11a 100644 --- a/Common/Server/Services/LogService.ts +++ b/Common/Server/Services/LogService.ts @@ -1,6 +1,6 @@ import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import Log from "Common/Models/AnalyticsModels/Log"; +import Log from "../../Models/AnalyticsModels/Log"; export class LogService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/Common/Server/Services/MailService.ts b/Common/Server/Services/MailService.ts index 956485f216..97fa673ae0 100644 --- a/Common/Server/Services/MailService.ts +++ b/Common/Server/Services/MailService.ts @@ -10,7 +10,7 @@ import Email from "../../Types/Email/EmailMessage"; import EmailServer from "../../Types/Email/EmailServer"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; -import API from "Common/Utils/API"; +import API from "../../Utils/API"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class MailService extends BaseService { diff --git a/Common/Server/Services/MetricService.ts b/Common/Server/Services/MetricService.ts index 0ee056afc7..72cc109108 100644 --- a/Common/Server/Services/MetricService.ts +++ b/Common/Server/Services/MetricService.ts @@ -1,6 +1,6 @@ import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import MetricSum from "Common/Models/AnalyticsModels/Metric"; +import MetricSum from "../../Models/AnalyticsModels/Metric"; export class MetricService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/Common/Server/Services/MetricTypeService.ts b/Common/Server/Services/MetricTypeService.ts index 8c0fabe227..c09ef525da 100644 --- a/Common/Server/Services/MetricTypeService.ts +++ b/Common/Server/Services/MetricTypeService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MetricType"; +import Model from "../../Models/DatabaseModels/MetricType"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorCustomFieldService.ts b/Common/Server/Services/MonitorCustomFieldService.ts index a764f4f664..fcfa6e28da 100644 --- a/Common/Server/Services/MonitorCustomFieldService.ts +++ b/Common/Server/Services/MonitorCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorCustomField"; +import Model from "../../Models/DatabaseModels/MonitorCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorFeedService.ts b/Common/Server/Services/MonitorFeedService.ts index 0a959b411a..cf9e93159a 100644 --- a/Common/Server/Services/MonitorFeedService.ts +++ b/Common/Server/Services/MonitorFeedService.ts @@ -8,7 +8,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import MonitorFeed, { MonitorFeedEventType, -} from "Common/Models/DatabaseModels/MonitorFeed"; +} from "../../Models/DatabaseModels/MonitorFeed"; import WorkspaceNotificationRuleService, { MessageBlocksByWorkspaceType, } from "./WorkspaceNotificationRuleService"; diff --git a/Common/Server/Services/MonitorGroupOwnerTeamService.ts b/Common/Server/Services/MonitorGroupOwnerTeamService.ts index 1882b722c0..b25d13f83b 100644 --- a/Common/Server/Services/MonitorGroupOwnerTeamService.ts +++ b/Common/Server/Services/MonitorGroupOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorGroupOwnerTeam"; +import Model from "../../Models/DatabaseModels/MonitorGroupOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorGroupOwnerUserService.ts b/Common/Server/Services/MonitorGroupOwnerUserService.ts index d5c61f809c..264733d7f3 100644 --- a/Common/Server/Services/MonitorGroupOwnerUserService.ts +++ b/Common/Server/Services/MonitorGroupOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorGroupOwnerUser"; +import Model from "../../Models/DatabaseModels/MonitorGroupOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorGroupResourceService.ts b/Common/Server/Services/MonitorGroupResourceService.ts index e2c7600212..f863f653de 100644 --- a/Common/Server/Services/MonitorGroupResourceService.ts +++ b/Common/Server/Services/MonitorGroupResourceService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorGroupResource"; +import Model from "../../Models/DatabaseModels/MonitorGroupResource"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorGroupService.ts b/Common/Server/Services/MonitorGroupService.ts index d7bb398714..f882aa0b3b 100644 --- a/Common/Server/Services/MonitorGroupService.ts +++ b/Common/Server/Services/MonitorGroupService.ts @@ -8,10 +8,10 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import MonitorGroup from "Common/Models/DatabaseModels/MonitorGroup"; -import MonitorGroupResource from "Common/Models/DatabaseModels/MonitorGroupResource"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; +import MonitorGroup from "../../Models/DatabaseModels/MonitorGroup"; +import MonitorGroupResource from "../../Models/DatabaseModels/MonitorGroupResource"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; import DeleteBy from "../Types/Database/DeleteBy"; import { OnDelete } from "../Types/Database/Hooks"; import StatusPageResourceService from "./StatusPageResourceService"; diff --git a/Common/Server/Services/MonitorLogService.ts b/Common/Server/Services/MonitorLogService.ts index ae5a81b6ce..34f713fb08 100644 --- a/Common/Server/Services/MonitorLogService.ts +++ b/Common/Server/Services/MonitorLogService.ts @@ -1,6 +1,6 @@ import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import MonitorLog from "Common/Models/AnalyticsModels/MonitorLog"; +import MonitorLog from "../../Models/AnalyticsModels/MonitorLog"; export class Service extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/Common/Server/Services/MonitorOwnerTeamService.ts b/Common/Server/Services/MonitorOwnerTeamService.ts index 34a483e18c..0d9c79b0e2 100644 --- a/Common/Server/Services/MonitorOwnerTeamService.ts +++ b/Common/Server/Services/MonitorOwnerTeamService.ts @@ -1,7 +1,7 @@ import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorOwnerTeam"; +import Model from "../../Models/DatabaseModels/MonitorOwnerTeam"; import MonitorFeedService from "./MonitorFeedService"; import { MonitorFeedEventType } from "../../Models/DatabaseModels/MonitorFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/MonitorOwnerUserService.ts b/Common/Server/Services/MonitorOwnerUserService.ts index 8c70139fa6..98b4e44966 100644 --- a/Common/Server/Services/MonitorOwnerUserService.ts +++ b/Common/Server/Services/MonitorOwnerUserService.ts @@ -1,6 +1,6 @@ import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/MonitorOwnerUser"; +import Model from "../../Models/DatabaseModels/MonitorOwnerUser"; import MonitorFeedService from "./MonitorFeedService"; import { MonitorFeedEventType } from "../../Models/DatabaseModels/MonitorFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/MonitorProbeService.ts b/Common/Server/Services/MonitorProbeService.ts index dd6967fcc5..ea7562230f 100644 --- a/Common/Server/Services/MonitorProbeService.ts +++ b/Common/Server/Services/MonitorProbeService.ts @@ -4,7 +4,7 @@ import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import OneUptimeDate from "../../Types/Date"; import BadDataException from "../../Types/Exception/BadDataException"; -import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe"; +import MonitorProbe from "../../Models/DatabaseModels/MonitorProbe"; import QueryHelper from "../Types/Database/QueryHelper"; import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import MonitorService from "./MonitorService"; diff --git a/Common/Server/Services/MonitorSecretService.ts b/Common/Server/Services/MonitorSecretService.ts index 73671fe115..4eb7d30901 100644 --- a/Common/Server/Services/MonitorSecretService.ts +++ b/Common/Server/Services/MonitorSecretService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import MonitorSecret from "Common/Models/DatabaseModels/MonitorSecret"; +import MonitorSecret from "../../Models/DatabaseModels/MonitorSecret"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/MonitorService.ts b/Common/Server/Services/MonitorService.ts index e64a5de31f..a0a93da800 100644 --- a/Common/Server/Services/MonitorService.ts +++ b/Common/Server/Services/MonitorService.ts @@ -30,16 +30,16 @@ import MonitorType, { import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Typeof from "../../Types/Typeof"; -import Model from "Common/Models/DatabaseModels/Monitor"; -import MonitorOwnerTeam from "Common/Models/DatabaseModels/MonitorOwnerTeam"; -import MonitorOwnerUser from "Common/Models/DatabaseModels/MonitorOwnerUser"; -import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; +import Model from "../../Models/DatabaseModels/Monitor"; +import MonitorOwnerTeam from "../../Models/DatabaseModels/MonitorOwnerTeam"; +import MonitorOwnerUser from "../../Models/DatabaseModels/MonitorOwnerUser"; +import MonitorProbe from "../../Models/DatabaseModels/MonitorProbe"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; import Probe, { ProbeConnectionStatus, -} from "Common/Models/DatabaseModels/Probe"; -import User from "Common/Models/DatabaseModels/User"; +} from "../../Models/DatabaseModels/Probe"; +import User from "../../Models/DatabaseModels/User"; import Select from "../Types/Database/Select"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import { EmailEnvelope } from "../../Types/Email/EmailMessage"; diff --git a/Common/Server/Services/MonitorStatusService.ts b/Common/Server/Services/MonitorStatusService.ts index c02e290f3f..3cc80157fe 100644 --- a/Common/Server/Services/MonitorStatusService.ts +++ b/Common/Server/Services/MonitorStatusService.ts @@ -8,7 +8,7 @@ import SortOrder from "../../Types/BaseDatabase/SortOrder"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/MonitorStatus"; +import Model from "../../Models/DatabaseModels/MonitorStatus"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/MonitorStatusTimelineService.ts b/Common/Server/Services/MonitorStatusTimelineService.ts index 3ba1031d0c..fffc434fa6 100644 --- a/Common/Server/Services/MonitorStatusTimelineService.ts +++ b/Common/Server/Services/MonitorStatusTimelineService.ts @@ -13,7 +13,7 @@ import OneUptimeDate from "../../Types/Date"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; import MonitorFeedService from "./MonitorFeedService"; import { MonitorFeedEventType } from "../../Models/DatabaseModels/MonitorFeed"; import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; diff --git a/Common/Server/Services/MonitorTestService.ts b/Common/Server/Services/MonitorTestService.ts index d45b95f52a..7c7856a593 100644 --- a/Common/Server/Services/MonitorTestService.ts +++ b/Common/Server/Services/MonitorTestService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import MonitorTest from "Common/Models/DatabaseModels/MonitorTest"; +import MonitorTest from "../../Models/DatabaseModels/MonitorTest"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/NotificationService.ts b/Common/Server/Services/NotificationService.ts index 95d1e2f2a4..6cd772f4f2 100644 --- a/Common/Server/Services/NotificationService.ts +++ b/Common/Server/Services/NotificationService.ts @@ -5,7 +5,7 @@ import BillingService from "./BillingService"; import ProjectService from "./ProjectService"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Project from "Common/Models/DatabaseModels/Project"; +import Project from "../../Models/DatabaseModels/Project"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class NotificationService extends BaseService { diff --git a/Common/Server/Services/OnCallDutyPolicyCustomFieldService.ts b/Common/Server/Services/OnCallDutyPolicyCustomFieldService.ts index e33610f1da..b6f95718b8 100644 --- a/Common/Server/Services/OnCallDutyPolicyCustomFieldService.ts +++ b/Common/Server/Services/OnCallDutyPolicyCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyCustomField"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts b/Common/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts index f77e0b201d..f00278b91d 100644 --- a/Common/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts +++ b/Common/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; import Dictionary from "../../Types/Dictionary"; import OnCallDutyPolicyService from "./OnCallDutyPolicyService"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; diff --git a/Common/Server/Services/OnCallDutyPolicyEscalationRuleService.ts b/Common/Server/Services/OnCallDutyPolicyEscalationRuleService.ts index 8b9a1ea593..bd75236cf0 100644 --- a/Common/Server/Services/OnCallDutyPolicyEscalationRuleService.ts +++ b/Common/Server/Services/OnCallDutyPolicyEscalationRuleService.ts @@ -24,12 +24,12 @@ import ObjectID from "../../Types/ObjectID"; import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus"; import PositiveNumber from "../../Types/PositiveNumber"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule"; -import OnCallDutyPolicyEscalationRuleSchedule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; -import OnCallDutyPolicyEscalationRuleTeam from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam"; -import OnCallDutyPolicyEscalationRuleUser from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser"; -import OnCallDutyPolicyExecutionLogTimeline from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline"; -import User from "Common/Models/DatabaseModels/User"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRule"; +import OnCallDutyPolicyEscalationRuleSchedule from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; +import OnCallDutyPolicyEscalationRuleTeam from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam"; +import OnCallDutyPolicyEscalationRuleUser from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser"; +import OnCallDutyPolicyExecutionLogTimeline from "../../Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline"; +import User from "../../Models/DatabaseModels/User"; import logger from "../Utils/Logger"; import OnCallDutyPolicyUserOverride from "../../Models/DatabaseModels/OnCallDutyPolicyUserOverride"; import OnCallDutyPolicyUserOverrideService from "./OnCallDutyPolicyUserOverrideService"; diff --git a/Common/Server/Services/OnCallDutyPolicyEscalationRuleTeamService.ts b/Common/Server/Services/OnCallDutyPolicyEscalationRuleTeamService.ts index cccb7a0015..11e4840cd1 100644 --- a/Common/Server/Services/OnCallDutyPolicyEscalationRuleTeamService.ts +++ b/Common/Server/Services/OnCallDutyPolicyEscalationRuleTeamService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam"; import Dictionary from "../../Types/Dictionary"; import OnCallDutyPolicyService from "./OnCallDutyPolicyService"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; diff --git a/Common/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts b/Common/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts index 3a74f9a93c..94507d00d3 100644 --- a/Common/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts +++ b/Common/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser"; import Dictionary from "../../Types/Dictionary"; import OnCallDutyPolicyService from "./OnCallDutyPolicyService"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; diff --git a/Common/Server/Services/OnCallDutyPolicyExecutionLogService.ts b/Common/Server/Services/OnCallDutyPolicyExecutionLogService.ts index 0427191e17..c910747e1c 100644 --- a/Common/Server/Services/OnCallDutyPolicyExecutionLogService.ts +++ b/Common/Server/Services/OnCallDutyPolicyExecutionLogService.ts @@ -4,8 +4,8 @@ import DatabaseService from "./DatabaseService"; import OnCallDutyPolicyEscalationRuleService from "./OnCallDutyPolicyEscalationRuleService"; import OnCallDutyPolicyStatus from "../../Types/OnCallDutyPolicy/OnCallDutyPolicyStatus"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; -import OnCallDutyPolicyEscalationRule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog"; +import OnCallDutyPolicyEscalationRule from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRule"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyExecutionLog"; import { IsBillingEnabled } from "../EnvironmentConfig"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import IncidentFeedService from "./IncidentFeedService"; diff --git a/Common/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts b/Common/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts index 10388ddb3c..4e17b32959 100644 --- a/Common/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts +++ b/Common/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts @@ -1,6 +1,6 @@ import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline"; import IncidentFeedService from "./IncidentFeedService"; import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"; import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus"; diff --git a/Common/Server/Services/OnCallDutyPolicyFeedService.ts b/Common/Server/Services/OnCallDutyPolicyFeedService.ts index b4d5f7044d..ea08b5ddac 100644 --- a/Common/Server/Services/OnCallDutyPolicyFeedService.ts +++ b/Common/Server/Services/OnCallDutyPolicyFeedService.ts @@ -8,7 +8,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import OnCallDutyPolicyFeed, { OnCallDutyPolicyFeedEventType, -} from "Common/Models/DatabaseModels/OnCallDutyPolicyFeed"; +} from "../../Models/DatabaseModels/OnCallDutyPolicyFeed"; import WorkspaceNotificationRuleService, { MessageBlocksByWorkspaceType, } from "./WorkspaceNotificationRuleService"; diff --git a/Common/Server/Services/OnCallDutyPolicyOwnerTeamService.ts b/Common/Server/Services/OnCallDutyPolicyOwnerTeamService.ts index e292c48e66..f5bbc743f9 100644 --- a/Common/Server/Services/OnCallDutyPolicyOwnerTeamService.ts +++ b/Common/Server/Services/OnCallDutyPolicyOwnerTeamService.ts @@ -1,7 +1,7 @@ import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerTeam"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyOwnerTeam"; import OnCallDutyPolicyFeedService from "./OnCallDutyPolicyFeedService"; import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCallDutyPolicyFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/OnCallDutyPolicyOwnerUserService.ts b/Common/Server/Services/OnCallDutyPolicyOwnerUserService.ts index 7fd5a88011..72be662dad 100644 --- a/Common/Server/Services/OnCallDutyPolicyOwnerUserService.ts +++ b/Common/Server/Services/OnCallDutyPolicyOwnerUserService.ts @@ -1,6 +1,6 @@ import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyOwnerUser"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyOwnerUser"; import OnCallDutyPolicyFeedService from "./OnCallDutyPolicyFeedService"; import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCallDutyPolicyFeed"; import { Gray500, Red500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/OnCallDutyPolicyScheduleLayerService.ts b/Common/Server/Services/OnCallDutyPolicyScheduleLayerService.ts index 79396c1beb..b9fdee9e82 100644 --- a/Common/Server/Services/OnCallDutyPolicyScheduleLayerService.ts +++ b/Common/Server/Services/OnCallDutyPolicyScheduleLayerService.ts @@ -8,7 +8,7 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyScheduleLayer"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import OnCallDutyPolicyScheduleService from "./OnCallDutyPolicyScheduleService"; diff --git a/Common/Server/Services/OnCallDutyPolicyScheduleLayerUserService.ts b/Common/Server/Services/OnCallDutyPolicyScheduleLayerUserService.ts index 53cff1e14e..42a5a446c5 100644 --- a/Common/Server/Services/OnCallDutyPolicyScheduleLayerUserService.ts +++ b/Common/Server/Services/OnCallDutyPolicyScheduleLayerUserService.ts @@ -9,7 +9,7 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import OnCallDutyPolicyScheduleService from "./OnCallDutyPolicyScheduleService"; diff --git a/Common/Server/Services/OnCallDutyPolicyScheduleService.ts b/Common/Server/Services/OnCallDutyPolicyScheduleService.ts index 4480bffc38..b214cfd4af 100644 --- a/Common/Server/Services/OnCallDutyPolicyScheduleService.ts +++ b/Common/Server/Services/OnCallDutyPolicyScheduleService.ts @@ -7,11 +7,11 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import OneUptimeDate from "../../Types/Date"; import ObjectID from "../../Types/ObjectID"; import LayerUtil, { LayerProps } from "../../Types/OnCallDutyPolicy/Layer"; -import OnCallDutyPolicyScheduleLayer from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer"; -import OnCallDutyPolicyScheduleLayerUser from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser"; -import User from "Common/Models/DatabaseModels/User"; +import OnCallDutyPolicyScheduleLayer from "../../Models/DatabaseModels/OnCallDutyPolicyScheduleLayer"; +import OnCallDutyPolicyScheduleLayerUser from "../../Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser"; +import User from "../../Models/DatabaseModels/User"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; -import OnCallDutyPolicySchedule from "Common/Models/DatabaseModels/OnCallDutyPolicySchedule"; +import OnCallDutyPolicySchedule from "../../Models/DatabaseModels/OnCallDutyPolicySchedule"; import OnCallDutyPolicyEscalationRuleSchedule from "../../Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule"; import OnCallDutyPolicyEscalationRuleScheduleService from "./OnCallDutyPolicyEscalationRuleScheduleService"; import Dictionary from "../../Types/Dictionary"; diff --git a/Common/Server/Services/OnCallDutyPolicyService.ts b/Common/Server/Services/OnCallDutyPolicyService.ts index 56e4fac7db..946d6e5f11 100644 --- a/Common/Server/Services/OnCallDutyPolicyService.ts +++ b/Common/Server/Services/OnCallDutyPolicyService.ts @@ -4,8 +4,8 @@ import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import OnCallDutyPolicyStatus from "../../Types/OnCallDutyPolicy/OnCallDutyPolicyStatus"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; -import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy"; -import OnCallDutyPolicyExecutionLog from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog"; +import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy"; +import OnCallDutyPolicyExecutionLog from "../../Models/DatabaseModels/OnCallDutyPolicyExecutionLog"; import DatabaseConfig from "../DatabaseConfig"; import URL from "../../Types/API/URL"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/OnCallDutyPolicyTimeLogService.ts b/Common/Server/Services/OnCallDutyPolicyTimeLogService.ts index b2b2cd99c4..e0ad86b66f 100644 --- a/Common/Server/Services/OnCallDutyPolicyTimeLogService.ts +++ b/Common/Server/Services/OnCallDutyPolicyTimeLogService.ts @@ -1,7 +1,7 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/OnCallDutyPolicyTimeLog"; +import Model from "../../Models/DatabaseModels/OnCallDutyPolicyTimeLog"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/OpenTelemetryIngestService.ts b/Common/Server/Services/OpenTelemetryIngestService.ts index 813f50b5a2..634e1e9d63 100644 --- a/Common/Server/Services/OpenTelemetryIngestService.ts +++ b/Common/Server/Services/OpenTelemetryIngestService.ts @@ -1,18 +1,18 @@ -import OneUptimeDate from "Common/Types/Date"; -import { JSONArray, JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; +import OneUptimeDate from "../../Types/Date"; +import { JSONArray, JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; import Metric, { AggregationTemporality, -} from "Common/Models/AnalyticsModels/Metric"; -import Dictionary from "Common/Types/Dictionary"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; -import { IsBillingEnabled } from "Common/Server/EnvironmentConfig"; -import TelemetryUsageBillingService from "Common/Server/Services/TelemetryUsageBillingService"; -import logger from "Common/Server/Utils/Logger"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; -import TelemetryServiceService from "Common/Server/Services/TelemetryServiceService"; -import { DEFAULT_RETENTION_IN_DAYS } from "Common/Models/DatabaseModels/TelemetryUsageBilling"; -import TelemetryUtil from "Common/Server/Utils/Telemetry/Telemetry"; +} from "../../Models/AnalyticsModels/Metric"; +import Dictionary from "../../Types/Dictionary"; +import ProductType from "../../Types/MeteredPlan/ProductType"; +import { IsBillingEnabled } from "../../Server/EnvironmentConfig"; +import TelemetryUsageBillingService from "../../Server/Services/TelemetryUsageBillingService"; +import logger from "../../Server/Utils/Logger"; +import TelemetryService from "../../Models/DatabaseModels/TelemetryService"; +import TelemetryServiceService from "../../Server/Services/TelemetryServiceService"; +import { DEFAULT_RETENTION_IN_DAYS } from "../../Models/DatabaseModels/TelemetryUsageBilling"; +import TelemetryUtil from "../../Server/Utils/Telemetry/Telemetry"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export enum OtelAggregationTemporality { diff --git a/Common/Server/Services/ProbeOwnerTeamService.ts b/Common/Server/Services/ProbeOwnerTeamService.ts index e8467ea6a6..b53158d958 100644 --- a/Common/Server/Services/ProbeOwnerTeamService.ts +++ b/Common/Server/Services/ProbeOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ProbeOwnerTeam"; +import Model from "../../Models/DatabaseModels/ProbeOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ProbeOwnerUserService.ts b/Common/Server/Services/ProbeOwnerUserService.ts index 953fda60e7..040e948f1c 100644 --- a/Common/Server/Services/ProbeOwnerUserService.ts +++ b/Common/Server/Services/ProbeOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ProbeOwnerUser"; +import Model from "../../Models/DatabaseModels/ProbeOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ProbeService.ts b/Common/Server/Services/ProbeService.ts index a718d99ba4..11e639c200 100644 --- a/Common/Server/Services/ProbeService.ts +++ b/Common/Server/Services/ProbeService.ts @@ -1,4 +1,4 @@ -import User from "Common/Models/DatabaseModels/User"; +import User from "../../Models/DatabaseModels/User"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; @@ -6,11 +6,11 @@ import ObjectID from "../../Types/ObjectID"; import Version from "../../Types/Version"; import Model, { ProbeConnectionStatus, -} from "Common/Models/DatabaseModels/Probe"; -import ProbeOwnerUser from "Common/Models/DatabaseModels/ProbeOwnerUser"; +} from "../../Models/DatabaseModels/Probe"; +import ProbeOwnerUser from "../../Models/DatabaseModels/ProbeOwnerUser"; import ProbeOwnerUserService from "./ProbeOwnerUserService"; import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; -import ProbeOwnerTeam from "Common/Models/DatabaseModels/ProbeOwnerTeam"; +import ProbeOwnerTeam from "../../Models/DatabaseModels/ProbeOwnerTeam"; import ProbeOwnerTeamService from "./ProbeOwnerTeamService"; import TeamMemberService from "./TeamMemberService"; import BadDataException from "../../Types/Exception/BadDataException"; diff --git a/Common/Server/Services/ProjectCallSMSConfigService.ts b/Common/Server/Services/ProjectCallSMSConfigService.ts index f7a09ff841..4f3bb2988d 100644 --- a/Common/Server/Services/ProjectCallSMSConfigService.ts +++ b/Common/Server/Services/ProjectCallSMSConfigService.ts @@ -1,7 +1,7 @@ import DatabaseService from "./DatabaseService"; import TwilioConfig from "../../Types/CallAndSMS/TwilioConfig"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/ProjectCallSMSConfig"; +import Model from "../../Models/DatabaseModels/ProjectCallSMSConfig"; import Phone from "../../Types/Phone"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/ProjectService.ts b/Common/Server/Services/ProjectService.ts index 2e07d2d7d2..bf593cba68 100755 --- a/Common/Server/Services/ProjectService.ts +++ b/Common/Server/Services/ProjectService.ts @@ -1,4 +1,4 @@ -import ResellerPlan from "Common/Models/DatabaseModels/ResellerPlan"; +import ResellerPlan from "../../Models/DatabaseModels/ResellerPlan"; import { IsBillingEnabled, NotificationSlackWebhookOnCreateProject, @@ -51,16 +51,16 @@ import BadDataException from "../../Types/Exception/BadDataException"; import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; import ObjectID from "../../Types/ObjectID"; import Permission from "../../Types/Permission"; -import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity"; -import IncidentState from "Common/Models/DatabaseModels/IncidentState"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import Model from "Common/Models/DatabaseModels/Project"; -import PromoCode from "Common/Models/DatabaseModels/PromoCode"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; -import Team from "Common/Models/DatabaseModels/Team"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; -import TeamPermission from "Common/Models/DatabaseModels/TeamPermission"; -import User from "Common/Models/DatabaseModels/User"; +import IncidentSeverity from "../../Models/DatabaseModels/IncidentSeverity"; +import IncidentState from "../../Models/DatabaseModels/IncidentState"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import Model from "../../Models/DatabaseModels/Project"; +import PromoCode from "../../Models/DatabaseModels/PromoCode"; +import ScheduledMaintenanceState from "../../Models/DatabaseModels/ScheduledMaintenanceState"; +import Team from "../../Models/DatabaseModels/Team"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; +import TeamPermission from "../../Models/DatabaseModels/TeamPermission"; +import User from "../../Models/DatabaseModels/User"; import Select from "../Types/Database/Select"; import Query from "../Types/Database/Query"; import AlertSeverity from "../../Models/DatabaseModels/AlertSeverity"; diff --git a/Common/Server/Services/ProjectSmtpConfigService.ts b/Common/Server/Services/ProjectSmtpConfigService.ts index f05773e7dc..757c106d18 100755 --- a/Common/Server/Services/ProjectSmtpConfigService.ts +++ b/Common/Server/Services/ProjectSmtpConfigService.ts @@ -1,7 +1,7 @@ import DatabaseService from "./DatabaseService"; import EmailServer from "../../Types/Email/EmailServer"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/ProjectSmtpConfig"; +import Model from "../../Models/DatabaseModels/ProjectSmtpConfig"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ProjectSsoService.ts b/Common/Server/Services/ProjectSsoService.ts index bd4adc859b..44e821e7b3 100644 --- a/Common/Server/Services/ProjectSsoService.ts +++ b/Common/Server/Services/ProjectSsoService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ProjectSso"; +import Model from "../../Models/DatabaseModels/ProjectSso"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ProjectUserService.ts b/Common/Server/Services/ProjectUserService.ts index 24af672c0a..66a61588df 100644 --- a/Common/Server/Services/ProjectUserService.ts +++ b/Common/Server/Services/ProjectUserService.ts @@ -2,7 +2,7 @@ import TeamMember from "../../Models/DatabaseModels/TeamMember"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ProjectUser"; +import Model from "../../Models/DatabaseModels/ProjectUser"; import TeamMemberService from "./TeamMemberService"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/PromoCodeService.ts b/Common/Server/Services/PromoCodeService.ts index c438dca29f..df28aafd2e 100644 --- a/Common/Server/Services/PromoCodeService.ts +++ b/Common/Server/Services/PromoCodeService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/PromoCode"; +import Model from "../../Models/DatabaseModels/PromoCode"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ResellerPlanService.ts b/Common/Server/Services/ResellerPlanService.ts index a40def367c..5f3bb1d6b3 100644 --- a/Common/Server/Services/ResellerPlanService.ts +++ b/Common/Server/Services/ResellerPlanService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ResellerPlan"; +import Model from "../../Models/DatabaseModels/ResellerPlan"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ResellerService.ts b/Common/Server/Services/ResellerService.ts index 20bcbe1487..24845dbaee 100644 --- a/Common/Server/Services/ResellerService.ts +++ b/Common/Server/Services/ResellerService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/Reseller"; +import Model from "../../Models/DatabaseModels/Reseller"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ScheduledMaintenanceCustomFieldService.ts b/Common/Server/Services/ScheduledMaintenanceCustomFieldService.ts index 08e83d719e..b4d6952798 100644 --- a/Common/Server/Services/ScheduledMaintenanceCustomFieldService.ts +++ b/Common/Server/Services/ScheduledMaintenanceCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceCustomField"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ScheduledMaintenanceFeedService.ts b/Common/Server/Services/ScheduledMaintenanceFeedService.ts index c98358f1ca..c7032da3db 100644 --- a/Common/Server/Services/ScheduledMaintenanceFeedService.ts +++ b/Common/Server/Services/ScheduledMaintenanceFeedService.ts @@ -8,7 +8,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import Model, { ScheduledMaintenanceFeedEventType, -} from "Common/Models/DatabaseModels/ScheduledMaintenanceFeed"; +} from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; import WorkspaceNotificationRuleService, { MessageBlocksByWorkspaceType, } from "./WorkspaceNotificationRuleService"; diff --git a/Common/Server/Services/ScheduledMaintenanceInternalNoteService.ts b/Common/Server/Services/ScheduledMaintenanceInternalNoteService.ts index 0a787d2d69..b37765f709 100644 --- a/Common/Server/Services/ScheduledMaintenanceInternalNoteService.ts +++ b/Common/Server/Services/ScheduledMaintenanceInternalNoteService.ts @@ -1,7 +1,7 @@ import ObjectID from "../../Types/ObjectID"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceInternalNote"; import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService"; import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; import { Blue500 } from "../../Types/BrandColors"; diff --git a/Common/Server/Services/ScheduledMaintenanceNoteTemplateService.ts b/Common/Server/Services/ScheduledMaintenanceNoteTemplateService.ts index 7b970f8f50..757fa963aa 100644 --- a/Common/Server/Services/ScheduledMaintenanceNoteTemplateService.ts +++ b/Common/Server/Services/ScheduledMaintenanceNoteTemplateService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceNoteTemplate"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ScheduledMaintenanceOwnerTeamService.ts b/Common/Server/Services/ScheduledMaintenanceOwnerTeamService.ts index 485c3ef700..297c44ea95 100644 --- a/Common/Server/Services/ScheduledMaintenanceOwnerTeamService.ts +++ b/Common/Server/Services/ScheduledMaintenanceOwnerTeamService.ts @@ -1,7 +1,7 @@ import Team from "../../Models/DatabaseModels/Team"; import ObjectID from "../../Types/ObjectID"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceOwnerTeam"; import TeamService from "./TeamService"; import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService"; import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; diff --git a/Common/Server/Services/ScheduledMaintenanceOwnerUserService.ts b/Common/Server/Services/ScheduledMaintenanceOwnerUserService.ts index 59d31284b1..66170776da 100644 --- a/Common/Server/Services/ScheduledMaintenanceOwnerUserService.ts +++ b/Common/Server/Services/ScheduledMaintenanceOwnerUserService.ts @@ -3,7 +3,7 @@ import ObjectID from "../../Types/ObjectID"; import DeleteBy from "../Types/Database/DeleteBy"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceOwnerUser"; import UserService from "./UserService"; import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService"; import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; diff --git a/Common/Server/Services/ScheduledMaintenancePublicNoteService.ts b/Common/Server/Services/ScheduledMaintenancePublicNoteService.ts index 2ad5722edd..70bbd8ab7f 100644 --- a/Common/Server/Services/ScheduledMaintenancePublicNoteService.ts +++ b/Common/Server/Services/ScheduledMaintenancePublicNoteService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate, OnUpdate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import OneUptimeDate from "../../Types/Date"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenancePublicNote"; import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService"; import ObjectID from "../../Types/ObjectID"; import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; diff --git a/Common/Server/Services/ScheduledMaintenanceService.ts b/Common/Server/Services/ScheduledMaintenanceService.ts index 848721f929..67f65e8c4e 100644 --- a/Common/Server/Services/ScheduledMaintenanceService.ts +++ b/Common/Server/Services/ScheduledMaintenanceService.ts @@ -16,33 +16,33 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import Typeof from "../../Types/Typeof"; -import Monitor from "Common/Models/DatabaseModels/Monitor"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenance"; -import ScheduledMaintenanceOwnerTeam from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam"; -import ScheduledMaintenanceOwnerUser from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; -import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; -import User from "Common/Models/DatabaseModels/User"; +import Monitor from "../../Models/DatabaseModels/Monitor"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenance"; +import ScheduledMaintenanceOwnerTeam from "../../Models/DatabaseModels/ScheduledMaintenanceOwnerTeam"; +import ScheduledMaintenanceOwnerUser from "../../Models/DatabaseModels/ScheduledMaintenanceOwnerUser"; +import ScheduledMaintenanceState from "../../Models/DatabaseModels/ScheduledMaintenanceState"; +import ScheduledMaintenanceStateTimeline from "../../Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; +import User from "../../Models/DatabaseModels/User"; import Recurring from "../../Types/Events/Recurring"; import OneUptimeDate from "../../Types/Date"; import UpdateBy from "../Types/Database/UpdateBy"; -import { FileRoute } from "Common/ServiceRoute"; -import Dictionary from "Common/Types/Dictionary"; -import EmailTemplateType from "Common/Types/Email/EmailTemplateType"; -import SMS from "Common/Types/SMS/SMS"; -import MailService from "Common/Server/Services/MailService"; -import ProjectCallSMSConfigService from "Common/Server/Services/ProjectCallSMSConfigService"; -import ProjectSmtpConfigService from "Common/Server/Services/ProjectSmtpConfigService"; -import SmsService from "Common/Server/Services/SmsService"; -import StatusPageResourceService from "Common/Server/Services/StatusPageResourceService"; -import StatusPageService from "Common/Server/Services/StatusPageService"; -import StatusPageSubscriberService from "Common/Server/Services/StatusPageSubscriberService"; -import QueryHelper from "Common/Server/Types/Database/QueryHelper"; -import Markdown, { MarkdownContentType } from "Common/Server/Types/Markdown"; -import logger from "Common/Server/Utils/Logger"; -import StatusPage from "Common/Models/DatabaseModels/StatusPage"; -import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource"; -import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscriber"; +import { FileRoute } from "../../ServiceRoute"; +import Dictionary from "../../Types/Dictionary"; +import EmailTemplateType from "../../Types/Email/EmailTemplateType"; +import SMS from "../../Types/SMS/SMS"; +import MailService from "../../Server/Services/MailService"; +import ProjectCallSMSConfigService from "../../Server/Services/ProjectCallSMSConfigService"; +import ProjectSmtpConfigService from "../../Server/Services/ProjectSmtpConfigService"; +import SmsService from "../../Server/Services/SmsService"; +import StatusPageResourceService from "../../Server/Services/StatusPageResourceService"; +import StatusPageService from "../../Server/Services/StatusPageService"; +import StatusPageSubscriberService from "../../Server/Services/StatusPageSubscriberService"; +import QueryHelper from "../../Server/Types/Database/QueryHelper"; +import Markdown, { MarkdownContentType } from "../../Server/Types/Markdown"; +import logger from "../../Server/Utils/Logger"; +import StatusPage from "../../Models/DatabaseModels/StatusPage"; +import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource"; +import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import { IsBillingEnabled } from "../EnvironmentConfig"; diff --git a/Common/Server/Services/ScheduledMaintenanceStateService.ts b/Common/Server/Services/ScheduledMaintenanceStateService.ts index 1bd0cbe699..6c1bea058f 100644 --- a/Common/Server/Services/ScheduledMaintenanceStateService.ts +++ b/Common/Server/Services/ScheduledMaintenanceStateService.ts @@ -9,7 +9,7 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; +import ScheduledMaintenanceState from "../../Models/DatabaseModels/ScheduledMaintenanceState"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/ScheduledMaintenanceStateTimelineService.ts b/Common/Server/Services/ScheduledMaintenanceStateTimelineService.ts index b2f3f17796..d42bcbe69a 100644 --- a/Common/Server/Services/ScheduledMaintenanceStateTimelineService.ts +++ b/Common/Server/Services/ScheduledMaintenanceStateTimelineService.ts @@ -15,13 +15,13 @@ import BadDataException from "../../Types/Exception/BadDataException"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Monitor from "Common/Models/DatabaseModels/Monitor"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; -import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance"; -import ScheduledMaintenancePublicNote from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote"; -import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState"; -import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; +import Monitor from "../../Models/DatabaseModels/Monitor"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; +import ScheduledMaintenance from "../../Models/DatabaseModels/ScheduledMaintenance"; +import ScheduledMaintenancePublicNote from "../../Models/DatabaseModels/ScheduledMaintenancePublicNote"; +import ScheduledMaintenanceState from "../../Models/DatabaseModels/ScheduledMaintenanceState"; +import ScheduledMaintenanceStateTimeline from "../../Models/DatabaseModels/ScheduledMaintenanceStateTimeline"; import { IsBillingEnabled } from "../EnvironmentConfig"; import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService"; import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed"; diff --git a/Common/Server/Services/ScheduledMaintenanceTemplateOwnerTeamService.ts b/Common/Server/Services/ScheduledMaintenanceTemplateOwnerTeamService.ts index dea8f51d25..bb9525e217 100644 --- a/Common/Server/Services/ScheduledMaintenanceTemplateOwnerTeamService.ts +++ b/Common/Server/Services/ScheduledMaintenanceTemplateOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerTeam"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ScheduledMaintenanceTemplateOwnerUserService.ts b/Common/Server/Services/ScheduledMaintenanceTemplateOwnerUserService.ts index 66e3e14556..201789a839 100644 --- a/Common/Server/Services/ScheduledMaintenanceTemplateOwnerUserService.ts +++ b/Common/Server/Services/ScheduledMaintenanceTemplateOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ScheduledMaintenanceTemplateService.ts b/Common/Server/Services/ScheduledMaintenanceTemplateService.ts index 90842c41cf..c009b46a7a 100644 --- a/Common/Server/Services/ScheduledMaintenanceTemplateService.ts +++ b/Common/Server/Services/ScheduledMaintenanceTemplateService.ts @@ -5,9 +5,9 @@ import ScheduledMaintenanceTemplateOwnerUserService from "./ScheduledMaintenance import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import ObjectID from "../../Types/ObjectID"; import Typeof from "../../Types/Typeof"; -import Model from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplate"; -import ScheduledMaintenanceTemplateOwnerTeam from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerTeam"; -import ScheduledMaintenanceTemplateOwnerUser from "Common/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser"; +import Model from "../../Models/DatabaseModels/ScheduledMaintenanceTemplate"; +import ScheduledMaintenanceTemplateOwnerTeam from "../../Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerTeam"; +import ScheduledMaintenanceTemplateOwnerUser from "../../Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser"; import CreateBy from "../Types/Database/CreateBy"; import OneUptimeDate from "../../Types/Date"; import Recurring from "../../Types/Events/Recurring"; diff --git a/Common/Server/Services/ServiceCatalogDependencyService.ts b/Common/Server/Services/ServiceCatalogDependencyService.ts index 0ec23881a3..87e4a9b769 100644 --- a/Common/Server/Services/ServiceCatalogDependencyService.ts +++ b/Common/Server/Services/ServiceCatalogDependencyService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCatalogDependency"; +import Model from "../../Models/DatabaseModels/ServiceCatalogDependency"; import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/ServiceCatalogMonitorService.ts b/Common/Server/Services/ServiceCatalogMonitorService.ts index 5def5a8579..1a4aadb154 100644 --- a/Common/Server/Services/ServiceCatalogMonitorService.ts +++ b/Common/Server/Services/ServiceCatalogMonitorService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCatalogMonitor"; +import Model from "../../Models/DatabaseModels/ServiceCatalogMonitor"; import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/ServiceCatalogOwnerTeamService.ts b/Common/Server/Services/ServiceCatalogOwnerTeamService.ts index da54ba3011..7cb09c3bf6 100644 --- a/Common/Server/Services/ServiceCatalogOwnerTeamService.ts +++ b/Common/Server/Services/ServiceCatalogOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCatalogOwnerTeam"; +import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ServiceCatalogOwnerUserService.ts b/Common/Server/Services/ServiceCatalogOwnerUserService.ts index c740eac24a..f54781096f 100644 --- a/Common/Server/Services/ServiceCatalogOwnerUserService.ts +++ b/Common/Server/Services/ServiceCatalogOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCatalogOwnerUser"; +import Model from "../../Models/DatabaseModels/ServiceCatalogOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ServiceCatalogService.ts b/Common/Server/Services/ServiceCatalogService.ts index 5968c3714b..3f5b36d747 100644 --- a/Common/Server/Services/ServiceCatalogService.ts +++ b/Common/Server/Services/ServiceCatalogService.ts @@ -3,7 +3,7 @@ import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import ArrayUtil from "../../Utils/Array"; import { BrightColors } from "../../Types/BrandColors"; -import Model from "Common/Models/DatabaseModels/ServiceCatalog"; +import Model from "../../Models/DatabaseModels/ServiceCatalog"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/ServiceCatalogTelemetryServiceService.ts b/Common/Server/Services/ServiceCatalogTelemetryServiceService.ts index d2268e2847..c3a592e2a9 100644 --- a/Common/Server/Services/ServiceCatalogTelemetryServiceService.ts +++ b/Common/Server/Services/ServiceCatalogTelemetryServiceService.ts @@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCatalogTelemetryService"; +import Model from "../../Models/DatabaseModels/ServiceCatalogTelemetryService"; import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/ServiceCopilotCodeRepositoryService.ts b/Common/Server/Services/ServiceCopilotCodeRepositoryService.ts index d1d5990c77..fdedf9314c 100644 --- a/Common/Server/Services/ServiceCopilotCodeRepositoryService.ts +++ b/Common/Server/Services/ServiceCopilotCodeRepositoryService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/ServiceCopilotCodeRepository"; +import Model from "../../Models/DatabaseModels/ServiceCopilotCodeRepository"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/ShortLinkService.ts b/Common/Server/Services/ShortLinkService.ts index 18ba3f5e66..aaa928038c 100644 --- a/Common/Server/Services/ShortLinkService.ts +++ b/Common/Server/Services/ShortLinkService.ts @@ -2,13 +2,13 @@ import DatabaseConfig from "../DatabaseConfig"; import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import { LinkShortenerRoute } from "Common/ServiceRoute"; +import { LinkShortenerRoute } from "../../ServiceRoute"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import Text from "../../Types/Text"; -import Model from "Common/Models/DatabaseModels/ShortLink"; +import Model from "../../Models/DatabaseModels/ShortLink"; import { IsBillingEnabled } from "../EnvironmentConfig"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/SmsLogService.ts b/Common/Server/Services/SmsLogService.ts index 6a870b871f..3c7b85440b 100644 --- a/Common/Server/Services/SmsLogService.ts +++ b/Common/Server/Services/SmsLogService.ts @@ -1,6 +1,6 @@ import { IsBillingEnabled } from "../EnvironmentConfig"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/SmsLog"; +import Model from "../../Models/DatabaseModels/SmsLog"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/SmsService.ts b/Common/Server/Services/SmsService.ts index 0900aca511..950250ecb9 100644 --- a/Common/Server/Services/SmsService.ts +++ b/Common/Server/Services/SmsService.ts @@ -10,7 +10,7 @@ import TwilioConfig from "../../Types/CallAndSMS/TwilioConfig"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; import SMS from "../../Types/SMS/SMS"; -import API from "Common/Utils/API"; +import API from "../../Utils/API"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class SmsService extends BaseService { diff --git a/Common/Server/Services/SpanService.ts b/Common/Server/Services/SpanService.ts index a31652b372..dc9b698d1d 100644 --- a/Common/Server/Services/SpanService.ts +++ b/Common/Server/Services/SpanService.ts @@ -1,6 +1,6 @@ import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import Span from "Common/Models/AnalyticsModels/Span"; +import Span from "../../Models/AnalyticsModels/Span"; export class SpanService extends AnalyticsDatabaseService { public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) { diff --git a/Common/Server/Services/StatusPageAnnouncementService.ts b/Common/Server/Services/StatusPageAnnouncementService.ts index 0c6782fa86..59559071d1 100644 --- a/Common/Server/Services/StatusPageAnnouncementService.ts +++ b/Common/Server/Services/StatusPageAnnouncementService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/StatusPageAnnouncement"; +import Model from "../../Models/DatabaseModels/StatusPageAnnouncement"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageCertificateService.ts b/Common/Server/Services/StatusPageCertificateService.ts index 46a2e6970f..db3bb8c1e9 100644 --- a/Common/Server/Services/StatusPageCertificateService.ts +++ b/Common/Server/Services/StatusPageCertificateService.ts @@ -7,7 +7,7 @@ import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; import URL from "../../Types/API/URL"; import { JSONObject } from "../../Types/JSON"; -import API from "Common/Utils/API"; +import API from "../../Utils/API"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class StatusPageCertificateService extends BaseService { diff --git a/Common/Server/Services/StatusPageCustomFieldService.ts b/Common/Server/Services/StatusPageCustomFieldService.ts index aa0ccf116d..207afaed2d 100644 --- a/Common/Server/Services/StatusPageCustomFieldService.ts +++ b/Common/Server/Services/StatusPageCustomFieldService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/StatusPageCustomField"; +import Model from "../../Models/DatabaseModels/StatusPageCustomField"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageDomainService.ts b/Common/Server/Services/StatusPageDomainService.ts index b24b4f50ff..b39a6426ec 100644 --- a/Common/Server/Services/StatusPageDomainService.ts +++ b/Common/Server/Services/StatusPageDomainService.ts @@ -12,10 +12,10 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import { JSONObject } from "../../Types/JSON"; import ObjectID from "../../Types/ObjectID"; -import API from "Common/Utils/API"; -import AcmeCertificate from "Common/Models/DatabaseModels/AcmeCertificate"; -import Domain from "Common/Models/DatabaseModels/Domain"; -import StatusPageDomain from "Common/Models/DatabaseModels/StatusPageDomain"; +import API from "../../Utils/API"; +import AcmeCertificate from "../../Models/DatabaseModels/AcmeCertificate"; +import Domain from "../../Models/DatabaseModels/Domain"; +import StatusPageDomain from "../../Models/DatabaseModels/StatusPageDomain"; import AcmeCertificateService from "./AcmeCertificateService"; import Telemetry, { Span } from "../Utils/Telemetry"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/StatusPageFooterLinkService.ts b/Common/Server/Services/StatusPageFooterLinkService.ts index bda7c7a791..dcdc9cad42 100644 --- a/Common/Server/Services/StatusPageFooterLinkService.ts +++ b/Common/Server/Services/StatusPageFooterLinkService.ts @@ -11,7 +11,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/StatusPageFooterLink"; +import Model from "../../Models/DatabaseModels/StatusPageFooterLink"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageGroupService.ts b/Common/Server/Services/StatusPageGroupService.ts index 74cd7aabac..5f1278c8d3 100644 --- a/Common/Server/Services/StatusPageGroupService.ts +++ b/Common/Server/Services/StatusPageGroupService.ts @@ -10,7 +10,7 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/StatusPageGroup"; +import Model from "../../Models/DatabaseModels/StatusPageGroup"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageHeaderLinkService.ts b/Common/Server/Services/StatusPageHeaderLinkService.ts index 1da5235b96..6a8c2b3dd1 100644 --- a/Common/Server/Services/StatusPageHeaderLinkService.ts +++ b/Common/Server/Services/StatusPageHeaderLinkService.ts @@ -10,7 +10,7 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/StatusPageHeaderLink"; +import Model from "../../Models/DatabaseModels/StatusPageHeaderLink"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/StatusPageHistoryChartBarColorRuleService.ts b/Common/Server/Services/StatusPageHistoryChartBarColorRuleService.ts index d5c3d719fd..53f7ed3e50 100644 --- a/Common/Server/Services/StatusPageHistoryChartBarColorRuleService.ts +++ b/Common/Server/Services/StatusPageHistoryChartBarColorRuleService.ts @@ -11,7 +11,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule"; +import Model from "../../Models/DatabaseModels/StatusPageHistoryChartBarColorRule"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageOwnerTeamService.ts b/Common/Server/Services/StatusPageOwnerTeamService.ts index 1aeeff367d..75926c914e 100644 --- a/Common/Server/Services/StatusPageOwnerTeamService.ts +++ b/Common/Server/Services/StatusPageOwnerTeamService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/StatusPageOwnerTeam"; +import Model from "../../Models/DatabaseModels/StatusPageOwnerTeam"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageOwnerUserService.ts b/Common/Server/Services/StatusPageOwnerUserService.ts index 5c5c5ed097..9056c30df0 100644 --- a/Common/Server/Services/StatusPageOwnerUserService.ts +++ b/Common/Server/Services/StatusPageOwnerUserService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/StatusPageOwnerUser"; +import Model from "../../Models/DatabaseModels/StatusPageOwnerUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPagePrivateUserService.ts b/Common/Server/Services/StatusPagePrivateUserService.ts index 91e76313e1..22589501fc 100644 --- a/Common/Server/Services/StatusPagePrivateUserService.ts +++ b/Common/Server/Services/StatusPagePrivateUserService.ts @@ -5,7 +5,7 @@ import logger from "../Utils/Logger"; import DatabaseService from "./DatabaseService"; import MailService from "./MailService"; import StatusPageService from "./StatusPageService"; -import { FileRoute } from "Common/ServiceRoute"; +import { FileRoute } from "../../ServiceRoute"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; @@ -14,8 +14,8 @@ import OneUptimeDate from "../../Types/Date"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import StatusPage from "Common/Models/DatabaseModels/StatusPage"; -import Model from "Common/Models/DatabaseModels/StatusPagePrivateUser"; +import StatusPage from "../../Models/DatabaseModels/StatusPage"; +import Model from "../../Models/DatabaseModels/StatusPagePrivateUser"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageResourceService.ts b/Common/Server/Services/StatusPageResourceService.ts index c3fa8cd3d5..0e646f0906 100644 --- a/Common/Server/Services/StatusPageResourceService.ts +++ b/Common/Server/Services/StatusPageResourceService.ts @@ -11,7 +11,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Model from "Common/Models/DatabaseModels/StatusPageResource"; +import Model from "../../Models/DatabaseModels/StatusPageResource"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageService.ts b/Common/Server/Services/StatusPageService.ts index 3bff5ce1b8..ee577e1d40 100755 --- a/Common/Server/Services/StatusPageService.ts +++ b/Common/Server/Services/StatusPageService.ts @@ -25,12 +25,12 @@ import JSONWebTokenData from "../../Types/JsonWebTokenData"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import Typeof from "../../Types/Typeof"; -import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus"; -import StatusPage from "Common/Models/DatabaseModels/StatusPage"; -import StatusPageDomain from "Common/Models/DatabaseModels/StatusPageDomain"; -import StatusPageOwnerTeam from "Common/Models/DatabaseModels/StatusPageOwnerTeam"; -import StatusPageOwnerUser from "Common/Models/DatabaseModels/StatusPageOwnerUser"; -import User from "Common/Models/DatabaseModels/User"; +import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus"; +import StatusPage from "../../Models/DatabaseModels/StatusPage"; +import StatusPageDomain from "../../Models/DatabaseModels/StatusPageDomain"; +import StatusPageOwnerTeam from "../../Models/DatabaseModels/StatusPageOwnerTeam"; +import StatusPageOwnerUser from "../../Models/DatabaseModels/StatusPageOwnerUser"; +import User from "../../Models/DatabaseModels/User"; import { AllowedStatusPageCountInFreePlan, IsBillingEnabled, @@ -39,23 +39,23 @@ import { PlanType } from "../../Types/Billing/SubscriptionPlan"; import Recurring from "../../Types/Events/Recurring"; import Email from "../../Types/Email"; import StatusPageSubscriberService from "./StatusPageSubscriberService"; -import StatusPageSubscriber from "Common/Models/DatabaseModels/StatusPageSubscriber"; +import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber"; import MailService from "./MailService"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; -import { FileRoute } from "Common/ServiceRoute"; +import { FileRoute } from "../../ServiceRoute"; import ProjectSMTPConfigService from "./ProjectSmtpConfigService"; -import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource"; +import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource"; import StatusPageResourceService from "./StatusPageResourceService"; import Dictionary from "../../Types/Dictionary"; -import MonitorGroupResource from "Common/Models/DatabaseModels/MonitorGroupResource"; +import MonitorGroupResource from "../../Models/DatabaseModels/MonitorGroupResource"; import MonitorGroupResourceService from "./MonitorGroupResourceService"; import QueryHelper from "../Types/Database/QueryHelper"; import OneUptimeDate from "../../Types/Date"; import IncidentService from "./IncidentService"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; import MonitorStatusTimelineService from "./MonitorStatusTimelineService"; import SortOrder from "../../Types/BaseDatabase/SortOrder"; -import UptimeUtil from "Common/Utils/Uptime/UptimeUtil"; +import UptimeUtil from "../../Utils/Uptime/UptimeUtil"; import UptimePrecision from "../../Types/StatusPage/UptimePrecision"; export interface StatusPageReportItem { diff --git a/Common/Server/Services/StatusPageSsoService.ts b/Common/Server/Services/StatusPageSsoService.ts index 5557124c17..ea9add174a 100644 --- a/Common/Server/Services/StatusPageSsoService.ts +++ b/Common/Server/Services/StatusPageSsoService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/StatusPageSso"; +import Model from "../../Models/DatabaseModels/StatusPageSso"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/StatusPageSubscriberService.ts b/Common/Server/Services/StatusPageSubscriberService.ts index 83a117c03e..557407cabd 100644 --- a/Common/Server/Services/StatusPageSubscriberService.ts +++ b/Common/Server/Services/StatusPageSubscriberService.ts @@ -16,7 +16,7 @@ import ProjectCallSMSConfigService from "./ProjectCallSMSConfigService"; import ProjectService, { CurrentPlan } from "./ProjectService"; import SmsService from "./SmsService"; import StatusPageService from "./StatusPageService"; -import { FileRoute } from "Common/ServiceRoute"; +import { FileRoute } from "../../ServiceRoute"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import URL from "../../Types/API/URL"; @@ -25,9 +25,9 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import StatusPage from "Common/Models/DatabaseModels/StatusPage"; -import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource"; -import Model from "Common/Models/DatabaseModels/StatusPageSubscriber"; +import StatusPage from "../../Models/DatabaseModels/StatusPage"; +import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource"; +import Model from "../../Models/DatabaseModels/StatusPageSubscriber"; import PositiveNumber from "../../Types/PositiveNumber"; import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType"; import NumberUtil from "../../Utils/Number"; diff --git a/Common/Server/Services/TableViewService.ts b/Common/Server/Services/TableViewService.ts index 7748afa8ab..6578308cc2 100644 --- a/Common/Server/Services/TableViewService.ts +++ b/Common/Server/Services/TableViewService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import TableView from "Common/Models/DatabaseModels/TableView"; +import TableView from "../../Models/DatabaseModels/TableView"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/TeamMemberService.ts b/Common/Server/Services/TeamMemberService.ts index 1519d19f9d..b029b8b1b7 100644 --- a/Common/Server/Services/TeamMemberService.ts +++ b/Common/Server/Services/TeamMemberService.ts @@ -17,7 +17,7 @@ import ProjectService from "./ProjectService"; import UserNotificationRuleService from "./UserNotificationRuleService"; import UserNotificationSettingService from "./UserNotificationSettingService"; import UserService from "./UserService"; -import { AccountsRoute } from "Common/ServiceRoute"; +import { AccountsRoute } from "../../ServiceRoute"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import URL from "../../Types/API/URL"; @@ -30,9 +30,9 @@ import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; -import Project from "Common/Models/DatabaseModels/Project"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; -import User from "Common/Models/DatabaseModels/User"; +import Project from "../../Models/DatabaseModels/Project"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; +import User from "../../Models/DatabaseModels/User"; import ProjectUserService from "./ProjectUserService"; import OnCallDutyPolicyTimeLogService from "./OnCallDutyPolicyTimeLogService"; import OneUptimeDate from "../../Types/Date"; diff --git a/Common/Server/Services/TeamPermissionService.ts b/Common/Server/Services/TeamPermissionService.ts index 12e27242f4..e5a46aa78b 100644 --- a/Common/Server/Services/TeamPermissionService.ts +++ b/Common/Server/Services/TeamPermissionService.ts @@ -10,9 +10,9 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Team from "Common/Models/DatabaseModels/Team"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; -import Model from "Common/Models/DatabaseModels/TeamPermission"; +import Team from "../../Models/DatabaseModels/Team"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; +import Model from "../../Models/DatabaseModels/TeamPermission"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/TeamService.ts b/Common/Server/Services/TeamService.ts index 53e49eef8c..1285da76e3 100644 --- a/Common/Server/Services/TeamService.ts +++ b/Common/Server/Services/TeamService.ts @@ -4,7 +4,7 @@ import UpdateBy from "../Types/Database/UpdateBy"; import DatabaseService from "./DatabaseService"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; -import Model from "Common/Models/DatabaseModels/Team"; +import Model from "../../Models/DatabaseModels/Team"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import ObjectID from "../../Types/ObjectID"; import TeamMember from "../../Models/DatabaseModels/TeamMember"; diff --git a/Common/Server/Services/TelemetryAttributeService.ts b/Common/Server/Services/TelemetryAttributeService.ts index c8ce06332c..c0a37fef98 100644 --- a/Common/Server/Services/TelemetryAttributeService.ts +++ b/Common/Server/Services/TelemetryAttributeService.ts @@ -1,7 +1,7 @@ import TelemetryType from "../../Types/Telemetry/TelemetryType"; import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase"; import AnalyticsDatabaseService from "./AnalyticsDatabaseService"; -import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute"; +import TelemetryAttribute from "../../Models/AnalyticsModels/TelemetryAttribute"; import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/TelemetryExceptionService.ts b/Common/Server/Services/TelemetryExceptionService.ts index 2269492858..5726ebf298 100644 --- a/Common/Server/Services/TelemetryExceptionService.ts +++ b/Common/Server/Services/TelemetryExceptionService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/TelemetryException"; +import Model from "../../Models/DatabaseModels/TelemetryException"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/TelemetryIngestionKeyService.ts b/Common/Server/Services/TelemetryIngestionKeyService.ts index 0c47f43add..82894b4240 100644 --- a/Common/Server/Services/TelemetryIngestionKeyService.ts +++ b/Common/Server/Services/TelemetryIngestionKeyService.ts @@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/TelemetryIngestionKey"; +import Model from "../../Models/DatabaseModels/TelemetryIngestionKey"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/TelemetryServiceService.ts b/Common/Server/Services/TelemetryServiceService.ts index d6fe735c58..348198a84f 100644 --- a/Common/Server/Services/TelemetryServiceService.ts +++ b/Common/Server/Services/TelemetryServiceService.ts @@ -5,7 +5,7 @@ import ArrayUtil from "../../Utils/Array"; import { BrightColors } from "../../Types/BrandColors"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/TelemetryService"; +import Model from "../../Models/DatabaseModels/TelemetryService"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/TelemetryUsageBillingService.ts b/Common/Server/Services/TelemetryUsageBillingService.ts index 58f841f76e..646688c491 100644 --- a/Common/Server/Services/TelemetryUsageBillingService.ts +++ b/Common/Server/Services/TelemetryUsageBillingService.ts @@ -9,7 +9,7 @@ import Decimal from "../../Types/Decimal"; import BadDataException from "../../Types/Exception/BadDataException"; import ProductType from "../../Types/MeteredPlan/ProductType"; import ObjectID from "../../Types/ObjectID"; -import Model from "Common/Models/DatabaseModels/TelemetryUsageBilling"; +import Model from "../../Models/DatabaseModels/TelemetryUsageBilling"; import { IsBillingEnabled } from "../EnvironmentConfig"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/UserCallService.ts b/Common/Server/Services/UserCallService.ts index 4ef98ccd87..5d33f9bcd3 100644 --- a/Common/Server/Services/UserCallService.ts +++ b/Common/Server/Services/UserCallService.ts @@ -12,8 +12,8 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import Text from "../../Types/Text"; -import Project from "Common/Models/DatabaseModels/Project"; -import Model from "Common/Models/DatabaseModels/UserCall"; +import Project from "../../Models/DatabaseModels/Project"; +import Model from "../../Models/DatabaseModels/UserCall"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/UserEmailService.ts b/Common/Server/Services/UserEmailService.ts index de7fcb4143..1d60a5a567 100644 --- a/Common/Server/Services/UserEmailService.ts +++ b/Common/Server/Services/UserEmailService.ts @@ -10,7 +10,7 @@ import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import Text from "../../Types/Text"; -import Model from "Common/Models/DatabaseModels/UserEmail"; +import Model from "../../Models/DatabaseModels/UserEmail"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/UserNotificationRuleService.ts b/Common/Server/Services/UserNotificationRuleService.ts index 27f2b0ac6c..dd1a425109 100644 --- a/Common/Server/Services/UserNotificationRuleService.ts +++ b/Common/Server/Services/UserNotificationRuleService.ts @@ -12,7 +12,7 @@ import SmsService from "./SmsService"; import UserEmailService from "./UserEmailService"; import UserOnCallLogService from "./UserOnCallLogService"; import UserOnCallLogTimelineService from "./UserOnCallLogTimelineService"; -import { AppApiRoute } from "Common/ServiceRoute"; +import { AppApiRoute } from "../../ServiceRoute"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; @@ -32,13 +32,13 @@ import SMS from "../../Types/SMS/SMS"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus"; import UserNotificationStatus from "../../Types/UserNotification/UserNotificationStatus"; -import Incident from "Common/Models/DatabaseModels/Incident"; -import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity"; -import ShortLink from "Common/Models/DatabaseModels/ShortLink"; -import UserEmail from "Common/Models/DatabaseModels/UserEmail"; -import Model from "Common/Models/DatabaseModels/UserNotificationRule"; -import UserOnCallLog from "Common/Models/DatabaseModels/UserOnCallLog"; -import UserOnCallLogTimeline from "Common/Models/DatabaseModels/UserOnCallLogTimeline"; +import Incident from "../../Models/DatabaseModels/Incident"; +import IncidentSeverity from "../../Models/DatabaseModels/IncidentSeverity"; +import ShortLink from "../../Models/DatabaseModels/ShortLink"; +import UserEmail from "../../Models/DatabaseModels/UserEmail"; +import Model from "../../Models/DatabaseModels/UserNotificationRule"; +import UserOnCallLog from "../../Models/DatabaseModels/UserOnCallLog"; +import UserOnCallLogTimeline from "../../Models/DatabaseModels/UserOnCallLogTimeline"; import Alert from "../../Models/DatabaseModels/Alert"; import AlertService from "./AlertService"; import AlertSeverity from "../../Models/DatabaseModels/AlertSeverity"; diff --git a/Common/Server/Services/UserNotificationSettingService.ts b/Common/Server/Services/UserNotificationSettingService.ts index 82b801c962..3a54420532 100644 --- a/Common/Server/Services/UserNotificationSettingService.ts +++ b/Common/Server/Services/UserNotificationSettingService.ts @@ -17,10 +17,10 @@ import NotificationSettingEventType from "../../Types/NotificationSetting/Notifi import ObjectID from "../../Types/ObjectID"; import PositiveNumber from "../../Types/PositiveNumber"; import { SMSMessage } from "../../Types/SMS/SMS"; -import UserCall from "Common/Models/DatabaseModels/UserCall"; -import UserEmail from "Common/Models/DatabaseModels/UserEmail"; -import UserNotificationSetting from "Common/Models/DatabaseModels/UserNotificationSetting"; -import UserSMS from "Common/Models/DatabaseModels/UserSMS"; +import UserCall from "../../Models/DatabaseModels/UserCall"; +import UserEmail from "../../Models/DatabaseModels/UserEmail"; +import UserNotificationSetting from "../../Models/DatabaseModels/UserNotificationSetting"; +import UserSMS from "../../Models/DatabaseModels/UserSMS"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/UserOnCallLogService.ts b/Common/Server/Services/UserOnCallLogService.ts index f683de2c29..e80d5ddad8 100644 --- a/Common/Server/Services/UserOnCallLogService.ts +++ b/Common/Server/Services/UserOnCallLogService.ts @@ -13,9 +13,9 @@ import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/O import PositiveNumber from "../../Types/PositiveNumber"; import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType"; import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus"; -import Incident from "Common/Models/DatabaseModels/Incident"; -import UserNotificationRule from "Common/Models/DatabaseModels/UserNotificationRule"; -import Model from "Common/Models/DatabaseModels/UserOnCallLog"; +import Incident from "../../Models/DatabaseModels/Incident"; +import UserNotificationRule from "../../Models/DatabaseModels/UserNotificationRule"; +import Model from "../../Models/DatabaseModels/UserOnCallLog"; import { IsBillingEnabled } from "../EnvironmentConfig"; import Alert from "../../Models/DatabaseModels/Alert"; import AlertService from "./AlertService"; diff --git a/Common/Server/Services/UserOnCallLogTimelineService.ts b/Common/Server/Services/UserOnCallLogTimelineService.ts index 64669b5957..f55d4b3648 100644 --- a/Common/Server/Services/UserOnCallLogTimelineService.ts +++ b/Common/Server/Services/UserOnCallLogTimelineService.ts @@ -12,8 +12,8 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import OnCallDutyExecutionLogTimelineStatus from "../../Types/OnCallDutyPolicy/OnCalDutyExecutionLogTimelineStatus"; import OnCallDutyPolicyStatus from "../../Types/OnCallDutyPolicy/OnCallDutyPolicyStatus"; import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus"; -import User from "Common/Models/DatabaseModels/User"; -import Model from "Common/Models/DatabaseModels/UserOnCallLogTimeline"; +import User from "../../Models/DatabaseModels/User"; +import Model from "../../Models/DatabaseModels/UserOnCallLogTimeline"; import AlertService from "./AlertService"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/UserService.ts b/Common/Server/Services/UserService.ts index 691d6f70a8..ef3d7fd73e 100755 --- a/Common/Server/Services/UserService.ts +++ b/Common/Server/Services/UserService.ts @@ -12,7 +12,7 @@ import MailService from "./MailService"; import TeamMemberService from "./TeamMemberService"; import UserNotificationRuleService from "./UserNotificationRuleService"; import UserNotificationSettingService from "./UserNotificationSettingService"; -import { AccountsRoute } from "Common/ServiceRoute"; +import { AccountsRoute } from "../../ServiceRoute"; import Hostname from "../../Types/API/Hostname"; import Protocol from "../../Types/API/Protocol"; import Route from "../../Types/API/Route"; @@ -25,11 +25,11 @@ import EmailTemplateType from "../../Types/Email/EmailTemplateType"; import HashedString from "../../Types/HashedString"; import ObjectID from "../../Types/ObjectID"; import Text from "../../Types/Text"; -import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken"; -import TeamMember from "Common/Models/DatabaseModels/TeamMember"; -import Model from "Common/Models/DatabaseModels/User"; +import EmailVerificationToken from "../../Models/DatabaseModels/EmailVerificationToken"; +import TeamMember from "../../Models/DatabaseModels/TeamMember"; +import Model from "../../Models/DatabaseModels/User"; import SlackUtil from "../Utils/Workspace/Slack/Slack"; -import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth"; +import UserTwoFactorAuth from "../../Models/DatabaseModels/UserTwoFactorAuth"; import UserTwoFactorAuthService from "./UserTwoFactorAuthService"; import BadDataException from "../../Types/Exception/BadDataException"; import Name from "../../Types/Name"; diff --git a/Common/Server/Services/UserSmsService.ts b/Common/Server/Services/UserSmsService.ts index 8f811a630e..6b618f9515 100644 --- a/Common/Server/Services/UserSmsService.ts +++ b/Common/Server/Services/UserSmsService.ts @@ -11,8 +11,8 @@ import LIMIT_MAX from "../../Types/Database/LimitMax"; import BadDataException from "../../Types/Exception/BadDataException"; import ObjectID from "../../Types/ObjectID"; import Text from "../../Types/Text"; -import Project from "Common/Models/DatabaseModels/Project"; -import Model from "Common/Models/DatabaseModels/UserSMS"; +import Project from "../../Models/DatabaseModels/Project"; +import Model from "../../Models/DatabaseModels/UserSMS"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/UserTwoFactorAuthService.ts b/Common/Server/Services/UserTwoFactorAuthService.ts index 52e5275cc7..2b04a7bdac 100644 --- a/Common/Server/Services/UserTwoFactorAuthService.ts +++ b/Common/Server/Services/UserTwoFactorAuthService.ts @@ -1,11 +1,11 @@ import CreateBy from "../Types/Database/CreateBy"; import { OnCreate, OnDelete } from "../Types/Database/Hooks"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/UserTwoFactorAuth"; +import Model from "../../Models/DatabaseModels/UserTwoFactorAuth"; import TwoFactorAuth from "../Utils/TwoFactorAuth"; import UserService from "./UserService"; import BadDataException from "../../Types/Exception/BadDataException"; -import User from "Common/Models/DatabaseModels/User"; +import User from "../../Models/DatabaseModels/User"; import DeleteBy from "../Types/Database/DeleteBy"; import LIMIT_MAX from "../../Types/Database/LimitMax"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/WorkflowLogService.ts b/Common/Server/Services/WorkflowLogService.ts index f5f94f0bc4..a28bc68e76 100644 --- a/Common/Server/Services/WorkflowLogService.ts +++ b/Common/Server/Services/WorkflowLogService.ts @@ -1,6 +1,6 @@ import { IsBillingEnabled } from "../EnvironmentConfig"; import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/WorkflowLog"; +import Model from "../../Models/DatabaseModels/WorkflowLog"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/WorkflowService.ts b/Common/Server/Services/WorkflowService.ts index 22f754c111..bbb1777093 100644 --- a/Common/Server/Services/WorkflowService.ts +++ b/Common/Server/Services/WorkflowService.ts @@ -14,8 +14,8 @@ import { NodeDataProp, NodeType, } from "../../Types/Workflow/Component"; -import API from "Common/Utils/API"; -import Model from "Common/Models/DatabaseModels/Workflow"; +import API from "../../Utils/API"; +import Model from "../../Models/DatabaseModels/Workflow"; import logger from "../Utils/Logger"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/WorkflowVariableService.ts b/Common/Server/Services/WorkflowVariableService.ts index db1ada17b9..f3996076ff 100644 --- a/Common/Server/Services/WorkflowVariableService.ts +++ b/Common/Server/Services/WorkflowVariableService.ts @@ -1,5 +1,5 @@ import DatabaseService from "./DatabaseService"; -import Model from "Common/Models/DatabaseModels/WorkflowVariable"; +import Model from "../../Models/DatabaseModels/WorkflowVariable"; export class Service extends DatabaseService { public constructor() { diff --git a/Common/Server/Services/WorkspaceCommunicationTools/Slack.ts b/Common/Server/Services/WorkspaceCommunicationTools/Slack.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Common/Server/Services/WorkspaceCommunicationTools/Teams.ts b/Common/Server/Services/WorkspaceCommunicationTools/Teams.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Common/Server/Services/WorkspaceCommunicationTools/WorkspaceCommunicationBaseService.ts b/Common/Server/Services/WorkspaceCommunicationTools/WorkspaceCommunicationBaseService.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Common/Server/Services/WorkspaceNotificationRuleService.ts b/Common/Server/Services/WorkspaceNotificationRuleService.ts index cf46cee501..3055f45e64 100644 --- a/Common/Server/Services/WorkspaceNotificationRuleService.ts +++ b/Common/Server/Services/WorkspaceNotificationRuleService.ts @@ -34,7 +34,7 @@ import WorkspaceProjectAuthToken, { import WorkspaceProjectAuthTokenService from "./WorkspaceProjectAuthTokenService"; import logger from "../Utils/Logger"; import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel"; -import WorkspaceNotificationRule from "Common/Models/DatabaseModels/WorkspaceNotificationRule"; +import WorkspaceNotificationRule from "../../Models/DatabaseModels/WorkspaceNotificationRule"; import UserService from "./UserService"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; import Monitor from "../../Models/DatabaseModels/Monitor"; diff --git a/Common/Server/Services/WorkspaceProjectAuthTokenService.ts b/Common/Server/Services/WorkspaceProjectAuthTokenService.ts index ed7ec32f56..81e367c1cc 100644 --- a/Common/Server/Services/WorkspaceProjectAuthTokenService.ts +++ b/Common/Server/Services/WorkspaceProjectAuthTokenService.ts @@ -3,7 +3,7 @@ import WorkspaceType from "../../Types/Workspace/WorkspaceType"; import DatabaseService from "./DatabaseService"; import Model, { SlackMiscData, -} from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken"; +} from "../../Models/DatabaseModels/WorkspaceProjectAuthToken"; import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Services/WorkspaceSettingService.ts b/Common/Server/Services/WorkspaceSettingService.ts index 470a21207f..423f2a40e5 100644 --- a/Common/Server/Services/WorkspaceSettingService.ts +++ b/Common/Server/Services/WorkspaceSettingService.ts @@ -3,7 +3,7 @@ import WorkspaceType from "../../Types/Workspace/WorkspaceType"; import DatabaseService from "./DatabaseService"; import Model, { SlackSettings, -} from "Common/Models/DatabaseModels/WorkspaceSetting"; +} from "../../Models/DatabaseModels/WorkspaceSetting"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Services/WorkspaceUserAuthTokenService.ts b/Common/Server/Services/WorkspaceUserAuthTokenService.ts index 378b915ea7..bbd87f73c7 100644 --- a/Common/Server/Services/WorkspaceUserAuthTokenService.ts +++ b/Common/Server/Services/WorkspaceUserAuthTokenService.ts @@ -3,7 +3,7 @@ import WorkspaceType from "../../Types/Workspace/WorkspaceType"; import DatabaseService from "./DatabaseService"; import Model, { SlackMiscData, -} from "Common/Models/DatabaseModels/WorkspaceUserAuthToken"; +} from "../../Models/DatabaseModels/WorkspaceUserAuthToken"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; export class Service extends DatabaseService { diff --git a/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts b/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts index 418d7fe21a..8cb1e153ef 100644 --- a/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts @@ -1,7 +1,7 @@ -import AggregationInterval from "Common/Types/BaseDatabase/AggregationInterval"; -import CommonAggregateBy from "Common/Types/BaseDatabase/AggregateBy"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import AggregationInterval from "../../Types/BaseDatabase/AggregationInterval"; +import CommonAggregateBy from "../../Types/BaseDatabase/AggregateBy"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import OneUptimeDate from "../../../Types/Date"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/AnalyticsDatabase/CountBy.ts b/Common/Server/Types/AnalyticsDatabase/CountBy.ts index e82c11c1e8..eb8ea45502 100644 --- a/Common/Server/Types/AnalyticsDatabase/CountBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/CountBy.ts @@ -1,8 +1,8 @@ import GroupBy from "./GroupBy"; import Query from "./Query"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface CountBy { query: Query; diff --git a/Common/Server/Types/AnalyticsDatabase/CreateBy.ts b/Common/Server/Types/AnalyticsDatabase/CreateBy.ts index 3fbca86e94..fdeb08fe8c 100644 --- a/Common/Server/Types/AnalyticsDatabase/CreateBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/CreateBy.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface CreateBy { data: TBaseModel; diff --git a/Common/Server/Types/AnalyticsDatabase/CreateManyBy.ts b/Common/Server/Types/AnalyticsDatabase/CreateManyBy.ts index 84de27af4b..2f3e305927 100644 --- a/Common/Server/Types/AnalyticsDatabase/CreateManyBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/CreateManyBy.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface CreateBy { items: Array; diff --git a/Common/Server/Types/AnalyticsDatabase/DeleteBy.ts b/Common/Server/Types/AnalyticsDatabase/DeleteBy.ts index 43445a5119..f39fde575c 100644 --- a/Common/Server/Types/AnalyticsDatabase/DeleteBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/DeleteBy.ts @@ -1,6 +1,6 @@ import Query from "./Query"; -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface DeleteBy { query: Query; diff --git a/Common/Server/Types/AnalyticsDatabase/FindBy.ts b/Common/Server/Types/AnalyticsDatabase/FindBy.ts index eea4d2ae95..f88665eb6f 100644 --- a/Common/Server/Types/AnalyticsDatabase/FindBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/FindBy.ts @@ -1,6 +1,6 @@ import FindOneBy from "./FindOneBy"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface FindBy extends FindOneBy { diff --git a/Common/Server/Types/AnalyticsDatabase/FindOneBy.ts b/Common/Server/Types/AnalyticsDatabase/FindOneBy.ts index 3fe9edcd6d..1e72ec0e80 100644 --- a/Common/Server/Types/AnalyticsDatabase/FindOneBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/FindOneBy.ts @@ -2,8 +2,8 @@ import GroupBy from "./GroupBy"; import Query from "./Query"; import Select from "./Select"; import Sort from "./Sort"; -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface FindOneBy { query: Query; diff --git a/Common/Server/Types/AnalyticsDatabase/FindOneByID.ts b/Common/Server/Types/AnalyticsDatabase/FindOneByID.ts index aa0d8771f8..d13a4d07a0 100644 --- a/Common/Server/Types/AnalyticsDatabase/FindOneByID.ts +++ b/Common/Server/Types/AnalyticsDatabase/FindOneByID.ts @@ -1,7 +1,7 @@ import Select from "./Select"; -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import ObjectID from "../../Types/ObjectID"; export default interface FindOneByID { id: ObjectID; diff --git a/Common/Server/Types/AnalyticsDatabase/Hooks.ts b/Common/Server/Types/AnalyticsDatabase/Hooks.ts index 937a812cad..b5e957d98e 100644 --- a/Common/Server/Types/AnalyticsDatabase/Hooks.ts +++ b/Common/Server/Types/AnalyticsDatabase/Hooks.ts @@ -2,7 +2,7 @@ import CreateBy from "./CreateBy"; import DeleteBy from "./DeleteBy"; import FindBy from "./FindBy"; import UpdateBy from "./UpdateBy"; -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; export type DatabaseTriggerType = "on-create" | "on-update" | "on-delete"; diff --git a/Common/Server/Types/AnalyticsDatabase/ModelPermission.ts b/Common/Server/Types/AnalyticsDatabase/ModelPermission.ts index b07b5908c1..27a80d1c18 100644 --- a/Common/Server/Types/AnalyticsDatabase/ModelPermission.ts +++ b/Common/Server/Types/AnalyticsDatabase/ModelPermission.ts @@ -7,25 +7,25 @@ import Query from "./Query"; import Select from "./Select"; import BaseModel, { AnalyticsBaseModelType, -} from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn"; -import ColumnBillingAccessControl from "Common/Types/BaseDatabase/ColumnBillingAccessControl"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +} from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; +import ColumnBillingAccessControl from "../../Types/BaseDatabase/ColumnBillingAccessControl"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; -import Columns from "Common/Types/Database/Columns"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; -import PaymentRequiredException from "Common/Types/Exception/PaymentRequiredException"; -import ObjectID from "Common/Types/ObjectID"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import SubscriptionPlan from "../../Types/Billing/SubscriptionPlan"; +import Columns from "../../Types/Database/Columns"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; +import PaymentRequiredException from "../../Types/Exception/PaymentRequiredException"; +import ObjectID from "../../Types/ObjectID"; import Permission, { PermissionHelper, UserPermission, -} from "Common/Types/Permission"; -import UserType from "Common/Types/UserType"; +} from "../../Types/Permission"; +import UserType from "../../Types/UserType"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; export interface CheckReadPermissionType { diff --git a/Common/Server/Types/AnalyticsDatabase/Query.ts b/Common/Server/Types/AnalyticsDatabase/Query.ts index 5b603c8070..1b31a0e873 100644 --- a/Common/Server/Types/AnalyticsDatabase/Query.ts +++ b/Common/Server/Types/AnalyticsDatabase/Query.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import CommonQuery from "Common/Types/BaseDatabase/Query"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import CommonQuery from "../../Types/BaseDatabase/Query"; type Query = CommonQuery; diff --git a/Common/Server/Types/AnalyticsDatabase/QueryHelper.ts b/Common/Server/Types/AnalyticsDatabase/QueryHelper.ts index cd883f045e..7df00ede05 100644 --- a/Common/Server/Types/AnalyticsDatabase/QueryHelper.ts +++ b/Common/Server/Types/AnalyticsDatabase/QueryHelper.ts @@ -1,8 +1,8 @@ -import GreaterThan from "Common/Types/BaseDatabase/GreaterThan"; -import InBetween from "Common/Types/BaseDatabase/InBetween"; -import Includes from "Common/Types/BaseDatabase/Includes"; -import LessThan from "Common/Types/BaseDatabase/LessThan"; -import ObjectID from "Common/Types/ObjectID"; +import GreaterThan from "../../Types/BaseDatabase/GreaterThan"; +import InBetween from "../../Types/BaseDatabase/InBetween"; +import Includes from "../../Types/BaseDatabase/Includes"; +import LessThan from "../../Types/BaseDatabase/LessThan"; +import ObjectID from "../../Types/ObjectID"; import { CompareType } from "../../../Types/Database/CompareBase"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/AnalyticsDatabase/Select.ts b/Common/Server/Types/AnalyticsDatabase/Select.ts index 67a3954d5a..8411d12309 100644 --- a/Common/Server/Types/AnalyticsDatabase/Select.ts +++ b/Common/Server/Types/AnalyticsDatabase/Select.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import Dictionary from "Common/Types/Dictionary"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import Dictionary from "../../Types/Dictionary"; export type SelectPropertyOptions = true | Dictionary; diff --git a/Common/Server/Types/AnalyticsDatabase/Sort.ts b/Common/Server/Types/AnalyticsDatabase/Sort.ts index 2151e83567..7b1afa786e 100644 --- a/Common/Server/Types/AnalyticsDatabase/Sort.ts +++ b/Common/Server/Types/AnalyticsDatabase/Sort.ts @@ -1,5 +1,5 @@ -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import CommonSort from "Common/Types/BaseDatabase/Sort"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import CommonSort from "../../Types/BaseDatabase/Sort"; type Sort = CommonSort; diff --git a/Common/Server/Types/AnalyticsDatabase/UpdateBy.ts b/Common/Server/Types/AnalyticsDatabase/UpdateBy.ts index 80db8cfb3a..adc79a7356 100644 --- a/Common/Server/Types/AnalyticsDatabase/UpdateBy.ts +++ b/Common/Server/Types/AnalyticsDatabase/UpdateBy.ts @@ -1,6 +1,6 @@ import Query from "./Query"; -import BaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface UpdateBy { query: Query; diff --git a/Common/Server/Types/AnalyticsDatabase/UpdateByID.ts b/Common/Server/Types/AnalyticsDatabase/UpdateByID.ts index 5e045b4338..10dac94377 100644 --- a/Common/Server/Types/AnalyticsDatabase/UpdateByID.ts +++ b/Common/Server/Types/AnalyticsDatabase/UpdateByID.ts @@ -1,5 +1,5 @@ -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface UpdateBy { data: TBaseModel; diff --git a/Common/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts b/Common/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts index 8b0a71cbfb..e8d44d5298 100644 --- a/Common/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts +++ b/Common/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts @@ -3,11 +3,11 @@ import MonitorService from "../../../Services/MonitorService"; import ProjectService from "../../../Services/ProjectService"; import QueryHelper from "../../Database/QueryHelper"; import ServerMeteredPlan from "./ServerMeteredPlan"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; -import MonitorType from "Common/Types/Monitor/MonitorType"; -import ObjectID from "Common/Types/ObjectID"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Project from "Common/Models/DatabaseModels/Project"; +import ProductType from "../../Types/MeteredPlan/ProductType"; +import MonitorType from "../../Types/Monitor/MonitorType"; +import ObjectID from "../../Types/ObjectID"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Project from "../../Models/DatabaseModels/Project"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class ActiveMonitoringMeteredPlan extends ServerMeteredPlan { diff --git a/Common/Server/Types/Billing/MeteredPlan/AllMeteredPlans.ts b/Common/Server/Types/Billing/MeteredPlan/AllMeteredPlans.ts index 281c70d9d6..065d19423d 100644 --- a/Common/Server/Types/Billing/MeteredPlan/AllMeteredPlans.ts +++ b/Common/Server/Types/Billing/MeteredPlan/AllMeteredPlans.ts @@ -2,8 +2,8 @@ import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; import ActiveMonitoringMeteredPlanType from "./ActiveMonitoringMeteredPlan"; import ServerMeteredPlan from "./ServerMeteredPlan"; import TelemetryMeteredPlanType from "./TelemetryMeteredPlan"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ProductType from "../../Types/MeteredPlan/ProductType"; export const ActiveMonitoringMeteredPlan: ActiveMonitoringMeteredPlanType = new ActiveMonitoringMeteredPlanType(); diff --git a/Common/Server/Types/Billing/MeteredPlan/ServerMeteredPlan.ts b/Common/Server/Types/Billing/MeteredPlan/ServerMeteredPlan.ts index bf19ca6ed9..6301c1c1fd 100644 --- a/Common/Server/Types/Billing/MeteredPlan/ServerMeteredPlan.ts +++ b/Common/Server/Types/Billing/MeteredPlan/ServerMeteredPlan.ts @@ -1,8 +1,8 @@ import BillingService from "../../../Services/BillingService"; -import MeteredPlan from "Common/Types/Billing/MeteredPlan"; -import NotImplementedException from "Common/Types/Exception/NotImplementedException"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; -import ObjectID from "Common/Types/ObjectID"; +import MeteredPlan from "../../Types/Billing/MeteredPlan"; +import NotImplementedException from "../../Types/Exception/NotImplementedException"; +import ProductType from "../../Types/MeteredPlan/ProductType"; +import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class ServerMeteredPlan { diff --git a/Common/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts b/Common/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts index ee89c176b3..1a07b1fb3d 100644 --- a/Common/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts +++ b/Common/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts @@ -2,11 +2,11 @@ import BillingService from "../../../Services/BillingService"; import ProjectService from "../../../Services/ProjectService"; import TelemetryUsageBillingService from "../../../Services/TelemetryUsageBillingService"; import ServerMeteredPlan from "./ServerMeteredPlan"; -import OneUptimeDate from "Common/Types/Date"; -import ProductType from "Common/Types/MeteredPlan/ProductType"; -import ObjectID from "Common/Types/ObjectID"; -import Project from "Common/Models/DatabaseModels/Project"; -import TelemetryUsageBilling from "Common/Models/DatabaseModels/TelemetryUsageBilling"; +import OneUptimeDate from "../../Types/Date"; +import ProductType from "../../Types/MeteredPlan/ProductType"; +import ObjectID from "../../Types/ObjectID"; +import Project from "../../Models/DatabaseModels/Project"; +import TelemetryUsageBilling from "../../Models/DatabaseModels/TelemetryUsageBilling"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class TelemetryMeteredPlan extends ServerMeteredPlan { diff --git a/Common/Server/Types/Database/CountBy.ts b/Common/Server/Types/Database/CountBy.ts index 32a4eb026c..7fe2b41aed 100644 --- a/Common/Server/Types/Database/CountBy.ts +++ b/Common/Server/Types/Database/CountBy.ts @@ -1,8 +1,8 @@ import GroupBy from "./GroupBy"; import Query from "./Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface CountBy { query: Query; diff --git a/Common/Server/Types/Database/CreateBy.ts b/Common/Server/Types/Database/CreateBy.ts index ea4c1e3a09..c5916fe77b 100644 --- a/Common/Server/Types/Database/CreateBy.ts +++ b/Common/Server/Types/Database/CreateBy.ts @@ -1,6 +1,6 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import { JSONObject } from "Common/Types/JSON"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import { JSONObject } from "../../Types/JSON"; export default interface CreateBy { data: TBaseModel; diff --git a/Common/Server/Types/Database/DeleteBy.ts b/Common/Server/Types/Database/DeleteBy.ts index 602bec8afa..f10bf23f1b 100644 --- a/Common/Server/Types/Database/DeleteBy.ts +++ b/Common/Server/Types/Database/DeleteBy.ts @@ -1,6 +1,6 @@ import DeleteOneBy from "./DeleteOneBy"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import PositiveNumber from "../../Types/PositiveNumber"; interface DeleteBy extends DeleteOneBy { diff --git a/Common/Server/Types/Database/DeleteById.ts b/Common/Server/Types/Database/DeleteById.ts index 0fea3a42bc..bd24cdefd4 100644 --- a/Common/Server/Types/Database/DeleteById.ts +++ b/Common/Server/Types/Database/DeleteById.ts @@ -1,6 +1,6 @@ -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import ObjectID from "Common/Types/ObjectID"; -import User from "Common/Models/DatabaseModels/User"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import ObjectID from "../../Types/ObjectID"; +import User from "../../Models/DatabaseModels/User"; export default interface DeleteById { id: ObjectID; diff --git a/Common/Server/Types/Database/DeleteOneBy.ts b/Common/Server/Types/Database/DeleteOneBy.ts index bd66097fbc..4dc218e883 100644 --- a/Common/Server/Types/Database/DeleteOneBy.ts +++ b/Common/Server/Types/Database/DeleteOneBy.ts @@ -1,7 +1,7 @@ import Query from "./Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import User from "Common/Models/DatabaseModels/User"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import User from "../../Models/DatabaseModels/User"; export default interface DeleteOneBy { query: Query; diff --git a/Common/Server/Types/Database/FindBy.ts b/Common/Server/Types/Database/FindBy.ts index de60adb9dd..aeeab84422 100644 --- a/Common/Server/Types/Database/FindBy.ts +++ b/Common/Server/Types/Database/FindBy.ts @@ -1,6 +1,6 @@ import FindOneBy from "./FindOneBy"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface FindBy extends FindOneBy { diff --git a/Common/Server/Types/Database/FindOneBy.ts b/Common/Server/Types/Database/FindOneBy.ts index 754d786508..9738c6086a 100644 --- a/Common/Server/Types/Database/FindOneBy.ts +++ b/Common/Server/Types/Database/FindOneBy.ts @@ -2,8 +2,8 @@ import GroupBy from "./GroupBy"; import Query from "./Query"; import Select from "./Select"; import Sort from "./Sort"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface FindOneBy { query: Query; diff --git a/Common/Server/Types/Database/FindOneByID.ts b/Common/Server/Types/Database/FindOneByID.ts index 015a6604cc..ec7405c60b 100644 --- a/Common/Server/Types/Database/FindOneByID.ts +++ b/Common/Server/Types/Database/FindOneByID.ts @@ -1,7 +1,7 @@ import Select from "./Select"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import ObjectID from "../../Types/ObjectID"; export default interface FindOneByID { id: ObjectID; diff --git a/Common/Server/Types/Database/HardDeleteBy.ts b/Common/Server/Types/Database/HardDeleteBy.ts index ff66ee8f36..f3d32cada1 100644 --- a/Common/Server/Types/Database/HardDeleteBy.ts +++ b/Common/Server/Types/Database/HardDeleteBy.ts @@ -1,6 +1,6 @@ import Query from "./Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; export default interface HardDeleteBy { query: Query; diff --git a/Common/Server/Types/Database/Hooks.ts b/Common/Server/Types/Database/Hooks.ts index 4b25581979..aca773337d 100644 --- a/Common/Server/Types/Database/Hooks.ts +++ b/Common/Server/Types/Database/Hooks.ts @@ -2,7 +2,7 @@ import CreateBy from "./CreateBy"; import DeleteBy from "./DeleteBy"; import FindBy from "./FindBy"; import UpdateBy from "./UpdateBy"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export type DatabaseTriggerType = "on-create" | "on-update" | "on-delete"; diff --git a/Common/Server/Types/Database/Permissions/AccessControlPermission.ts b/Common/Server/Types/Database/Permissions/AccessControlPermission.ts index a971736e4e..0cac5f5805 100644 --- a/Common/Server/Types/Database/Permissions/AccessControlPermission.ts +++ b/Common/Server/Types/Database/Permissions/AccessControlPermission.ts @@ -2,23 +2,23 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import Query from "../Query"; import Select from "../Select"; import TablePermission from "./TablePermission"; -import AccessControlModel from "Common/Models/DatabaseModels/DatabaseBaseModel/AccessControlModel"; +import AccessControlModel from "../../Models/DatabaseModels/DatabaseBaseModel/AccessControlModel"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import ArrayUtil from "Common/Utils/Array"; -import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import ArrayUtil from "../../Utils/Array"; +import { ColumnAccessControl } from "../../Types/BaseDatabase/AccessControl"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; -import ObjectID from "Common/Types/ObjectID"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; +import ObjectID from "../../Types/ObjectID"; import Permission, { PermissionHelper, UserPermission, -} from "Common/Types/Permission"; +} from "../../Types/Permission"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class AccessControlPermission { diff --git a/Common/Server/Types/Database/Permissions/BasePermission.ts b/Common/Server/Types/Database/Permissions/BasePermission.ts index 39b03af31a..ca2e99e673 100644 --- a/Common/Server/Types/Database/Permissions/BasePermission.ts +++ b/Common/Server/Types/Database/Permissions/BasePermission.ts @@ -10,11 +10,11 @@ import SelectPermission from "./SelectPermission"; import TablePermission from "./TablePermission"; import TenantPermission from "./TenantPermission"; import UserPermissions from "./UserPermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import { TableColumnMetadata } from "Common/Types/Database/TableColumn"; -import TableColumnType from "Common/Types/Database/TableColumnType"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import { TableColumnMetadata } from "../../Types/Database/TableColumn"; +import TableColumnType from "../../Types/Database/TableColumnType"; +import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export interface CheckPermissionBaseInterface { diff --git a/Common/Server/Types/Database/Permissions/BillingPermission.ts b/Common/Server/Types/Database/Permissions/BillingPermission.ts index b52323f778..8bb13abe46 100644 --- a/Common/Server/Types/Database/Permissions/BillingPermission.ts +++ b/Common/Server/Types/Database/Permissions/BillingPermission.ts @@ -5,10 +5,10 @@ import { import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; -import PaymentRequiredException from "Common/Types/Exception/PaymentRequiredException"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import SubscriptionPlan from "../../Types/Billing/SubscriptionPlan"; +import PaymentRequiredException from "../../Types/Exception/PaymentRequiredException"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class BillingPermissions { diff --git a/Common/Server/Types/Database/Permissions/ColumnPermission.ts b/Common/Server/Types/Database/Permissions/ColumnPermission.ts index 87b6a5bcb6..41c1d324b3 100644 --- a/Common/Server/Types/Database/Permissions/ColumnPermission.ts +++ b/Common/Server/Types/Database/Permissions/ColumnPermission.ts @@ -3,25 +3,25 @@ import { getAllEnvVars, } from "../../../../Server/EnvironmentConfig"; import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl"; -import ColumnBillingAccessControl from "Common/Types/BaseDatabase/ColumnBillingAccessControl"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { ColumnAccessControl } from "../../Types/BaseDatabase/AccessControl"; +import ColumnBillingAccessControl from "../../Types/BaseDatabase/ColumnBillingAccessControl"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan"; -import Columns from "Common/Types/Database/Columns"; -import { TableColumnMetadata } from "Common/Types/Database/TableColumn"; -import TableColumnType from "Common/Types/Database/TableColumnType"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import PaymentRequiredException from "Common/Types/Exception/PaymentRequiredException"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import SubscriptionPlan from "../../Types/Billing/SubscriptionPlan"; +import Columns from "../../Types/Database/Columns"; +import { TableColumnMetadata } from "../../Types/Database/TableColumn"; +import TableColumnType from "../../Types/Database/TableColumnType"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import PaymentRequiredException from "../../Types/Exception/PaymentRequiredException"; import Permission, { PermissionHelper, UserPermission, -} from "Common/Types/Permission"; +} from "../../Types/Permission"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Database/Permissions/CreatePermission.ts b/Common/Server/Types/Database/Permissions/CreatePermission.ts index 6eacea5715..03a6f0f2d7 100644 --- a/Common/Server/Types/Database/Permissions/CreatePermission.ts +++ b/Common/Server/Types/Database/Permissions/CreatePermission.ts @@ -1,8 +1,8 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import ColumnPermissions from "./ColumnPermission"; import TablePermission from "./TablePermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class CreatePermission { diff --git a/Common/Server/Types/Database/Permissions/DeletePermission.ts b/Common/Server/Types/Database/Permissions/DeletePermission.ts index 356f5d9530..b56a7b13d2 100644 --- a/Common/Server/Types/Database/Permissions/DeletePermission.ts +++ b/Common/Server/Types/Database/Permissions/DeletePermission.ts @@ -4,8 +4,8 @@ import AccessControlUtil from "./AccessControlPermission"; import PermissionUtil from "./PermissionsUtil"; import TablePermission from "./TablePermission"; import TenantPermission from "./TenantPermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class DeletePermission { diff --git a/Common/Server/Types/Database/Permissions/Index.ts b/Common/Server/Types/Database/Permissions/Index.ts index 6fa699ce53..a576bce7fa 100644 --- a/Common/Server/Types/Database/Permissions/Index.ts +++ b/Common/Server/Types/Database/Permissions/Index.ts @@ -5,8 +5,8 @@ import CreatePermission from "./CreatePermission"; import DeletePermission from "./DeletePermission"; import ReadPermission, { CheckReadPermissionType } from "./ReadPermission"; import UpdatePermission from "./UpdatePermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class ModelPermission { diff --git a/Common/Server/Types/Database/Permissions/PermissionsUtil.ts b/Common/Server/Types/Database/Permissions/PermissionsUtil.ts index 192435cc9d..0e6900adac 100644 --- a/Common/Server/Types/Database/Permissions/PermissionsUtil.ts +++ b/Common/Server/Types/Database/Permissions/PermissionsUtil.ts @@ -1,6 +1,6 @@ import Query from "../Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class PermissionUtil { diff --git a/Common/Server/Types/Database/Permissions/PublicPermission.ts b/Common/Server/Types/Database/Permissions/PublicPermission.ts index 2b3b848d44..e8b3ddbad9 100644 --- a/Common/Server/Types/Database/Permissions/PublicPermission.ts +++ b/Common/Server/Types/Database/Permissions/PublicPermission.ts @@ -1,11 +1,11 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import TablePermission from "./TablePermission"; -import { DatabaseBaseModelType } from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException"; +import { DatabaseBaseModelType } from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; -import Permission from "Common/Types/Permission"; -import UserType from "Common/Types/UserType"; +import Permission from "../../Types/Permission"; +import UserType from "../../Types/UserType"; export default class PublicPermission { @CaptureSpan() diff --git a/Common/Server/Types/Database/Permissions/QueryPermission.ts b/Common/Server/Types/Database/Permissions/QueryPermission.ts index 8d4de789f4..9bc61da8af 100644 --- a/Common/Server/Types/Database/Permissions/QueryPermission.ts +++ b/Common/Server/Types/Database/Permissions/QueryPermission.ts @@ -4,23 +4,23 @@ import Select from "../Select"; import ColumnPermissions from "./ColumnPermission"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import Columns from "Common/Types/Database/Columns"; -import { TableColumnMetadata } from "Common/Types/Database/TableColumn"; -import TableColumnType from "Common/Types/Database/TableColumnType"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import Columns from "../../Types/Database/Columns"; +import { TableColumnMetadata } from "../../Types/Database/TableColumn"; +import TableColumnType from "../../Types/Database/TableColumnType"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; -import { JSONObject } from "Common/Types/JSON"; +import { JSONObject } from "../../Types/JSON"; import Permission, { PermissionHelper, UserPermission, -} from "Common/Types/Permission"; -import Typeof from "Common/Types/Typeof"; +} from "../../Types/Permission"; +import Typeof from "../../Types/Typeof"; export default class QueryPermission { @CaptureSpan() diff --git a/Common/Server/Types/Database/Permissions/ReadPermission.ts b/Common/Server/Types/Database/Permissions/ReadPermission.ts index ea5e8343c0..5b5b2aae57 100644 --- a/Common/Server/Types/Database/Permissions/ReadPermission.ts +++ b/Common/Server/Types/Database/Permissions/ReadPermission.ts @@ -6,13 +6,13 @@ import Select from "../Select"; import SelectUtil from "../SelectUtil"; import BasePermission, { CheckPermissionBaseInterface } from "./BasePermission"; import TablePermission from "./TablePermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import ObjectID from "Common/Types/ObjectID"; -import Permission, { UserPermission } from "Common/Types/Permission"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import ObjectID from "../../Types/ObjectID"; +import Permission, { UserPermission } from "../../Types/Permission"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export interface CheckReadPermissionType diff --git a/Common/Server/Types/Database/Permissions/SelectPermission.ts b/Common/Server/Types/Database/Permissions/SelectPermission.ts index ce950f6ecd..42c81719bd 100644 --- a/Common/Server/Types/Database/Permissions/SelectPermission.ts +++ b/Common/Server/Types/Database/Permissions/SelectPermission.ts @@ -3,15 +3,15 @@ import Select from "../Select"; import ColumnPermissions from "./ColumnPermission"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import Columns from "Common/Types/Database/Columns"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; -import { PermissionHelper, UserPermission } from "Common/Types/Permission"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import Columns from "../../Types/Database/Columns"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; +import { PermissionHelper, UserPermission } from "../../Types/Permission"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class SelectPermission { diff --git a/Common/Server/Types/Database/Permissions/TablePermission.ts b/Common/Server/Types/Database/Permissions/TablePermission.ts index 0000bf819c..a4234e3205 100644 --- a/Common/Server/Types/Database/Permissions/TablePermission.ts +++ b/Common/Server/Types/Database/Permissions/TablePermission.ts @@ -3,17 +3,17 @@ import BillingPermissions from "./BillingPermission"; import PublicPermission from "./PublicPermission"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; import DatabaseCommonInteractionPropsUtil, { PermissionType, -} from "Common/Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; +} from "../../Types/BaseDatabase/DatabaseCommonInteractionPropsUtil"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; import Permission, { PermissionHelper, UserPermission, -} from "Common/Types/Permission"; +} from "../../Types/Permission"; export default class TablePermission { @CaptureSpan() diff --git a/Common/Server/Types/Database/Permissions/TenantPermission.ts b/Common/Server/Types/Database/Permissions/TenantPermission.ts index 0c8e314f11..be69b27a9b 100644 --- a/Common/Server/Types/Database/Permissions/TenantPermission.ts +++ b/Common/Server/Types/Database/Permissions/TenantPermission.ts @@ -2,11 +2,11 @@ import DatabaseRequestType from "../../BaseDatabase/DatabaseRequestType"; import Query from "../Query"; import Select from "../Select"; import BasePermission, { CheckPermissionBaseInterface } from "./BasePermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; +import ObjectID from "../../Types/ObjectID"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class TenantPermission { diff --git a/Common/Server/Types/Database/Permissions/UpdatePermission.ts b/Common/Server/Types/Database/Permissions/UpdatePermission.ts index 37293bcd1f..d4928b0e0e 100644 --- a/Common/Server/Types/Database/Permissions/UpdatePermission.ts +++ b/Common/Server/Types/Database/Permissions/UpdatePermission.ts @@ -4,9 +4,9 @@ import AccessControlUtil from "./AccessControlPermission"; import BasePermission, { CheckPermissionBaseInterface } from "./BasePermission"; import ColumnPermissions from "./ColumnPermission"; import TablePermission from "./TablePermission"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import QueryDeepPartialEntity from "Common/Types/Database/PartialEntity"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import QueryDeepPartialEntity from "../../Types/Database/PartialEntity"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class UpdatePermission { diff --git a/Common/Server/Types/Database/Permissions/UserPermission.ts b/Common/Server/Types/Database/Permissions/UserPermission.ts index cd1599342d..b44a6d6ef1 100644 --- a/Common/Server/Types/Database/Permissions/UserPermission.ts +++ b/Common/Server/Types/Database/Permissions/UserPermission.ts @@ -1,8 +1,8 @@ import Query from "../Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import UserModel from "Common/Models/DatabaseModels/User"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import UserModel from "../../Models/DatabaseModels/User"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class UserPermissions { diff --git a/Common/Server/Types/Database/Query.ts b/Common/Server/Types/Database/Query.ts index 735a402c6a..c6de27ba18 100644 --- a/Common/Server/Types/Database/Query.ts +++ b/Common/Server/Types/Database/Query.ts @@ -1,4 +1,4 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import BaseQuery, { OrQuery as BaseQueryOrQuery, } from "../../../Types/BaseDatabase/Query"; diff --git a/Common/Server/Types/Database/QueryHelper.ts b/Common/Server/Types/Database/QueryHelper.ts index f8efb4133d..0985f261aa 100644 --- a/Common/Server/Types/Database/QueryHelper.ts +++ b/Common/Server/Types/Database/QueryHelper.ts @@ -1,9 +1,9 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Dictionary from "Common/Types/Dictionary"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import Text from "Common/Types/Text"; -import Typeof from "Common/Types/Typeof"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import Dictionary from "../../Types/Dictionary"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import Text from "../../Types/Text"; +import Typeof from "../../Types/Typeof"; import { FindOperator, Raw } from "typeorm"; import { FindWhereProperty } from "../../../Types/BaseDatabase/Query"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Database/QueryUtil.ts b/Common/Server/Types/Database/QueryUtil.ts index 660fb2fded..e651255447 100644 --- a/Common/Server/Types/Database/QueryUtil.ts +++ b/Common/Server/Types/Database/QueryUtil.ts @@ -1,22 +1,22 @@ import Query from "./Query"; import QueryHelper from "./QueryHelper"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import EqualToOrNull from "Common/Types/BaseDatabase/EqualToOrNull"; -import GreaterThan from "Common/Types/BaseDatabase/GreaterThan"; -import GreaterThanOrEqual from "Common/Types/BaseDatabase/GreaterThanOrEqual"; -import InBetween from "Common/Types/BaseDatabase/InBetween"; -import Includes from "Common/Types/BaseDatabase/Includes"; -import IsNull from "Common/Types/BaseDatabase/IsNull"; -import LessThan from "Common/Types/BaseDatabase/LessThan"; -import LessThanOrEqual from "Common/Types/BaseDatabase/LessThanOrEqual"; -import NotEqual from "Common/Types/BaseDatabase/NotEqual"; -import NotNull from "Common/Types/BaseDatabase/NotNull"; -import Search from "Common/Types/BaseDatabase/Search"; -import { TableColumnMetadata } from "Common/Types/Database/TableColumn"; -import TableColumnType from "Common/Types/Database/TableColumnType"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import Typeof from "Common/Types/Typeof"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import EqualToOrNull from "../../Types/BaseDatabase/EqualToOrNull"; +import GreaterThan from "../../Types/BaseDatabase/GreaterThan"; +import GreaterThanOrEqual from "../../Types/BaseDatabase/GreaterThanOrEqual"; +import InBetween from "../../Types/BaseDatabase/InBetween"; +import Includes from "../../Types/BaseDatabase/Includes"; +import IsNull from "../../Types/BaseDatabase/IsNull"; +import LessThan from "../../Types/BaseDatabase/LessThan"; +import LessThanOrEqual from "../../Types/BaseDatabase/LessThanOrEqual"; +import NotEqual from "../../Types/BaseDatabase/NotEqual"; +import NotNull from "../../Types/BaseDatabase/NotNull"; +import Search from "../../Types/BaseDatabase/Search"; +import { TableColumnMetadata } from "../../Types/Database/TableColumn"; +import TableColumnType from "../../Types/Database/TableColumnType"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import Typeof from "../../Types/Typeof"; import { FindOperator } from "typeorm/find-options/FindOperator"; import { CompareType } from "../../../Types/Database/CompareBase"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Database/RelationSelect.ts b/Common/Server/Types/Database/RelationSelect.ts index 9c1e55c8cc..df8b0decdf 100644 --- a/Common/Server/Types/Database/RelationSelect.ts +++ b/Common/Server/Types/Database/RelationSelect.ts @@ -1,5 +1,5 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { JSONObject } from "Common/Types/JSON"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { JSONObject } from "../../Types/JSON"; import { FindOptionsRelations } from "typeorm"; type RelationSelect = diff --git a/Common/Server/Types/Database/SearchBy.ts b/Common/Server/Types/Database/SearchBy.ts index b002461c92..36a69eb9ce 100644 --- a/Common/Server/Types/Database/SearchBy.ts +++ b/Common/Server/Types/Database/SearchBy.ts @@ -1,7 +1,7 @@ import Select from "./Select"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface SearchBy { text: string; diff --git a/Common/Server/Types/Database/SearchResult.ts b/Common/Server/Types/Database/SearchResult.ts index ce27bd6aaa..7f26c3ad72 100644 --- a/Common/Server/Types/Database/SearchResult.ts +++ b/Common/Server/Types/Database/SearchResult.ts @@ -1,5 +1,5 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import PositiveNumber from "../../Types/PositiveNumber"; export default interface SearchResult { items: Array; diff --git a/Common/Server/Types/Database/Select.ts b/Common/Server/Types/Database/Select.ts index ec2dcac57b..1d6eba9627 100644 --- a/Common/Server/Types/Database/Select.ts +++ b/Common/Server/Types/Database/Select.ts @@ -1,4 +1,4 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export type SelectPropertyOptions = boolean | SelectOptions | undefined; diff --git a/Common/Server/Types/Database/SelectUtil.ts b/Common/Server/Types/Database/SelectUtil.ts index f5a92d6cda..2c19c46163 100644 --- a/Common/Server/Types/Database/SelectUtil.ts +++ b/Common/Server/Types/Database/SelectUtil.ts @@ -2,9 +2,9 @@ import RelationSelect from "./RelationSelect"; import Select from "./Select"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { JSONObject } from "Common/Types/JSON"; -import Typeof from "Common/Types/Typeof"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { JSONObject } from "../../Types/JSON"; +import Typeof from "../../Types/Typeof"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; export default class SelectUtil { diff --git a/Common/Server/Types/Database/Sort.ts b/Common/Server/Types/Database/Sort.ts index d6ed42e197..4041f47917 100644 --- a/Common/Server/Types/Database/Sort.ts +++ b/Common/Server/Types/Database/Sort.ts @@ -1,6 +1,6 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import SortOrder from "Common/Types/BaseDatabase/SortOrder"; -import DatabaseProperty from "Common/Types/Database/DatabaseProperty"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import DatabaseProperty from "../../Types/Database/DatabaseProperty"; import { FindOptionsOrderProperty, FindOptionsOrderValue } from "typeorm"; export declare type FindOrderProperty = diff --git a/Common/Server/Types/Database/UpdateBy.ts b/Common/Server/Types/Database/UpdateBy.ts index 30e0d9c1b2..0dd10302f0 100644 --- a/Common/Server/Types/Database/UpdateBy.ts +++ b/Common/Server/Types/Database/UpdateBy.ts @@ -1,6 +1,6 @@ import UpdateOneBy from "./UpdateOneBy"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import PositiveNumber from "../../Types/PositiveNumber"; interface UpdateBy extends UpdateOneBy { diff --git a/Common/Server/Types/Database/UpdateByID.ts b/Common/Server/Types/Database/UpdateByID.ts index aed7ef0476..2e56260335 100644 --- a/Common/Server/Types/Database/UpdateByID.ts +++ b/Common/Server/Types/Database/UpdateByID.ts @@ -1,6 +1,6 @@ -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import ObjectID from "../../Types/ObjectID"; import QueryDeepPartialEntity from "../../../Types/Database/PartialEntity"; export default interface UpdateBy { diff --git a/Common/Server/Types/Database/UpdateByIDAndFetch.ts b/Common/Server/Types/Database/UpdateByIDAndFetch.ts index 4416a627f2..fa00723572 100644 --- a/Common/Server/Types/Database/UpdateByIDAndFetch.ts +++ b/Common/Server/Types/Database/UpdateByIDAndFetch.ts @@ -1,6 +1,6 @@ import Select from "./Select"; import UpdateByID from "./UpdateByID"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default interface UpdateByIDAndFetch extends UpdateByID { diff --git a/Common/Server/Types/Database/UpdateOneBy.ts b/Common/Server/Types/Database/UpdateOneBy.ts index 9b6148b213..f0ef0a4c53 100644 --- a/Common/Server/Types/Database/UpdateOneBy.ts +++ b/Common/Server/Types/Database/UpdateOneBy.ts @@ -1,7 +1,7 @@ import Query from "./Query"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps"; -import PartialEntity from "Common/Types/Database/PartialEntity"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps"; +import PartialEntity from "../../Types/Database/PartialEntity"; export default interface UpdateOneBy { query: Query; diff --git a/Common/Server/Types/Domain.ts b/Common/Server/Types/Domain.ts index b4321cf955..821680d038 100644 --- a/Common/Server/Types/Domain.ts +++ b/Common/Server/Types/Domain.ts @@ -1,6 +1,6 @@ import logger from "../Utils/Logger"; -import DomainCommon from "Common/Types/Domain"; -import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes"; +import DomainCommon from "../../Types/Domain"; +import { PromiseRejectErrorFunction } from "../../Types/FunctionTypes"; import dns from "dns"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/ComponentCode.ts b/Common/Server/Types/Workflow/ComponentCode.ts index 23c9c88bc3..c23084a321 100644 --- a/Common/Server/Types/Workflow/ComponentCode.ts +++ b/Common/Server/Types/Workflow/ComponentCode.ts @@ -1,10 +1,10 @@ // this class is the base class that all the component can implement // -import BadDataException from "Common/Types/Exception/BadDataException"; -import Exception from "Common/Types/Exception/Exception"; -import { JSONArray, JSONObject, JSONValue } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Exception from "../../Types/Exception/Exception"; +import { JSONArray, JSONObject, JSONValue } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; export interface RunOptions { diff --git a/Common/Server/Types/Workflow/Components/API/Delete.ts b/Common/Server/Types/Workflow/Components/API/Delete.ts index 04aa5387ab..e81aa9a54b 100644 --- a/Common/Server/Types/Workflow/Components/API/Delete.ts +++ b/Common/Server/Types/Workflow/Components/API/Delete.ts @@ -1,15 +1,15 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import APIComponents from "Common/Types/Workflow/Components/API"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import APIComponents from "../../Types/Workflow/Components/API"; +import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class ApiDelete extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/API/Get.ts b/Common/Server/Types/Workflow/Components/API/Get.ts index b38a58ce1f..f6f7357b6d 100644 --- a/Common/Server/Types/Workflow/Components/API/Get.ts +++ b/Common/Server/Types/Workflow/Components/API/Get.ts @@ -1,15 +1,15 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import APIComponents from "Common/Types/Workflow/Components/API"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import APIComponents from "../../Types/Workflow/Components/API"; +import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class ApiGet extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/API/Patch.ts b/Common/Server/Types/Workflow/Components/API/Patch.ts index 52179843dd..0c9247a573 100644 --- a/Common/Server/Types/Workflow/Components/API/Patch.ts +++ b/Common/Server/Types/Workflow/Components/API/Patch.ts @@ -1,15 +1,15 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import APIComponents from "Common/Types/Workflow/Components/API"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import APIComponents from "../../Types/Workflow/Components/API"; +import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class ApiPut extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/API/Post.ts b/Common/Server/Types/Workflow/Components/API/Post.ts index 337582f1fe..d1201dacc9 100644 --- a/Common/Server/Types/Workflow/Components/API/Post.ts +++ b/Common/Server/Types/Workflow/Components/API/Post.ts @@ -1,15 +1,15 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import APIComponents from "Common/Types/Workflow/Components/API"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import APIComponents from "../../Types/Workflow/Components/API"; +import API from "../../Utils/API"; import logger from "../../../../Utils/Logger"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Put.ts b/Common/Server/Types/Workflow/Components/API/Put.ts index 1d86c64ea7..a5b18037e2 100644 --- a/Common/Server/Types/Workflow/Components/API/Put.ts +++ b/Common/Server/Types/Workflow/Components/API/Put.ts @@ -1,15 +1,15 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import APIComponents from "Common/Types/Workflow/Components/API"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import APIComponents from "../../Types/Workflow/Components/API"; +import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class ApiPut extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/API/Utils.ts b/Common/Server/Types/Workflow/Components/API/Utils.ts index 6f4c1bab25..46d1098400 100644 --- a/Common/Server/Types/Workflow/Components/API/Utils.ts +++ b/Common/Server/Types/Workflow/Components/API/Utils.ts @@ -1,11 +1,11 @@ import { RunOptions } from "../../ComponentCode"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export class ApiComponentUtils { diff --git a/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts index 2db37472ec..ee4bf30dd7 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts @@ -1,12 +1,12 @@ import DatabaseService from "../../../../Services/DatabaseService"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class CreateManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts index eb934ebaff..6329520910 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts @@ -1,14 +1,14 @@ import DatabaseService from "../../../../Services/DatabaseService"; import logger from "../../../../Utils/Logger"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import Exception from "Common/Types/Exception/Exception"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Exception from "../../Types/Exception/Exception"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class CreateOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts index 2634024902..3564fdd8ff 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts @@ -1,15 +1,15 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; export default class DeleteManyBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts index eb24ec7382..6aaf677a10 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts @@ -1,13 +1,13 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class DeleteOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts index 31933c279a..f62c6887e1 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts @@ -2,15 +2,15 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import Select from "../../../Database/Select"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class FindManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts index f0ad336060..1f72f063f2 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts @@ -2,13 +2,13 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import Select from "../../../Database/Select"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class FindOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts index eacca9d004..5b75c8a6b1 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnCreateBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts index d829a019be..9a4f3a3561 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnDeleteBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts index 00441b97d0..39970731db 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts @@ -7,16 +7,16 @@ import Response from "../../../../Utils/Response"; import Select from "../../../Database/Select"; import { RunOptions, RunReturnType } from "../../ComponentCode"; import TriggerCode, { ExecuteWorkflowType, InitProps } from "../../TriggerCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ObjectID from "Common/Types/ObjectID"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; -import Workflow from "Common/Models/DatabaseModels/Workflow"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import LIMIT_MAX from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ObjectID from "../../Types/ObjectID"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import Workflow from "../../Models/DatabaseModels/Workflow"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class OnTriggerBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts index c848da52f5..fc1ae6bc7c 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnUpdateBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts index 6974ebf85e..a84fcfdd6e 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts @@ -1,16 +1,16 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import QueryDeepPartialEntity from "Common/Types/Database/PartialEntity"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import QueryDeepPartialEntity from "../../Types/Database/PartialEntity"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class UpdateManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts index 7947bf78a7..a67affbf4f 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts @@ -1,14 +1,14 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import QueryDeepPartialEntity from "Common/Types/Database/PartialEntity"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Text from "Common/Types/Text"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import BaseModelComponents from "Common/Types/Workflow/Components/BaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import QueryDeepPartialEntity from "../../Types/Database/PartialEntity"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Text from "../../Types/Text"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class UpdateOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts b/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts index fb5042d3b0..0a8bfc5bed 100644 --- a/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts +++ b/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts @@ -1,13 +1,13 @@ import VMUtil from "../../../../Utils/VM/VMAPI"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ReturnResult from "Common/Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; import Components, { ConditionOperator, -} from "Common/Types/Workflow/Components/Condition"; +} from "../../Types/Workflow/Components/Condition"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class IfElse extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/Email.ts b/Common/Server/Types/Workflow/Components/Email.ts index f571e81526..d1615e1ad4 100644 --- a/Common/Server/Types/Workflow/Components/Email.ts +++ b/Common/Server/Types/Workflow/Components/Email.ts @@ -1,9 +1,9 @@ import ComponentCode, { RunOptions, RunReturnType } from "../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import Components from "Common/Types/Workflow/Components/Email"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import Components from "../../Types/Workflow/Components/Email"; import nodemailer, { Transporter } from "nodemailer"; import SMTPTransport from "nodemailer/lib/smtp-transport"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/Index.ts b/Common/Server/Types/Workflow/Components/Index.ts index 0e6a8eb05c..35065d2f3a 100644 --- a/Common/Server/Types/Workflow/Components/Index.ts +++ b/Common/Server/Types/Workflow/Components/Index.ts @@ -28,10 +28,10 @@ import MicrosoftTeamsSendMessageToChannel from "./MicrosoftTeams/SendMessageToCh import Schedule from "./Schedule"; import SlackSendMessageToChannel from "./Slack/SendMessageToChannel"; import WebhookTrigger from "./Webhook"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Dictionary from "Common/Types/Dictionary"; -import Text from "Common/Types/Text"; -import ComponentID from "Common/Types/Workflow/ComponentID"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import Dictionary from "../../Types/Dictionary"; +import Text from "../../Types/Text"; +import ComponentID from "../../Types/Workflow/ComponentID"; import ApiPatch from "./API/Patch"; const Components: Dictionary = { diff --git a/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts b/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts index e7955ae749..79f548f5b1 100644 --- a/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts +++ b/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import JSONComponents from "Common/Types/Workflow/Components/JSON"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import JSONComponents from "../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class JsonToText extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts b/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts index a2d3cedb3b..26396a61e0 100644 --- a/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts +++ b/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import JSONComponents from "Common/Types/Workflow/Components/JSON"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import JSONComponents from "../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class MergeJSON extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts b/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts index dbf0b17ea1..8cc8c35c92 100644 --- a/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts +++ b/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import JSONComponents from "Common/Types/Workflow/Components/JSON"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import JSONComponents from "../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class TextToJSON extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/JavaScript.ts b/Common/Server/Types/Workflow/Components/JavaScript.ts index 493f91b0d7..29a79677f1 100644 --- a/Common/Server/Types/Workflow/Components/JavaScript.ts +++ b/Common/Server/Types/Workflow/Components/JavaScript.ts @@ -1,12 +1,12 @@ import { WorkflowScriptTimeoutInMS } from "../../../../Server/EnvironmentConfig"; import VMUtil from "../../../Utils/VM/VMAPI"; import ComponentCode, { RunOptions, RunReturnType } from "../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ReturnResult from "Common/Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import JavaScriptComponents from "Common/Types/Workflow/Components/JavaScript"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import JavaScriptComponents from "../../Types/Workflow/Components/JavaScript"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class JavaScriptCode extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/Log.ts b/Common/Server/Types/Workflow/Components/Log.ts index 1b078b4121..400032eb33 100644 --- a/Common/Server/Types/Workflow/Components/Log.ts +++ b/Common/Server/Types/Workflow/Components/Log.ts @@ -1,9 +1,9 @@ import ComponentCode, { RunOptions, RunReturnType } from "../ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import LogComponents from "Common/Types/Workflow/Components/Log"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import LogComponents from "../../Types/Workflow/Components/Log"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class Log extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/Manual.ts b/Common/Server/Types/Workflow/Components/Manual.ts index 3029f8a2ec..0d22befde9 100644 --- a/Common/Server/Types/Workflow/Components/Manual.ts +++ b/Common/Server/Types/Workflow/Components/Manual.ts @@ -1,8 +1,8 @@ import TriggerCode from "../TriggerCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import ComponentMetadata from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import ManualComponents from "Common/Types/Workflow/Components/Manual"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ComponentMetadata from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import ManualComponents from "../../Types/Workflow/Components/Manual"; export default class ManualTrigger extends TriggerCode { public constructor() { diff --git a/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts b/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts index d225fead7e..08eff7ef93 100644 --- a/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts +++ b/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import APIException from "Common/Types/Exception/ApiException"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import MicrosoftTeamComponents from "Common/Types/Workflow/Components/MicrosoftTeams"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import APIException from "../../Types/Exception/ApiException"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import MicrosoftTeamComponents from "../../Types/Workflow/Components/MicrosoftTeams"; +import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class SendMessageToChannel extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/Schedule.ts b/Common/Server/Types/Workflow/Components/Schedule.ts index 72c1618df7..80457976bd 100644 --- a/Common/Server/Types/Workflow/Components/Schedule.ts +++ b/Common/Server/Types/Workflow/Components/Schedule.ts @@ -6,14 +6,14 @@ import TriggerCode, { InitProps, UpdateProps, } from "../TriggerCode"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import ScheduleComponents from "Common/Types/Workflow/Components/Schedule"; -import Workflow from "Common/Models/DatabaseModels/Workflow"; +import LIMIT_MAX from "../../Types/Database/LimitMax"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import ScheduleComponents from "../../Types/Workflow/Components/Schedule"; +import Workflow from "../../Models/DatabaseModels/Workflow"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class WebhookTrigger extends TriggerCode { diff --git a/Common/Server/Types/Workflow/Components/Slack/SendMessageToChannel.ts b/Common/Server/Types/Workflow/Components/Slack/SendMessageToChannel.ts index 27277ec859..1bf3071ec2 100644 --- a/Common/Server/Types/Workflow/Components/Slack/SendMessageToChannel.ts +++ b/Common/Server/Types/Workflow/Components/Slack/SendMessageToChannel.ts @@ -1,13 +1,13 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import APIException from "Common/Types/Exception/ApiException"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import SlackComponents from "Common/Types/Workflow/Components/Slack"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import APIException from "../../Types/Exception/ApiException"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import SlackComponents from "../../Types/Workflow/Components/Slack"; import SlackUtil from "../../../../Utils/Workspace/Slack/Slack"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/Webhook.ts b/Common/Server/Types/Workflow/Components/Webhook.ts index 1be8421c1c..837fc895b2 100644 --- a/Common/Server/Types/Workflow/Components/Webhook.ts +++ b/Common/Server/Types/Workflow/Components/Webhook.ts @@ -6,12 +6,12 @@ import { import Response from "../../../Utils/Response"; import { RunOptions, RunReturnType } from "../ComponentCode"; import TriggerCode, { ExecuteWorkflowType, InitProps } from "../TriggerCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import ComponentMetadata, { Port } from "Common/Types/Workflow/Component"; -import ComponentID from "Common/Types/Workflow/ComponentID"; -import WebhookComponents from "Common/Types/Workflow/Components/Webhook"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import ComponentID from "../../Types/Workflow/ComponentID"; +import WebhookComponents from "../../Types/Workflow/Components/Webhook"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; export default class WebhookTrigger extends TriggerCode { diff --git a/Common/Server/Types/Workflow/TriggerCode.ts b/Common/Server/Types/Workflow/TriggerCode.ts index 422f823d61..526de04c19 100644 --- a/Common/Server/Types/Workflow/TriggerCode.ts +++ b/Common/Server/Types/Workflow/TriggerCode.ts @@ -2,10 +2,10 @@ // import { ExpressRouter } from "../../Utils/Express"; import ComponentCode, { RunOptions, RunReturnType } from "./ComponentCode"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import { Port } from "Common/Types/Workflow/Component"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import { Port } from "../../Types/Workflow/Component"; import CaptureSpan from "../../Utils/Telemetry/CaptureSpan"; export interface ExecuteWorkflowType { diff --git a/Common/Server/Types/Workflow/Workflow.ts b/Common/Server/Types/Workflow/Workflow.ts index 7bf37d0030..c692aa64f0 100644 --- a/Common/Server/Types/Workflow/Workflow.ts +++ b/Common/Server/Types/Workflow/Workflow.ts @@ -1,5 +1,5 @@ -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; export interface RunProps { arguments: JSONObject; diff --git a/Common/Server/Utils/Airtable.ts b/Common/Server/Utils/Airtable.ts index 3a730eec76..6d4c5588ab 100644 --- a/Common/Server/Utils/Airtable.ts +++ b/Common/Server/Utils/Airtable.ts @@ -1,6 +1,6 @@ import { AirtableApiKey, AirtableBaseId } from "../EnvironmentConfig"; -import Dictionary from "Common/Types/Dictionary"; -import PositiveNumber from "Common/Types/PositiveNumber"; +import Dictionary from "../../Types/Dictionary"; +import PositiveNumber from "../../Types/PositiveNumber"; import AirtableLib, { FieldSet, Records } from "airtable"; import CaptureSpan from "../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/AnalyticsDatabase/Statement.ts b/Common/Server/Utils/AnalyticsDatabase/Statement.ts index e62b66fb68..98fa9e171f 100644 --- a/Common/Server/Utils/AnalyticsDatabase/Statement.ts +++ b/Common/Server/Utils/AnalyticsDatabase/Statement.ts @@ -1,18 +1,18 @@ import { BaseQueryParams } from "@clickhouse/client"; import { integer } from "@elastic/elasticsearch/lib/api/types"; -import { RecordValue } from "Common/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel"; -import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType"; -import GreaterThan from "Common/Types/BaseDatabase/GreaterThan"; -import GreaterThanOrEqual from "Common/Types/BaseDatabase/GreaterThanOrEqual"; -import Includes from "Common/Types/BaseDatabase/Includes"; -import LessThan from "Common/Types/BaseDatabase/LessThan"; -import LessThanOrEqual from "Common/Types/BaseDatabase/LessThanOrEqual"; +import { RecordValue } from "../../Models/AnalyticsModels/AnalyticsBaseModel/CommonModel"; +import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType"; +import GreaterThan from "../../Types/BaseDatabase/GreaterThan"; +import GreaterThanOrEqual from "../../Types/BaseDatabase/GreaterThanOrEqual"; +import Includes from "../../Types/BaseDatabase/Includes"; +import LessThan from "../../Types/BaseDatabase/LessThan"; +import LessThanOrEqual from "../../Types/BaseDatabase/LessThanOrEqual"; import LessThanOrNull from "../../../Types/BaseDatabase/LessThanOrNull"; import GreaterThanOrNull from "../../../Types/BaseDatabase/GreaterThanOrNull"; -import Search from "Common/Types/BaseDatabase/Search"; -import OneUptimeDate from "Common/Types/Date"; -import Dictionary from "Common/Types/Dictionary"; -import ObjectID from "Common/Types/ObjectID"; +import Search from "../../Types/BaseDatabase/Search"; +import OneUptimeDate from "../../Types/Date"; +import Dictionary from "../../Types/Dictionary"; +import ObjectID from "../../Types/ObjectID"; import { inspect } from "util"; /** diff --git a/Common/Server/Utils/AnalyticsDatabase/StatementGenerator.ts b/Common/Server/Utils/AnalyticsDatabase/StatementGenerator.ts index 4ff8dc8285..a489a45bb0 100644 --- a/Common/Server/Utils/AnalyticsDatabase/StatementGenerator.ts +++ b/Common/Server/Utils/AnalyticsDatabase/StatementGenerator.ts @@ -6,29 +6,29 @@ import Sort from "../../Types/AnalyticsDatabase/Sort"; import UpdateBy from "../../Types/AnalyticsDatabase/UpdateBy"; import logger from "../Logger"; import { SQL, Statement } from "./Statement"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import CommonModel, { Record, RecordValue, -} from "Common/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel"; -import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn"; -import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType"; -import GreaterThan from "Common/Types/BaseDatabase/GreaterThan"; -import GreaterThanOrEqual from "Common/Types/BaseDatabase/GreaterThanOrEqual"; -import InBetween from "Common/Types/BaseDatabase/InBetween"; -import Includes from "Common/Types/BaseDatabase/Includes"; -import IsNull from "Common/Types/BaseDatabase/IsNull"; -import LessThan from "Common/Types/BaseDatabase/LessThan"; -import LessThanOrEqual from "Common/Types/BaseDatabase/LessThanOrEqual"; +} from "../../Models/AnalyticsModels/AnalyticsBaseModel/CommonModel"; +import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; +import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType"; +import GreaterThan from "../../Types/BaseDatabase/GreaterThan"; +import GreaterThanOrEqual from "../../Types/BaseDatabase/GreaterThanOrEqual"; +import InBetween from "../../Types/BaseDatabase/InBetween"; +import Includes from "../../Types/BaseDatabase/Includes"; +import IsNull from "../../Types/BaseDatabase/IsNull"; +import LessThan from "../../Types/BaseDatabase/LessThan"; +import LessThanOrEqual from "../../Types/BaseDatabase/LessThanOrEqual"; import GreaterThanOrNull from "../../../Types/BaseDatabase/GreaterThanOrNull"; import LessThanOrNull from "../../../Types/BaseDatabase/LessThanOrNull"; -import NotEqual from "Common/Types/BaseDatabase/NotEqual"; -import Search from "Common/Types/BaseDatabase/Search"; -import SortOrder from "Common/Types/BaseDatabase/SortOrder"; -import OneUptimeDate from "Common/Types/Date"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; +import NotEqual from "../../Types/BaseDatabase/NotEqual"; +import Search from "../../Types/BaseDatabase/Search"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; import AggregateBy, { AggregateUtil, } from "../../Types/AnalyticsDatabase/AggregateBy"; diff --git a/Common/Server/Utils/BasicCron.ts b/Common/Server/Utils/BasicCron.ts index 834b99eda6..510b7a70e3 100644 --- a/Common/Server/Utils/BasicCron.ts +++ b/Common/Server/Utils/BasicCron.ts @@ -1,5 +1,5 @@ import logger from "./Logger"; -import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; +import { PromiseVoidFunction } from "../../Types/FunctionTypes"; import cron from "node-cron"; type BasicCronProps = { diff --git a/Common/Server/Utils/CodeRepository/CodeRepository.ts b/Common/Server/Utils/CodeRepository/CodeRepository.ts index 93d32ba997..0963668b9c 100644 --- a/Common/Server/Utils/CodeRepository/CodeRepository.ts +++ b/Common/Server/Utils/CodeRepository/CodeRepository.ts @@ -3,7 +3,7 @@ import LocalFile from "../LocalFile"; import logger from "../Logger"; import CaptureSpan from "../Telemetry/CaptureSpan"; import CodeRepositoryFile from "./CodeRepositoryFile"; -import Dictionary from "Common/Types/Dictionary"; +import Dictionary from "../../Types/Dictionary"; export default class CodeRepositoryUtil { @CaptureSpan() diff --git a/Common/Server/Utils/CodeRepository/GitHub/GitHub.ts b/Common/Server/Utils/CodeRepository/GitHub/GitHub.ts index 3b83d3410b..e0ec1f36b9 100644 --- a/Common/Server/Utils/CodeRepository/GitHub/GitHub.ts +++ b/Common/Server/Utils/CodeRepository/GitHub/GitHub.ts @@ -1,14 +1,14 @@ import Execute from "../../Execute"; import logger from "../../Logger"; import HostedCodeRepository from "../HostedCodeRepository/HostedCodeRepository"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import PullRequest from "Common/Types/CodeRepository/PullRequest"; -import PullRequestState from "Common/Types/CodeRepository/PullRequestState"; -import OneUptimeDate from "Common/Types/Date"; -import { JSONArray, JSONObject } from "Common/Types/JSON"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import PullRequest from "../../Types/CodeRepository/PullRequest"; +import PullRequestState from "../../Types/CodeRepository/PullRequestState"; +import OneUptimeDate from "../../Types/Date"; +import { JSONArray, JSONObject } from "../../Types/JSON"; +import API from "../../Utils/API"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class GitHubUtil extends HostedCodeRepository { diff --git a/Common/Server/Utils/CodeRepository/HostedCodeRepository/HostedCodeRepository.ts b/Common/Server/Utils/CodeRepository/HostedCodeRepository/HostedCodeRepository.ts index 12f82d6207..0ba0825d6d 100644 --- a/Common/Server/Utils/CodeRepository/HostedCodeRepository/HostedCodeRepository.ts +++ b/Common/Server/Utils/CodeRepository/HostedCodeRepository/HostedCodeRepository.ts @@ -1,7 +1,7 @@ -import PullRequest from "Common/Types/CodeRepository/PullRequest"; -import PullRequestState from "Common/Types/CodeRepository/PullRequestState"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import NotImplementedException from "Common/Types/Exception/NotImplementedException"; +import PullRequest from "../../Types/CodeRepository/PullRequest"; +import PullRequestState from "../../Types/CodeRepository/PullRequestState"; +import BadDataException from "../../Types/Exception/BadDataException"; +import NotImplementedException from "../../Types/Exception/NotImplementedException"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class HostedCodeRepository { diff --git a/Common/Server/Utils/Cookie.ts b/Common/Server/Utils/Cookie.ts index 1783912acf..c642af7d1f 100644 --- a/Common/Server/Utils/Cookie.ts +++ b/Common/Server/Utils/Cookie.ts @@ -1,12 +1,12 @@ import { ExpressRequest, ExpressResponse } from "./Express"; -import Dictionary from "Common/Types/Dictionary"; -import ObjectID from "Common/Types/ObjectID"; +import Dictionary from "../../Types/Dictionary"; +import ObjectID from "../../Types/ObjectID"; import { CookieOptions } from "express"; import JSONWebToken from "./JsonWebToken"; -import User from "Common/Models/DatabaseModels/User"; -import OneUptimeDate from "Common/Types/Date"; -import PositiveNumber from "Common/Types/PositiveNumber"; -import CookieName from "Common/Types/CookieName"; +import User from "../../Models/DatabaseModels/User"; +import OneUptimeDate from "../../Types/Date"; +import PositiveNumber from "../../Types/PositiveNumber"; +import CookieName from "../../Types/CookieName"; import CaptureSpan from "./Telemetry/CaptureSpan"; export default class CookieUtil { diff --git a/Common/Server/Utils/CronTab.ts b/Common/Server/Utils/CronTab.ts index ad24e3661c..b10d868288 100644 --- a/Common/Server/Utils/CronTab.ts +++ b/Common/Server/Utils/CronTab.ts @@ -1,4 +1,4 @@ -import BadDataException from "Common/Types/Exception/BadDataException"; +import BadDataException from "../../Types/Exception/BadDataException"; import CronParser, { CronExpression } from "cron-parser"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/Environment.ts b/Common/Server/Utils/Environment.ts index 6a456eab06..0bda9c5cc8 100644 --- a/Common/Server/Utils/Environment.ts +++ b/Common/Server/Utils/Environment.ts @@ -1,4 +1,4 @@ -import AppEnvironment from "Common/Types/AppEnvironment"; +import AppEnvironment from "../../Types/AppEnvironment"; import dotenv from "dotenv"; const Env: string = process.env["NODE_ENV"] || AppEnvironment.Development; diff --git a/Common/Server/Utils/Execute.ts b/Common/Server/Utils/Execute.ts index d1c545050d..fad9d7ba84 100644 --- a/Common/Server/Utils/Execute.ts +++ b/Common/Server/Utils/Execute.ts @@ -1,4 +1,4 @@ -import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes"; +import { PromiseRejectErrorFunction } from "../../Types/FunctionTypes"; import { ExecException, exec } from "node:child_process"; import logger from "./Logger"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/Express.ts b/Common/Server/Utils/Express.ts index 6a7e828cb9..25640ace58 100644 --- a/Common/Server/Utils/Express.ts +++ b/Common/Server/Utils/Express.ts @@ -1,15 +1,15 @@ import logger from "./Logger"; -import Dictionary from "Common/Types/Dictionary"; -import GenericFunction from "Common/Types/GenericFunction"; -import { JSONObject, JSONObjectOrArray } from "Common/Types/JSON"; -import JSONWebTokenData from "Common/Types/JsonWebTokenData"; -import ObjectID from "Common/Types/ObjectID"; +import Dictionary from "../../Types/Dictionary"; +import GenericFunction from "../../Types/GenericFunction"; +import { JSONObject, JSONObjectOrArray } from "../../Types/JSON"; +import JSONWebTokenData from "../../Types/JsonWebTokenData"; +import ObjectID from "../../Types/ObjectID"; import { UserGlobalAccessPermission, UserTenantAccessPermission, -} from "Common/Types/Permission"; -import Port from "Common/Types/Port"; -import UserType from "Common/Types/UserType"; +} from "../../Types/Permission"; +import Port from "../../Types/Port"; +import UserType from "../../Types/UserType"; import "ejs"; import express from "express"; import { Server, createServer } from "http"; diff --git a/Common/Server/Utils/Greenlock/Greenlock.ts b/Common/Server/Utils/Greenlock/Greenlock.ts index 329710a0c9..0787248a56 100644 --- a/Common/Server/Utils/Greenlock/Greenlock.ts +++ b/Common/Server/Utils/Greenlock/Greenlock.ts @@ -6,15 +6,15 @@ import AcmeCertificateService from "../../Services/AcmeCertificateService"; import AcmeChallengeService from "../../Services/AcmeChallengeService"; import QueryHelper from "../../Types/Database/QueryHelper"; import logger from "../Logger"; -import SortOrder from "Common/Types/BaseDatabase/SortOrder"; -import LIMIT_MAX from "Common/Types/Database/LimitMax"; -import OneUptimeDate from "Common/Types/Date"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import Exception from "Common/Types/Exception/Exception"; -import ServerException from "Common/Types/Exception/ServerException"; -import Text from "Common/Types/Text"; -import AcmeCertificate from "Common/Models/DatabaseModels/AcmeCertificate"; -import AcmeChallenge from "Common/Models/DatabaseModels/AcmeChallenge"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import LIMIT_MAX from "../../Types/Database/LimitMax"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Exception from "../../Types/Exception/Exception"; +import ServerException from "../../Types/Exception/ServerException"; +import Text from "../../Types/Text"; +import AcmeCertificate from "../../Models/DatabaseModels/AcmeCertificate"; +import AcmeChallenge from "../../Models/DatabaseModels/AcmeChallenge"; import acme from "acme-client"; import { Challenge } from "acme-client/types/rfc8555"; import CaptureSpan from "../Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/JsonToCsv.ts b/Common/Server/Utils/JsonToCsv.ts index 8852852b60..df0fb69200 100644 --- a/Common/Server/Utils/JsonToCsv.ts +++ b/Common/Server/Utils/JsonToCsv.ts @@ -1,4 +1,4 @@ -import { JSONArray, JSONObject } from "Common/Types/JSON"; +import { JSONArray, JSONObject } from "../../Types/JSON"; import Json2Csv from "json2csv"; export default { diff --git a/Common/Server/Utils/JsonWebToken.ts b/Common/Server/Utils/JsonWebToken.ts index 5a76716223..e09dd1998a 100644 --- a/Common/Server/Utils/JsonWebToken.ts +++ b/Common/Server/Utils/JsonWebToken.ts @@ -1,14 +1,14 @@ import { EncryptionSecret } from "../EnvironmentConfig"; -import Email from "Common/Types/Email"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import JSONWebTokenData from "Common/Types/JsonWebTokenData"; -import Name from "Common/Types/Name"; -import ObjectID from "Common/Types/ObjectID"; -import Timezone from "Common/Types/Timezone"; -import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser"; -import User from "Common/Models/DatabaseModels/User"; +import Email from "../../Types/Email"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import JSONWebTokenData from "../../Types/JsonWebTokenData"; +import Name from "../../Types/Name"; +import ObjectID from "../../Types/ObjectID"; +import Timezone from "../../Types/Timezone"; +import StatusPagePrivateUser from "../../Models/DatabaseModels/StatusPagePrivateUser"; +import User from "../../Models/DatabaseModels/User"; import jwt from "jsonwebtoken"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/LocalFile.ts b/Common/Server/Utils/LocalFile.ts index 606d870247..1c9a814af4 100644 --- a/Common/Server/Utils/LocalFile.ts +++ b/Common/Server/Utils/LocalFile.ts @@ -1,4 +1,4 @@ -import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes"; +import { PromiseRejectErrorFunction } from "../../Types/FunctionTypes"; import fs from "fs"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/Logger.ts b/Common/Server/Utils/Logger.ts index adad30414a..a82d811870 100644 --- a/Common/Server/Utils/Logger.ts +++ b/Common/Server/Utils/Logger.ts @@ -1,8 +1,8 @@ import { ConfigLogLevel, LogLevel } from "../EnvironmentConfig"; import OneUptimeTelemetry, { TelemetryLogger } from "./Telemetry"; import { SeverityNumber } from "@opentelemetry/api-logs"; -import Exception from "Common/Types/Exception/Exception"; -import { JSONObject } from "Common/Types/JSON"; +import Exception from "../../Types/Exception/Exception"; +import { JSONObject } from "../../Types/JSON"; export type LogBody = string | JSONObject | Exception | Error | unknown; diff --git a/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts b/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts index 64a8862dea..4591e7ade1 100644 --- a/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts @@ -1,14 +1,14 @@ import DataToProcess from "../DataToProcess"; import CompareCriteria from "./CompareCriteria"; import EvaluateOverTime from "./EvaluateOverTime"; -import { JSONObject } from "Common/Types/JSON"; +import { JSONObject } from "../../Types/JSON"; import { CheckOn, CriteriaFilter, FilterType, -} from "Common/Types/Monitor/CriteriaFilter"; -import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse"; -import Typeof from "Common/Types/Typeof"; +} from "../../Types/Monitor/CriteriaFilter"; +import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; +import Typeof from "../../Types/Typeof"; import CaptureSpan from "../../Telemetry/CaptureSpan"; import logger from "../../Logger"; diff --git a/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts b/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts index e969a1bfdc..b0a2e3b190 100644 --- a/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts @@ -4,8 +4,8 @@ import { CriteriaFilter, EvaluateOverTimeType, FilterType, -} from "Common/Types/Monitor/CriteriaFilter"; -import Typeof from "Common/Types/Typeof"; +} from "../../Types/Monitor/CriteriaFilter"; +import Typeof from "../../Types/Typeof"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class CompareCriteria { diff --git a/Common/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts index c6c8361595..278baf906f 100644 --- a/Common/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts @@ -1,6 +1,6 @@ import CompareCriteria from "./CompareCriteria"; -import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter"; -import CustomCodeMonitorResponse from "Common/Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse"; +import { CheckOn, CriteriaFilter } from "../../Types/Monitor/CriteriaFilter"; +import CustomCodeMonitorResponse from "../../Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class CustomCodeMonitoringCriteria { diff --git a/Common/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts b/Common/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts index f57edd12ce..6c36bb14bc 100644 --- a/Common/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts +++ b/Common/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts @@ -1,13 +1,13 @@ import Query from "../../../Types/AnalyticsDatabase/Query"; -import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax"; -import OneUptimeDate from "Common/Types/Date"; -import { JSONObject } from "Common/Types/JSON"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import OneUptimeDate from "../../Types/Date"; +import { JSONObject } from "../../Types/JSON"; import { CheckOn, EvaluateOverTimeOptions, EvaluateOverTimeType, -} from "Common/Types/Monitor/CriteriaFilter"; -import ObjectID from "Common/Types/ObjectID"; +} from "../../Types/Monitor/CriteriaFilter"; +import ObjectID from "../../Types/ObjectID"; import Metric from "../../../../Models/AnalyticsModels/Metric"; import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType"; import MetricService from "../../../Services/MetricService"; diff --git a/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts b/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts index 1f5d3be370..36a962471e 100644 --- a/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts @@ -1,17 +1,17 @@ import logger from "../../../Utils/Logger"; import DataToProcess from "../DataToProcess"; -import OneUptimeDate from "Common/Types/Date"; -import { JSONObject } from "Common/Types/JSON"; +import OneUptimeDate from "../../Types/Date"; +import { JSONObject } from "../../Types/JSON"; import { CheckOn, CriteriaFilter, FilterType, -} from "Common/Types/Monitor/CriteriaFilter"; -import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; -import Typeof from "Common/Types/Typeof"; +} from "../../Types/Monitor/CriteriaFilter"; +import IncomingMonitorRequest from "../../Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; +import Typeof from "../../Types/Typeof"; import EvaluateOverTime from "./EvaluateOverTime"; import CompareCriteria from "./CompareCriteria"; -import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse"; +import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class IncomingRequestCriteria { diff --git a/Common/Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts index 21511c3a41..2c65fdc71c 100644 --- a/Common/Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/LogMonitorCriteria.ts @@ -1,8 +1,8 @@ import CaptureSpan from "../../Telemetry/CaptureSpan"; import DataToProcess from "../DataToProcess"; import CompareCriteria from "./CompareCriteria"; -import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter"; -import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse"; +import { CheckOn, CriteriaFilter } from "../../Types/Monitor/CriteriaFilter"; +import LogMonitorResponse from "../../Types/Monitor/LogMonitor/LogMonitorResponse"; export default class LogMonitorCriteria { @CaptureSpan() diff --git a/Common/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts index dd39b127e7..d0cbe061dc 100644 --- a/Common/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts @@ -10,7 +10,7 @@ import { CheckOn, CriteriaFilter, EvaluateOverTimeType, -} from "Common/Types/Monitor/CriteriaFilter"; +} from "../../Types/Monitor/CriteriaFilter"; import CaptureSpan from "../../Telemetry/CaptureSpan"; export default class MetricMonitorCriteria { diff --git a/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts index 07345ed158..5ee6eb5648 100644 --- a/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts @@ -1,13 +1,13 @@ import DataToProcess from "../DataToProcess"; import CompareCriteria from "./CompareCriteria"; -import OneUptimeDate from "Common/Types/Date"; +import OneUptimeDate from "../../Types/Date"; import { CheckOn, CriteriaFilter, FilterType, -} from "Common/Types/Monitor/CriteriaFilter"; -import SslMonitorResponse from "Common/Types/Monitor/SSLMonitor/SslMonitorResponse"; -import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse"; +} from "../../Types/Monitor/CriteriaFilter"; +import SslMonitorResponse from "../../Types/Monitor/SSLMonitor/SslMonitorResponse"; +import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; import EvaluateOverTime from "./EvaluateOverTime"; import CaptureSpan from "../../Telemetry/CaptureSpan"; import logger from "../../Logger"; diff --git a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts index b7dd3b9701..c9bfa6daa7 100644 --- a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts @@ -1,17 +1,17 @@ import DataToProcess from "../DataToProcess"; import CompareCriteria from "./CompareCriteria"; import EvaluateOverTime from "./EvaluateOverTime"; -import OneUptimeDate from "Common/Types/Date"; -import { BasicDiskMetrics } from "Common/Types/Infrastructure/BasicMetrics"; -import { JSONObject } from "Common/Types/JSON"; +import OneUptimeDate from "../../Types/Date"; +import { BasicDiskMetrics } from "../../Types/Infrastructure/BasicMetrics"; +import { JSONObject } from "../../Types/JSON"; import { CheckOn, CriteriaFilter, FilterType, -} from "Common/Types/Monitor/CriteriaFilter"; +} from "../../Types/Monitor/CriteriaFilter"; import ServerMonitorResponse, { ServerProcess, -} from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse"; +} from "../../Types/Monitor/ServerMonitor/ServerMonitorResponse"; import logger from "../../Logger"; import CaptureSpan from "../../Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/Monitor/Criteria/SyntheticMonitor.ts b/Common/Server/Utils/Monitor/Criteria/SyntheticMonitor.ts index 0a036c528f..bfc60f0d6f 100644 --- a/Common/Server/Utils/Monitor/Criteria/SyntheticMonitor.ts +++ b/Common/Server/Utils/Monitor/Criteria/SyntheticMonitor.ts @@ -1,8 +1,8 @@ import CaptureSpan from "../../Telemetry/CaptureSpan"; import CompareCriteria from "./CompareCriteria"; import CustomCodeMonitoringCriteria from "./CustomCodeMonitorCriteria"; -import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter"; -import SyntheticMonitorResponse from "Common/Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse"; +import { CheckOn, CriteriaFilter } from "../../Types/Monitor/CriteriaFilter"; +import SyntheticMonitorResponse from "../../Types/Monitor/SyntheticMonitors/SyntheticMonitorResponse"; export default class SyntheticMonitoringCriteria { @CaptureSpan() diff --git a/Common/Server/Utils/Monitor/Criteria/TraceMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/TraceMonitorCriteria.ts index fdb6c5b7f3..4233ba7c56 100644 --- a/Common/Server/Utils/Monitor/Criteria/TraceMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/TraceMonitorCriteria.ts @@ -2,7 +2,7 @@ import TraceMonitorResponse from "../../../../Types/Monitor/TraceMonitor/TraceMo import CaptureSpan from "../../Telemetry/CaptureSpan"; import DataToProcess from "../DataToProcess"; import CompareCriteria from "./CompareCriteria"; -import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter"; +import { CheckOn, CriteriaFilter } from "../../Types/Monitor/CriteriaFilter"; export default class TraceMonitorCriteria { @CaptureSpan() diff --git a/Common/Server/Utils/Monitor/DataToProcess.ts b/Common/Server/Utils/Monitor/DataToProcess.ts index 64ae032b51..e450894d56 100644 --- a/Common/Server/Utils/Monitor/DataToProcess.ts +++ b/Common/Server/Utils/Monitor/DataToProcess.ts @@ -1,8 +1,8 @@ -import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; -import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse"; -import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse"; -import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse"; -import TraceMonitorResponse from "Common/Types/Monitor/TraceMonitor/TraceMonitorResponse"; +import IncomingMonitorRequest from "../../Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; +import ServerMonitorResponse from "../../Types/Monitor/ServerMonitor/ServerMonitorResponse"; +import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; +import LogMonitorResponse from "../../Types/Monitor/LogMonitor/LogMonitorResponse"; +import TraceMonitorResponse from "../../Types/Monitor/TraceMonitor/TraceMonitorResponse"; import MetricMonitorResponse from "../../../Types/Monitor/MetricMonitor/MetricMonitorResponse"; type DataToProcess = diff --git a/Common/Server/Utils/Monitor/MonitorResource.ts b/Common/Server/Utils/Monitor/MonitorResource.ts index 6bca2883d5..29b71fe4b9 100644 --- a/Common/Server/Utils/Monitor/MonitorResource.ts +++ b/Common/Server/Utils/Monitor/MonitorResource.ts @@ -10,34 +10,34 @@ import SSLMonitorCriteria from "./Criteria/SSLMonitorCriteria"; import ServerMonitorCriteria from "./Criteria/ServerMonitorCriteria"; import SyntheticMonitoringCriteria from "./Criteria/SyntheticMonitor"; import DataToProcess from "./DataToProcess"; -import SortOrder from "Common/Types/BaseDatabase/SortOrder"; -import Dictionary from "Common/Types/Dictionary"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import BasicInfrastructureMetrics from "Common/Types/Infrastructure/BasicMetrics"; -import ReturnResult from "Common/Types/IsolatedVM/ReturnResult"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import BasicInfrastructureMetrics from "../../Types/Infrastructure/BasicMetrics"; +import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; import Semaphore, { SemaphoreMutex } from "../../Infrastructure/Semaphore"; -import { JSONObject } from "Common/Types/JSON"; -import { CheckOn, CriteriaFilter } from "Common/Types/Monitor/CriteriaFilter"; -import IncomingMonitorRequest from "Common/Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; -import MonitorCriteria from "Common/Types/Monitor/MonitorCriteria"; -import MonitorCriteriaInstance from "Common/Types/Monitor/MonitorCriteriaInstance"; -import MonitorStep from "Common/Types/Monitor/MonitorStep"; -import MonitorSteps from "Common/Types/Monitor/MonitorSteps"; +import { JSONObject } from "../../Types/JSON"; +import { CheckOn, CriteriaFilter } from "../../Types/Monitor/CriteriaFilter"; +import IncomingMonitorRequest from "../../Types/Monitor/IncomingMonitor/IncomingMonitorRequest"; +import MonitorCriteria from "../../Types/Monitor/MonitorCriteria"; +import MonitorCriteriaInstance from "../../Types/Monitor/MonitorCriteriaInstance"; +import MonitorStep from "../../Types/Monitor/MonitorStep"; +import MonitorSteps from "../../Types/Monitor/MonitorSteps"; import MonitorType, { MonitorTypeHelper, -} from "Common/Types/Monitor/MonitorType"; -import ServerMonitorResponse from "Common/Types/Monitor/ServerMonitor/ServerMonitorResponse"; -import ObjectID from "Common/Types/ObjectID"; -import ProbeApiIngestResponse from "Common/Types/Probe/ProbeApiIngestResponse"; -import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse"; -import Typeof from "Common/Types/Typeof"; -import Monitor from "Common/Models/DatabaseModels/Monitor"; -import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe"; -import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline"; -import OneUptimeDate from "Common/Types/Date"; +} from "../../Types/Monitor/MonitorType"; +import ServerMonitorResponse from "../../Types/Monitor/ServerMonitor/ServerMonitorResponse"; +import ObjectID from "../../Types/ObjectID"; +import ProbeApiIngestResponse from "../../Types/Probe/ProbeApiIngestResponse"; +import ProbeMonitorResponse from "../../Types/Probe/ProbeMonitorResponse"; +import Typeof from "../../Types/Typeof"; +import Monitor from "../../Models/DatabaseModels/Monitor"; +import MonitorProbe from "../../Models/DatabaseModels/MonitorProbe"; +import MonitorStatusTimeline from "../../Models/DatabaseModels/MonitorStatusTimeline"; +import OneUptimeDate from "../../Types/Date"; import LogMonitorCriteria from "./Criteria/LogMonitorCriteria"; -import LogMonitorResponse from "Common/Types/Monitor/LogMonitor/LogMonitorResponse"; -import TelemetryType from "Common/Types/Telemetry/TelemetryType"; +import LogMonitorResponse from "../../Types/Monitor/LogMonitor/LogMonitorResponse"; +import TelemetryType from "../../Types/Telemetry/TelemetryType"; import TraceMonitorResponse from "../../../Types/Monitor/TraceMonitor/TraceMonitorResponse"; import TraceMonitorCriteria from "./Criteria/TraceMonitorCriteria"; import { TelemetryQuery } from "../../../Types/Telemetry/TelemetryQuery"; diff --git a/Common/Server/Utils/Realtime.ts b/Common/Server/Utils/Realtime.ts index 609f39b14c..a8766eedd5 100644 --- a/Common/Server/Utils/Realtime.ts +++ b/Common/Server/Utils/Realtime.ts @@ -1,12 +1,12 @@ import IO, { Socket, SocketServer } from "../Infrastructure/SocketIO"; import logger from "./Logger"; -import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import DatabaseType from "Common/Types/BaseDatabase/DatabaseType"; -import BadDataException from "Common/Types/Exception/BadDataException"; -import { JSONObject } from "Common/Types/JSON"; -import ObjectID from "Common/Types/ObjectID"; -import RealtimeUtil from "Common/Utils/Realtime"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import DatabaseType from "../../Types/BaseDatabase/DatabaseType"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import RealtimeUtil from "../../Utils/Realtime"; import JSONWebTokenData from "../../Types/JsonWebTokenData"; import JSONWebToken from "./JsonWebToken"; import Permission, { diff --git a/Common/Server/Utils/Response.ts b/Common/Server/Utils/Response.ts index 0c227f1147..a1867e54e2 100644 --- a/Common/Server/Utils/Response.ts +++ b/Common/Server/Utils/Response.ts @@ -8,20 +8,20 @@ import JsonToCsv from "./JsonToCsv"; import logger from "./Logger"; import AnalyticsDataModel, { AnalyticsBaseModelType, -} from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +} from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel, { DatabaseBaseModelType, -} from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import FileModel from "Common/Models/DatabaseModels/DatabaseBaseModel/FileModel"; -import EmptyResponse from "Common/Types/API/EmptyResponse"; -import StatusCode from "Common/Types/API/StatusCode"; -import URL from "Common/Types/API/URL"; -import { DEFAULT_LIMIT } from "Common/Types/Database/LimitMax"; -import Dictionary from "Common/Types/Dictionary"; -import Exception from "Common/Types/Exception/Exception"; -import { JSONArray, JSONObject } from "Common/Types/JSON"; -import ListData from "Common/Types/ListData"; -import PositiveNumber from "Common/Types/PositiveNumber"; +} from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import FileModel from "../../Models/DatabaseModels/DatabaseBaseModel/FileModel"; +import EmptyResponse from "../../Types/API/EmptyResponse"; +import StatusCode from "../../Types/API/StatusCode"; +import URL from "../../Types/API/URL"; +import { DEFAULT_LIMIT } from "../../Types/Database/LimitMax"; +import Dictionary from "../../Types/Dictionary"; +import Exception from "../../Types/Exception/Exception"; +import { JSONArray, JSONObject } from "../../Types/JSON"; +import ListData from "../../Types/ListData"; +import PositiveNumber from "../../Types/PositiveNumber"; import Route from "../../Types/API/Route"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/StartServer.ts b/Common/Server/Utils/StartServer.ts index 8319763b28..ad1f2cc0bc 100644 --- a/Common/Server/Utils/StartServer.ts +++ b/Common/Server/Utils/StartServer.ts @@ -19,15 +19,15 @@ import logger from "./Logger"; import "./Process"; import Response from "./Response"; import { api } from "@opentelemetry/sdk-node"; -import StatusCode from "Common/Types/API/StatusCode"; -import Exception from "Common/Types/Exception/Exception"; -import NotFoundException from "Common/Types/Exception/NotFoundException"; -import ServerException from "Common/Types/Exception/ServerException"; -import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; -import { JSONObject } from "Common/Types/JSON"; -import JSONFunctions from "Common/Types/JSONFunctions"; -import Port from "Common/Types/Port"; -import Typeof from "Common/Types/Typeof"; +import StatusCode from "../../Types/API/StatusCode"; +import Exception from "../../Types/Exception/Exception"; +import NotFoundException from "../../Types/Exception/NotFoundException"; +import ServerException from "../../Types/Exception/ServerException"; +import { PromiseVoidFunction } from "../../Types/FunctionTypes"; +import { JSONObject } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Port from "../../Types/Port"; +import Typeof from "../../Types/Typeof"; import CookieParser from "cookie-parser"; import cors from "cors"; import zlib from "zlib"; diff --git a/Common/Server/Utils/Stream.ts b/Common/Server/Utils/Stream.ts index 331c0d1591..ce9a8e7875 100644 --- a/Common/Server/Utils/Stream.ts +++ b/Common/Server/Utils/Stream.ts @@ -1,4 +1,4 @@ -import { PromiseRejectErrorFunction } from "Common/Types/FunctionTypes"; +import { PromiseRejectErrorFunction } from "../../Types/FunctionTypes"; import { Stream } from "stream"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/Telemetry.ts b/Common/Server/Utils/Telemetry.ts index 4371d5b2cb..f8209369f5 100644 --- a/Common/Server/Utils/Telemetry.ts +++ b/Common/Server/Utils/Telemetry.ts @@ -28,8 +28,8 @@ import { import * as opentelemetry from "@opentelemetry/sdk-node"; import { SpanExporter } from "@opentelemetry/sdk-trace-node"; import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions"; -import URL from "Common/Types/API/URL"; -import Dictionary from "Common/Types/Dictionary"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; import { DisableTelemetry } from "../EnvironmentConfig"; import logger from "./Logger"; diff --git a/Common/Server/Utils/TwoFactorAuth.ts b/Common/Server/Utils/TwoFactorAuth.ts index 8b6a348e8e..6db0db0481 100644 --- a/Common/Server/Utils/TwoFactorAuth.ts +++ b/Common/Server/Utils/TwoFactorAuth.ts @@ -1,4 +1,4 @@ -import Email from "Common/Types/Email"; +import Email from "../../Types/Email"; import * as OTPAuth from "otpauth"; import CaptureSpan from "./Telemetry/CaptureSpan"; diff --git a/Common/Server/Utils/VM/VMAPI.ts b/Common/Server/Utils/VM/VMAPI.ts index d0851aa353..51bde53fa7 100644 --- a/Common/Server/Utils/VM/VMAPI.ts +++ b/Common/Server/Utils/VM/VMAPI.ts @@ -1,13 +1,13 @@ import { IsolatedVMHostname } from "../../../Server/EnvironmentConfig"; import ClusterKeyAuthorization from "../../Middleware/ClusterKeyAuthorization"; -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import Protocol from "Common/Types/API/Protocol"; -import Route from "Common/Types/API/Route"; -import URL from "Common/Types/API/URL"; -import ReturnResult from "Common/Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "Common/Types/JSON"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import Protocol from "../../Types/API/Protocol"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import API from "../../Utils/API"; import CaptureSpan from "../Telemetry/CaptureSpan"; export default class VMUtil { diff --git a/Common/Server/Utils/VM/VMRunner.ts b/Common/Server/Utils/VM/VMRunner.ts index a87141e851..f97f6a1ea9 100644 --- a/Common/Server/Utils/VM/VMRunner.ts +++ b/Common/Server/Utils/VM/VMRunner.ts @@ -1,7 +1,7 @@ -import Dictionary from "Common/Types/Dictionary"; -import GenericObject from "Common/Types/GenericObject"; -import ReturnResult from "Common/Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "Common/Types/JSON"; +import Dictionary from "../../Types/Dictionary"; +import GenericObject from "../../Types/GenericObject"; +import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../Types/JSON"; import axios from "axios"; import http from "http"; import https from "https"; diff --git a/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts b/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts index 885c01be14..821fdecdda 100644 --- a/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts +++ b/Common/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts @@ -1,8 +1,8 @@ -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import { JSONObject } from "Common/Types/JSON"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import { JSONObject } from "../../Types/JSON"; +import API from "../../Utils/API"; import WorkspaceMessagePayload from "../../../../Types/Workspace/WorkspaceMessagePayload"; import logger from "../../Logger"; import Dictionary from "../../../../Types/Dictionary"; diff --git a/Common/Server/Utils/Workspace/Slack/Slack.ts b/Common/Server/Utils/Workspace/Slack/Slack.ts index 9537641de6..a2af5897e0 100644 --- a/Common/Server/Utils/Workspace/Slack/Slack.ts +++ b/Common/Server/Utils/Workspace/Slack/Slack.ts @@ -1,8 +1,8 @@ -import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import URL from "Common/Types/API/URL"; -import { JSONObject } from "Common/Types/JSON"; -import API from "Common/Utils/API"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../Types/API/HTTPResponse"; +import URL from "../../Types/API/URL"; +import { JSONObject } from "../../Types/JSON"; +import API from "../../Utils/API"; import WorkspaceMessagePayload, { WorkspaceCheckboxBlock, WorkspaceDateTimePickerBlock, diff --git a/Common/Server/Utils/Workspace/WorkspaceBase.ts b/Common/Server/Utils/Workspace/WorkspaceBase.ts index 2b305eb844..de0f5f45c0 100644 --- a/Common/Server/Utils/Workspace/WorkspaceBase.ts +++ b/Common/Server/Utils/Workspace/WorkspaceBase.ts @@ -20,7 +20,7 @@ import WorkspaceMessagePayload, { } from "../../../Types/Workspace/WorkspaceMessagePayload"; import WorkspaceType from "../../../Types/Workspace/WorkspaceType"; import logger from "../Logger"; -import URL from "Common/Types/API/URL"; +import URL from "../../Types/API/URL"; import CaptureSpan from "../Telemetry/CaptureSpan"; export interface WorkspaceThread { diff --git a/Common/package-lock.json b/Common/package-lock.json index c18df0d0e2..6131273f8b 100644 --- a/Common/package-lock.json +++ b/Common/package-lock.json @@ -42,7 +42,6 @@ "airtable": "^0.12.2", "axios": "^1.7.2", "bullmq": "^5.3.3", - "Common": "file:../Common", "cookie-parser": "^1.4.7", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -5179,10 +5178,6 @@ "node": ">= 6" } }, - "node_modules/Common": { - "resolved": "", - "link": true - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",