@oneuptime/common 7.0.4232 → 7.0.4239

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

@@ -13,18 +13,18 @@ import Express, {
 import Response from "../../../Server/Utils/Response";
 import { mockRouter } from "./Helpers";
 import { describe, expect, it } from "@jest/globals";
-import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
-import { PlanType } from "Common/Types/Billing/SubscriptionPlan";
-import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import BadRequestException from "Common/Types/Exception/BadRequestException";
-import GenericObject from "Common/Types/GenericObject";
-import ObjectID from "Common/Types/ObjectID";
-import { UserPermission } from "Common/Types/Permission";
-import PositiveNumber from "Common/Types/PositiveNumber";
-import UserType from "Common/Types/UserType";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import DatabaseCommonInteractionProps from "../../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+import { PlanType } from "../../../Types/Billing/SubscriptionPlan";
+import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import BadRequestException from "../../../Types/Exception/BadRequestException";
+import GenericObject from "../../../Types/GenericObject";
+import ObjectID from "../../../Types/ObjectID";
+import { UserPermission } from "../../../Types/Permission";
+import PositiveNumber from "../../../Types/PositiveNumber";
+import UserType from "../../../Types/UserType";
+import getJestMockFunction, { MockFunction } from "../../MockType";
 
 jest.mock("../../../Server/Utils/Express", () => {
   return {
@@ -74,7 +74,7 @@ jest.mock("../../../Server/Services/DatabaseService", () => {
 });
 
 jest.mock(
-  "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel",
+  "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel",
   () => {
     return jest.fn().mockImplementation((initObject: GenericObject) => {
       return {

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

@@ -8,9 +8,9 @@ import {
 import Response from "../../../Server/Utils/Response";
 import { mockRouter } from "./Helpers";
 import { describe, expect, it } from "@jest/globals";
-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";
 
 jest.mock("../../../Server/Utils/Express", () => {
   return {

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

@@ -8,13 +8,13 @@ import {
 import Response from "../../../Server/Utils/Response";
 import { mockRouter } from "./Helpers";
 import { describe, expect, it } from "@jest/globals";
-import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
-import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException";
-import JSONWebTokenData from "Common/Types/JsonWebTokenData";
-import ObjectID from "Common/Types/ObjectID";
-import PositiveNumber from "Common/Types/PositiveNumber";
-import Project from "Common/Models/DatabaseModels/Project";
-import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
+import NotAuthenticatedException from "../../../Types/Exception/NotAuthenticatedException";
+import JSONWebTokenData from "../../../Types/JsonWebTokenData";
+import ObjectID from "../../../Types/ObjectID";
+import PositiveNumber from "../../../Types/PositiveNumber";
+import Project from "../../../Models/DatabaseModels/Project";
+import TeamMember from "../../../Models/DatabaseModels/TeamMember";
 
 jest.mock("../../../Server/Utils/Express", () => {
   return {

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

@@ -8,10 +8,10 @@ import {
 import Response from "../../../Server/Utils/Response";
 import { mockRouter } from "./Helpers";
 import { describe, expect, it } from "@jest/globals";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import JSONWebTokenData from "Common/Types/JsonWebTokenData";
-import ObjectID from "Common/Types/ObjectID";
-import UserSMS from "Common/Models/DatabaseModels/UserSMS";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import JSONWebTokenData from "../../../Types/JsonWebTokenData";
+import ObjectID from "../../../Types/ObjectID";
+import UserSMS from "../../../Models/DatabaseModels/UserSMS";
 
 jest.mock("../../../Server/Utils/Express", () => {
   return {

package/Tests/Server/Middleware/BearerTokenAuthorization.test.ts

@@ -5,8 +5,8 @@ import {
 } from "../../../Server/Utils/Express";
 import JSONWebToken from "../../../Server/Utils/JsonWebToken";
 import { describe, expect, it } from "@jest/globals";
-import { JSONObject } from "Common/Types/JSON";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import { JSONObject } from "../../../Types/JSON";
+import getJestMockFunction, { MockFunction } from "../../../Tests/MockType";
 
 describe("BearerTokenAuthorization", () => {
   describe("isAuthorizedBearerToken", () => {

package/Tests/Server/Middleware/ClusterKeyAuthorization.test.ts

@@ -6,8 +6,8 @@ import {
   NextFunction,
 } from "../../../Server/Utils/Express";
 import Response from "../../../Server/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";
 
 describe("ClusterKeyAuthorization", () => {
   describe("getClusterKeyHeaders", () => {

package/Tests/Server/Middleware/NotificationMiddleware.test.ts

@@ -8,10 +8,10 @@ import {
 import JSONWebToken from "../../../Server/Utils/JsonWebToken";
 // Helpers
 import Response from "../../../Server/Utils/Response";
-import { OnCallInputRequest } from "Common/Types/Call/CallRequest";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import { JSONObject } from "Common/Types/JSON";
-import JSONFunctions from "Common/Types/JSONFunctions";
+import { OnCallInputRequest } from "../../../Types/Call/CallRequest";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import { JSONObject } from "../../../Types/JSON";
+import JSONFunctions from "../../../Types/JSONFunctions";
 import VoiceResponse from "twilio/lib/twiml/VoiceResponse";
 
 jest.mock("twilio/lib/twiml/VoiceResponse");
@@ -21,7 +21,7 @@ jest.mock("../../../Server/Utils/JsonWebToken", () => {
     decodeJsonPayload: jest.fn(),
   };
 });
-jest.mock("Common/Types/JSONFunctions", () => {
+jest.mock("../../../Types/JSONFunctions", () => {
   return {
     deserialize: jest.fn(),
   };

package/Tests/Server/Middleware/ProjectAuthorization.test.ts

@@ -8,14 +8,14 @@ import {
   NextFunction,
 } from "../../../Server/Utils/Express";
 import "../TestingUtils/Init";
-import OneUptimeDate from "Common/Types/Date";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import ObjectID from "Common/Types/ObjectID";
-import { UserTenantAccessPermission } from "Common/Types/Permission";
-import ApiKey from "Common/Models/DatabaseModels/ApiKey";
+import OneUptimeDate from "../../../Types/Date";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import ObjectID from "../../../Types/ObjectID";
+import { UserTenantAccessPermission } from "../../../Types/Permission";
+import ApiKey from "../../../Models/DatabaseModels/ApiKey";
 import { describe, expect, afterEach, jest } from "@jest/globals";
-import getJestMockFunction from "Common/Tests/MockType";
-import { getJestSpyOn } from "Common/Tests/Spy";
+import getJestMockFunction from "../../../Tests/MockType";
+import { getJestSpyOn } from "../../../Tests/Spy";
 import { TestDatabaseMock } from "../TestingUtils/__mocks__/TestDatabase.mock";
 import APIKeyAccessPermission from "../../../Server/Utils/APIKey/AccessPermission";
 

package/Tests/Server/Middleware/UserAuthorization.test.ts

@@ -11,19 +11,19 @@ import {
 import JSONWebToken from "../../../Server/Utils/JsonWebToken";
 import logger from "../../../Server/Utils/Logger";
 import Response from "../../../Server/Utils/Response";
-import Dictionary from "Common/Types/Dictionary";
-import Email from "Common/Types/Email";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import SsoAuthorizationException from "Common/Types/Exception/SsoAuthorizationException";
-import HashedString from "Common/Types/HashedString";
-import JSONFunctions from "Common/Types/JSONFunctions";
-import JSONWebTokenData from "Common/Types/JsonWebTokenData";
-import ObjectID from "Common/Types/ObjectID";
+import Dictionary from "../../../Types/Dictionary";
+import Email from "../../../Types/Email";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import SsoAuthorizationException from "../../../Types/Exception/SsoAuthorizationException";
+import HashedString from "../../../Types/HashedString";
+import JSONFunctions from "../../../Types/JSONFunctions";
+import JSONWebTokenData from "../../../Types/JsonWebTokenData";
+import ObjectID from "../../../Types/ObjectID";
 import {
   UserGlobalAccessPermission,
   UserTenantAccessPermission,
-} from "Common/Types/Permission";
-import Project from "Common/Models/DatabaseModels/Project";
+} from "../../../Types/Permission";
+import Project from "../../../Models/DatabaseModels/Project";
 import {
   describe,
   expect,
@@ -32,8 +32,8 @@ import {
   afterEach,
   jest,
 } from "@jest/globals";
-import { getJestSpyOn } from "Common/Tests/Spy";
-import getJestMockFunction from "Common/Tests/MockType";
+import { getJestSpyOn } from "../../../Tests/Spy";
+import getJestMockFunction from "../../../Tests/MockType";
 import UserPermissionUtil from "../../../Server/Utils/UserPermission/UserPermission";
 
 jest.mock("../../../Server/Utils/Logger");
@@ -43,8 +43,8 @@ jest.mock("../../../Server/Services/UserService");
 jest.mock("../../../Server/Services/AccessTokenService");
 jest.mock("../../../Server/Utils/Response");
 jest.mock("../../../Server/Services/ProjectService");
-jest.mock("Common/Types/HashedString");
-jest.mock("Common/Types/JSONFunctions");
+jest.mock("../../../Types/HashedString");
+jest.mock("../../../Types/JSONFunctions");
 
 type StringOrUndefined = string | undefined;
 

package/Tests/Server/Services/AnalyticsDatabaseService.test.ts

@@ -5,12 +5,12 @@ import {
 } from "../../../Server/Utils/AnalyticsDatabase/Statement";
 import logger from "../../../Server/Utils/Logger";
 import "../TestingUtils/Init";
-import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import Route from "Common/Types/API/Route";
-import AnalyticsTableEngine from "Common/Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
-import GenericObject from "Common/Types/GenericObject";
+import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import Route from "../../../Types/API/Route";
+import AnalyticsTableEngine from "../../../Types/AnalyticsDatabase/AnalyticsTableEngine";
+import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
+import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
+import GenericObject from "../../../Types/GenericObject";
 import {
   describe,
   expect,

package/Tests/Server/Services/BillingService.test.ts

@@ -1,4 +1,4 @@
-import getJestMockFunction from "Common/Tests/MockType";
+import getJestMockFunction from "../../MockType";
 import {
   BillingService,
   Invoice,
@@ -29,9 +29,9 @@ import {
 } from "../TestingUtils/Services/Types";
 import { Stripe, mockStripe } from "../TestingUtils/__mocks__/Stripe.mock";
 import { describe, expect, beforeEach, jest } from "@jest/globals";
-import MeteredPlan from "Common/Types/Billing/MeteredPlan";
-import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
-import SubscriptionStatus from "Common/Types/Billing/SubscriptionStatus";
+import MeteredPlan from "../../../Types/Billing/MeteredPlan";
+import SubscriptionPlan from "../../../Types/Billing/SubscriptionPlan";
+import SubscriptionStatus from "../../../Types/Billing/SubscriptionStatus";
 import OneUptimeDate from "../../../Types/Date";
 
 describe("BillingService", () => {

package/Tests/Server/Services/ProbeService.test.ts

@@ -1,11 +1,11 @@
 import "../TestingUtils/Init";
 import UserTestService from "../TestingUtils/Services/UserServiceHelper";
-import ObjectID from "Common/Types/ObjectID";
-import PositiveNumber from "Common/Types/PositiveNumber";
-import Version from "Common/Types/Version";
-import Faker from "Common/Utils/Faker";
-import Probe from "Common/Models/DatabaseModels/Probe";
-import User from "Common/Models/DatabaseModels/User";
+import ObjectID from "../../../Types/ObjectID";
+import PositiveNumber from "../../../Types/PositiveNumber";
+import Version from "../../../Types/Version";
+import Faker from "../../../Utils/Faker";
+import Probe from "../../../Models/DatabaseModels/Probe";
+import User from "../../../Models/DatabaseModels/User";
 import { fail } from "assert";
 import { describe, expect, beforeEach, afterEach, test } from "@jest/globals";
 import { TestDatabaseMock } from "../TestingUtils/__mocks__/TestDatabase.mock";

package/Tests/Server/Services/ScheduledMaintenanceService.test.ts

@@ -3,9 +3,9 @@ import "../TestingUtils/Init";
 import ProjectServiceHelper from "../TestingUtils/Services/ProjectServiceHelper";
 import ScheduledMaintenanceServiceHelper from "../TestingUtils/Services/ScheduledMaintenanceServiceHelper";
 import { describe, expect, it } from "@jest/globals";
-import Project from "Common/Models/DatabaseModels/Project";
-import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance";
-import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState";
+import Project from "../../../Models/DatabaseModels/Project";
+import ScheduledMaintenance from "../../../Models/DatabaseModels/ScheduledMaintenance";
+import ScheduledMaintenanceState from "../../../Models/DatabaseModels/ScheduledMaintenanceState";
 import { TestDatabaseMock } from "../TestingUtils/__mocks__/TestDatabase.mock";
 import ProjectService from "../../../Server/Services/ProjectService";
 import ScheduledMaintenanceStateService from "../../../Server/Services/ScheduledMaintenanceStateService";

package/Tests/Server/Services/TeamMemberService.test.ts

@@ -12,12 +12,12 @@ import TeamMemberServiceHelper from "../TestingUtils/Services/TeamMemberServiceH
 import TeamServiceHelper from "../TestingUtils/Services/TeamServiceHelper";
 import UserServiceHelper from "../TestingUtils/Services/UserServiceHelper";
 import { describe, expect, it } from "@jest/globals";
-import Email from "Common/Types/Email";
-import ObjectID from "Common/Types/ObjectID";
-import Project from "Common/Models/DatabaseModels/Project";
-import Team from "Common/Models/DatabaseModels/Team";
-import TeamMember from "Common/Models/DatabaseModels/TeamMember";
-import User from "Common/Models/DatabaseModels/User";
+import Email from "../../../Types/Email";
+import ObjectID from "../../../Types/ObjectID";
+import Project from "../../../Models/DatabaseModels/Project";
+import Team from "../../../Models/DatabaseModels/Team";
+import TeamMember from "../../../Models/DatabaseModels/TeamMember";
+import User from "../../../Models/DatabaseModels/User";
 import Faker from "../../../Utils/Faker";
 import UserService from "../../../Server/Services/UserService";
 import ProjectService from "../../../Server/Services/ProjectService";

package/Tests/Server/TestingUtils/Postgres/TestDataSourceOptions.ts

@@ -1,6 +1,6 @@
 import { DatabaseName } from "../../../../Server/EnvironmentConfig";
 import ProdDataSourceOptions from "../../../../Server/Infrastructure/Postgres/DataSourceOptions";
-import Faker from "Common/Utils/Faker";
+import Faker from "../../../../Utils/Faker";
 import { DataSourceOptions } from "typeorm";
 
 type GetTestDataSourceOptions = () => DataSourceOptions;

package/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts

@@ -6,12 +6,12 @@ import {
   MeteredSubscription,
   Subscription,
 } from "./Types";
-import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
-import Email from "Common/Types/Email";
-import ProductType from "Common/Types/MeteredPlan/ProductType";
-import ObjectID from "Common/Types/ObjectID";
+import Email from "../../../../Types/Email";
+import ProductType from "../../../../Types/MeteredPlan/ProductType";
+import ObjectID from "../../../../Types/ObjectID";
 import { Stripe } from "stripe";
 import Faker from "../../../../Utils/Faker";
+import SubscriptionPlan from "../../../../Types/Billing/SubscriptionPlan";
 
 /// @dev consider modifyfing the EnvirontmentConfig to use functions instead of constants so that we can mock them
 

package/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts

@@ -1,5 +1,5 @@
-import Faker from "Common/Utils/Faker";
-import Project from "Common/Models/DatabaseModels/Project";
+import Faker from "../../../../Utils/Faker";
+import Project from "../../../../Models/DatabaseModels/Project";
 import SubscriptionPlan, {
   PlanType,
 } from "../../../../Types/Billing/SubscriptionPlan";

package/Tests/Server/TestingUtils/Services/ScheduledMaintenanceServiceHelper.ts

@@ -1,6 +1,6 @@
-import ObjectID from "Common/Types/ObjectID";
-import Faker from "Common/Utils/Faker";
-import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance";
+import ObjectID from "../../../../Types/ObjectID";
+import Faker from "../../../../Utils/Faker";
+import ScheduledMaintenance from "../../../../Models/DatabaseModels/ScheduledMaintenance";
 import OneUptimeDate from "../../../../Types/Date";
 
 export default class ScheduledMaintenanceTestService {

package/Tests/Server/TestingUtils/Services/ScheduledMaintenanceStateServiceHelper.ts

@@ -1,6 +1,6 @@
-import { Black, Yellow } from "Common/Types/BrandColors";
-import ObjectID from "Common/Types/ObjectID";
-import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState";
+import { Black, Yellow } from "../../../../Types/BrandColors";
+import ObjectID from "../../../..//Types/ObjectID";
+import ScheduledMaintenanceState from "../../../../Models/DatabaseModels/ScheduledMaintenanceState";
 
 export default class ScheduledMaintenanceStateTestService {
   public static generateScheduledState(data: {

package/Tests/Server/TestingUtils/Services/TeamMemberServiceHelper.ts

@@ -1,5 +1,5 @@
-import ObjectID from "Common/Types/ObjectID";
-import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import ObjectID from "../../../../Types/ObjectID";
+import TeamMember from "../../../../Models/DatabaseModels/TeamMember";
 
 export default class TeamMemberTestService {
   public static generateRandomTeamMember(data: {

package/Tests/Server/TestingUtils/Services/TeamServiceHelper.ts

@@ -1,5 +1,5 @@
-import ObjectID from "Common/Types/ObjectID";
-import Team from "Common/Models/DatabaseModels/Team";
+import ObjectID from "../../../../Types/ObjectID";
+import Team from "../../../../Models/DatabaseModels/Team";
 import Faker from "../../../../Utils/Faker";
 import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import TeamService from "../../../../Server/Services/TeamService";

package/Tests/Server/TestingUtils/Services/Types.ts

@@ -1,9 +1,9 @@
 import { PaymentMethod } from "../../../../Server/Services/BillingService";
 import ServerMeteredPlan from "../../../../Server/Types/Billing/MeteredPlan/ServerMeteredPlan";
-import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
-import Dictionary from "Common/Types/Dictionary";
-import Email from "Common/Types/Email";
-import ObjectID from "Common/Types/ObjectID";
+import SubscriptionPlan from "../../../../Types/Billing/SubscriptionPlan";
+import Dictionary from "../../../../Types/Dictionary";
+import Email from "../../../../Types/Email";
+import ObjectID from "../../../../Types/ObjectID";
 
 export type CustomerData = {
   id: ObjectID;

package/Tests/Server/TestingUtils/Services/UserServiceHelper.ts

@@ -1,7 +1,7 @@
-import CompanySize from "Common/Types/Company/CompanySize";
-import JobRole from "Common/Types/Company/JobRole";
-import Faker from "Common/Utils/Faker";
-import User from "Common/Models/DatabaseModels/User";
+import CompanySize from "../../../../Types/Company/CompanySize";
+import JobRole from "../../../../Types/Company/JobRole";
+import Faker from "../../../../Utils/Faker";
+import User from "../../../../Models/DatabaseModels/User";
 import Email from "../../../../Types/Email";
 import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import UserService from "../../../../Server/Services/UserService";

package/Tests/Server/Utils/AnalyticsDatabase/Statement.test.ts

@@ -3,7 +3,7 @@ import {
   Statement,
 } from "../../../../Server/Utils/AnalyticsDatabase/Statement";
 import "../../TestingUtils/Init";
-import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
+import TableColumnType from "../../../../Types/AnalyticsDatabase/TableColumnType";
 
 describe("Statement", () => {
   describe("constructor", () => {

package/Tests/Server/Utils/AnalyticsDatabase/StatementGenerator.test.ts

@@ -7,14 +7,14 @@ import {
 import StatementGenerator from "../../../../Server/Utils/AnalyticsDatabase/StatementGenerator";
 import logger from "../../../../Server/Utils/Logger";
 import "../../TestingUtils/Init";
-import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import NestedModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/NestedModel";
-import Route from "Common/Types/API/Route";
-import AnalyticsTableEngine from "Common/Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
-import OneUptimeDate from "Common/Types/Date";
-import GenericObject from "Common/Types/GenericObject";
+import AnalyticsBaseModel from "../../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import NestedModel from "../../../../Models/AnalyticsModels/AnalyticsBaseModel/NestedModel";
+import Route from "../../../../Types/API/Route";
+import AnalyticsTableEngine from "../../../../Types/AnalyticsDatabase/AnalyticsTableEngine";
+import AnalyticsTableColumn from "../../../../Types/AnalyticsDatabase/TableColumn";
+import TableColumnType from "../../../../Types/AnalyticsDatabase/TableColumnType";
+import OneUptimeDate from "../../../../Types/Date";
+import GenericObject from "../../../../Types/GenericObject";
 
 function expectStatement(actual: Statement, expected: Statement): void {
   expect(actual.query).toBe(expected.query);

package/Tests/Server/Utils/Cookie.test.ts

@@ -1,8 +1,8 @@
 import CookieUtil from "../../../Server/Utils/Cookie";
 import { ExpressRequest, ExpressResponse } from "../../../Server/Utils/Express";
-import Dictionary from "Common/Types/Dictionary";
-import { JSONObject } from "Common/Types/JSON";
-import ObjectID from "Common/Types/ObjectID";
+import Dictionary from "../../../Types/Dictionary";
+import { JSONObject } from "../../../Types/JSON";
+import ObjectID from "../../../Types/ObjectID";
 
 describe("CookieUtils", () => {
   let mockRequest: ExpressRequest;

package/Tests/Server/Utils/JsonToCsv.test.ts

@@ -1,6 +1,6 @@
 import csvConverter from "../../../Server/Utils/JsonToCsv";
 import { describe, expect, it } from "@jest/globals";
-import { JSONArray } from "Common/Types/JSON";
+import { JSONArray } from "../../../Types/JSON";
 
 describe("CSV Converter", () => {
   it("throws an error when the input JSON array is empty", () => {

package/Tests/UI/Components/404.test.tsx

@@ -1,9 +1,9 @@
 import NotFound, { ComponentProps } from "../../../UI/Components/404";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
-import Route from "Common/Types/API/Route";
-import URL from "Common/Types/API/URL";
-import Email from "Common/Types/Email";
+import Route from "../../../Types/API/Route";
+import URL from "../../../Types/API/URL";
+import Email from "../../../Types/Email";
 import * as React from "react";
 import { describe, expect, jest } from "@jest/globals";
 

package/Tests/UI/Components/BasicForm.test.tsx

@@ -6,10 +6,10 @@ import "@testing-library/jest-dom/extend-expect";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { UserEvent } from "@testing-library/user-event/dist/types/setup/setup";
-import Route from "Common/Types/API/Route";
+import Route from "../../../Types/API/Route";
 import * as React from "react";
 import { describe, expect } from "@jest/globals";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import getJestMockFunction, { MockFunction } from "../../../Tests/MockType";
 
 describe("BasicForm test", () => {
   const fields: Fields<FormValues<any>> = [

package/Tests/UI/Components/Breadcrumbs.test.tsx

@@ -1,8 +1,8 @@
 import Breadcrumbs from "../../../UI/Components/Breadcrumbs/Breadcrumbs";
 import Navigation from "../../../UI/Utils/Navigation";
 import { describe, expect, test, jest } from "@jest/globals";
-import Route from "Common/Types/API/Route";
-import Link from "Common/Types/Link";
+import Route from "../../../Types/API/Route";
+import Link from "../../../Types/Link";
 import * as React from "react";
 import renderer, {
   ReactTestInstance,

package/Tests/UI/Components/Button.test.tsx

@@ -6,7 +6,7 @@ import ButtonType from "../../../UI/Components/Button/ButtonTypes";
 import ShortcutKey from "../../../UI/Components/ShortcutKey/ShortcutKey";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
-import IconProp from "Common/Types/Icon/IconProp";
+import IconProp from "../../../Types/Icon/IconProp";
 import React from "react";
 import { describe, expect, jest } from "@jest/globals";
 

package/Tests/UI/Components/Card.test.tsx

@@ -5,7 +5,7 @@ import Card, {
 } from "../../../UI/Components/Card/Card";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
-import IconProp from "Common/Types/Icon/IconProp";
+import IconProp from "../../../Types/Icon/IconProp";
 import React, { ReactElement } from "react";
 import { describe, expect, jest } from "@jest/globals";
 

package/Tests/UI/Components/ColorViewer.test.tsx

@@ -1,10 +1,10 @@
 import ColorViewer from "../../../UI/Components/ColorViewer/ColorViewer";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render } from "@testing-library/react";
-import Color from "Common/Types/Color";
+import Color from "../../../Types/Color";
 import * as React from "react";
 import { describe, expect } from "@jest/globals";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import getJestMockFunction, { MockFunction } from "../../../Tests/MockType";
 
 describe("Color Viewer", () => {
   test("Render the component", () => {

package/Tests/UI/Components/ComponentsModal.test.tsx

@@ -2,13 +2,13 @@ import ComponentsModal from "../../../UI/Components/Workflow/ComponentsModal";
 import { describe, expect, it } from "@jest/globals";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
-import IconProp from "Common/Types/Icon/IconProp";
+import IconProp from "../../../Types/Icon/IconProp";
 import ComponentMetadata, {
   ComponentCategory,
   ComponentType,
-} from "Common/Types/Workflow/Component";
+} from "../../../Types/Workflow/Component";
 import React from "react";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import getJestMockFunction, { MockFunction } from "../../../Tests/MockType";
 import Faker from "../../../Utils/Faker";
 
 /// @dev we use different UUID for (id & title), description, and category to ensure that the component is unique

package/Tests/UI/Components/DictionaryOfStrings.test.tsx

@@ -6,10 +6,10 @@ import DictionaryOfStrings, {
 import { describe, expect, it, jest } from "@jest/globals";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
-import Dictionary from "Common/Types/Dictionary";
+import Dictionary from "../../../Types/Dictionary";
 import React from "react";
 
-jest.mock("Common/Types/Date", () => {
+jest.mock("../../../Types/Date", () => {
   return {
     toDateTimeLocalString: jest.fn(),
     asDateForDatabaseQuery: jest.fn(),

package/Tests/UI/Components/Dropdown.test.tsx

@@ -5,7 +5,7 @@ import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
 import React from "react";
 import { describe, expect } from "@jest/globals";
-import getJestMockFunction, { MockFunction } from "Common/Tests/MockType";
+import getJestMockFunction, { MockFunction } from "../../../Tests/MockType";
 describe("Dropdown", () => {
   const options: DropdownOption[] = [
     { value: "1", label: "1" },