Refactor data access layer to use shared enums and interfaces

backend/src/entities/agent/repository/custom-agent-repository-extension.ts

@@ -1,7 +1,7 @@
 import { nanoid } from 'nanoid';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { AgentEntity } from '../agent.entity.js';
-import { ConnectionTypeTestEnum } from '../../../enums/connection-type.enum.js';
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export const customAgentRepositoryExtension = {
   async createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string> {

backend/src/entities/connection/application/dto/create-connection.dto.ts

@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { IsBoolean, IsEnum, IsNumber, IsOptional, IsString, Max, Min } from 'class-validator';
 import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import { isTest } from '../../../../helpers/app/is-test.js';
-import { ConnectionTypeTestEnum } from '../../../../enums/connection-type.enum.js';
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export class CreateConnectionDto {
   @ApiProperty({ required: false })

backend/src/entities/connection/utils/validate-create-connection-data.ts

@@ -3,13 +3,13 @@ import { HttpException } from '@nestjs/common/exceptions/http.exception.js';
 import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import dns from 'dns';
 import ipRangeCheck from 'ip-range-check';
-import { ConnectionTypeTestEnum } from '../../../enums/connection-type.enum.js';
 import { Messages } from '../../../exceptions/text/messages.js';
 import { isSaaS } from '../../../helpers/app/is-saas.js';
 import { Constants } from '../../../helpers/constants/constants.js';
 import { isConnectionTypeAgent, toPrettyErrorsMsg } from '../../../helpers/index.js';
 import { CreateConnectionDs } from '../application/data-structures/create-connection.ds.js';
 import { UpdateConnectionDs } from '../application/data-structures/update-connection.ds.js';
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export async function validateCreateConnectionData(
   createConnectionData: CreateConnectionDs | UpdateConnectionDs,

backend/src/helpers/is-connection-entity-agent.ts

@@ -1,7 +1,7 @@
 import { ConnectionEntity } from '../entities/connection/connection.entity.js';
 import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
-import { ConnectionTypeTestEnum } from '../enums/connection-type.enum.js';
 import { CreateConnectionDto } from '../entities/connection/application/dto/create-connection.dto.js';
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export function isConnectionEntityAgent(connection: ConnectionEntity | CreateConnectionDto): boolean {
   const agentTypes = [

backend/test/mock.factory.ts

@@ -7,7 +7,6 @@ import { CreateTableWidgetDto } from '../src/entities/widget/dto/index.js';
 import { AccessLevelEnum, PermissionTypeEnum, QueryOrderingEnum, WidgetTypeEnum } from '../src/enums/index.js';
 import { TestConstants } from './mocks/test-constants.js';
 import json5 from 'json5';
-import { ConnectionTypeTestEnum } from '../src/enums/connection-type.enum.js';
 import { CreateConnectionDto } from '../src/entities/connection/application/dto/create-connection.dto.js';
 import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import { CreateTableActionDTO } from '../src/entities/table-actions/table-actions-module/dto/create-table-action.dto.js';

shared-code/src/data-access-layer/data-access-objects/data-access-object-agent.ts

@@ -13,8 +13,8 @@ import { TableSettingsDS } from '../shared/data-structures/table-settings.ds.js'
 import { TableStructureDS } from '../shared/data-structures/table-structure.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { IDataAccessObjectAgent } from '../shared/interfaces/data-access-object-agent.interface.js';
-import { DataAccessObjectCommandsEnum } from '../shared/enums/data-access-object-commands.enum.js';
+import { IDataAccessObjectAgent } from '../../shared/interfaces/data-access-object-agent.interface.js';
+import { DataAccessObjectCommandsEnum } from '../../shared/enums/data-access-object-commands.enum.js';
 import { LRUStorage } from '../../caching/lru-storage.js';
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { Stream, Readable } from 'node:stream';
@@ -30,7 +30,7 @@ import {
   isPostgresDateOrTimeType,
   isPostgresDateStringByRegexp,
 } from '../../helpers/is-database-date.js';
-import { ConnectionTypesEnum } from '../shared/enums/connection-types-enum.js';
+import { ConnectionTypesEnum } from '../../shared/enums/connection-types-enum.js';
 
 export class DataAccessObjectAgent implements IDataAccessObjectAgent {
   private readonly connection: ConnectionAgentParams;

shared-code/src/data-access-layer/data-access-objects/data-access-object-cassandra.ts

@@ -20,9 +20,9 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { QueryOrderingEnum } from '../shared/enums/query-ordering.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export class DataAccessObjectCassandra extends BasicDataAccessObject implements IDataAccessObject {

shared-code/src/data-access-layer/data-access-objects/data-access-object-clickhouse.ts

@@ -18,8 +18,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 import { NodeClickHouseClientConfigOptions } from '@clickhouse/client/dist/config.js';
 

shared-code/src/data-access-layer/data-access-objects/data-access-object-dynamodb.ts

@@ -28,9 +28,9 @@ import { DynamoDBType, TableStructureDS } from '../shared/data-structures/table-
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { QueryOrderingEnum } from '../shared/enums/query-ordering.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export type DdAndClient = {

shared-code/src/data-access-layer/data-access-objects/data-access-object-elasticsearch.ts

@@ -16,8 +16,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export class DataAccessObjectElasticsearch extends BasicDataAccessObject implements IDataAccessObject {

shared-code/src/data-access-layer/data-access-objects/data-access-object-ibmdb2.ts

@@ -20,8 +20,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export class DataAccessObjectIbmDb2 extends BasicDataAccessObject implements IDataAccessObject {

shared-code/src/data-access-layer/data-access-objects/data-access-object-mongodb.ts

@@ -23,8 +23,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export type MongoClientDB = {

shared-code/src/data-access-layer/data-access-objects/data-access-object-mssql.ts

@@ -22,9 +22,9 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { QueryOrderingEnum } from '../shared/enums/query-ordering.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 export class DataAccessObjectMssql extends BasicDataAccessObject implements IDataAccessObject {

shared-code/src/data-access-layer/data-access-objects/data-access-object-mysql.ts

@@ -15,8 +15,8 @@ import { TableSettingsDS } from '../shared/data-structures/table-settings.ds.js'
 import { TableStructureDS } from '../shared/data-structures/table-structure.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 import { objectKeysToLowercase } from '../../helpers/object-kyes-to-lowercase.js';
 import { Knex } from 'knex';

shared-code/src/data-access-layer/data-access-objects/data-access-object-oracle.ts

@@ -27,8 +27,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 
 type RefererencedConstraint = {
@@ -494,7 +494,8 @@ export class DataAccessObjectOracle extends BasicDataAccessObject implements IDa
     }
     const knex = await this.configureKnex();
     const schema = this.connection.schema ?? this.connection.username.toUpperCase();
-    const structureColumns = await knex.queryBuilder()
+    const structureColumns = await knex
+      .queryBuilder()
       .select('COLUMN_NAME', 'DATA_DEFAULT', 'DATA_TYPE', 'NULLABLE', 'DATA_LENGTH')
       .from('ALL_TAB_COLUMNS')
       .orderBy('COLUMN_ID')

shared-code/src/data-access-layer/data-access-objects/data-access-object-postgres.ts

@@ -19,8 +19,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 import { nanoid } from 'nanoid';
 

shared-code/src/data-access-layer/data-access-objects/data-access-object-redis.ts

@@ -19,8 +19,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
 import { TableDS } from '../shared/data-structures/table.ds.js';
 import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
 import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
-import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
-import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
+import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 import { BasicDataAccessObject } from './basic-data-access-object.js';
 import { isRedisConnectionUrl } from '../shared/create-data-access-object.js';
 

shared-code/src/data-access-layer/shared/create-data-access-object.ts

@@ -12,9 +12,9 @@ import { DataAccessObjectOracle } from '../data-access-objects/data-access-objec
 import { DataAccessObjectPostgres } from '../data-access-objects/data-access-object-postgres.js';
 import { DataAccessObjectRedis } from '../data-access-objects/data-access-object-redis.js';
 import { ConnectionAgentParams, ConnectionParams } from './data-structures/connections-params.ds.js';
-import { ConnectionTypesEnum } from './enums/connection-types-enum.js';
-import { IDataAccessObjectAgent } from './interfaces/data-access-object-agent.interface.js';
-import { IDataAccessObject } from './interfaces/data-access-object.interface.js';
+import { ConnectionTypesEnum } from '../../shared/enums/connection-types-enum.js';
+import { IDataAccessObjectAgent } from '../../shared/interfaces/data-access-object-agent.interface.js';
+import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
 
 interface IUnknownConnectionParams {
   [key: string]: any;

shared-code/src/data-access-layer/shared/data-structures/filtering-fields.ds.ts

@@ -1,4 +1,4 @@
-import { FilterCriteriaEnum } from '../enums/filter-criteria.enum.js';
+import { FilterCriteriaEnum } from '../../../shared/enums/filter-criteria.enum.js';
 
 export class FilteringFieldsDS {
   field: string;

shared-code/src/data-access-layer/shared/data-structures/table-settings.ds.ts

@@ -1,4 +1,4 @@
-import { QueryOrderingEnum } from '../enums/query-ordering.enum.js';
+import { QueryOrderingEnum } from '../../../shared/enums/query-ordering.enum.js';
 
 export class TableSettingsDS {
   table_name: string;

shared-code/src/data-access-layer/shared/data-structures/table-widget.ds.ts

@@ -1,4 +1,4 @@
-import { TableWidgetTypeEnum } from '../enums/table-widget-type.enum.js';
+import { TableWidgetTypeEnum } from '../../../shared/enums/table-widget-type.enum.js';
 
 export class TableWidgetDS {
   id: string;

shared-code/src/data-access-layer/shared/data-structures/validate-table-settings.ds.ts

@@ -1,4 +1,4 @@
-import { QueryOrderingEnum } from '../enums/query-ordering.enum.js';
+import { QueryOrderingEnum } from '../../../shared/enums/query-ordering.enum.js';
 import { CustomFieldDS } from './custom-field.ds.js';
 import { TableWidgetDS } from './table-widget.ds.js';
 

shared-code/src/helpers/data-structures-builders/table-widget-ds.builder.ts

@@ -1,5 +1,5 @@
 import { TableWidgetDS } from '../../data-access-layer/shared/data-structures/table-widget.ds.js';
-import { IUnknownDataStructure } from '../../data-access-layer/shared/interfaces/unknown-datastructure.interface.js';
+import { IUnknownDataStructure } from '../../shared/interfaces/unknown-datastructure.interface.js';
 
 export function buildTableWidgetDs(tableWidgetParams: IUnknownDataStructure): TableWidgetDS {
   return {

shared-code/src/helpers/data-structures-builders/validate-table-settings-ds.builder.ts

@@ -1,5 +1,5 @@
 import { ValidateTableSettingsDS } from '../../data-access-layer/shared/data-structures/validate-table-settings.ds.js';
-import { IUnknownDataStructure } from '../../data-access-layer/shared/interfaces/unknown-datastructure.interface.js';
+import { IUnknownDataStructure } from '../../shared/interfaces/unknown-datastructure.interface.js';
 import { buildTableWidgetDs } from './table-widget-ds.builder.js';
 
 export function buildValidateTableSettingsDS(tableSettings: IUnknownDataStructure): ValidateTableSettingsDS {

shared-code/src/helpers/validation/table-settings-validation-errors.ts

@@ -1,4 +1,4 @@
-import { QueryOrderingEnum } from '../../data-access-layer/shared/enums/query-ordering.enum.js';
+import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
 import { enumToString } from '../../helpers/enum-to-string.js';
 
 export const TABLE_SETTINGS_VALIDATION_ERRORS = {

shared-code/src/helpers/validation/table-settings-validator.ts

@@ -1,7 +1,7 @@
 import { PrimaryKeyDS } from '../../data-access-layer/shared/data-structures/primary-key.ds.js';
 import { TableSettingsDS } from '../../data-access-layer/shared/data-structures/table-settings.ds.js';
 import { ValidateTableSettingsDS } from '../../data-access-layer/shared/data-structures/validate-table-settings.ds.js';
-import { QueryOrderingEnum } from '../../data-access-layer/shared/enums/query-ordering.enum.js';
+import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
 import { isObjectEmpty } from '../is-object-empty.js';
 import { TABLE_SETTINGS_VALIDATION_ERRORS } from './table-settings-validation-errors.js';
 
@@ -10,7 +10,6 @@ export function tableSettingsFieldValidator(
   primaryColumns: Array<PrimaryKeyDS>,
   settings: ValidateTableSettingsDS | TableSettingsDS,
 ): Array<string> {
-
   const errorMessages = [];
   if (isObjectEmpty(settings)) {
     return errorMessages;
@@ -150,5 +149,4 @@ export function tableSettingsFieldValidator(
   }
 
   return errorMessages;
-
 }