feat: update SlugUuidParameter and refactor batchId handling in TableSchemaChangeEntity

Author: Artuomka

backend/src/decorators/slug-uuid.decorator.ts

@@ -15,7 +15,9 @@ export type SlugUuidParameter =
 	| 'companyId'
 	| 'threadId'
 	| 'filterId'
-	| 'chatId';
+	| 'chatId'
+	| 'changeId'
+	| 'batchId';
 export const SlugUuid = createParamDecorator(
 	(parameterName: SlugUuidParameter = 'slug', ctx: ExecutionContext): string => {
 		const request: IRequestWithCognitoInfo = ctx.switchToHttp().getRequest();
@@ -32,6 +34,8 @@ export const SlugUuid = createParamDecorator(
 			'threadId',
 			'filterId',
 			'chatId',
+			'changeId',
+			'batchId',
 		];
 		if (!availableSlagParameters.includes(parameterName)) {
 			throw new BadRequestException(Messages.UUID_INVALID);

backend/src/entities/table-schema/table-schema-change.entity.ts

@@ -15,7 +15,7 @@ export class TableSchemaChangeEntity {
 	@Column({ type: 'varchar', length: 38 })
 	connectionId: string;
 
-	@Column({ type: 'varchar', length: 38, nullable: true })
+	@Column({ type: 'uuid', nullable: true })
 	batchId: string | null;
 
 	@Column({ type: 'int', default: 0 })

backend/src/entities/table-schema/table-schema.controller.ts

@@ -6,7 +6,6 @@ import {
 	HttpStatus,
 	Inject,
 	Injectable,
-	Param,
 	Post,
 	Query,
 	UseGuards,
@@ -101,7 +100,7 @@ export class TableSchemaController {
 	@Post('/table-schema/change/:changeId/approve')
 	@HttpCode(HttpStatus.OK)
 	async approve(
-		@Param('changeId') changeId: string,
+		@SlugUuid('changeId') changeId: string,
 		@UserId() userId: string,
 		@MasterPassword() masterPassword: string,
 		@Body() body: ApproveSchemaChangeDto,
@@ -121,7 +120,7 @@ export class TableSchemaController {
 	@UseGuards(SchemaChangeOwnershipGuard)
 	@Post('/table-schema/change/:changeId/reject')
 	@HttpCode(HttpStatus.OK)
-	async reject(@Param('changeId') changeId: string, @UserId() userId: string): Promise<SchemaChangeResponseDto> {
+	async reject(@SlugUuid('changeId') changeId: string, @UserId() userId: string): Promise<SchemaChangeResponseDto> {
 		return await this.rejectSchemaChangeUseCase.execute({ changeId, userId });
 	}
 
@@ -132,7 +131,7 @@ export class TableSchemaController {
 	@Post('/table-schema/change/:changeId/rollback')
 	@HttpCode(HttpStatus.OK)
 	async rollback(
-		@Param('changeId') changeId: string,
+		@SlugUuid('changeId') changeId: string,
 		@UserId() userId: string,
 		@MasterPassword() masterPassword: string,
 	): Promise<SchemaChangeResponseDto> {
@@ -162,7 +161,7 @@ export class TableSchemaController {
 	@ApiResponse({ status: 200, type: SchemaChangeResponseDto })
 	@UseGuards(SchemaChangeOwnershipGuard)
 	@Get('/table-schema/change/:changeId')
-	async get(@Param('changeId') changeId: string, @UserId() userId: string): Promise<SchemaChangeResponseDto> {
+	async get(@SlugUuid('changeId') changeId: string, @UserId() userId: string): Promise<SchemaChangeResponseDto> {
 		return await this.getSchemaChangeUseCase.execute({ changeId, userId });
 	}
 
@@ -177,7 +176,7 @@ export class TableSchemaController {
 	@Post('/table-schema/batch/:batchId/approve')
 	@HttpCode(HttpStatus.OK)
 	async approveBatch(
-		@Param('batchId') batchId: string,
+		@SlugUuid('batchId') batchId: string,
 		@UserId() userId: string,
 		@MasterPassword() masterPassword: string,
 		@Body() body: ApproveBatchSchemaChangeDto,
@@ -197,7 +196,7 @@ export class TableSchemaController {
 	@Post('/table-schema/batch/:batchId/reject')
 	@HttpCode(HttpStatus.OK)
 	async rejectBatch(
-		@Param('batchId') batchId: string,
+		@SlugUuid('batchId') batchId: string,
 		@UserId() userId: string,
 	): Promise<SchemaChangeBatchResponseDto> {
 		return await this.rejectBatchSchemaChangeUseCase.execute({ batchId, userId });
@@ -210,7 +209,7 @@ export class TableSchemaController {
 	@Post('/table-schema/batch/:batchId/rollback')
 	@HttpCode(HttpStatus.OK)
 	async rollbackBatch(
-		@Param('batchId') batchId: string,
+		@SlugUuid('batchId') batchId: string,
 		@UserId() userId: string,
 		@MasterPassword() masterPassword: string,
 	): Promise<SchemaChangeBatchResponseDto> {
@@ -222,7 +221,10 @@ export class TableSchemaController {
 	@ApiResponse({ status: 200, type: SchemaChangeBatchResponseDto })
 	@UseGuards(SchemaChangeBatchOwnershipGuard)
 	@Get('/table-schema/batch/:batchId')
-	async getBatch(@Param('batchId') batchId: string, @UserId() userId: string): Promise<SchemaChangeBatchResponseDto> {
+	async getBatch(
+		@SlugUuid('batchId') batchId: string,
+		@UserId() userId: string,
+	): Promise<SchemaChangeBatchResponseDto> {
 		return await this.getBatchSchemaChangeUseCase.execute({ batchId, userId });
 	}
 }

backend/src/entities/table-schema/use-cases/generate-schema-change.use-case.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Inject, Injectable, Logger, 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/shared/enums/connection-types-enum.js';
-import { nanoid } from 'nanoid';
+import crypto from 'crypto';
 import { AICoreService, AIProviderType, MessageBuilder } from '../../../ai-core/index.js';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
 import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
@@ -115,7 +115,7 @@ export class GenerateSchemaChangeUseCase
 		const aiModelUsed =
 			this.aiCoreService.getAvailableProviders().find((p) => p.type === this.provider)?.defaultModel ?? null;
 
-		const batchId = nanoid(12);
+		const batchId = crypto.randomUUID();
 		const items: Partial<TableSchemaChangeEntity>[] = proposals.map((proposal, index) => ({
 			connectionId,
 			batchId,

backend/src/entities/table-schema/utils/schema-change-batch-ownership.guard.ts

@@ -10,6 +10,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { IRequestWithCognitoInfo } from '../../../authorization/index.js';
 import { Messages } from '../../../exceptions/text/messages.js';
+import { ValidationHelper } from '../../../helpers/validators/validation-helper.js';
 import { CedarAction } from '../../cedar-authorization/cedar-action-map.js';
 import { CedarAuthorizationService } from '../../cedar-authorization/cedar-authorization.service.js';
 import { TableSchemaChangeEntity } from '../table-schema-change.entity.js';
@@ -27,7 +28,7 @@ export class SchemaChangeBatchOwnershipGuard implements CanActivate {
 		const userId = request.decoded.sub;
 		const batchId: string = request.params?.batchId;
 
-		if (!batchId || batchId.length > 64) {
+		if (!batchId || !ValidationHelper.isValidUUID(batchId)) {
 			throw new BadRequestException('Invalid or missing batchId.');
 		}
 

backend/src/migrations/1777295364595-AddBatchColumnsToTableSchemaChange.ts

@@ -4,7 +4,7 @@ export class AddBatchColumnsToTableSchemaChange1777295364595 implements Migratio
 	name = 'AddBatchColumnsToTableSchemaChange1777295364595';
 
 	public async up(queryRunner: QueryRunner): Promise<void> {
-		await queryRunner.query(`ALTER TABLE "table_schema_change" ADD "batchId" character varying(38)`);
+		await queryRunner.query(`ALTER TABLE "table_schema_change" ADD "batchId" uuid`);
 		await queryRunner.query(`ALTER TABLE "table_schema_change" ADD "orderInBatch" integer NOT NULL DEFAULT '0'`);
 		await queryRunner.query(`CREATE INDEX "IDX_tsc_batch_order" ON "table_schema_change" ("batchId", "orderInBatch") `);
 	}