From ae85482520bccc8e8d3a31a8fb9b38e5800d34b8 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Sun, 18 Oct 2026 18:16:25 +0500 Subject: [PATCH 1/4] fix(groups): scope and atomically persist sibling order --- .../project/board-group.service.spec.ts | 56 ++++++- .../modules/project/board-group.service.ts | 29 +++- .../domain/board-group-repository.port.ts | 5 +- .../typeorm-board-group.repository.ts | 24 ++- alfy-bot/test/board-groups.e2e-spec.ts | 144 ++++++++++++++++++ 5 files changed, 242 insertions(+), 16 deletions(-) diff --git a/alfy-bot/src/modules/project/board-group.service.spec.ts b/alfy-bot/src/modules/project/board-group.service.spec.ts index 1818041..392ee8c 100644 --- a/alfy-bot/src/modules/project/board-group.service.spec.ts +++ b/alfy-bot/src/modules/project/board-group.service.spec.ts @@ -474,24 +474,64 @@ describe('BoardGroupService', () => { // ── reorder ───────────────────────────────────────────────────── describe('reorder', () => { - it('обновляет порядок групп по переданным ID', async () => { + beforeEach(() => { projRepo.findById.mockResolvedValue(makeProject()); + groupRepo.findAllByProject.mockResolvedValue([ + makeGroup({ id: 'group-1', order: 0 }), + makeGroup({ id: 'group-2', order: 1 }), + makeGroup({ id: 'group-3', order: 2 }), + makeGroup({ id: 'story-1', parentId: 'group-1', type: 'story' }), + makeGroup({ + id: 'story-2', + parentId: 'group-1', + type: 'story', + order: 1, + }), + makeGroup({ id: 'story-3', parentId: 'group-2', type: 'story' }), + ]); + }); + it('сохраняет порядок эпиков с ограничением проектом', async () => { await service.reorder(1, 'proj-1', ['group-3', 'group-1', 'group-2']); - - expect(groupRepo.reorder).toHaveBeenCalledWith([ + expect(groupRepo.reorder).toHaveBeenCalledWith('proj-1', [ { id: 'group-3', order: 0 }, { id: 'group-1', order: 1 }, { id: 'group-2', order: 2 }, ]); }); - it('бросает BadRequestException если массив пустой', async () => { - projRepo.findById.mockResolvedValue(makeProject()); + it('добавляет пропущенных соседей после переданных ID без совпадений порядка', async () => { + await service.reorder(1, 'proj-1', ['group-3']); + expect(groupRepo.reorder).toHaveBeenCalledWith('proj-1', [ + { id: 'group-3', order: 0 }, + { id: 'group-1', order: 1 }, + { id: 'group-2', order: 2 }, + ]); + }); - await expect(service.reorder(1, 'proj-1', [])).rejects.toThrow( - BadRequestException, - ); + it('переставляет только истории одного эпика', async () => { + await service.reorder(1, 'proj-1', ['story-2', 'story-1']); + expect(groupRepo.reorder).toHaveBeenCalledWith('proj-1', [ + { id: 'story-2', order: 0 }, + { id: 'story-1', order: 1 }, + ]); }); + + it.each([ + [], + ['group-1', 'group-1'], + ['group-1', 'unknown'], + ['group-1', 'foreign-project-id'], + ['group-1', 'story-1'], + ['story-1', 'story-3'], + ])( + 'отклоняет некорректные ID %j до сохранения', + async (...ids: string[]) => { + await expect(service.reorder(1, 'proj-1', ids)).rejects.toThrow( + BadRequestException, + ); + expect(groupRepo.reorder).not.toHaveBeenCalled(); + }, + ); }); }); diff --git a/alfy-bot/src/modules/project/board-group.service.ts b/alfy-bot/src/modules/project/board-group.service.ts index 3f579ee..cc26f61 100644 --- a/alfy-bot/src/modules/project/board-group.service.ts +++ b/alfy-bot/src/modules/project/board-group.service.ts @@ -184,7 +184,32 @@ export class BoardGroupService { throw new BadRequestException('Ordered IDs array cannot be empty'); } - const updates = orderedIds.map((id, index) => ({ id, order: index })); - await this.groupRepo.reorder(updates); + const selectedIds = new Set(orderedIds); + if (selectedIds.size !== orderedIds.length) { + throw new BadRequestException('Ordered IDs must be unique'); + } + + const groups = await this.groupRepo.findAllByProject(projectId); + const groupsById = new Map(groups.map((group) => [group.id, group])); + const selected = orderedIds.map((id) => { + const group = groupsById.get(id); + if (!group) { + throw new BadRequestException('All groups must belong to this project'); + } + return group; + }); + const parentId = selected[0].parentId; + if (selected.some((group) => group.parentId !== parentId)) { + throw new BadRequestException('Only sibling groups can be reordered'); + } + + const remaining = groups.filter( + (group) => group.parentId === parentId && !selectedIds.has(group.id), + ); + const updates = [...selected, ...remaining].map((group, order) => ({ + id: group.id, + order, + })); + await this.groupRepo.reorder(projectId, updates); } } diff --git a/alfy-bot/src/modules/project/domain/board-group-repository.port.ts b/alfy-bot/src/modules/project/domain/board-group-repository.port.ts index c74dd2c..61dc63f 100644 --- a/alfy-bot/src/modules/project/domain/board-group-repository.port.ts +++ b/alfy-bot/src/modules/project/domain/board-group-repository.port.ts @@ -7,5 +7,8 @@ export abstract class BoardGroupRepositoryPort { abstract create(data: Partial): Promise; abstract save(group: BoardGroup): Promise; abstract delete(id: string, projectId: string): Promise; - abstract reorder(updates: { id: string; order: number }[]): Promise; + abstract reorder( + projectId: string, + updates: { id: string; order: number }[], + ): Promise; } diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.ts index 9569fc6..dac10f1 100644 --- a/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.ts +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@nestjs/common'; +import { BadRequestException, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { BoardGroup } from '../../../shared/entities'; @@ -44,9 +44,23 @@ export class TypeOrmBoardGroupRepository extends BoardGroupRepositoryPort { 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) => { + for (const { id, order } of updates) { + const result = await manager.update( + BoardGroup, + { id, projectId }, + { order }, + ); + if (result.affected !== 1) { + throw new BadRequestException( + 'Group no longer belongs to this project', + ); + } + } + }); } } diff --git a/alfy-bot/test/board-groups.e2e-spec.ts b/alfy-bot/test/board-groups.e2e-spec.ts index cb4cd03..6980c70 100644 --- a/alfy-bot/test/board-groups.e2e-spec.ts +++ b/alfy-bot/test/board-groups.e2e-spec.ts @@ -1,4 +1,9 @@ import request from 'supertest'; +import { randomUUID } from 'node:crypto'; +import { Server } from 'node:http'; +import { DataSource } from 'typeorm'; +import { BoardGroup } from '../src/shared/entities'; +import { BoardGroupRepositoryPort } from '../src/modules/project/domain/board-group-repository.port'; import { INestApplication } from '@nestjs/common'; import { createTestApp } from './helpers/test-app'; @@ -160,6 +165,145 @@ describe('Board groups (e2e)', () => { }); }); + describe('порядок соседних групп', () => { + let orderingProjectId: string; + let otherProjectId: string; + let epicIds: string[]; + let storyIds: string[]; + let otherStoryId: string; + let foreignGroupId: string; + + const createGroup = async ( + project: string, + title: string, + parentId?: string, + ) => { + const response = await request(app.getHttpServer()) + .post(`/api/projects/${project}/groups`) + .set('Authorization', auth()) + .send({ title, parentId }) + .expect(201); + return (response.body as { id: string }).id; + }; + const readGroups = async () => { + const response = await request(app.getHttpServer()) + .get(`/api/projects/${orderingProjectId}/groups`) + .set('Authorization', auth()) + .expect(200); + return response.body as (BoardGroup & { children: BoardGroup[] })[]; + }; + const reorder = (orderedIds: string[]) => + request(app.getHttpServer()) + .patch(`/api/projects/${orderingProjectId}/groups/reorder`) + .set('Authorization', auth()) + .send({ orderedIds }); + + beforeAll(async () => { + const createProject = async () => { + const response = await request(app.getHttpServer()) + .post('/api/projects') + .set('Authorization', auth()) + .send({ title: 'Порядок групп', type: 'agile' }) + .expect(201); + return (response.body as { id: string }).id; + }; + orderingProjectId = await createProject(); + otherProjectId = await createProject(); + epicIds = []; + storyIds = []; + for (let i = 0; i < 4; i++) { + epicIds.push(await createGroup(orderingProjectId, `Эпик ${i}`)); + } + for (let i = 0; i < 3; i++) { + storyIds.push( + await createGroup(orderingProjectId, `История ${i}`, epicIds[0]), + ); + } + otherStoryId = await createGroup( + orderingProjectId, + 'Другая история', + epicIds[1], + ); + foreignGroupId = await createGroup(otherProjectId, 'Чужой эпик'); + }); + + it('сохраняет перестановку эпиков и историй при повторном чтении', async () => { + const orderedEpics = [epicIds[2], epicIds[3], epicIds[0], epicIds[1]]; + await reorder(orderedEpics).expect(200); + await reorder([storyIds[2], storyIds[0], storyIds[1]]).expect(200); + const tree = await readGroups(); + expect(tree.map((group) => group.id)).toEqual(orderedEpics); + expect(tree[2].children.map((group) => group.id)).toEqual([ + storyIds[2], + storyIds[0], + storyIds[1], + ]); + expect( + tree[2].children.every((group) => group.parentId === epicIds[0]), + ).toBe(true); + expect(tree[3].children.map((group) => group.id)).toEqual([otherStoryId]); + }); + + it('отклоняет повторы, чужие, неизвестные и несоседние ID без записи', async () => { + const before = await readGroups(); + const foreignBefore = await app + .get(DataSource) + .getRepository(BoardGroup) + .findOneByOrFail({ id: foreignGroupId }); + for (const orderedIds of [ + [], + [epicIds[0], epicIds[0]], + [epicIds[0], foreignGroupId], + [epicIds[0], randomUUID()], + [epicIds[0], storyIds[0]], + [storyIds[0], otherStoryId], + ]) { + await reorder(orderedIds).expect(400); + expect(await readGroups()).toEqual(before); + } + expect( + await app + .get(DataSource) + .getRepository(BoardGroup) + .findOneByOrFail({ id: foreignGroupId }), + ).toEqual(foreignBefore); + }); + + it('откатывает предыдущие обновления при сбое посередине записи', async () => { + const before = await readGroups(); + const dataSource = app.get(DataSource); + await dataSource.query( + `CREATE TRIGGER fail_group_reorder BEFORE UPDATE OF "order" ON board_groups WHEN NEW.id = '${epicIds[1]}' BEGIN SELECT RAISE(ABORT, 'injected reorder failure'); END`, + ); + try { + await reorder(epicIds).expect(500); + expect(await readGroups()).toEqual(before); + } finally { + await dataSource.query('DROP TRIGGER fail_group_reorder'); + } + }); + + it('репозиторий не меняет чужой проект и откатывает предшествующую запись', async () => { + const before = await readGroups(); + const repository = app.get(BoardGroupRepositoryPort); + await expect( + repository.reorder(orderingProjectId, [ + { id: epicIds[0], order: 40 }, + { id: foreignGroupId, order: 41 }, + ]), + ).rejects.toThrow(); + expect(await readGroups()).toEqual(before); + expect( + ( + await app + .get(DataSource) + .getRepository(BoardGroup) + .findOneByOrFail({ id: foreignGroupId }) + ).order, + ).toBe(0); + }); + }); + describe('даты эпика', () => { let epicId: string; let storyId: string; From bdbaedaa2d38eda860f6379717d6b035ce762d01 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Sun, 18 Oct 2026 18:16:25 +0500 Subject: [PATCH 2/4] feat(board): reorder epics and stories with arrow controls --- .../features/projects/model/group-store.ts | 13 ++- .../features/projects/ui/AgileBoardView.vue | 43 +++++++++- .../features/projects/ui/AgileEpicBlock.vue | 18 +++- .../features/projects/ui/AgileStoryBlock.vue | 12 +++ .../projects/ui/GroupOrderControls.vue | 42 ++++++++++ .../projects/model/group-store.spec.ts | 22 +++++ .../projects/ui/AgileBoardView.spec.ts | 82 +++++++++++++++++++ 7 files changed, 227 insertions(+), 5 deletions(-) create mode 100644 alfy-bot-frontend/src/features/projects/ui/GroupOrderControls.vue diff --git a/alfy-bot-frontend/src/features/projects/model/group-store.ts b/alfy-bot-frontend/src/features/projects/model/group-store.ts index 959adbb..c65aa35 100644 --- a/alfy-bot-frontend/src/features/projects/model/group-store.ts +++ b/alfy-bot-frontend/src/features/projects/model/group-store.ts @@ -154,9 +154,10 @@ export const useGroupStore = defineStore('groups', () => { const reorderGroups = async (projectId: string, orderedIds: string[]) => { const tree = trees.value[projectId] ?? [] - const previous = tree const firstId = orderedIds[0] const isRootLevel = tree.some(node => node.id === firstId) + const parent = isRootLevel ? undefined : tree.find(epic => epic.children.some(child => child.id === firstId)) + const previousOrders = new Map((isRootLevel ? tree : parent?.children ?? []).map(node => [node.id, node.order])) if (isRootLevel) { trees.value[projectId] = orderedIds @@ -167,7 +168,6 @@ export const useGroupStore = defineStore('groups', () => { .filter((n): n is BoardGroupNode => n !== null) } else { - const parent = tree.find(epic => epic.children.some(child => child.id === firstId)) if (parent) { trees.value[projectId] = replaceNode(tree, parent.id, node => ({ ...node, @@ -185,7 +185,14 @@ export const useGroupStore = defineStore('groups', () => { await groupsApi.reorderGroups(projectId, orderedIds) } catch (err) { - trees.value[projectId] = previous + const restoreOrder = (nodes: BoardGroupNode[]) => nodes + .map(node => ({ ...node, order: previousOrders.get(node.id) ?? node.order })) + .sort((a, b) => a.order - b.order) + const current = trees.value[projectId] ?? [] + if (isRootLevel) + trees.value[projectId] = restoreOrder(current) + else if (parent) + trees.value[projectId] = replaceNode(current, parent.id, node => ({ ...node, children: restoreOrder(node.children) })) throw err } } diff --git a/alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue b/alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue index 111e23e..1a11730 100644 --- a/alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue +++ b/alfy-bot-frontend/src/features/projects/ui/AgileBoardView.vue @@ -43,6 +43,8 @@ const { deleteGroupWithConfirm } = useGroupDeletion() const groupDetail = useGroupDetail() const addingEpic = ref(false) +const reordering = ref(false) +const reorderError = ref(null) const sortedColumns = computed(() => [...columnStore.columns].sort((a, b) => a.order - b.order), @@ -84,6 +86,37 @@ function laneTaskCount(lane: ProjectColumn): number { return projectTasksByColumn.value.get(lane.id)?.length ?? 0 } +async function handleMoveGroup(group: BoardGroupNode, direction: -1 | 1) { + if (reordering.value) + return + + const projectId = props.projectId + const tree = groupStore.groupsOf(projectId) + const siblings = [...(group.parentId ? tree.find(epic => epic.id === group.parentId)?.children ?? [] : tree)] + .sort((a, b) => a.order - b.order) + const index = siblings.findIndex(sibling => sibling.id === group.id) + const targetIndex = index + direction + if (index < 0 || targetIndex < 0 || targetIndex >= siblings.length) + return + + const orderedIds = siblings.map(sibling => sibling.id) + const targetId = orderedIds[targetIndex]! + orderedIds[targetIndex] = group.id + orderedIds[index] = targetId + reordering.value = true + reorderError.value = null + try { + await groupStore.reorderGroups(projectId, orderedIds) + } + catch { + if (props.projectId === projectId) + reorderError.value = 'Не удалось сохранить порядок. Прежний порядок восстановлен. Попробуйте ещё раз.' + } + finally { + reordering.value = false + } +} + async function handleToggleGroupDone(group: BoardGroupNode) { await groupStore.toggleGroupDone(props.projectId, group) } @@ -133,6 +166,7 @@ function handleTaskChange(event: any, columnId: string, groupId: string | null, } watch(() => props.projectId, (id) => { + reorderError.value = null if (id) { columnStore.fetchColumns(id) groupStore.fetchGroups(id) @@ -145,6 +179,9 @@ watch(() => props.projectId, (id) => {
+
props.projectId, (id) => {
() const emit = defineEmits<{ + moveGroup: [group: BoardGroupNode, direction: -1 | 1] toggleTask: [id: string] openTask: [task: Task] taskChange: [event: any, columnId: string, groupId: string | null, tasks: Task[]] @@ -109,6 +114,13 @@ function handleCreateStory(title: string) { {{ totalCount }} {{ doneCount }} из {{ totalCount }} готово
+ {{ tasks.length }}
+