Backend refactoring ts

backend/src/common/application/global-database-context.ts

@@ -31,7 +31,7 @@ import { ConnectionPropertiesEntity } from '../../entities/connection-properties
 import { IConnectionPropertiesRepository } from '../../entities/connection-properties/repository/connection-properties.repository.interface.js';
 import { customConnectionPropertiesRepositoryExtension } from '../../entities/connection-properties/repository/custom-connection-properties-repository-extension.js';
 import { CustomFieldsEntity } from '../../entities/custom-field/custom-fields.entity.js';
-import { cusomFieldsCustomRepositoryExtension } from '../../entities/custom-field/repository/custom-field-repository-extension.js';
+import { customFieldsCustomRepositoryExtension } from '../../entities/custom-field/repository/custom-field-repository-extension.js';
 import { ICustomFieldsRepository } from '../../entities/custom-field/repository/custom-fields-repository.interface.js';
 import { EmailVerificationEntity } from '../../entities/email/email-verification.entity.js';
 import { IEmailVerificationRepository } from '../../entities/email/repository/email-verification.repository.interface.js';
@@ -192,7 +192,7 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 			.extend(customConnectionPropertiesRepositoryExtension);
 		this._customFieldsRepository = this.appDataSource
 			.getRepository(CustomFieldsEntity)
-			.extend(cusomFieldsCustomRepositoryExtension);
+			.extend(customFieldsCustomRepositoryExtension);
 		this._tableLogsRepository = this.appDataSource
 			.getRepository(TableLogsEntity)
 			.extend(tableLogsCustomRepositoryExtension);

backend/src/entities/agent/agent.entity.ts

@@ -25,15 +25,26 @@ export class AgentEntity {
 	@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
 	updatedAt: Date;
 
+	private _tokenChanged = false;
+
+	setToken(token: string): void {
+		this.token = token;
+		this._tokenChanged = true;
+	}
+
 	@BeforeInsert()
 	encryptToken(): void {
 		this.token = Encryptor.hashDataHMAC(this.token);
+		this._tokenChanged = false;
 	}
 
 	@BeforeUpdate()
 	updateTimestampAndEncryptToken(): void {
 		this.updatedAt = new Date();
-		this.token = Encryptor.hashDataHMAC(this.token);
+		if (this._tokenChanged) {
+			this.token = Encryptor.hashDataHMAC(this.token);
+			this._tokenChanged = false;
+		}
 	}
 
 	@OneToOne(

backend/src/entities/agent/agent.module.ts

@@ -1,6 +1,5 @@
-import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AuthMiddleware } from '../../authorization/index.js';
 import { GlobalDatabaseContext } from '../../common/application/global-database-context.js';
 import { BaseType } from '../../common/data-injection.tokens.js';
 import { LogOutEntity } from '../log-out/log-out.entity.js';
@@ -17,8 +16,4 @@ import { AgentEntity } from './agent.entity.js';
 	],
 	exports: [],
 })
-export class AgentModule implements NestModule {
-	public configure(consumer: MiddlewareConsumer): any {
-		consumer.apply(AuthMiddleware).forRoutes();
-	}
-}
+export class AgentModule {}

backend/src/entities/agent/repository/agent.repository.interface.ts

@@ -1,3 +1,4 @@
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { AgentEntity } from '../agent.entity.js';
 
@@ -7,4 +8,6 @@ export interface IAgentRepository {
 	createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string>;
 
 	renewOrCreateConnectionToken(connectionId: string): Promise<string>;
+
+	getTestAgentToken(connectionType: ConnectionTypeTestEnum): string;
 }

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

@@ -2,26 +2,18 @@ import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared
 import { nanoid } from 'nanoid';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { AgentEntity } from '../agent.entity.js';
+import { IAgentRepository } from './agent.repository.interface.js';
 
