refactor(api): consolidate fixes for areas, invitations, and state management (#108)

maksberegovoi · soorq · commit 476721112e5f · 2026-06-23T19:57:15.000+03:00
* refactor(area): fix area update * refactor(area): fix area creating and update response * refactor(area): fix deleting area * refactor(invitations): fix getting invitations query * refactor(state): rename `orderIndex` to `position` * Feat/casl (#101) * feat(authorization): implement role-based access control system * feat(teams): add ability-based access control for invitations, roles, and team management * refactor(teams): rename TEAMS to TEAM * refactor(teams): update imports
diff --git a/src/area/application/controllers/area/swagger.ts b/src/area/application/controllers/area/swagger.ts
@@ -10,7 +10,13 @@ import {
 import { ZOD_RESPONSE_TOKEN } from '@shared/interceptors';
 import { ActionResponse } from '@shared/schemas';
 
-import { CreateAreaDto, UpdateAreaDto, AreaResponse, AreasResponse } from '../../dtos';
+import {
+    CreateAreaDto,
+    UpdateAreaDto,
+    AreaResponse,
+    AreasResponse,
+    CreateAreaResponse,
+} from '../../dtos';
 
 export const CreateAreaSwagger = () =>
     applyDecorators(
@@ -42,14 +48,14 @@ export const CreateAreaSwagger = () =>
         ApiResponse({
             status: 201,
             description: 'Область успешно создана',
-            type: ActionResponse.Output,
+            type: CreateAreaResponse.Output,
         }),
         ApiValidationError(),
         ApiUnauthorized(),
         ApiForbidden('Нет прав для создания области в этом проекте'),
         ApiConflict('Область с таким названием или slug уже существует'),
 
-        SetMetadata(ZOD_RESPONSE_TOKEN, ActionResponse),
+        SetMetadata(ZOD_RESPONSE_TOKEN, CreateAreaResponse),
     );
 
 export const FindAllAreasSwagger = () =>
diff --git a/src/area/application/dtos/area.dto.ts b/src/area/application/dtos/area.dto.ts
@@ -1,4 +1,5 @@
 import { DEFAULT_VIEWS } from '@core/area/domain/entities';
+import { ActionResponseSchema } from '@shared/schemas';
 import { createZodDto } from 'nestjs-zod';
 import { z } from 'zod/v4';
 
@@ -65,6 +66,7 @@ export const AreaSchema = z.object({
     maxTasksLimit: z
         .number()
         .int('Лимит задач должен быть целым числом')
+        .max(100000, 'Лимит задач не может превышать 100 000')
         .positive('Лимит задач должен быть положительным числом')
         .nullable()
         .optional()
@@ -117,6 +119,12 @@ export const CreateAreaSchema = AreaSchema.omit({
     })
     .describe('Схема для создания новой области');
 
+export const CreateAreaResponseSchema = ActionResponseSchema.extend({
+    slug: z.string(
+        'URL-дружественный идентификатор (например: "development", "contract-approval")',
+    ),
+});
+
 export const UpdateAreaSchema = CreateAreaSchema.partial()
     .refine((data) => Object.keys(data).length > 0, {
         error: 'Необходимо передать хотя бы одно поле для обновления',
@@ -126,6 +134,7 @@ export const UpdateAreaSchema = CreateAreaSchema.partial()
 
 export const AreasSchema = z.array(AreaSchema);
 
+export class CreateAreaResponse extends createZodDto(CreateAreaResponseSchema) {}
 export class AreaResponse extends createZodDto(AreaSchema) {}
 export class AreasResponse extends createZodDto(AreasSchema) {}
 export class CreateAreaDto extends createZodDto(CreateAreaSchema) {}
diff --git a/src/area/application/dtos/state.dto.ts b/src/area/application/dtos/state.dto.ts
@@ -47,7 +47,7 @@ export const StateSchema = z.object({
         .nullable()
         .optional()
         .describe('Emoji или иконка для визуального обозначения (например: "📋", "🚀", "✅")'),
-    orderIndex: z
+    position: z
         .number()
         .int('Порядковый номер должен быть целым числом')
         .min(0, 'Порядковый номер не может быть отрицательным')
@@ -60,6 +60,7 @@ export const StateSchema = z.object({
     maxTasksLimit: z
         .number()
         .int('Лимит задач должен быть целым числом')
+        .max(100000, 'Лимит задач должен быть целым числом')
         .positive('Лимит задач должен быть положительным числом')
         .nullable()
         .optional()
diff --git a/src/area/application/use-cases/areas/create.use-case.ts b/src/area/application/use-cases/areas/create.use-case.ts
@@ -40,7 +40,7 @@ export class CreateAreaUseCase {
                 );
             }
 
-            const existingArea = await this.areaRepo.findBySlug(project.id, currentSlug);
+            const existingArea = await this.areaRepo.findBySlug(currentSlug, project.id);
 
             if (existingArea) {
                 throw new BaseException(
diff --git a/src/area/application/use-cases/areas/delete.use-case.ts b/src/area/application/use-cases/areas/delete.use-case.ts
@@ -19,7 +19,7 @@ export class DeleteAreaUseCase {
                 'owner',
             ]);
 
-            const area = await this.areaRepo.findBySlug(project.id, key);
+            const area = await this.areaRepo.findBySlug(key, project.id);
 
             if (!area) {
                 throw new BaseException(
diff --git a/src/area/application/use-cases/areas/update.use-case.ts b/src/area/application/use-cases/areas/update.use-case.ts
@@ -7,7 +7,7 @@ import slugify from 'slugify';
 
 import { UpdateAreaDto } from '../../dtos';
 
-import type { NewArea } from '../../../domain/entities';
+import type { Area } from '../../../domain/entities';
 
 @Injectable()
 export class UpdateAreaUseCase {
@@ -24,7 +24,7 @@ export class UpdateAreaUseCase {
                 'owner',
             ]);
 
-            const area = await this.areaRepo.findBySlug(project.id, key);
+            const area = await this.areaRepo.findBySlug(key, project.id);
 
             if (!area) {
                 throw new BaseException(
@@ -36,75 +36,13 @@ export class UpdateAreaUseCase {
                 );
             }
 
-            const updateData: Partial<NewArea> = {
-                updatedAt: new Date().toISOString(),
-                ...(dto.title && dto.title !== area.title && { title: dto.title.trim() }),
-                ...(dto.description &&
-                    dto.description !== area.description && {
-                        description: dto.description?.trim() || null,
-                    }),
-                ...(dto.descriptionHtml &&
-                    dto.descriptionHtml !== area.descriptionHtml && {
-                        descriptionHtml: dto.descriptionHtml?.trim() || null,
-                    }),
-                ...(dto.color && dto.color !== area.color && { color: dto.color || null }),
-                ...(dto.icon && dto.icon !== area.icon && { icon: dto.icon || null }),
-                ...(dto.defaultView &&
-                    dto.defaultView !== area.defaultView && { defaultView: dto.defaultView }),
-                ...(dto.position &&
-                    dto.position !== area.position &&
-                    dto.position >= 0 && { position: dto.position }),
-                ...(dto.maxTasksLimit &&
-                    dto.maxTasksLimit !== area.maxTasksLimit &&
-                    dto.maxTasksLimit > 0 && { maxTasksLimit: dto.maxTasksLimit }),
-                ...(dto.isLocked && dto.isLocked !== area.isLocked && { isLocked: dto.isLocked }),
-            };
-
-            let hasChanges = false;
+            const updateData = this.buildUpdateData(area, dto);
 
             if (dto.slug && dto.slug !== area.slug) {
-                let newSlug = dto.slug;
-
-                if (newSlug) {
-                    newSlug = slugify(newSlug, {
-                        lower: true,
-                        strict: true,
-                        trim: true,
-                    });
-
-                    if (!newSlug) {
-                        throw new BaseException(
-                            {
-                                code: AreaErrorCodes.SLUG_INVALID,
-                                message: AreaErrorMessages[AreaErrorCodes.SLUG_INVALID],
-                            },
-                            HttpStatus.BAD_REQUEST,
-                        );
-                    }
-
-                    const existingArea = await this.areaRepo.findBySlug(project.id, newSlug);
-                    if (existingArea && existingArea.id !== area.id) {
-                        throw new BaseException(
-                            {
-                                code: AreaErrorCodes.SLUG_DUPLICATE,
-                                message: AreaErrorMessages[AreaErrorCodes.SLUG_DUPLICATE],
-                            },
-                            HttpStatus.CONFLICT,
-                        );
-                    }
-
-                    updateData.slug = newSlug;
-                } else {
-                    updateData.slug = slugify(updateData.title || area.title, {
-                        lower: true,
-                        strict: true,
-                        trim: true,
-                    });
-                }
-                hasChanges = true;
+                await this.updateSlug(project.id, area, dto.slug, updateData);
             }
 
-            if (!hasChanges) {
+            if (Object.keys(updateData).length === 0) {
                 return {
                     success: true,
                     message: 'Нет изменений для обновления',
@@ -131,4 +69,86 @@ export class UpdateAreaUseCase {
             );
         }
     }
+
+    private buildUpdateData(area: Area, dto: UpdateAreaDto): Partial<Area> {
+        const updateData: Partial<Area> = {};
+
+        if (dto.title !== undefined && dto.title !== area.title) {
+            updateData.title = dto.title.trim();
+        }
+
+        if (dto.description !== undefined && dto.description !== area.description) {
+            updateData.description = dto.description?.trim() ?? null;
+        }
+
+        if (dto.descriptionHtml !== undefined && dto.descriptionHtml !== area.descriptionHtml) {
+            updateData.descriptionHtml = dto.descriptionHtml?.trim() ?? null;
+        }
+
+        if (dto.color !== undefined && dto.color !== area.color) {
+            updateData.color = dto.color ?? null;
+        }
+
+        if (dto.icon !== undefined && dto.icon !== area.icon) {
+            updateData.icon = dto.icon ?? null;
+        }
+
+        if (dto.defaultView !== undefined && dto.defaultView !== area.defaultView) {
+            updateData.defaultView = dto.defaultView;
+        }
+
+        if (dto.position !== undefined && dto.position !== area.position && dto.position >= 0) {
+            updateData.position = dto.position;
+        }
+
+        if (
+            dto.maxTasksLimit &&
+            dto.maxTasksLimit !== area.maxTasksLimit &&
+            dto.maxTasksLimit > 0
+        ) {
+            updateData.maxTasksLimit = dto.maxTasksLimit;
+        }
+
+        if (dto.isLocked !== undefined && dto.isLocked !== area.isLocked) {
+            updateData.isLocked = dto.isLocked;
+        }
+
+        return updateData;
+    }
+
+    private async updateSlug(
+        projectId: string,
+        area: Area,
+        slug: string,
+        updateData: Partial<Area>,
+    ): Promise<void> {
+        const newSlug = slugify(slug, {
+            lower: true,
+            strict: true,
+            trim: true,
+        });
+
+        if (!newSlug) {
+            throw new BaseException(
+                {
+                    code: AreaErrorCodes.SLUG_INVALID,
+                    message: AreaErrorMessages[AreaErrorCodes.SLUG_INVALID],
+                },
+                HttpStatus.BAD_REQUEST,
+            );
+        }
+
+        const existingArea = await this.areaRepo.findBySlug(projectId, slug);
+        if (existingArea && existingArea.id !== area.id) {
+            throw new BaseException(
+                {
+                    code: AreaErrorCodes.SLUG_DUPLICATE,
+                    message: AreaErrorMessages[AreaErrorCodes.SLUG_DUPLICATE],
+                },
+                HttpStatus.CONFLICT,
+            );
+        }
+
+        updateData.slug = slug;
+    }
 }
diff --git a/src/area/application/use-cases/states/reorder.use-case.ts b/src/area/application/use-cases/states/reorder.use-case.ts
@@ -15,6 +15,14 @@ export class ReorderStateUseCase {
     ) {}
 
     async execute(slug: string, _dto: ReordersStatesDto, userId: string) {
+        throw new BaseException(
+            {
+                code: 'NOT_IMPLEMENTED',
+                message: 'Функция в разработке',
+            },
+            HttpStatus.NOT_IMPLEMENTED,
+        );
+
         try {
             const area = await this.getAreaQ.execute({ key: slug }, userId);
 
diff --git a/src/area/application/use-cases/states/update.use-case.ts b/src/area/application/use-cases/states/update.use-case.ts
@@ -16,6 +16,7 @@ export class UpdateStateUseCase {
 
     async execute(slug: string, stateId: string, dto: UpdateStateDto, userId: string) {
         try {
+            //TODO: 500 for unique constraint
             const area = await this.getAreaQ.execute({ key: slug }, userId);
 
             const state = await this.stateRepo.findOne(area.id, stateId);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class CreateAreaUseCase {`
`40`	`40`	`);`
`41`	`41`	`}`
`42`	`42`
`43`		`- const existingArea = await this.areaRepo.findBySlug(project.id, currentSlug);`
	`43`	`+ const existingArea = await this.areaRepo.findBySlug(currentSlug, project.id);`
`44`	`44`
`45`	`45`	`if (existingArea) {`
`46`	`46`	`throw new BaseException(`