From d56368ed856412a4ae96d42d37342e9e81dc19f5 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Mon, 12 Oct 2026 10:08:31 +0500 Subject: [PATCH 1/6] feat(projects): protect occupied agile columns --- .../domain/project-column-repository.port.ts | 11 +- .../typeorm-project-column.repository.spec.ts | 179 ++++++++++++++++++ .../typeorm-project-column.repository.ts | 57 +++++- .../project/project-column.service.spec.ts | 26 ++- .../modules/project/project-column.service.ts | 13 +- 5 files changed, 272 insertions(+), 14 deletions(-) create mode 100644 alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.spec.ts diff --git a/alfy-bot/src/modules/project/domain/project-column-repository.port.ts b/alfy-bot/src/modules/project/domain/project-column-repository.port.ts index c596387..a3417d5 100644 --- a/alfy-bot/src/modules/project/domain/project-column-repository.port.ts +++ b/alfy-bot/src/modules/project/domain/project-column-repository.port.ts @@ -8,6 +8,13 @@ export abstract class ProjectColumnRepositoryPort { ): Promise; abstract create(data: Partial): Promise; abstract save(column: ProjectColumn): Promise; - abstract delete(id: string, projectId: string): Promise; - abstract reorder(updates: { id: string; order: number }[]): Promise; + abstract delete( + id: string, + projectId: string, + isAgile: boolean, + ): Promise; + abstract reorder( + projectId: string, + updates: { id: string; order: number }[], + ): Promise; } diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.spec.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.spec.ts new file mode 100644 index 0000000..8b64e57 --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.spec.ts @@ -0,0 +1,179 @@ +import { ConflictException, BadRequestException } from '@nestjs/common'; +import { DataSource } from 'typeorm'; +import { + BoardGroup, + PomodoroConfig, + Project, + ProjectColumn, + Release, + Sprint, + Task, + User, +} from '../../../shared/entities'; +import { TypeOrmProjectColumnRepository } from './typeorm-project-column.repository'; + +describe('TypeOrmProjectColumnRepository (SQLite)', () => { + let db: DataSource; + let repository: TypeOrmProjectColumnRepository; + + beforeEach(async () => { + db = new DataSource({ + type: 'sqlite', + database: ':memory:', + entities: [ + User, + Project, + ProjectColumn, + Task, + PomodoroConfig, + BoardGroup, + Sprint, + Release, + ], + synchronize: true, + }); + await db.initialize(); + await db.getRepository(User).save({ id: 1 }); + await db.getRepository(Project).save([ + { id: 'agile', userId: 1, title: 'Agile', type: 'agile' }, + { + id: 'simple', + userId: 1, + title: 'Simple', + type: 'simple', + viewMode: 'board', + }, + { id: 'other', userId: 1, title: 'Other', type: 'agile' }, + ]); + await db.getRepository(ProjectColumn).save([ + { id: 'a1', projectId: 'agile', title: 'A1', order: 0 }, + { id: 'a2', projectId: 'agile', title: 'A2', order: 1 }, + { id: 's1', projectId: 'simple', title: 'S1', order: 0 }, + { id: 'o1', projectId: 'other', title: 'O1', order: 0 }, + ]); + repository = new TypeOrmProjectColumnRepository( + db.getRepository(ProjectColumn), + ); + }); + + afterEach(async () => db.destroy()); + + it.each([false, true])( + 'отклоняет удаление Agile-колонки с задачей completed=%s', + async (completed) => { + await db.getRepository(Task).save({ + id: 'task', + userId: 1, + title: 'Task', + projectId: 'agile', + columnId: 'a1', + completed, + }); + + await expect(repository.delete('a1', 'agile', true)).rejects.toThrow( + ConflictException, + ); + expect(await db.getRepository(ProjectColumn).countBy({ id: 'a1' })).toBe( + 1, + ); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: 'task' })).columnId, + ).toBe('a1'); + }, + ); + + it('учитывает задачу закрытого спринта', async () => { + await db.getRepository(Sprint).save({ + id: 'sprint', + userId: 1, + projectId: 'agile', + name: 'Past', + status: 'closed', + }); + await db.getRepository(Task).save({ + id: 'task', + userId: 1, + title: 'Task', + projectId: 'agile', + columnId: 'a1', + sprintId: 'sprint', + completed: true, + }); + + await expect(repository.delete('a1', 'agile', true)).rejects.toThrow( + ConflictException, + ); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: 'task' })).columnId, + ).toBe('a1'); + }); + + it('подсказывает перенести задачи при отказе удаления', async () => { + await db.getRepository(Task).save({ + id: 'task', + userId: 1, + title: 'Task', + projectId: 'agile', + columnId: 'a1', + }); + + await expect(repository.delete('a1', 'agile', true)).rejects.toThrow( + 'Сначала перенесите задачи в другую колонку.', + ); + }); + + it('удаляет пустую Agile-колонку', async () => { + await expect(repository.delete('a1', 'agile', true)).resolves.toBe(true); + expect(await db.getRepository(ProjectColumn).countBy({ id: 'a1' })).toBe(0); + }); + + it('сохраняет прежнее удаление занятой колонки простой доски', async () => { + await db.getRepository(Task).save({ + id: 'task', + userId: 1, + title: 'Task', + projectId: 'simple', + columnId: 's1', + }); + + await expect(repository.delete('s1', 'simple', false)).resolves.toBe(true); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: 'task' })).columnId, + ).toBeNull(); + }); + + it('отклоняет чужой ID без частичной перестановки', async () => { + await expect( + repository.reorder('agile', [ + { id: 'a2', order: 0 }, + { id: 'o1', order: 1 }, + ]), + ).rejects.toThrow(BadRequestException); + expect((await repository.findById('a1', 'agile'))?.order).toBe(0); + expect((await repository.findById('a2', 'agile'))?.order).toBe(1); + expect((await repository.findById('o1', 'other'))?.order).toBe(0); + }); + + it('требует полный список без повторов', async () => { + await expect( + repository.reorder('agile', [{ id: 'a1', order: 0 }]), + ).rejects.toThrow(BadRequestException); + await expect( + repository.reorder('agile', [ + { id: 'a1', order: 0 }, + { id: 'a1', order: 1 }, + ]), + ).rejects.toThrow(BadRequestException); + }); + + it('переставляет все колонки только указанного проекта', async () => { + await repository.reorder('agile', [ + { id: 'a2', order: 0 }, + { id: 'a1', order: 1 }, + ]); + expect( + (await repository.findAllByProject('agile')).map((c) => c.id), + ).toEqual(['a2', 'a1']); + expect((await repository.findById('o1', 'other'))?.order).toBe(0); + }); +}); diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.ts index 4c87994..d303ae5 100644 --- a/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.ts +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-project-column.repository.ts @@ -1,4 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { + BadRequestException, + ConflictException, + Injectable, +} from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { ProjectColumn } from '../../../shared/entities'; @@ -33,16 +37,57 @@ export class TypeOrmProjectColumnRepository extends ProjectColumnRepositoryPort return this.repo.save(column); } - async delete(id: string, projectId: string): Promise { + async delete( + id: string, + projectId: string, + isAgile: boolean, + ): Promise { + if (isAgile) { + const result = await this.repo + .createQueryBuilder() + .delete() + .from(ProjectColumn) + .where('id = :id AND projectId = :projectId', { id, projectId }) + .andWhere( + 'NOT EXISTS (SELECT 1 FROM tasks WHERE tasks.columnId = project_columns.id)', + ) + .execute(); + if (result.affected) return true; + if (await this.findById(id, projectId)) { + throw new ConflictException( + 'Нельзя удалить колонку, пока в ней есть задачи. Сначала перенесите задачи в другую колонку.', + ); + } + return false; + } + const column = await this.findById(id, projectId); if (!column) return false; await this.repo.remove(column); return true; } - async reorder(updates: { id: string; order: number }[]): Promise { - await Promise.all( - updates.map(({ id, order }) => this.repo.update(id, { order })), - ); + async reorder( + projectId: string, + updates: { id: string; order: number }[], + ): Promise { + await this.repo.manager.transaction(async (manager) => { + const columns = await manager + .getRepository(ProjectColumn) + .find({ where: { projectId } }); + const ids = new Set(columns.map((column) => column.id)); + if ( + updates.length !== columns.length || + new Set(updates.map((update) => update.id)).size !== columns.length || + updates.some((update) => !ids.has(update.id)) + ) { + throw new BadRequestException( + 'Укажите все колонки проекта без повторов', + ); + } + for (const { id, order } of updates) { + await manager.update(ProjectColumn, { id, projectId }, { order }); + } + }); } } diff --git a/alfy-bot/src/modules/project/project-column.service.spec.ts b/alfy-bot/src/modules/project/project-column.service.spec.ts index a1c770c..31f6afe 100644 --- a/alfy-bot/src/modules/project/project-column.service.spec.ts +++ b/alfy-bot/src/modules/project/project-column.service.spec.ts @@ -128,6 +128,20 @@ describe('ProjectColumnService', () => { ); }); + it('добавляет колонку после последней при пропуске в порядке', async () => { + projRepo.findById.mockResolvedValue(makeProject({ type: 'agile' })); + colRepo.findAllByProject.mockResolvedValue([ + makeColumn({ id: 'col-1', order: 0 }), + makeColumn({ id: 'col-3', order: 2 }), + ]); + + await service.create(1, 'proj-1', { title: 'Новая' }); + + expect(colRepo.create).toHaveBeenCalledWith( + expect.objectContaining({ order: 3 }), + ); + }); + it('создаёт колонку с указанным color', async () => { projRepo.findById.mockResolvedValue(makeProject()); colRepo.findAllByProject.mockResolvedValue([]); @@ -221,7 +235,15 @@ describe('ProjectColumnService', () => { await service.delete(1, 'proj-1', 'col-1'); - expect(colRepo.delete).toHaveBeenCalledWith('col-1', 'proj-1'); + expect(colRepo.delete).toHaveBeenCalledWith('col-1', 'proj-1', false); + }); + + it('передаёт тип Agile для защиты занятой колонки', async () => { + projRepo.findById.mockResolvedValue(makeProject({ type: 'agile' })); + + await service.delete(1, 'proj-1', 'col-1'); + + expect(colRepo.delete).toHaveBeenCalledWith('col-1', 'proj-1', true); }); it('бросает NotFoundException если колонка не найдена', async () => { @@ -242,7 +264,7 @@ describe('ProjectColumnService', () => { await service.reorder(1, 'proj-1', ['col-3', 'col-1', 'col-2']); - expect(colRepo.reorder).toHaveBeenCalledWith([ + expect(colRepo.reorder).toHaveBeenCalledWith('proj-1', [ { id: 'col-3', order: 0 }, { id: 'col-1', order: 1 }, { id: 'col-2', order: 2 }, diff --git a/alfy-bot/src/modules/project/project-column.service.ts b/alfy-bot/src/modules/project/project-column.service.ts index 995b7b7..03545a9 100644 --- a/alfy-bot/src/modules/project/project-column.service.ts +++ b/alfy-bot/src/modules/project/project-column.service.ts @@ -48,7 +48,8 @@ export class ProjectColumnService { } const existing = await this.columnRepo.findAllByProject(projectId); - const nextOrder = existing.length; + const nextOrder = + existing.reduce((max, column) => Math.max(max, column.order), -1) + 1; return this.columnRepo.create({ projectId, @@ -74,9 +75,13 @@ export class ProjectColumnService { } async delete(userId: number, projectId: string, id: string): Promise { - await this.validateProjectAccess(userId, projectId); + const project = await this.validateProjectAccess(userId, projectId); - const deleted = await this.columnRepo.delete(id, projectId); + const deleted = await this.columnRepo.delete( + id, + projectId, + project.type === 'agile', + ); if (!deleted) throw new NotFoundException(`Column #${id} not found`); } @@ -92,6 +97,6 @@ export class ProjectColumnService { } const updates = orderedIds.map((id, index) => ({ id, order: index })); - await this.columnRepo.reorder(updates); + await this.columnRepo.reorder(projectId, updates); } } From 43d1fbf8dc8dcf5c62562b410a3b6d4e0b8fde98 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Mon, 12 Oct 2026 10:08:38 +0500 Subject: [PATCH 2/6] feat(projects): manage agile columns in project settings --- .../projects/ui/ProjectColumnSettings.vue | 150 ++++++++++++++++++ .../projects/ui/ProjectEditDialog.vue | 5 +- .../projects/ui/ProjectColumnSettings.spec.ts | 104 ++++++++++++ 3 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 alfy-bot-frontend/src/features/projects/ui/ProjectColumnSettings.vue create mode 100644 alfy-bot-frontend/tests/features/projects/ui/ProjectColumnSettings.spec.ts diff --git a/alfy-bot-frontend/src/features/projects/ui/ProjectColumnSettings.vue b/alfy-bot-frontend/src/features/projects/ui/ProjectColumnSettings.vue new file mode 100644 index 0000000..353fe29 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/ProjectColumnSettings.vue @@ -0,0 +1,150 @@ + + + diff --git a/alfy-bot-frontend/src/features/projects/ui/ProjectEditDialog.vue b/alfy-bot-frontend/src/features/projects/ui/ProjectEditDialog.vue index 2530c1d..94d7446 100644 --- a/alfy-bot-frontend/src/features/projects/ui/ProjectEditDialog.vue +++ b/alfy-bot-frontend/src/features/projects/ui/ProjectEditDialog.vue @@ -1,6 +1,6 @@