Skip to content

Commit a4b6289

Browse files
committed
Refactor data access layer to use shared enums and interfaces
1 parent 70eb521 commit a4b6289

35 files changed

Lines changed: 91 additions & 92 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { nanoid } from 'nanoid';
22
import { ConnectionEntity } from '../../connection/connection.entity.js';
33
import { AgentEntity } from '../agent.entity.js';
4-
import { ConnectionTypeTestEnum } from '../../../enums/connection-type.enum.js';
4+
import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
55

66
export const customAgentRepositoryExtension = {
77
async createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger';
22
import { IsBoolean, IsEnum, IsNumber, IsOptional, IsString, Max, Min } from 'class-validator';
33
import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
44
import { isTest } from '../../../../helpers/app/is-test.js';
5-
import { ConnectionTypeTestEnum } from '../../../../enums/connection-type.enum.js';
5+
import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
66

77
export class CreateConnectionDto {
88
@ApiProperty({ required: false })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { HttpException } from '@nestjs/common/exceptions/http.exception.js';
33
import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
44
import dns from 'dns';
55
import ipRangeCheck from 'ip-range-check';
6-
import { ConnectionTypeTestEnum } from '../../../enums/connection-type.enum.js';
76
import { Messages } from '../../../exceptions/text/messages.js';
87
import { isSaaS } from '../../../helpers/app/is-saas.js';
98
import { Constants } from '../../../helpers/constants/constants.js';
109
import { isConnectionTypeAgent, toPrettyErrorsMsg } from '../../../helpers/index.js';
1110
import { CreateConnectionDs } from '../application/data-structures/create-connection.ds.js';
1211
import { UpdateConnectionDs } from '../application/data-structures/update-connection.ds.js';
12+
import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
1313

1414
export async function validateCreateConnectionData(
1515
createConnectionData: CreateConnectionDs | UpdateConnectionDs,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ConnectionEntity } from '../entities/connection/connection.entity.js';
22
import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
3-
import { ConnectionTypeTestEnum } from '../enums/connection-type.enum.js';
43
import { CreateConnectionDto } from '../entities/connection/application/dto/create-connection.dto.js';
4+
import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
55

66
export function isConnectionEntityAgent(connection: ConnectionEntity | CreateConnectionDto): boolean {
77
const agentTypes = [

backend/test/mock.factory.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { CreateTableWidgetDto } from '../src/entities/widget/dto/index.js';
77
import { AccessLevelEnum, PermissionTypeEnum, QueryOrderingEnum, WidgetTypeEnum } from '../src/enums/index.js';
88
import { TestConstants } from './mocks/test-constants.js';
99
import json5 from 'json5';
10-
import { ConnectionTypeTestEnum } from '../src/enums/connection-type.enum.js';
1110
import { CreateConnectionDto } from '../src/entities/connection/application/dto/create-connection.dto.js';
1211
import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
1312
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import { TableSettingsDS } from '../shared/data-structures/table-settings.ds.js'
1313
import { TableStructureDS } from '../shared/data-structures/table-structure.ds.js';
1414
import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
1515
import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
16-
import { IDataAccessObjectAgent } from '../shared/interfaces/data-access-object-agent.interface.js';
17-
import { DataAccessObjectCommandsEnum } from '../shared/enums/data-access-object-commands.enum.js';
16+
import { IDataAccessObjectAgent } from '../../shared/interfaces/data-access-object-agent.interface.js';
17+
import { DataAccessObjectCommandsEnum } from '../../shared/enums/data-access-object-commands.enum.js';
1818
import { LRUStorage } from '../../caching/lru-storage.js';
1919
import { TableDS } from '../shared/data-structures/table.ds.js';
2020
import { Stream, Readable } from 'node:stream';
@@ -30,7 +30,7 @@ import {
3030
isPostgresDateOrTimeType,
3131
isPostgresDateStringByRegexp,
3232
} from '../../helpers/is-database-date.js';
33-
import { ConnectionTypesEnum } from '../shared/enums/connection-types-enum.js';
33+
import { ConnectionTypesEnum } from '../../shared/enums/connection-types-enum.js';
3434

3535
export class DataAccessObjectAgent implements IDataAccessObjectAgent {
3636
private readonly connection: ConnectionAgentParams;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
2020
import { TableDS } from '../shared/data-structures/table.ds.js';
2121
import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
2222
import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
23-
import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
24-
import { QueryOrderingEnum } from '../shared/enums/query-ordering.enum.js';
25-
import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
23+
import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
24+
import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
25+
import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
2626
import { BasicDataAccessObject } from './basic-data-access-object.js';
2727

2828
export class DataAccessObjectCassandra extends BasicDataAccessObject implements IDataAccessObject {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
1818
import { TableDS } from '../shared/data-structures/table.ds.js';
1919
import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
2020
import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
21-
import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
22-
import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
21+
import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
22+
import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
2323
import { BasicDataAccessObject } from './basic-data-access-object.js';
2424
import { NodeClickHouseClientConfigOptions } from '@clickhouse/client/dist/config.js';
2525

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import { DynamoDBType, TableStructureDS } from '../shared/data-structures/table-
2828
import { TableDS } from '../shared/data-structures/table.ds.js';
2929
import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
3030
import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
31-
import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
32-
import { QueryOrderingEnum } from '../shared/enums/query-ordering.enum.js';
33-
import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
31+
import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
32+
import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';
33+
import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
3434
import { BasicDataAccessObject } from './basic-data-access-object.js';
3535

3636
export type DdAndClient = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { TableStructureDS } from '../shared/data-structures/table-structure.ds.j
1616
import { TableDS } from '../shared/data-structures/table.ds.js';
1717
import { TestConnectionResultDS } from '../shared/data-structures/test-result-connection.ds.js';
1818
import { ValidateTableSettingsDS } from '../shared/data-structures/validate-table-settings.ds.js';
19-
import { FilterCriteriaEnum } from '../shared/enums/filter-criteria.enum.js';
20-
import { IDataAccessObject } from '../shared/interfaces/data-access-object.interface.js';
19+
import { FilterCriteriaEnum } from '../../shared/enums/filter-criteria.enum.js';
20+
import { IDataAccessObject } from '../../shared/interfaces/data-access-object.interface.js';
2121
import { BasicDataAccessObject } from './basic-data-access-object.js';
2222

2323
export class DataAccessObjectElasticsearch extends BasicDataAccessObject implements IDataAccessObject {

0 commit comments

Comments
 (0)