Merge pull request #1461 from rocket-admin/backend_refactoring

Refactor data access layer to use shared enums and interfaces

Author: Artuomka

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/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts

@@ -1,6 +1,5 @@
 import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import OpenAI from 'openai';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
 import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
@@ -17,9 +16,10 @@ import { ResponsesModel } from 'openai/resources/index.js';
 import { Stream } from 'openai/core/streaming.js';
 import { Response } from 'express';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
-import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js';
-import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js';
 import { AiResponsesToUserEntity } from '../ai-data-entities/ai-reponses-to-user/ai-responses-to-user.entity.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
+import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
+import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
 @Injectable({ scope: Scope.REQUEST })
 export class RequestInfoFromTableWithAIUseCaseV4
   extends AbstractUseCase<RequestInfoFromTableDSV2, void>

backend/src/entities/connection/application/data-structures/create-connection.ds.ts

@@ -1,4 +1,4 @@
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export class CreateConnectionDs {
   connection_parameters: {

backend/src/entities/connection/application/data-structures/found-connections.ds.ts

@@ -1,9 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 import { AccessLevelEnum } from '../../../../enums/index.js';
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
-import { UserEntity } from '../../../user/user.entity.js';
 import { FoundGroupDataWithUsersDs } from '../../../group/application/data-sctructures/found-user-groups.ds.js';
 import { SimpleFoundUserInfoDs } from '../../../user/dto/found-user.dto.js';
+import { UserEntity } from '../../../user/user.entity.js';
 
 export class FoundDirectConnectionsDs {
   @ApiProperty()

backend/src/entities/connection/application/data-structures/update-connection.ds.ts

@@ -1,4 +1,4 @@
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export class UpdateConnectionDs {
   connection_parameters: {

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

@@ -1,8 +1,10 @@
 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 {
+  ConnectionTypesEnum,
+  ConnectionTypeTestEnum,
+} from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export class CreateConnectionDto {
   @ApiProperty({ required: false })

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

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import { FoundUserDto } from '../../../user/dto/found-user.dto.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 export class CreatedGroupInConnectionDTO {
   @ApiProperty()

backend/src/entities/connection/connection.controller.ts

@@ -42,15 +42,16 @@ import { RestoredConnectionDs } from './application/data-structures/restored-con
 import { UpdateConnectionDs } from './application/data-structures/update-connection.ds.js';
 import { UpdateMasterPasswordDs } from './application/data-structures/update-master-password.ds.js';
 import { CreatedConnectionDTO } from './application/dto/created-connection.dto.js';
-
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { SkipThrottle } from '@nestjs/throttler';
+import { isRedisConnectionUrl } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
 import { TestConnectionResultDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/test-result-connection.ds.js';
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
 import { SuccessResponse } from '../../microservices/saas-microservice/data-structures/common-responce.ds.js';
 import { FoundGroupResponseDto } from '../group/dto/found-group-response.dto.js';
 import { FoundOneConnectionDs } from './application/data-structures/found-one-connection.ds.js';
 import { FoundPermissionsInConnectionDs } from './application/data-structures/found-permissions-in-connection.ds.js';
 import { ValidateConnectionMasterPasswordDs } from './application/data-structures/validate-connection-master-password.ds.js';
+import { CreateConnectionDto } from './application/dto/create-connection.dto.js';
 import { CreateGroupInConnectionDTO } from './application/dto/create-group-in-connection.dto.js';
 import { DeleteConnectionReasonDto } from './application/dto/delete-connection.dto.js';
 import { DeleteGroupFromConnectionDTO } from './application/dto/delete-group-from-connection-request.dto.js';
@@ -81,9 +82,7 @@ import {
 } from './use-cases/use-cases.interfaces.js';
 import { TokenValidationResult } from './use-cases/validate-connection-token.use.case.js';
 import { isTestConnectionUtil } from './utils/is-test-connection-util.js';
-import { SkipThrottle } from '@nestjs/throttler';
-import { isRedisConnectionUrl } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
-import { CreateConnectionDto } from './application/dto/create-connection.dto.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 
 @UseInterceptors(SentryInterceptor)
 @Controller()

backend/src/entities/connection/use-cases/test-connection.use.case.ts

@@ -1,24 +1,24 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { getRepository } from 'typeorm';
-import AbstractUseCase from '../../../common/abstract-use.case.js';
-import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
-import { BaseType } from '../../../common/data-injection.tokens.js';
 import {
   getDataAccessObject,
   isRedisConnectionUrl,
 } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
+import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
+import { getRepository } from 'typeorm';
+import AbstractUseCase from '../../../common/abstract-use.case.js';
+import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
+import { BaseType } from '../../../common/data-injection.tokens.js';
 import { Messages } from '../../../exceptions/text/messages.js';
 import { processExceptionMessage } from '../../../exceptions/utils/process-exception-message.js';
-import { isConnectionTypeAgent, slackPostMessage } from '../../../helpers/index.js';
 import { Encryptor } from '../../../helpers/encryption/encryptor.js';
+import { isConnectionTypeAgent, slackPostMessage } from '../../../helpers/index.js';
+import { CreateConnectionDs } from '../application/data-structures/create-connection.ds.js';
 import { TestConnectionResultDs } from '../application/data-structures/test-connection-result.ds.js';
 import { UpdateConnectionDs } from '../application/data-structures/update-connection.ds.js';
 import { ConnectionEntity } from '../connection.entity.js';
 import { isHostAllowed } from '../utils/is-host-allowed.js';
-import { ITestConnection } from './use-cases.interfaces.js';
 import { processAWSConnection } from '../utils/process-aws-connection.util.js';
-import { CreateConnectionDs } from '../application/data-structures/create-connection.ds.js';
-import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js';
+import { ITestConnection } from './use-cases.interfaces.js';
 
 @Injectable()
 export class TestConnectionUseCase
@@ -129,7 +129,11 @@ export class TestConnectionUseCase
         };
       }
     } else {
-      if (!connectionData.password && !isConnectionTypeAgent(connectionData.type) && !isRedisConnectionUrl(connectionData.host)) {
+      if (
+        !connectionData.password &&
+        !isConnectionTypeAgent(connectionData.type) &&
+        !isRedisConnectionUrl(connectionData.host)
+      ) {
         return {
           result: false,
           message: Messages.PASSWORD_MISSING,

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

@@ -1,9 +1,11 @@
 import { HttpStatus } from '@nestjs/common';
 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 {
+  ConnectionTypesEnum,
+  ConnectionTypeTestEnum,
+} from '@rocketadmin/shared-code/dist/src/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';