-export const customAgentRepositoryExtension = {
-	async saveNewAgent(agent: AgentEntity): Promise<AgentEntity> {
-		return await this.save(agent);
-	},
-
+export const customAgentRepositoryExtension: IAgentRepository = {
 	async createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string> {
 		const newAgent = await this.createNewAgentForConnection(connection);
 		return newAgent.token;
 	},
 
 	async createNewAgentForConnection(connection: ConnectionEntity): Promise<AgentEntity> {
 		const agent = new AgentEntity();
-		let token = nanoid(64);
-		if (process.env.NODE_ENV !== 'test') {
-			agent.token = token;
-		} else {
-			token = this.getTestAgentToken(connection.type);
-			agent.token = token;
-		}
+		const token = process.env.NODE_ENV !== 'test' ? nanoid(64) : this.getTestAgentToken(connection.type);
+		agent.setToken(token);
 		agent.connection = connection;
 		const savedAgent = await this.save(agent);
 		savedAgent.token = token;
@@ -42,7 +34,7 @@ export const customAgentRepositoryExtension = {
 			return await this.createNewAgentForConnectionAndReturnToken(foundConnection);
 		} else {
 			const newToken = nanoid(64);
-			foundAgent.token = newToken;
+			foundAgent.setToken(newToken);
 			await this.save(foundAgent);
 			return newToken;
 		}

backend/src/entities/amplitude/amplitude.service.ts

@@ -1,36 +1,56 @@
 import Amplitude from '@amplitude/node';
-import { Injectable } from '@nestjs/common';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { AmplitudeEventTypeEnum } from '../../enums/index.js';
 import { UserEntity } from '../user/user.entity.js';
 
+export interface AmplitudeLogOptions {
+	user_email?: string;
+	tablesCount?: number;
+	reason?: string;
+	message?: string;
+	operationCount?: number;
+}
+
 @Injectable()
-export class AmplitudeService {
+export class AmplitudeService implements OnModuleInit {
+	private client: ReturnType<typeof Amplitude.init>;
+
 	constructor(
 		@InjectRepository(UserEntity)
 		private readonly userRepository: Repository<UserEntity>,
 	) {}
 
-	public async formAndSendLogRecord(event_type: AmplitudeEventTypeEnum, user_id: string, options = null) {
+	public onModuleInit(): void {
+		if (process.env.AMPLITUDE_API_KEY) {
+			this.client = Amplitude.init(process.env.AMPLITUDE_API_KEY);
+		}
+	}
+
+	public async formAndSendLogRecord(
+		event_type: AmplitudeEventTypeEnum,
+		user_id: string,
+		options?: AmplitudeLogOptions,
+	): Promise<void> {
 		try {
 			if (process.env.NODE_ENV === 'test') return;
 			let user_email = (await this.userRepository.findOne({ where: { id: user_id } }))?.email;
 			if (!user_email && options) {
-				user_email = options?.user_email;
+				user_email = options.user_email;
 			}
-			let event_properties;
+			let event_properties: Record<string, unknown> | undefined;
 			if (user_email) {
 				event_properties = {
 					user_properties: {
-						email: user_email ? user_email : 'unknown',
-						tablesCount: options?.tablesCount ? options.tablesCount : undefined,
-						reason: options?.reason ? options?.reason : undefined,
-						message: options?.message ? options.message : undefined,
+						email: user_email ?? 'unknown',
+						tablesCount: options?.tablesCount,
+						reason: options?.reason,
+						message: options?.message,
 					},
 				};
 			}
-			if (options?.operationCount && options?.operationCount > 0) {
+			if (options?.operationCount && options.operationCount > 0) {
 				const promisesArr = Array.from(Array(options.operationCount), () =>
 					this.sendLog(event_type, user_id, event_properties),
 				);
@@ -43,21 +63,19 @@ export class AmplitudeService {
 		}
 	}
 
-	private async sendLog(eventType, cognitoUserName, eventProperties) {
-		const client = Amplitude.init(process.env.AMPLITUDE_API_KEY);
+	private async sendLog(
+		eventType: AmplitudeEventTypeEnum,
+		userId: string,
+		eventProperties?: Record<string, unknown>,
+	): Promise<void> {
+		if (!this.client) return;
 		try {
-			client
-				.logEvent({
-					event_type: eventType,
-					user_id: cognitoUserName,
-					event_properties: eventProperties ? eventProperties : undefined,
-				})
-				.catch((e) => {
-					throw new Error(e);
-				});
-			client.flush().catch((e) => {
-				throw new Error(e);
+			await this.client.logEvent({
+				event_type: eventType,
+				user_id: userId,
+				event_properties: eventProperties,
 			});
+			await this.client.flush();
 		} catch (e) {
 			console.error(e);
 		}

backend/src/entities/company-info/company-info-helper.service.ts

@@ -21,9 +21,10 @@ export class CompanyInfoHelperService {
 
 		const companyInformationFromSaaS = await this.saasCompanyGatewayService.getCompanyInfo(companyId);
 
-		const countUsersInCompany = await this._dbContext.userRepository.countUsersInCompany(companyId);
-		const countInvitationsInCompany =
-			await this._dbContext.invitationInCompanyRepository.countNonExpiredInvitationsInCompany(companyId);
+		const [countUsersInCompany, countInvitationsInCompany] = await Promise.all([
+			this._dbContext.userRepository.countUsersInCompany(companyId),
+			this._dbContext.invitationInCompanyRepository.countNonExpiredInvitationsInCompany(companyId),
+		]);
 
 		if (companyInformationFromSaaS.subscriptionLevel === SubscriptionLevelEnum.FREE_PLAN) {
 			return countUsersInCompany + countInvitationsInCompany < Constants.FREE_PLAN_USERS_COUNT;

backend/src/entities/company-info/company-info.controller.ts

@@ -81,6 +81,7 @@ import {
 	IRemoveUserFromCompany,
 	IRevokeUserInvitationInCompany,
 	ISuspendUsersInCompany,
+	IUnsuspendUsersInCompany,
 	IToggleCompanyTestConnectionsMode,
 	IUpdateCompanyName,
 	IUpdateUsers2faStatusInCompany,
@@ -128,7 +129,7 @@ export class CompanyInfoController {
 		@Inject(UseCaseType.SUSPEND_USERS_IN_COMPANY)
 		private readonly suspendUsersInCompanyUseCase: ISuspendUsersInCompany,
 		@Inject(UseCaseType.UNSUSPEND_USERS_IN_COMPANY)
-		private readonly unSuspendUsersInCompanyUseCase: ISuspendUsersInCompany,
+		private readonly unSuspendUsersInCompanyUseCase: IUnsuspendUsersInCompany,
 		@Inject(UseCaseType.TOGGLE_TEST_CONNECTIONS_DISPLAY_MODE_IN_COMPANY)
 		private readonly toggleTestConnectionsCompanyDisplayModeUseCase: IToggleCompanyTestConnectionsMode,
 		@Inject(UseCaseType.UPLOAD_COMPANY_LOGO)

backend/src/entities/company-info/invitation-in-company/repository/invitation-in-company-custom-repository-extension.ts

@@ -52,7 +52,7 @@ export const invitationInCompanyCustomRepositoryExtension: IInvitationInCompanyR
 			.leftJoinAndSelect('invitation_in_company.company', 'company')
 			.leftJoinAndSelect('company.users', 'users')
 			.where("invitation_in_company.createdAt > NOW() - INTERVAL '1 day'")
-			.where('invitation_in_company.verification_string = :verificationString', { verificationString });
+			.andWhere('invitation_in_company.verification_string = :verificationString', { verificationString });
 		return await qb.getOne();
 	},
 

backend/src/entities/company-info/repository/company-info-custom-repository.extension.ts

@@ -26,13 +26,6 @@ export const companyInfoRepositoryExtension: ICompanyInfoRepository = {
 			.getOne();
 	},
 
-	async finOneCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity> {
-		return await this.createQueryBuilder('company_info')
-			.leftJoinAndSelect('company_info.users', 'users')
-			.where('users.id = :userId', { userId })
-			.getOne();
-	},
-
 	async findCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity> {
 		return await this.createQueryBuilder('company_info')
 			.leftJoinAndSelect('company_info.users', 'users')
@@ -94,9 +87,10 @@ export const companyInfoRepositoryExtension: ICompanyInfoRepository = {
 			.andWhere('connections.isTestConnection IS FALSE')
 			.andWhere('connections.is_frozen IS FALSE')
 			.getMany();
-		return foundCompaniesWithPaidConnections.map((companyInfo: CompanyInfoEntity) => {
-			return companyInfo.connections;
-		});
+		return foundCompaniesWithPaidConnections
+			.map((companyInfo: CompanyInfoEntity) => companyInfo.connections)
+			.filter(Boolean)
+			.flat();
 	},
 
 	async findCompanyFrozenPaidConnections(companyIds: Array<string>): Promise<Array<ConnectionEntity>> {
@@ -108,9 +102,10 @@ export const companyInfoRepositoryExtension: ICompanyInfoRepository = {
 			.andWhere('connections.isTestConnection IS FALSE')
 			.andWhere('connections.is_frozen IS TRUE')
 			.getMany();
-		return foundCompaniesWithPaidConnections.map((companyInfo: CompanyInfoEntity) => {
-			return companyInfo.connections;
-		});
+		return foundCompaniesWithPaidConnections
+			.map((companyInfo: CompanyInfoEntity) => companyInfo.connections)
+			.filter(Boolean)
+			.flat();
 	},
 
 	async findCompanyWithLogo(companyId: string): Promise<CompanyInfoEntity> {

backend/src/entities/company-info/repository/company-info-repository.interface.ts

@@ -8,8 +8,6 @@ export interface ICompanyInfoRepository {
 
 	findOneCompanyInfoByUserIdWithConnections(userId: string): Promise<CompanyInfoEntity>;
 
-	finOneCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity>;
-
 	findCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity>;
 
 	findFullCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity>;

backend/src/entities/company-info/use-cases/company-info-use-cases.interface.ts

@@ -84,6 +84,8 @@ export interface ISuspendUsersInCompany {
 	execute(inputData: SuspendUsersInCompanyDS, inTransaction: InTransactionEnum): Promise<SuccessResponse>;
 }
 
+export type IUnsuspendUsersInCompany = ISuspendUsersInCompany;
+
 export interface IToggleCompanyTestConnectionsMode {
 	execute(inputData: ToggleTestConnectionDisplayModeDs, inTransaction: InTransactionEnum): Promise<SuccessResponse>;
 }

backend/src/entities/company-info/use-cases/toggle-test-connections-company-display-mode.use.case.ts

@@ -21,7 +21,7 @@ export class ToggleCompanyTestConnectionsDisplayModeUseCase
 
 	public async implementation(inputData: ToggleTestConnectionDisplayModeDs): Promise<SuccessResponse> {
 		const { userId, displayMode } = inputData;
-		const foundCompanyInfo = await this._dbContext.companyInfoRepository.finOneCompanyInfoByUserId(userId);
+		const foundCompanyInfo = await this._dbContext.companyInfoRepository.findCompanyInfoByUserId(userId);
 		if (!foundCompanyInfo) {
 			throw new NotFoundException(Messages.COMPANY_NOT_FOUND);
 		}

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

@@ -1,18 +1,18 @@
 export class CreateConnectionPropertiesDs {
-	hidden_tables: Array<string>;
 	userId: string;
 	connectionId: string;
 	master_password: string;
-	logo_url: string;
-	primary_color: string;
-	secondary_color: string;
-	hostname: string;
-	company_name: string;
-	tables_audit: boolean;
-	human_readable_table_names: boolean;
-	allow_ai_requests: boolean;
-	default_showing_table: string;
-	table_categories: Array<{
+	hidden_tables?: Array<string>;
+	logo_url?: string;
+	primary_color?: string;
+	secondary_color?: string;
+	hostname?: string;
+	company_name?: string;
+	tables_audit?: boolean;
+	human_readable_table_names?: boolean;
+	allow_ai_requests?: boolean;
+	default_showing_table?: string;
+	table_categories?: Array<{
 		category_name: string;
 		tables: Array<string>;
 		category_color: string;