From d0f45e18afc66eda6519f2db16fb852843072367 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Wed, 4 Nov 2026 23:08:19 +0500 Subject: [PATCH 01/12] chore(planning): record approved scope and restore reproducible backend install --- alfy-bot/package-lock.json | 6 +-- docs/tasks/sprint-planning.md | 94 +++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 docs/tasks/sprint-planning.md diff --git a/alfy-bot/package-lock.json b/alfy-bot/package-lock.json index daaef84..b9a545d 100644 --- a/alfy-bot/package-lock.json +++ b/alfy-bot/package-lock.json @@ -7853,9 +7853,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" diff --git a/docs/tasks/sprint-planning.md b/docs/tasks/sprint-planning.md new file mode 100644 index 0000000..9580bd1 --- /dev/null +++ b/docs/tasks/sprint-planning.md @@ -0,0 +1,94 @@ +# Планирование спринтов и жизненный цикл историй + +**Status:** executing +**Branch:** codex/sprint-planning +**Worktree:** /Users/v/projects/Alfy/.worktrees/sprint-planning +**Base:** f9af7e8 +**Goal:** Пользователь Alfy ведёт истории от проработки до принятого результата, собирает выполнимый спринт из бэклога, видит нагрузку и блокеры, работает с ежедневным фокусом и сохраняет достоверные итоги; AI через MCP предлагает объяснимый состав, который можно просмотреть и применить. Useless if: статусы только декоративны; перенос теряет статус; нагрузка игнорирует неизвестные оценки; закрытие стирает исходный план; предложения тайно меняют задачи; функции доступны только через API, но не через интерфейс. +**Mode:** hands-off + +## Context +- База origin/main содержит эпики/истории open/done, атомарные переносы, спринты, релизы, оценки времени/Pomodoro и MCP. +- Спринт сейчас хранит даты и цель, закрытие переносит незавершённые задачи без истории состава; бэклог не имеет поиска и массового планирования. +- Пользователь одобрил весь предложенный объём и отдельно потребовал полноценные статусы историй. + +## Design +Расширить существующую модель и API совместимо. Отдельный workflow историй не зависит от колонок задач. Сохранить status=open/done как совместимый признак принятого результата, добавить workflowStatusId. Сервер возвращает каталог пяти начальных статусов, проект может переименовать, упорядочить и дополнить его. Категории open/ready/in_progress/review/done задают смысл; блокировка, отложенная дата и архив независимы. Все задачи истории готовы — предложение проверить историю, без автоматического принятия. + +Бэклог получает режимы проработки/готовых/отложенных/архива, поиск и фильтры; планирование показывает две области с выбранным спринтом, массовым переносом, ручной очередностью и отменой последнего переноса с проверкой конфликтов. Истории имеют зависимости от других историй того же проекта без циклов. + +Бюджет спринта в минутах необязателен, резерв задаётся явно (изначально 0). Оценка задачи: durationMinutes при положительном значении, иначе pomodoroCount*pomodoroDuration; неизвестная оценка учитывается отдельно. Тот же расчёт используется для предложений, загрузки и отчёта. Учитывать обязательства других проектов за пересекающиеся даты отдельным показателем, не выдавая их за точный календарный прогноз. При недостатке данных прогноз не строить. + +Сохранить состав/оценки на старте, изменения состава и итог на закрытии. Данные старых спринтов помечать как неполные, не восстанавливать вымышленную историю. Итог хранит оценку достижения цели, причины переноса и улучшение следующего спринта. Открытые элементы можно распределить по разным planned-спринтам или бэклогу. Переносы историй согласованы с задачами, закрытая история неизменна. + +Для AI использовать существующее подключение MCP: read-only контекст и объяснимое предложение, отдельная команда применения явного списка. В UI детерминированная подсказка называется «Предложить план», не выдаётся за вызов LLM. Новые облачные ключи и платные сервисы не нужны. + +Визуальная основа: существующие токены Alfy, компактная типографика и shadcn-vue. Отличительный элемент — закреплённая полоса бюджета между бэклогом и спринтом. Мобильный режим складывает области вертикально; управление доступно без drag-and-drop. + +Альтернативы: расширять open/done напрямую проще, но ломает потребителей; отдельная новая система планирования дублирует задачи. Выбран совместимый workflow + существующие сущности, с отдельными сервисами планирования и отчётов. +TDD: yes для контрактов API, вычислений, атомарности и совместимости; визуальные изменения проверяются браузером. + +### Invariants +- IV1 — Все чтения/записи ограничены пользователем и проектом; чужие UUID, циклы и закрытые назначения отвергаются без частичных записей. +- IV2 — Статус истории независим от выполнения задач; перенос спринта не меняет workflow, блокер, релиз и структуру. +- IV3 — Старые open/done и существующие API работают; каталог статусов имеет один серверный источник. +- IV4 — Расчёт минут не удваивает Pomodoro и duration; неизвестные оценки видны; бюджет не выдумывается. +- IV5 — История стартового и итогового состава переживает перенос, изменение и удаление задач; legacy-данные обозначены неполными. +- IV6 — Предложения не меняют данные; применение/массовый перенос атомарны, отмена не затирает более новые изменения. +- IV7 — Ошибки доступны в UI; ключевые действия доступны клавиатурой и на мобильном; архив и отложенные элементы доступны для восстановления. + +## Plan + +### PH1 — Workflow историй +- `alfy-bot/src/shared/entities/board-group.entity.ts:1-132`, `project.entity.ts:1-100`: workflowStatusId, blockedReason, deferredUntil, archived, dependencyIds, каталог проекта storyWorkflow. +- `alfy-bot/src/modules/project/board-group.service.ts:1-220`, `dto/update-group.dto.ts:1-20`, `dto/create-group.dto.ts`: совместимые переходы, зависимость/циклы, метаданные бэклога. +- Новые `story-workflow.controller.ts`, `story-workflow.service.ts`, `domain/story-workflow.ts`, DTO и необходимые repository-методы: IF1, каталог по проекту, проверка занятых статусов при замене. +- Unit и SQLite HTTP e2e: старые статусы, независимость, авторизация, цикл, конфигурация. Не менять project.module/app.module/index.ts — интеграция PH2. +- Commit: feat(stories): add configurable story lifecycle and backlog readiness + +### PH2 — Планирование и история +- `alfy-bot/src/shared/entities/sprint.entity.ts:1-90`, `modules/project/sprint.service.ts:1-260`, `infrastructure/typeorm-sprint.repository.ts:1-240`, DTO/порты: бюджет, снимки, история, завершение с итогами и выборочным переносом, IF2. +- Новые `modules/project/planning*`, `domain/planning*`, `infrastructure/*planning*`: IF3, атомарность, отмена, оценки, контекст/предложения, межпроектные обязательства. +- Нужные изменения repository-путей задач/историй и shared/database для полного наблюдения изменений спринта; интегрировать новые сущности и контроллеры в project.module.ts/app.module.ts/shared/entities/index.ts, включая PH1. +- Unit и реальные SQLite HTTP e2e для IF2/IF3 и IV1/4/5/6. +- Commit: feat(sprints): add capacity planning and durable sprint reports + +### PH3 — Интерфейс +- `alfy-bot-frontend/src/features/projects/{api,model,lib,ui}/`: типы/клиенты IF1-3, статус в строке/карточке истории, редактор каталога, доска историй, фильтры и метаданные. +- `src/views/ProjectBacklogView.vue:1-360`, `ProjectView.vue:1-400`: планирование, поиск, выделение, очередность, отмена, подсказка плана, бюджет, ежедневный фокус и архив/отчёты. +- `SprintFormDialog.vue`, `SprintCompleteDialog.vue`: бюджет и ретроспектива/направления переноса; использовать единые API, обновлять Pinia после действий. +- Компонентные проверки ключевых действий, сборка и браузер desktop/mobile. Не менять backend/MCP. +- Commit: feat(planning): build backlog workspace and story board + +### PH4 — MCP и интеграция +- `alfy-mcp/src/tools/{groups,sprints}.ts`, новый `planning.ts`, `server.ts`, соответствующие tests: IF1-3, чтение каталога/контекста/отчёта, предложение и явное применение, корректные annotations. +- README приложений и этот task-файл: новые потоки и ограничения legacy-истории. +- Проверить регистрацию PH1/PH2, типы запросов PH3, реальные API и браузер. Исправлять только подтверждённые дефекты в рамках согласованного объёма. +- Commit: feat(mcp): expose guided sprint planning and reports + +### Interfaces +- IF1 — GET `/projects/:projectId/story-workflow` -> `{statuses: StoryWorkflowStatus[]}`; PUT same `{statuses}`; status `{id:string,name:string,category:'open'|'ready'|'in_progress'|'review'|'done',color:string}`. IDs стабильны. Начальные IDs равны категориям. Group добавляет `workflowStatusId:string|null`, `blockedReason:string|null`, `deferredUntil:string|null` (YYYY-MM-DD), `archived:boolean`, `dependencyIds:string[]`. PATCH group принимает эти поля; existing status=open/done синхронизируется с категорией. GET groups возвращает нормализованный workflowStatusId для legacy. +- IF2 — Sprint добавляет `capacityMinutes:number|null`, `reserveMinutes:number` (0), обновляются existing create/update. Complete payload добавляет `goalOutcome?:'achieved'|'partial'|'missed'`, `retrospective?:string`, `improvement?:string`, `carryoverReason?:string`, `taskDestinations?:{taskId:string,sprintId:string|null}[]`, `storyDestinations?:{storyId:string,sprintId:string|null}[]`; исходный moveTo остаётся обязательным default для неуказанных элементов. GET `/projects/:projectId/sprints/:id/report` -> `{sprint, historyComplete:boolean, initial:PlanningSnapshot|null, final:PlanningSnapshot|null, events:SprintEvent[], summary:{planned:number,added:number,removed:number,completed:number,carried:number}, retrospective:{goalOutcome,retrospective,improvement,carryoverReason}}`. Snapshot `{capturedAt:string,tasks:{id,title,completed,estimateMinutes:number|null,groupId:string|null}[],stories:{id,title,status,workflowStatusId}[]}`; event `{id,sprintId,taskId:string|null,kind:string,occurredAt:string,title:string}`. +- IF3 — GET `/projects/:projectId/planning?sprintId=UUID` -> `{sprintId:string|null,capacityMinutes:number|null,reserveMinutes:number,plannedMinutes:number,remainingMinutes:number|null,unestimatedCount:number,otherProjectsMinutes:number,historicalCapacityMinutes:number|null,historySampleCount:number,tasks:PlanningTask[],stories:BoardGroup[],carryoverCounts:Record}`. PlanningTask `{id,title,completed,groupId,sprintId,order,estimateMinutes:number|null,priority?:string,blocked:boolean}`. POST `/projects/:projectId/planning/proposal` `{sprintId:string,budgetMinutes:number,goal:string}` -> `{taskIds:string[],storyIds:string[],totalMinutes:number,unestimatedIds:string[],excluded:{id,reason}[],reasons:{id,reason}[]}`; selection deterministic, goal word relevance + order, completed/archived/deferred/blocked excluded; dependencies must be satisfied or included without breaking budget. +- IF3 commands — POST `/projects/:projectId/planning/move` `{taskIds:string[],storyIds:string[],sprintId:string|null}` -> `{updated:number,undoToken:string}`; POST `/projects/:projectId/planning/undo` `{undoToken:string}` -> `{updated:number}`; PATCH `/projects/:projectId/planning/order` `{taskIds:string[],sprintId:string|null}` -> `{updated:number}`. Apply proposal uses move with explicit reviewed IDs. All writes scoped and atomic; undo detects moved/deleted/changed targets instead of clobbering. UI refetches tasks/groups/sprints after writes. + +### Interface graph +- PH1 -> IF1 @ alfy-bot/src/shared/entities/board-group.entity.ts alfy-bot/src/shared/entities/project.entity.ts alfy-bot/src/modules/project/board-group.service.ts alfy-bot/src/modules/project/dto/*group* alfy-bot/src/modules/project/*story-workflow* alfy-bot/src/modules/project/domain/story-workflow* alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.ts alfy-bot/src/modules/project/domain/board-group-repository.port.ts alfy-bot/test/story-workflow.e2e-spec.ts +- PH2 IF1 -> IF2, IF3 @ alfy-bot/ (except PH1 owned paths) +- PH3 IF1, IF2, IF3 -> @ alfy-bot-frontend/ +- PH4 IF1, IF2, IF3 -> @ alfy-mcp/ docs/ README.md + +### Test strategy +Baseline: existing sprint/group unit tests and frontend sprint/backlog tests in isolated npm-ci environments. Test-first API edge cases; final SQLite HTTP attacks and browser full cycle create story → transition → plan → start → add/move → close → inspect preserved report, plus failure and mobile. + +### Risks / rollback +- RK1 — Разный смысл статусов нарушит закрытие спринтов: сохраняется совместимый open/done, тестируются переносы всех промежуточных статусов. +- RK2 — История через разные пути обновления может быть неполной: проверить обычный PATCH task, перенос истории, массовые операции и удаление; прежние спринты явно incomplete. +- RK3 — Большой объём пересекает несколько приложений: отдельные владельцы файлов, сериализованные коммиты и интеграционная проверка контрактов. Откат фаз через revert; существующие данные не удалять. + +## Conclusion +### Hands-off decisions +- make: весь согласованный объём, включая статусы историй, принят; dedicated worktree от актуального origin/main, чужие незакоммиченные изменения сохранены. +- udesign: совместимое status + workflowStatusId выбрано для существующих MCP/релизов; AI через уже доступный MCP без нового платного провайдера. +- udesign: независимые части разделены на фазы одного общего результата; автоапрув разрешает выполнить все без выбора первой вручную. +- uplan: plan auto-approved; параллельные implementers по контракту uexecute, коммиты контроллером. From a57ecb05ced9139164eb64a73528d16a1e415529 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Wed, 4 Nov 2026 23:25:43 +0500 Subject: [PATCH 02/12] feat(stories): add configurable story lifecycle and backlog readiness --- .../project/board-group.service.spec.ts | 108 +++++ .../modules/project/board-group.service.ts | 164 +++++++- .../domain/board-group-repository.port.ts | 1 + .../modules/project/domain/story-workflow.ts | 122 ++++++ .../modules/project/dto/story-workflow.dto.ts | 45 +++ .../modules/project/dto/update-group.dto.ts | 47 ++- .../typeorm-board-group.repository.spec.ts | 63 +++ .../typeorm-board-group.repository.ts | 34 +- .../project/story-workflow.controller.ts | 42 ++ .../modules/project/story-workflow.service.ts | 72 ++++ .../src/shared/entities/board-group.entity.ts | 15 + .../src/shared/entities/project.entity.ts | 17 + alfy-bot/test/story-workflow.e2e-spec.ts | 381 ++++++++++++++++++ 13 files changed, 1098 insertions(+), 13 deletions(-) create mode 100644 alfy-bot/src/modules/project/domain/story-workflow.ts create mode 100644 alfy-bot/src/modules/project/dto/story-workflow.dto.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.spec.ts create mode 100644 alfy-bot/src/modules/project/story-workflow.controller.ts create mode 100644 alfy-bot/src/modules/project/story-workflow.service.ts create mode 100644 alfy-bot/test/story-workflow.e2e-spec.ts 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 392ee8c..9da5fe3 100644 --- a/alfy-bot/src/modules/project/board-group.service.spec.ts +++ b/alfy-bot/src/modules/project/board-group.service.spec.ts @@ -5,6 +5,8 @@ import { ForbiddenException, } from '@nestjs/common'; import { BoardGroupService } from './board-group.service'; +import { UpdateGroupDto } from './dto/update-group.dto'; +import { StoryWorkflowService } from './story-workflow.service'; import { BoardGroupRepositoryPort } from './domain/board-group-repository.port'; import { ProjectRepositoryPort } from './domain/project-repository.port'; import { BoardGroup, Project } from '../../shared/entities'; @@ -84,6 +86,7 @@ describe('BoardGroupService', () => { const module: TestingModule = await Test.createTestingModule({ providers: [ BoardGroupService, + StoryWorkflowService, { provide: BoardGroupRepositoryPort, useValue: groupRepo }, { provide: ProjectRepositoryPort, useValue: projRepo }, ], @@ -534,4 +537,109 @@ describe('BoardGroupService', () => { }, ); }); + describe('жизненный цикл истории', () => { + beforeEach(() => { + projRepo.findById.mockResolvedValue(makeProject({ type: 'agile' })); + const story = makeGroup({ id: 'story', type: 'story', parentId: 'epic' }); + groupRepo.findById.mockResolvedValue(story); + groupRepo.findAllByProject.mockResolvedValue([story]); + }); + + it('переводит историю в работу без изменения совместимого open', async () => { + const result = await service.update(1, 'proj-1', 'story', { + workflowStatusId: 'in_progress', + } as UpdateGroupDto); + expect(result).toMatchObject({ + workflowStatusId: 'in_progress', + status: 'open', + completedAt: null, + }); + }); + + it('принимает результат только при выборе выполненного статуса', async () => { + const result = await service.update(1, 'proj-1', 'story', { + workflowStatusId: 'done', + } as UpdateGroupDto); + expect(result).toMatchObject({ + workflowStatusId: 'done', + status: 'done', + }); + expect(result.completedAt).toBeInstanceOf(Date); + }); + + it('отклоняет отсутствующий в каталоге статус до записи', async () => { + await expect( + service.update(1, 'proj-1', 'story', { + workflowStatusId: 'missing', + } as UpdateGroupDto), + ).rejects.toThrow(BadRequestException); + expect(groupRepo.save).not.toHaveBeenCalled(); + }); + + it('сохраняет блокировку, архив и дату отдельно от статуса', async () => { + const result = await service.update(1, 'proj-1', 'story', { + blockedReason: 'Ждём доступ', + archived: true, + deferredUntil: '2026-11-15', + } as UpdateGroupDto); + expect(result).toMatchObject({ + blockedReason: 'Ждём доступ', + archived: true, + deferredUntil: '2026-11-15', + status: 'open', + }); + }); + + it('отклоняет зависимость истории от самой себя', async () => { + await expect( + service.update(1, 'proj-1', 'story', { + dependencyIds: ['story'], + } as UpdateGroupDto), + ).rejects.toThrow(BadRequestException); + expect(groupRepo.save).not.toHaveBeenCalled(); + }); + + it('отклоняет зависимость от истории другого проекта', async () => { + await expect( + service.update(1, 'proj-1', 'story', { + dependencyIds: ['foreign'], + } as UpdateGroupDto), + ).rejects.toThrow(BadRequestException); + }); + + it('не выдумывает дату выполнения старой истории при изменении описания', async () => { + groupRepo.findById.mockResolvedValue( + makeGroup({ + id: 'story', + type: 'story', + parentId: 'epic', + status: 'done', + completedAt: null, + }), + ); + const result = await service.update(1, 'proj-1', 'story', { + description: 'Уточнение', + }); + expect(result.completedAt).toBeNull(); + }); + + it('нормализует старую выполненную историю без изменения базы при чтении', async () => { + groupRepo.findAllByProject.mockResolvedValue([ + makeGroup({ id: 'epic' }), + makeGroup({ + id: 'story', + type: 'story', + parentId: 'epic', + status: 'done', + }), + ]); + const tree = await service.getTree(1, 'proj-1'); + expect(tree[0].children[0]).toMatchObject({ + workflowStatusId: 'done', + dependencyIds: [], + archived: false, + }); + expect(groupRepo.save).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 cc26f61..ef13a2e 100644 --- a/alfy-bot/src/modules/project/board-group.service.ts +++ b/alfy-bot/src/modules/project/board-group.service.ts @@ -9,6 +9,17 @@ import { BoardGroupRepositoryPort } from './domain/board-group-repository.port'; import { ProjectRepositoryPort } from './domain/project-repository.port'; import { CreateGroupDto } from './dto/create-group.dto'; import { UpdateGroupDto } from './dto/update-group.dto'; +import { StoryWorkflowService } from './story-workflow.service'; +import { + dependencyIssue, + normalizeStoryGroup, + storyStatusId, + storyWorkflow, +} from './domain/story-workflow'; +import type { + Project, + StoryWorkflowStatus, +} from '../../shared/entities/project.entity'; export interface BoardGroupNode extends BoardGroup { children: BoardGroupNode[]; @@ -19,6 +30,7 @@ export class BoardGroupService { constructor( private readonly groupRepo: BoardGroupRepositoryPort, private readonly projectRepo: ProjectRepositoryPort, + private readonly workflow: StoryWorkflowService, ) {} private assertDates( @@ -44,12 +56,16 @@ export class BoardGroupService { } async getTree(userId: number, projectId: string): Promise { - await this.validateProjectAccess(userId, projectId); + const project = await this.validateProjectAccess(userId, projectId); + const statuses = storyWorkflow(project); const groups = await this.groupRepo.findAllByProject(projectId); const nodeById = new Map(); for (const group of groups) { - nodeById.set(group.id, { ...group, children: [] }); + nodeById.set(group.id, { + ...normalizeStoryGroup(group, statuses), + children: [], + }); } const roots: BoardGroupNode[] = []; @@ -71,7 +87,17 @@ export class BoardGroupService { projectId: string, dto: CreateGroupDto, ): Promise { - await this.validateProjectAccess(userId, projectId); + return this.workflow.exclusive(projectId, () => + this.createGroup(userId, projectId, dto), + ); + } + + private async createGroup( + userId: number, + projectId: string, + dto: CreateGroupDto, + ): Promise { + const project = await this.validateProjectAccess(userId, projectId); let type: 'epic' | 'story' = 'epic'; let parentId: string | null = null; @@ -106,6 +132,17 @@ export class BoardGroupService { order: nextOrder, startDate, dueDate, + workflowStatusId: + type === 'story' + ? storyStatusId( + { workflowStatusId: null, status: 'open' }, + storyWorkflow(project), + ) + : null, + blockedReason: null, + deferredUntil: null, + archived: false, + dependencyIds: [], }); } @@ -115,10 +152,21 @@ export class BoardGroupService { id: string, dto: UpdateGroupDto, ): Promise { - await this.validateProjectAccess(userId, projectId); + return this.workflow.exclusive(projectId, () => + this.updateGroup(userId, projectId, id, dto), + ); + } - const group = await this.groupRepo.findById(id, projectId); - if (!group) throw new NotFoundException(`Group #${id} not found`); + private async updateGroup( + userId: number, + projectId: string, + id: string, + dto: UpdateGroupDto, + ): Promise { + const project = await this.validateProjectAccess(userId, projectId); + const current = await this.groupRepo.findById(id, projectId); + if (!current) throw new NotFoundException(`Group #${id} not found`); + const group = { ...current }; if (dto.parentId !== undefined && dto.parentId !== group.parentId) { if (dto.parentId === id) { @@ -158,17 +206,115 @@ export class BoardGroupService { if (dto.description !== undefined) group.description = dto.description; if (dto.color !== undefined) group.color = dto.color; - if (dto.status !== undefined) { + await this.applyStoryFields(group, dto, project); + return this.groupRepo.save( + normalizeStoryGroup(group, storyWorkflow(project)), + ); + } + + private async applyStoryFields( + group: BoardGroup, + dto: UpdateGroupDto, + project: Project, + ): Promise { + const storyFields = [ + 'workflowStatusId', + 'blockedReason', + 'deferredUntil', + 'archived', + 'dependencyIds', + ] as const; + if ( + group.type !== 'story' && + storyFields.some((field) => dto[field] !== undefined) + ) { + throw new BadRequestException( + 'Поля жизненного цикла доступны только историям', + ); + } + if (group.type === 'story') { + this.applyStoryStatus(group, dto, storyWorkflow(project)); + if (dto.blockedReason !== undefined) + group.blockedReason = dto.blockedReason?.trim() ?? null; + if (dto.deferredUntil !== undefined) + group.deferredUntil = dto.deferredUntil; + if (dto.archived !== undefined) group.archived = dto.archived; + if (dto.dependencyIds !== undefined) { + const groups = await this.groupRepo.findAllByProject(project.id); + const issue = dependencyIssue(group.id, dto.dependencyIds, groups); + if (issue) throw new BadRequestException(issue); + group.dependencyIds = [...dto.dependencyIds]; + } + } else if (dto.status !== undefined) { group.status = dto.status; - group.completedAt = dto.status === 'done' ? new Date() : null; } + if (dto.status !== undefined || dto.workflowStatusId !== undefined) { + group.completedAt = + group.status === 'done' ? (group.completedAt ?? new Date()) : null; + } + } - return this.groupRepo.save(group); + private applyStoryStatus( + group: BoardGroup, + dto: UpdateGroupDto, + statuses: StoryWorkflowStatus[], + ): void { + let id = storyStatusId(group, statuses); + if (dto.status !== undefined) { + id = storyStatusId( + { workflowStatusId: null, status: dto.status }, + statuses, + ); + } + if (dto.workflowStatusId !== undefined) id = dto.workflowStatusId; + const selected = statuses.find((status) => status.id === id); + if (!selected) + throw new BadRequestException( + 'Статус истории не найден в каталоге проекта', + ); + const status = selected.category === 'done' ? 'done' : 'open'; + if (dto.status !== undefined && dto.status !== status) { + throw new BadRequestException( + 'Статус истории противоречит признаку выполнения', + ); + } + group.workflowStatusId = selected.id; + group.status = status; } async delete(userId: number, projectId: string, id: string): Promise { + return this.workflow.exclusive(projectId, () => + this.deleteGroup(userId, projectId, id), + ); + } + + private async deleteGroup( + userId: number, + projectId: string, + id: string, + ): Promise { await this.validateProjectAccess(userId, projectId); + const groups = await this.groupRepo.findAllByProject(projectId); + const removed = new Set([ + id, + ...groups + .filter((group) => group.parentId === id) + .map((group) => group.id), + ]); + if ( + groups.some( + (group) => + !removed.has(group.id) && + (group.dependencyIds ?? []).some((dependency) => + removed.has(dependency), + ), + ) + ) { + throw new BadRequestException( + 'Сначала удалите зависимости других историй от этой группы', + ); + } const deleted = await this.groupRepo.delete(id, projectId); if (!deleted) throw new NotFoundException(`Group #${id} not found`); } 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 61dc63f..6af2507 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 @@ -5,6 +5,7 @@ export abstract class BoardGroupRepositoryPort { abstract findById(id: string, projectId: string): Promise; abstract countChildren(id: string): Promise; abstract create(data: Partial): Promise; + /** Сохраняет редактируемые метаданные группы; назначения спринта/релиза и порядок не изменяются. */ abstract save(group: BoardGroup): Promise; abstract delete(id: string, projectId: string): Promise; abstract reorder( diff --git a/alfy-bot/src/modules/project/domain/story-workflow.ts b/alfy-bot/src/modules/project/domain/story-workflow.ts new file mode 100644 index 0000000..b1c2436 --- /dev/null +++ b/alfy-bot/src/modules/project/domain/story-workflow.ts @@ -0,0 +1,122 @@ +import type { BoardGroup } from '../../../shared/entities/board-group.entity'; +import type { + Project, + StoryWorkflowStatus, +} from '../../../shared/entities/project.entity'; + +export type { + StoryWorkflowCategory, + StoryWorkflowStatus, +} from '../../../shared/entities/project.entity'; + +export const INITIAL_STORY_WORKFLOW: readonly StoryWorkflowStatus[] = [ + { id: 'open', name: 'К проработке', category: 'open', color: '#64748b' }, + { id: 'ready', name: 'Готова к работе', category: 'ready', color: '#0284c7' }, + { + id: 'in_progress', + name: 'В работе', + category: 'in_progress', + color: '#d97706', + }, + { id: 'review', name: 'На проверке', category: 'review', color: '#9333ea' }, + { id: 'done', name: 'Выполнена', category: 'done', color: '#16a34a' }, +]; + +/** Возвращает независимую копию каталога проекта или начального каталога старого проекта. */ +export function storyWorkflow( + project: Pick, +): StoryWorkflowStatus[] { + return (project.storyWorkflow ?? INITIAL_STORY_WORKFLOW).map((status) => ({ + ...status, + })); +} + +/** Возвращает статус истории; старый open/done сопоставляется с первым статусом соответствующей категории. */ +export function storyStatusId( + group: Pick, + statuses: StoryWorkflowStatus[], +): string { + if (group.workflowStatusId) return group.workflowStatusId; + const status = statuses.find((item) => item.category === group.status); + if (!status) + throw new Error('Каталог историй не содержит обязательной категории'); + return status.id; +} + +/** Нормализует новые поля старой группы для ответа API, не изменяя исходный объект. */ +export function normalizeStoryGroup( + group: T, + statuses: StoryWorkflowStatus[], +): T { + return { + ...group, + workflowStatusId: + group.type === 'story' ? storyStatusId(group, statuses) : null, + blockedReason: group.blockedReason ?? null, + deferredUntil: group.deferredUntil ?? null, + archived: group.archived ?? false, + dependencyIds: [...(group.dependencyIds ?? [])], + }; +} + +/** Возвращает причину недопустимости каталога; null означает, что существующие истории сохранят смысл статуса. */ +export function workflowIssue( + statuses: StoryWorkflowStatus[], + previous: StoryWorkflowStatus[], + groups: BoardGroup[], +): string | null { + if (!Array.isArray(statuses) || statuses.length === 0) + return 'Каталог статусов не может быть пустым'; + const ids = new Set(statuses.map((status) => status.id)); + if (ids.size !== statuses.length) + return 'Идентификаторы статусов должны быть уникальны'; + if ( + !statuses.some((status) => status.category === 'open') || + !statuses.some((status) => status.category === 'done') + ) { + return 'Нужны статусы категорий open и done'; + } + for (const group of groups.filter((group) => group.type === 'story')) { + const id = storyStatusId(group, previous); + const oldStatus = previous.find((status) => status.id === id); + const nextStatus = statuses.find((status) => status.id === id); + if (!nextStatus) return 'Нельзя удалить статус, используемый историей'; + if (oldStatus?.category !== nextStatus.category) + return 'Нельзя изменить категорию используемого статуса'; + } + return null; +} + +/** Возвращает причину недопустимости зависимостей истории: дубликаты, чужие элементы или цикл. */ +export function dependencyIssue( + id: string, + dependencies: string[], + groups: BoardGroup[], +): string | null { + if (!Array.isArray(dependencies)) return 'Зависимости должны быть массивом'; + if (new Set(dependencies).size !== dependencies.length) + return 'Зависимости не должны повторяться'; + const stories = new Map( + groups + .filter((group) => group.type === 'story') + .map((group) => [group.id, group]), + ); + if ( + dependencies.some( + (dependency) => dependency === id || !stories.has(dependency), + ) + ) { + return 'Зависимость должна ссылаться на другую историю этого проекта'; + } + const reaches = (current: string, visited: Set): boolean => { + if (current === id) return true; + if (visited.has(current)) return false; + visited.add(current); + return (stories.get(current)?.dependencyIds ?? []).some((next) => + reaches(next, visited), + ); + }; + return dependencies.some((dependency) => reaches(dependency, new Set())) + ? 'Зависимости не должны образовывать цикл' + : null; +} diff --git a/alfy-bot/src/modules/project/dto/story-workflow.dto.ts b/alfy-bot/src/modules/project/dto/story-workflow.dto.ts new file mode 100644 index 0000000..fb7ceb6 --- /dev/null +++ b/alfy-bot/src/modules/project/dto/story-workflow.dto.ts @@ -0,0 +1,45 @@ +import { Type } from 'class-transformer'; +import { + ArrayMinSize, + ArrayUnique, + IsArray, + IsIn, + IsString, + Matches, + MaxLength, + ValidateNested, +} from 'class-validator'; +import { ApiProperty } from '@nestjs/swagger'; +import type { StoryWorkflowCategory } from '../domain/story-workflow'; + +export class StoryWorkflowStatusDto { + @ApiProperty() + @IsString() + @Matches(/^[a-zA-Z0-9_-]+$/) + @MaxLength(64) + id: string; + + @ApiProperty() + @IsString() + @Matches(/\S/) + @MaxLength(120) + name: string; + + @ApiProperty({ enum: ['open', 'ready', 'in_progress', 'review', 'done'] }) + @IsIn(['open', 'ready', 'in_progress', 'review', 'done']) + category: StoryWorkflowCategory; + + @ApiProperty() + @Matches(/^#[0-9a-fA-F]{6}$/) + color: string; +} + +export class ReplaceStoryWorkflowDto { + @ApiProperty({ type: [StoryWorkflowStatusDto] }) + @IsArray() + @ArrayMinSize(2) + @ArrayUnique((status: StoryWorkflowStatusDto) => status.id) + @ValidateNested({ each: true }) + @Type(() => StoryWorkflowStatusDto) + statuses: StoryWorkflowStatusDto[]; +} diff --git a/alfy-bot/src/modules/project/dto/update-group.dto.ts b/alfy-bot/src/modules/project/dto/update-group.dto.ts index 81604de..7be3ce2 100644 --- a/alfy-bot/src/modules/project/dto/update-group.dto.ts +++ b/alfy-bot/src/modules/project/dto/update-group.dto.ts @@ -1,10 +1,53 @@ import { PartialType, ApiPropertyOptional } from '@nestjs/swagger'; -import { IsIn, IsOptional } from 'class-validator'; +import { + ArrayUnique, + IsArray, + IsBoolean, + IsDateString, + IsIn, + IsString, + IsUUID, + Matches, + MaxLength, + ValidateIf, +} from 'class-validator'; import { CreateGroupDto } from './create-group.dto'; export class UpdateGroupDto extends PartialType(CreateGroupDto) { @ApiPropertyOptional({ enum: ['open', 'done'] }) - @IsOptional() + @ValidateIf((_object, value) => value !== undefined) @IsIn(['open', 'done']) status?: 'open' | 'done'; + + @ApiPropertyOptional() + @ValidateIf((_object, value) => value !== undefined) + @IsString() + @Matches(/^[a-zA-Z0-9_-]+$/) + @MaxLength(64) + workflowStatusId?: string; + + @ApiPropertyOptional({ nullable: true }) + @ValidateIf((_object, value) => value !== undefined && value !== null) + @IsString() + @Matches(/\S/) + @MaxLength(2000) + blockedReason?: string | null; + + @ApiPropertyOptional({ nullable: true, example: '2026-11-15' }) + @ValidateIf((_object, value) => value !== undefined && value !== null) + @Matches(/^\d{4}-\d{2}-\d{2}$/) + @IsDateString({ strict: true }) + deferredUntil?: string | null; + + @ApiPropertyOptional() + @ValidateIf((_object, value) => value !== undefined) + @IsBoolean() + archived?: boolean; + + @ApiPropertyOptional({ type: [String] }) + @ValidateIf((_object, value) => value !== undefined) + @IsArray() + @ArrayUnique() + @IsUUID('4', { each: true }) + dependencyIds?: string[]; } diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.spec.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.spec.ts new file mode 100644 index 0000000..e7d3457 --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-board-group.repository.spec.ts @@ -0,0 +1,63 @@ +import { DataSource } from 'typeorm'; +import * as entities from '../../../shared/entities'; +import { BoardGroup, Project, Sprint, User } from '../../../shared/entities'; +import { TypeOrmBoardGroupRepository } from './typeorm-board-group.repository'; + +describe('Метаданные историй и конкурентное планирование', () => { + let dataSource: DataSource; + + beforeEach(async () => { + dataSource = await new DataSource({ + type: 'sqlite', + database: ':memory:', + entities: Object.values(entities), + synchronize: true, + }).initialize(); + await dataSource.getRepository(User).save({ id: 1 }); + await dataSource + .getRepository(Project) + .save({ id: 'project', userId: 1, title: 'Проект', type: 'agile' }); + }); + + afterEach(async () => { + await dataSource.destroy(); + }); + + it('сохранение статуса не возвращает историю в старый спринт и порядок', async () => { + const groups = dataSource.getRepository(BoardGroup); + const repository = new TypeOrmBoardGroupRepository(groups); + const epic = await groups.save({ + userId: 1, + projectId: 'project', + title: 'Эпик', + type: 'epic', + }); + const story = await groups.save({ + userId: 1, + projectId: 'project', + title: 'История', + parentId: epic.id, + type: 'story', + workflowStatusId: 'open', + }); + const stale = await repository.findById(story.id, 'project'); + const sprint = await dataSource + .getRepository(Sprint) + .save({ userId: 1, projectId: 'project', name: 'Следующий' }); + await groups.update(story.id, { sprintId: sprint.id, order: 3 }); + const updated = await repository.save({ + ...stale!, + workflowStatusId: 'in_progress', + }); + expect(updated).toMatchObject({ + sprintId: sprint.id, + order: 3, + workflowStatusId: 'in_progress', + }); + expect(await repository.findById(story.id, 'project')).toMatchObject({ + sprintId: sprint.id, + order: 3, + workflowStatusId: 'in_progress', + }); + }); +}); 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 dac10f1..60882e8 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,8 @@ -import { BadRequestException, Injectable } from '@nestjs/common'; +import { + BadRequestException, + Injectable, + NotFoundException, +} from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { BoardGroup } from '../../../shared/entities'; @@ -34,7 +38,33 @@ export class TypeOrmBoardGroupRepository extends BoardGroupRepositoryPort { } async save(group: BoardGroup): Promise { - return this.repo.save(group); + const fields = [ + 'parentId', + 'type', + 'title', + 'description', + 'color', + 'startDate', + 'dueDate', + 'status', + 'completedAt', + 'workflowStatusId', + 'blockedReason', + 'deferredUntil', + 'archived', + 'dependencyIds', + ] as const; + const changes = Object.fromEntries( + fields.map((field) => [field, group[field]]), + ); + const result = await this.repo.update( + { id: group.id, projectId: group.projectId }, + changes, + ); + if (result.affected !== 1) throw new NotFoundException('Группа не найдена'); + const saved = await this.findById(group.id, group.projectId); + if (!saved) throw new NotFoundException('Группа не найдена'); + return saved; } async delete(id: string, projectId: string): Promise { diff --git a/alfy-bot/src/modules/project/story-workflow.controller.ts b/alfy-bot/src/modules/project/story-workflow.controller.ts new file mode 100644 index 0000000..99b6c5e --- /dev/null +++ b/alfy-bot/src/modules/project/story-workflow.controller.ts @@ -0,0 +1,42 @@ +import { + Body, + Controller, + Get, + Param, + Put, + Request, + UseGuards, +} from '@nestjs/common'; +import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger'; +import { JwtOrApiTokenGuard } from '../auth/guards/jwt-or-api-token.guard'; +import { JwtPayload } from '../auth/strategies/jwt.strategy'; +import { StoryWorkflowService } from './story-workflow.service'; +import { ReplaceStoryWorkflowDto } from './dto/story-workflow.dto'; + +interface AuthRequest extends Request { + user: JwtPayload; +} + +@ApiTags('story-workflow') +@ApiBearerAuth() +@UseGuards(JwtOrApiTokenGuard) +@Controller('projects/:projectId/story-workflow') +export class StoryWorkflowController { + constructor(private readonly workflow: StoryWorkflowService) {} + + @Get() + @ApiOperation({ summary: 'Каталог статусов историй проекта' }) + get(@Request() req: AuthRequest, @Param('projectId') projectId: string) { + return this.workflow.get(req.user.sub, projectId); + } + + @Put() + @ApiOperation({ summary: 'Сохранить каталог статусов историй' }) + replace( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Body() dto: ReplaceStoryWorkflowDto, + ) { + return this.workflow.replace(req.user.sub, projectId, dto.statuses); + } +} diff --git a/alfy-bot/src/modules/project/story-workflow.service.ts b/alfy-bot/src/modules/project/story-workflow.service.ts new file mode 100644 index 0000000..abf3ffc --- /dev/null +++ b/alfy-bot/src/modules/project/story-workflow.service.ts @@ -0,0 +1,72 @@ +import { + BadRequestException, + Injectable, + NotFoundException, +} from '@nestjs/common'; +import { ProjectRepositoryPort } from './domain/project-repository.port'; +import { BoardGroupRepositoryPort } from './domain/board-group-repository.port'; +import { + storyWorkflow, + workflowIssue, + type StoryWorkflowStatus, +} from './domain/story-workflow'; + +@Injectable() +export class StoryWorkflowService { + private readonly pending = new Map>(); + + constructor( + private readonly projectRepo: ProjectRepositoryPort, + private readonly groupRepo: BoardGroupRepositoryPort, + ) {} + + /** Возвращает каталог доступного пользователю agile-проекта без изменения базы. */ + async get( + userId: number, + projectId: string, + ): Promise<{ statuses: StoryWorkflowStatus[] }> { + const project = await this.projectRepo.findById(projectId, userId); + if (!project || project.userId !== userId) + throw new NotFoundException('Проект не найден'); + if (project.type !== 'agile') + throw new BadRequestException('Статусы историй доступны в agile-проекте'); + return { statuses: storyWorkflow(project) }; + } + + /** Сохраняет каталог; занятые статусы нельзя удалять или переводить в другую категорию. */ + async replace( + userId: number, + projectId: string, + statuses: StoryWorkflowStatus[], + ): Promise<{ statuses: StoryWorkflowStatus[] }> { + return this.exclusive(projectId, async () => { + const previous = await this.get(userId, projectId); + const groups = await this.groupRepo.findAllByProject(projectId); + const issue = workflowIssue(statuses, previous.statuses, groups); + if (issue) throw new BadRequestException(issue); + const project = await this.projectRepo.update(userId, projectId, { + storyWorkflow: statuses.map((status) => ({ + ...status, + name: status.name.trim(), + })), + }); + return { statuses: storyWorkflow(project) }; + }); + } + + /** Последовательно выполняет операции каталога и историй одного проекта; ошибка не блокирует следующие операции. */ + async exclusive( + projectId: string, + operation: () => Promise, + ): Promise { + const previous = this.pending.get(projectId) ?? Promise.resolve(); + const current = previous.then(operation, operation); + this.pending.set(projectId, current); + try { + return await current; + } finally { + if (this.pending.get(projectId) === current) + this.pending.delete(projectId); + } + } +} diff --git a/alfy-bot/src/shared/entities/board-group.entity.ts b/alfy-bot/src/shared/entities/board-group.entity.ts index bf33f79..32d9c48 100644 --- a/alfy-bot/src/shared/entities/board-group.entity.ts +++ b/alfy-bot/src/shared/entities/board-group.entity.ts @@ -69,6 +69,21 @@ export class BoardGroup { @Column({ type: 'text', default: 'open' }) status: 'open' | 'done'; + @Column({ type: 'text', nullable: true }) + workflowStatusId: string | null; + + @Column({ type: 'text', nullable: true }) + blockedReason: string | null; + + @Column({ type: 'text', nullable: true }) + deferredUntil: string | null; + + @Column({ default: false }) + archived: boolean; + + @Column({ type: 'simple-json', default: '[]' }) + dependencyIds: string[]; + @Column({ type: 'datetime', nullable: true }) completedAt: Date | null; diff --git a/alfy-bot/src/shared/entities/project.entity.ts b/alfy-bot/src/shared/entities/project.entity.ts index 1951c7e..e991f3a 100644 --- a/alfy-bot/src/shared/entities/project.entity.ts +++ b/alfy-bot/src/shared/entities/project.entity.ts @@ -12,6 +12,20 @@ import { import { User } from './user.entity'; import { ProjectColumn } from './project-column.entity'; +export type StoryWorkflowCategory = + | 'open' + | 'ready' + | 'in_progress' + | 'review' + | 'done'; + +export interface StoryWorkflowStatus { + id: string; + name: string; + category: StoryWorkflowCategory; + color: string; +} + @Entity('projects') @Index('IDX_project_task_key_prefix', ['userId', 'taskKeyPrefix'], { unique: true, @@ -54,6 +68,9 @@ export class Project { @Column({ type: 'integer', default: 0 }) order: number; + @Column({ type: 'simple-json', nullable: true }) + storyWorkflow: StoryWorkflowStatus[] | null; + @CreateDateColumn() createdAt: Date; diff --git a/alfy-bot/test/story-workflow.e2e-spec.ts b/alfy-bot/test/story-workflow.e2e-spec.ts new file mode 100644 index 0000000..bb5e606 --- /dev/null +++ b/alfy-bot/test/story-workflow.e2e-spec.ts @@ -0,0 +1,381 @@ +import request from 'supertest'; +import { randomUUID } from 'node:crypto'; +import { INestApplication } from '@nestjs/common'; +import { createTestApp } from './helpers/test-app'; + +describe('Жизненный цикл историй (HTTP + SQLite)', () => { + let app: INestApplication; + let token: string; + let projectId: string; + let epicId: string; + let storyId: string; + + const api = () => request(app.getHttpServer()); + const auth = () => `Bearer ${token}`; + const groups = () => `/api/projects/${projectId}/groups`; + const workflow = () => `/api/projects/${projectId}/story-workflow`; + + beforeAll(async () => { + ({ app, token } = await createTestApp()); + await app.listen(0, '127.0.0.1'); + const project = await api() + .post('/api/projects') + .set('Authorization', auth()) + .send({ title: 'Истории', type: 'agile', viewMode: 'board' }) + .expect(201); + projectId = project.body.id as string; + const epic = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'Эпик' }) + .expect(201); + epicId = epic.body.id as string; + const story = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'Оплата', parentId: epicId }) + .expect(201); + storyId = story.body.id as string; + }); + + afterAll(async () => { + await app?.close(); + }); + + it('возвращает пять серверных статусов с русскими названиями', async () => { + const response = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + expect(response.body.statuses.map((s: { id: string }) => s.id)).toEqual([ + 'open', + 'ready', + 'in_progress', + 'review', + 'done', + ]); + expect(response.body.statuses[2].name).toBe('В работе'); + }); + + it('меняет статус без завершения задач и сохраняет его после переноса в спринт', async () => { + await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ + workflowStatusId: 'in_progress', + blockedReason: 'Ждём ответ', + deferredUntil: '2026-11-20', + }) + .expect(200); + const sprint = await api() + .post(`/api/projects/${projectId}/sprints`) + .set('Authorization', auth()) + .send({}) + .expect(201); + await api() + .patch(`${groups()}/${storyId}/sprint`) + .set('Authorization', auth()) + .send({ sprintId: sprint.body.id }) + .expect(200); + const tree = await api() + .get(groups()) + .set('Authorization', auth()) + .expect(200); + expect(tree.body[0].children[0]).toMatchObject({ + status: 'open', + workflowStatusId: 'in_progress', + blockedReason: 'Ждём ответ', + deferredUntil: '2026-11-20', + }); + }); + + it('поддерживает старое завершение и повторное открытие', async () => { + const done = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ status: 'done' }) + .expect(200); + expect(done.body).toMatchObject({ + status: 'done', + workflowStatusId: 'done', + }); + expect(done.body.completedAt).not.toBeNull(); + const reopened = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ status: 'open' }) + .expect(200); + expect(reopened.body).toMatchObject({ + status: 'open', + workflowStatusId: 'open', + completedAt: null, + }); + }); + + it('позволяет переименовать каталог, добавить промежуточный статус и применить его', async () => { + const response = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + const statuses = [ + ...response.body.statuses, + { + id: 'qa', + name: 'Проверка на стенде', + category: 'review', + color: '#a855f7', + }, + ]; + statuses[0].name = 'Идея'; + await api() + .put(workflow()) + .set('Authorization', auth()) + .send({ statuses }) + .expect(200); + const updated = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ workflowStatusId: 'qa' }) + .expect(200); + expect(updated.body).toMatchObject({ + workflowStatusId: 'qa', + status: 'open', + }); + const reread = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + expect(reread.body.statuses[0].name).toBe('Идея'); + }); + + it('не удаляет занятый статус и не меняет категорию занятого статуса', async () => { + const { body } = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + await api() + .put(workflow()) + .set('Authorization', auth()) + .send({ + statuses: body.statuses.filter((s: { id: string }) => s.id !== 'qa'), + }) + .expect(400); + await api() + .put(workflow()) + .set('Authorization', auth()) + .send({ + statuses: body.statuses.map((s: { id: string }) => + s.id === 'qa' ? { ...s, category: 'done' } : s, + ), + }) + .expect(400); + }); + + it('сохраняет архив и позволяет восстановить историю', async () => { + const archived = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ archived: true }) + .expect(200); + expect(archived.body.archived).toBe(true); + const restored = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ archived: false, blockedReason: null, deferredUntil: null }) + .expect(200); + expect(restored.body).toMatchObject({ + archived: false, + blockedReason: null, + deferredUntil: null, + }); + }); + + it('отклоняет чужие зависимости, эпики, самоссылки и циклы', async () => { + for (const dependencyIds of [ + [storyId], + [epicId], + [randomUUID()], + [storyId, storyId], + ]) { + await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ dependencyIds }) + .expect(400); + } + const second = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'Вторая', parentId: epicId }) + .expect(201); + const secondId = second.body.id as string; + await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ dependencyIds: [secondId] }) + .expect(200); + await api() + .patch(`${groups()}/${secondId}`) + .set('Authorization', auth()) + .send({ dependencyIds: [storyId] }) + .expect(400); + }); + + it.each([ + { workflowStatusId: 'missing' }, + { workflowStatusId: null }, + { archived: null }, + { dependencyIds: null }, + { deferredUntil: '2026-02-30' }, + { blockedReason: ' ' }, + { workflowStatusId: 'review', status: 'done' }, + ])('отклоняет невалидные поля %j', async (payload) => { + await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send(payload) + .expect(400); + }); + + it('не раскрывает каталог чужого проекта', async () => { + await api() + .get(`/api/projects/${randomUUID()}/story-workflow`) + .set('Authorization', auth()) + .expect(404); + }); + it('конкурентные зависимости не образуют цикл', async () => { + const first = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'А', parentId: epicId }) + .expect(201); + const second = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'Б', parentId: epicId }) + .expect(201); + const results = await Promise.all([ + api() + .patch(`${groups()}/${first.body.id}`) + .set('Authorization', auth()) + .send({ dependencyIds: [second.body.id] }), + api() + .patch(`${groups()}/${second.body.id}`) + .set('Authorization', auth()) + .send({ dependencyIds: [first.body.id] }), + ]); + expect(results.map((result) => result.status).sort()).toEqual([200, 400]); + }); + + it('удаление статуса одновременно с назначением не оставляет неизвестный статус', async () => { + const original = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + const statuses = [ + ...original.body.statuses, + { id: 'race', name: 'Проверка', category: 'review', color: '#9333ea' }, + ]; + await api() + .put(workflow()) + .set('Authorization', auth()) + .send({ statuses }) + .expect(200); + const results = await Promise.all([ + api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ workflowStatusId: 'race' }), + api() + .put(workflow()) + .set('Authorization', auth()) + .send({ statuses: original.body.statuses }), + ]); + expect(results.map((result) => result.status).sort()).toEqual([200, 400]); + const tree = await api() + .get(groups()) + .set('Authorization', auth()) + .expect(200); + const catalog = await api() + .get(workflow()) + .set('Authorization', auth()) + .expect(200); + const story = tree.body[0].children.find( + (item: { id: string }) => item.id === storyId, + ); + expect( + catalog.body.statuses.map((status: { id: string }) => status.id), + ).toContain(story.workflowStatusId); + }); + + it('выполнение всех задач не принимает результат истории автоматически', async () => { + const story = await api() + .post(groups()) + .set('Authorization', auth()) + .send({ title: 'Проверка результата', parentId: epicId }) + .expect(201); + await api() + .patch(`${groups()}/${story.body.id}`) + .set('Authorization', auth()) + .send({ workflowStatusId: 'review' }) + .expect(200); + const task = await api() + .post('/api/tasks') + .set('Authorization', auth()) + .send({ + title: 'Реализация', + projectId, + groupId: story.body.id, + sprintId: null, + }) + .expect(201); + await api() + .patch(`/api/tasks/${task.body.id}`) + .set('Authorization', auth()) + .send({ completed: true }) + .expect(200); + const tree = await api() + .get(groups()) + .set('Authorization', auth()) + .expect(200); + expect( + tree.body[0].children.find( + (item: { id: string }) => item.id === story.body.id, + ), + ).toMatchObject({ + workflowStatusId: 'review', + status: 'open', + completedAt: null, + }); + }); + + it('повторное завершение не меняет дату принятия результата', async () => { + const first = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ status: 'done' }) + .expect(200); + const second = await api() + .patch(`${groups()}/${storyId}`) + .set('Authorization', auth()) + .send({ status: 'done' }) + .expect(200); + expect(second.body.completedAt).toBe(first.body.completedAt); + }); + + it.each( + [ + null, + [], + [null], + ['bad'], + [{ id: 'one', name: 'Один', category: 'unknown', color: 'red' }], + ].map((statuses) => ({ statuses })), + )('невалидный каталог $statuses возвращает 400', async ({ statuses }) => { + await api() + .put(workflow()) + .set('Authorization', auth()) + .send({ statuses }) + .expect(400); + }); +}); From def8e279f6fab80555d01d9c94035f683fb725f1 Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Wed, 4 Nov 2026 23:27:33 +0500 Subject: [PATCH 03/12] feat(planning): add sprint budgets, safe planning and immutable reports --- alfy-bot/src/app.module.ts | 6 + .../project/domain/planning-context.ts | 134 ++++ .../project/domain/planning-proposal.ts | 198 +++++ .../domain/planning-repository.port.ts | 35 + .../src/modules/project/domain/planning.ts | 84 +++ .../project/domain/sprint-repository.port.ts | 2 + .../project/dto/complete-sprint.dto.ts | 64 +- .../modules/project/dto/create-sprint.dto.ts | 19 + .../src/modules/project/dto/planning.dto.ts | 57 ++ .../modules/project/dto/update-sprint.dto.ts | 21 + .../project/infrastructure/planning-access.ts | 29 + .../infrastructure/planning-mutations.ts | 185 +++++ .../project/infrastructure/planning-state.ts | 33 + .../infrastructure/sprint-completion.ts | 107 +++ .../typeorm-planning.repository.ts | 109 +++ .../typeorm-project.repository.ts | 2 +- .../typeorm-sprint.repository.ts | 74 +- .../modules/project/planning.controller.ts | 78 ++ .../src/modules/project/planning.service.ts | 81 ++ .../src/modules/project/project.module.ts | 11 + .../src/modules/project/sprint.controller.ts | 15 +- .../modules/project/sprint.service.spec.ts | 10 + .../src/modules/project/sprint.service.ts | 30 +- .../board-group-constraints.service.ts | 3 +- .../src/shared/database/create-data-source.ts | 4 +- .../database/question-migration.service.ts | 5 + .../database/schedule-migration.service.ts | 5 + .../shared/database/serialized-sqlite.spec.ts | 209 ++++++ .../src/shared/database/serialized-sqlite.ts | 228 ++++++ .../shared/database/sprint-history.service.ts | 113 +++ alfy-bot/src/shared/entities/index.ts | 3 + .../shared/entities/planning-undo.entity.ts | 36 + .../shared/entities/sprint-event.entity.ts | 35 + alfy-bot/src/shared/entities/sprint.entity.ts | 19 + .../src/shared/types/sprint-planning.types.ts | 23 + alfy-bot/test/helpers/test-app.ts | 7 +- alfy-bot/test/planning.e2e-spec.ts | 696 ++++++++++++++++++ 37 files changed, 2745 insertions(+), 25 deletions(-) create mode 100644 alfy-bot/src/modules/project/domain/planning-context.ts create mode 100644 alfy-bot/src/modules/project/domain/planning-proposal.ts create mode 100644 alfy-bot/src/modules/project/domain/planning-repository.port.ts create mode 100644 alfy-bot/src/modules/project/domain/planning.ts create mode 100644 alfy-bot/src/modules/project/dto/planning.dto.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/planning-access.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/planning-mutations.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/planning-state.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/sprint-completion.ts create mode 100644 alfy-bot/src/modules/project/infrastructure/typeorm-planning.repository.ts create mode 100644 alfy-bot/src/modules/project/planning.controller.ts create mode 100644 alfy-bot/src/modules/project/planning.service.ts create mode 100644 alfy-bot/src/shared/database/serialized-sqlite.spec.ts create mode 100644 alfy-bot/src/shared/database/serialized-sqlite.ts create mode 100644 alfy-bot/src/shared/database/sprint-history.service.ts create mode 100644 alfy-bot/src/shared/entities/planning-undo.entity.ts create mode 100644 alfy-bot/src/shared/entities/sprint-event.entity.ts create mode 100644 alfy-bot/src/shared/types/sprint-planning.types.ts create mode 100644 alfy-bot/test/planning.e2e-spec.ts diff --git a/alfy-bot/src/app.module.ts b/alfy-bot/src/app.module.ts index d5b70c8..1546768 100644 --- a/alfy-bot/src/app.module.ts +++ b/alfy-bot/src/app.module.ts @@ -32,6 +32,8 @@ import { ProjectColumn, BoardGroup, Sprint, + SprintEvent, + PlanningUndo, Release, ApiToken, Link, @@ -44,6 +46,7 @@ import { TaskNumberMigrationService } from './shared/database/task-number-migrat import { QuestionMigrationService } from './shared/database/question-migration.service'; import { AuthMethodMigrationService } from './shared/database/auth-method-migration.service'; import { RecurringSeriesRepairService } from './shared/database/recurring-series-repair.service'; +import { SprintHistoryService } from './shared/database/sprint-history.service'; import { SharedModule } from './shared/shared.module'; const telegramImports = isTelegramEnabled() @@ -79,6 +82,8 @@ const telegramImports = isTelegramEnabled() ProjectColumn, BoardGroup, Sprint, + SprintEvent, + PlanningUndo, Release, ApiToken, Link, @@ -114,6 +119,7 @@ const telegramImports = isTelegramEnabled() AuthMethodMigrationService, RecurringSeriesRepairService, BoardGroupConstraintsMigrationService, + SprintHistoryService, ProjectTypeMigrationService, TaskNumberMigrationService, ], diff --git a/alfy-bot/src/modules/project/domain/planning-context.ts b/alfy-bot/src/modules/project/domain/planning-context.ts new file mode 100644 index 0000000..4500aca --- /dev/null +++ b/alfy-bot/src/modules/project/domain/planning-context.ts @@ -0,0 +1,134 @@ +import type { BoardGroup, Sprint } from '../../../shared/entities'; +import { estimateMinutes, PlanningData } from './planning'; +import { normalizeStoryGroup, storyWorkflow } from './story-workflow'; + +/** Определяет блокировку истории по явной причине или незавершённой зависимости; отсутствующая зависимость считается блокером. */ +export function storyBlocked( + story: BoardGroup, + stories: BoardGroup[], +): boolean { + return ( + Boolean(story.blockedReason?.trim()) || + (story.dependencyIds ?? []).some( + (id) => !stories.some((s) => s.id === id && s.status === 'done'), + ) + ); +} + +/** Рассчитывает нагрузку выбранного спринта и возвращает доступные для планирования задачи проекта без изменения данных. */ +export function planningContext(data: PlanningData, sprintId: string | null) { + const sprint = data.sprints.find((s) => s.id === sprintId); + const closed = new Set( + data.sprints.filter((s) => s.status === 'closed').map((s) => s.id), + ); + const tasks = data.tasks + .filter((t) => !t.sprintId || !closed.has(t.sprintId)) + .map((task) => { + const story = data.stories.find((s) => s.id === task.groupId); + return { + id: task.id, + title: task.title, + completed: task.completed, + groupId: task.groupId, + sprintId: task.sprintId, + order: task.order, + estimateMinutes: estimateMinutes(task), + priority: task.priority, + blocked: Boolean( + task.isOverdue || (story && storyBlocked(story, data.stories)), + ), + updatedAt: task.updatedAt.toISOString(), + }; + }); + const selected = tasks.filter((t) => t.sprintId === sprintId); + const plannedMinutes = selected.reduce( + (total, t) => total + (t.estimateMinutes ?? 0), + 0, + ); + const reserveMinutes = sprint?.reserveMinutes ?? 0; + const capacityMinutes = sprint?.capacityMinutes ?? null; + const overlap = new Set( + data.otherSprints + .filter( + (s) => + s.status !== 'closed' && + s.startDate && + s.endDate && + sprint?.startDate && + sprint.endDate && + s.startDate <= sprint.endDate && + s.endDate >= sprint.startDate, + ) + .map((s) => s.id), + ); + const otherTasks = data.otherTasks.filter( + (t) => !t.completed && t.sprintId && overlap.has(t.sprintId), + ); + const duration = (s: Sprint | undefined): number | null => + s?.startDate && s.endDate + ? Date.parse(s.endDate) - Date.parse(s.startDate) + : null; + const targetDuration = duration(sprint); + const samples = data.sprints + .filter( + (s) => + targetDuration !== null && + duration(s) === targetDuration && + s.status === 'closed' && + s.initialSnapshot && + s.finalSnapshot && + s.finalSnapshot.tasks.every((t) => t.estimateMinutes !== null), + ) + .map((s) => + s + .finalSnapshot!.tasks.filter((t) => t.completed) + .reduce((total, t) => total + t.estimateMinutes!, 0), + ) + .sort((a, b) => a - b); + const historicalCapacityMinutes = samples.length + ? (samples[Math.floor((samples.length - 1) / 2)] + + samples[Math.floor(samples.length / 2)]) / + 2 + : null; + const carryoverCounts: Record = {}; + for (const previous of data.sprints.filter( + (s) => s.status === 'closed' && s.finalSnapshot, + )) { + for (const task of previous.finalSnapshot!.tasks.filter( + (t) => !t.completed, + )) + carryoverCounts[task.id] = (carryoverCounts[task.id] ?? 0) + 1; + for (const story of previous.finalSnapshot!.stories.filter( + (s) => s.status !== 'done', + )) + carryoverCounts[story.id] = (carryoverCounts[story.id] ?? 0) + 1; + } + const statuses = storyWorkflow(data.project); + return { + today: data.today, + sprintId, + capacityMinutes, + reserveMinutes, + plannedMinutes, + remainingEffortMinutes: selected + .filter((t) => !t.completed) + .reduce((total, t) => total + (t.estimateMinutes ?? 0), 0), + remainingMinutes: + capacityMinutes === null + ? null + : capacityMinutes - reserveMinutes - plannedMinutes, + unestimatedCount: selected.filter((t) => t.estimateMinutes === null).length, + otherProjectsMinutes: otherTasks.reduce( + (total, t) => total + (estimateMinutes(t) ?? 0), + 0, + ), + otherProjectsUnestimatedCount: otherTasks.filter( + (t) => estimateMinutes(t) === null, + ).length, + historicalCapacityMinutes, + historySampleCount: samples.length, + tasks, + stories: data.stories.map((s) => normalizeStoryGroup(s, statuses)), + carryoverCounts, + }; +} diff --git a/alfy-bot/src/modules/project/domain/planning-proposal.ts b/alfy-bot/src/modules/project/domain/planning-proposal.ts new file mode 100644 index 0000000..1d50d88 --- /dev/null +++ b/alfy-bot/src/modules/project/domain/planning-proposal.ts @@ -0,0 +1,198 @@ +import type { BoardGroup, Task } from '../../../shared/entities'; +import { estimateMinutes, PlanningData, PlanningProposal } from './planning'; +import { storyStatusId, storyWorkflow } from './story-workflow'; + +type Reason = { id: string; reason: string }; +type Candidate = { + id: string; + story: BoardGroup | null; + tasks: Task[]; + order: number; + title: string; +}; + +/** Предлагает состав в пределах явного бюджета, включая незавершённые зависимости; неизвестные оценки остаются вне предложения. Записей не выполняет. */ +export function proposePlan(data: PlanningData, input: PlanningProposal) { + const statuses = storyWorkflow(data.project); + const existing = data.tasks.filter((t) => t.sprintId === input.sprintId); + const selectedTasks = new Set(existing.map((t) => t.id)); + const selectedStories = new Set( + data.stories + .filter((s) => s.sprintId === input.sprintId && s.status !== 'done') + .map((s) => s.id), + ); + const unestimated = new Set( + existing.filter((t) => estimateMinutes(t) === null).map((t) => t.id), + ); + let totalMinutes = existing.reduce( + (sum, t) => sum + (estimateMinutes(t) ?? 0), + 0, + ); + const reasons: Reason[] = []; + const excluded: Reason[] = []; + const closed = new Set( + data.sprints.filter((s) => s.status === 'closed').map((s) => s.id), + ); + const storyCandidates: Candidate[] = data.stories + .filter((s) => s.status !== 'done') + .map((story) => ({ + id: story.id, + story, + tasks: data.tasks.filter( + (t) => + t.groupId === story.id && (!t.sprintId || !closed.has(t.sprintId)), + ), + order: story.order, + title: story.title, + })); + const candidates = storyCandidates.filter( + (c) => c.story!.sprintId !== input.sprintId, + ); + const included = new Map(); + candidates.push( + ...data.tasks + .filter( + (t) => + !t.completed && + !data.stories.some((s) => s.id === t.groupId) && + t.sprintId !== input.sprintId, + ) + .map((task) => ({ + id: task.id, + story: null, + tasks: [task], + order: task.order, + title: task.title, + })), + ); + const terms = input.goal + .toLocaleLowerCase('ru') + .split(/[^\p{L}\p{N}]+/u) + .filter((t) => t.length > 2); + const relevance = (candidate: Candidate) => + terms.filter((term) => + candidate.title.toLocaleLowerCase('ru').includes(term), + ).length; + candidates.sort( + (a, b) => + relevance(b) - relevance(a) || + a.order - b.order || + a.id.localeCompare(b.id), + ); + const byStory = new Map(storyCandidates.map((c) => [c.id, c])); + const eligibility = (candidate: Candidate): string | null => { + const story = candidate.story; + if (story?.archived) return 'История в архиве'; + if (story?.deferredUntil && story.deferredUntil > data.today) + return `Отложена до ${story.deferredUntil}`; + if (story?.blockedReason?.trim()) + return `Заблокирована: ${story.blockedReason}`; + if ( + story && + statuses.find((s) => s.id === storyStatusId(story, statuses)) + ?.category === 'open' + ) + return 'История ещё не готова к работе'; + if (story?.sprintId && story.sprintId !== input.sprintId) + return 'История уже назначена в другой спринт'; + if (candidate.tasks.some((t) => t.isOverdue)) + return 'Есть замороженная задача'; + if ( + candidate.tasks.some((t) => t.sprintId && t.sprintId !== input.sprintId) + ) + return 'Есть задачи в другом спринте'; + const unknown = candidate.tasks.filter((t) => estimateMinutes(t) === null); + unknown.forEach((t) => unestimated.add(t.id)); + if (unknown.length || (story && candidate.tasks.length === 0)) + return 'Нужна оценка объёма работы'; + return null; + }; + const gather = ( + candidate: Candidate, + gathered: Map, + visiting: Set, + ): string | null => { + if (gathered.has(candidate.id)) return null; + if (visiting.has(candidate.id)) return 'Циклическая зависимость'; + const issue = eligibility(candidate); + if (issue) return issue; + visiting.add(candidate.id); + for (const id of candidate.story?.dependencyIds ?? []) { + const story = data.stories.find((s) => s.id === id); + if (story?.status === 'done') continue; + const dependency = byStory.get(id); + if (!dependency) return 'Зависимость недоступна для планирования'; + const blocked = gather(dependency, gathered, visiting); + if (blocked) return `Зависимость: ${blocked}`; + } + visiting.delete(candidate.id); + gathered.set(candidate.id, candidate); + return null; + }; + for (const candidate of candidates) { + if (selectedStories.has(candidate.id) || selectedTasks.has(candidate.id)) + continue; + const gathered = new Map(); + const issue = gather(candidate, gathered, new Set()); + if (issue) { + excluded.push({ id: candidate.id, reason: issue }); + continue; + } + const added = [...gathered.values()] + .flatMap((c) => c.tasks) + .filter((t) => !selectedTasks.has(t.id)); + const cost = added.reduce((sum, t) => sum + estimateMinutes(t)!, 0); + if (unestimated.size && existing.some((t) => estimateMinutes(t) === null)) { + excluded.push({ + id: candidate.id, + reason: 'Сначала оцените задачи выбранного спринта', + }); + continue; + } + if (totalMinutes + cost > input.budgetMinutes) { + excluded.push({ + id: candidate.id, + reason: 'Не помещается в бюджет с учётом зависимостей', + }); + continue; + } + totalMinutes += cost; + for (const item of gathered.values()) { + included.set(item.id, item); + if (item.story) selectedStories.add(item.id); + item.tasks.forEach((t) => selectedTasks.add(t.id)); + reasons.push({ + id: item.id, + reason: + item.id !== candidate.id + ? 'Необходима для выбранной истории' + : relevance(item) + ? 'Связана с целью и помещается в бюджет' + : 'Следующая по очереди и помещается в бюджет', + }); + } + } + const existingIds = new Set(existing.map((t) => t.id)); + const movingStories = [...included.values()] + .filter( + (c) => + c.story && + (c.story.sprintId !== input.sprintId || + c.tasks.some((t) => t.sprintId !== input.sprintId)), + ) + .map((c) => c.id); + return { + taskIds: [...selectedTasks].filter( + (id) => + !existingIds.has(id) && + !data.tasks.some( + (t) => t.id === id && t.groupId && movingStories.includes(t.groupId), + ), + ), + storyIds: movingStories, + totalMinutes, + unestimatedIds: [...unestimated], + excluded, + reasons, + }; +} diff --git a/alfy-bot/src/modules/project/domain/planning-repository.port.ts b/alfy-bot/src/modules/project/domain/planning-repository.port.ts new file mode 100644 index 0000000..59fd6e5 --- /dev/null +++ b/alfy-bot/src/modules/project/domain/planning-repository.port.ts @@ -0,0 +1,35 @@ +import type { Sprint, SprintEvent } from '../../../shared/entities'; +import type { + PlanningData, + PlanningMove, + PlanningOrder, + PlanningSnapshot, +} from './planning'; + +export abstract class PlanningRepositoryPort { + abstract load(userId: number, projectId: string): Promise; + abstract move( + userId: number, + projectId: string, + input: PlanningMove, + ): Promise<{ updated: number; undoToken: string }>; + abstract undo( + userId: number, + projectId: string, + token: string, + ): Promise<{ updated: number }>; + abstract reorder( + userId: number, + projectId: string, + input: PlanningOrder, + ): Promise<{ updated: number }>; + abstract report( + userId: number, + projectId: string, + sprintId: string, + ): Promise<{ + sprint: Sprint; + current: PlanningSnapshot; + events: SprintEvent[]; + }>; +} diff --git a/alfy-bot/src/modules/project/domain/planning.ts b/alfy-bot/src/modules/project/domain/planning.ts new file mode 100644 index 0000000..285e94a --- /dev/null +++ b/alfy-bot/src/modules/project/domain/planning.ts @@ -0,0 +1,84 @@ +import type { + BoardGroup, + Project, + Sprint, + Task, +} from '../../../shared/entities'; + +import type { PlanningSnapshot } from '../../../shared/types/sprint-planning.types'; +export type { + PlanningSnapshot, + SprintRetrospective, +} from '../../../shared/types/sprint-planning.types'; + +export interface SprintCompletion { + goalOutcome?: 'achieved' | 'partial' | 'missed'; + retrospective?: string; + improvement?: string; + carryoverReason?: string; + taskDestinations?: { taskId: string; sprintId: string | null }[]; + storyDestinations?: { storyId: string; sprintId: string | null }[]; +} + +export interface PlanningData { + project: Project; + tasks: Task[]; + stories: BoardGroup[]; + sprints: Sprint[]; + otherTasks: Task[]; + otherSprints: Sprint[]; + today: string; +} + +export interface PlanningMove { + taskIds: string[]; + storyIds: string[]; + sprintId: string | null; +} + +export interface PlanningOrder { + taskIds: string[]; + sprintId: string | null; +} + +export interface PlanningProposal { + sprintId: string; + budgetMinutes: number; + goal: string; +} + +/** Возвращает оценку задачи в минутах: явная длительность приоритетнее Pomodoro; без положительной оценки возвращает null. */ +export function estimateMinutes( + task: Pick, +): number | null { + if (task.durationMinutes != null && task.durationMinutes > 0) + return task.durationMinutes; + const config = task.pomodoroConfig; + if (config && config.pomodoroCount > 0 && config.pomodoroDuration > 0) + return config.pomodoroCount * config.pomodoroDuration; + return null; +} + +/** Создаёт независимый снимок состава спринта с оценками, названиями и состояниями на указанный момент. */ +export function planningSnapshot( + tasks: Task[], + stories: BoardGroup[], + capturedAt: string, +): PlanningSnapshot { + return { + capturedAt, + tasks: tasks.map((t) => ({ + id: t.id, + title: t.title, + completed: t.completed, + estimateMinutes: estimateMinutes(t), + groupId: t.groupId, + })), + stories: stories.map((s) => ({ + id: s.id, + title: s.title, + status: s.status, + workflowStatusId: s.workflowStatusId ?? s.status, + })), + }; +} diff --git a/alfy-bot/src/modules/project/domain/sprint-repository.port.ts b/alfy-bot/src/modules/project/domain/sprint-repository.port.ts index 4940a0a..de4d88f 100644 --- a/alfy-bot/src/modules/project/domain/sprint-repository.port.ts +++ b/alfy-bot/src/modules/project/domain/sprint-repository.port.ts @@ -1,3 +1,4 @@ +import type { SprintCompletion } from './planning'; import { Sprint } from '../../../shared/entities'; export abstract class SprintRepositoryPort { @@ -31,6 +32,7 @@ export abstract class SprintRepositoryPort { abstract closeAndMoveUnfinished( sprintId: string, moveToSprintId: string | null, + completion?: SprintCompletion, ): Promise; /** Атомарно назначает спринт истории проекта и её задачам вне закрытых спринтов; возвращает число обновлённых задач. */ diff --git a/alfy-bot/src/modules/project/dto/complete-sprint.dto.ts b/alfy-bot/src/modules/project/dto/complete-sprint.dto.ts index c79db15..96818a7 100644 --- a/alfy-bot/src/modules/project/dto/complete-sprint.dto.ts +++ b/alfy-bot/src/modules/project/dto/complete-sprint.dto.ts @@ -1,12 +1,72 @@ -import { IsUUID, ValidateIf } from 'class-validator'; +import { Type } from 'class-transformer'; +import { + ArrayUnique, + IsArray, + IsIn, + IsString, + IsUUID, + MaxLength, + ValidateIf, + ValidateNested, +} from 'class-validator'; import { ApiProperty } from '@nestjs/swagger'; +export class TaskDestinationDto { + @IsUUID('4') + taskId: string; + + @ValidateIf((o: TaskDestinationDto) => o.sprintId !== null) + @IsUUID('4') + sprintId: string | null; +} + +export class StoryDestinationDto { + @IsUUID('4') + storyId: string; + + @ValidateIf((o: StoryDestinationDto) => o.sprintId !== null) + @IsUUID('4') + sprintId: string | null; +} + export class CompleteSprintDto { @ApiProperty({ description: 'backlog либо UUID запланированного спринта проекта', - example: 'backlog', }) @ValidateIf((dto: CompleteSprintDto) => dto.moveTo !== 'backlog') @IsUUID('4') moveTo: string; + + @ValidateIf((o: CompleteSprintDto) => o.goalOutcome !== undefined) + @IsIn(['achieved', 'partial', 'missed']) + goalOutcome?: 'achieved' | 'partial' | 'missed'; + + @ValidateIf((o: CompleteSprintDto) => o.retrospective !== undefined) + @IsString() + @MaxLength(10000) + retrospective?: string; + + @ValidateIf((o: CompleteSprintDto) => o.improvement !== undefined) + @IsString() + @MaxLength(10000) + improvement?: string; + + @ValidateIf((o: CompleteSprintDto) => o.carryoverReason !== undefined) + @IsString() + @MaxLength(10000) + carryoverReason?: string; + + @ValidateIf((o: CompleteSprintDto) => o.taskDestinations !== undefined) + @IsArray() + @ArrayUnique((value: TaskDestinationDto) => value.taskId) + @ValidateNested({ each: true }) + @Type(() => TaskDestinationDto) + taskDestinations?: TaskDestinationDto[]; + + @ValidateIf((o: CompleteSprintDto) => o.storyDestinations !== undefined) + @IsArray() + @ArrayUnique((value: StoryDestinationDto) => value.storyId) + @ValidateNested({ each: true }) + @Type(() => StoryDestinationDto) + storyDestinations?: StoryDestinationDto[]; } diff --git a/alfy-bot/src/modules/project/dto/create-sprint.dto.ts b/alfy-bot/src/modules/project/dto/create-sprint.dto.ts index e6d784d..1c51315 100644 --- a/alfy-bot/src/modules/project/dto/create-sprint.dto.ts +++ b/alfy-bot/src/modules/project/dto/create-sprint.dto.ts @@ -1,3 +1,4 @@ +import { IsInt, Min, Max, ValidateIf } from 'class-validator'; import { IsNotEmpty, IsOptional, IsString } from 'class-validator'; import { ApiPropertyOptional } from '@nestjs/swagger'; @@ -12,4 +13,22 @@ export class CreateSprintDto { @IsOptional() @IsString() goal?: string; + @ApiPropertyOptional({ + nullable: true, + description: 'Доступное время в минутах; null — бюджет не задан', + }) + @IsOptional() + @IsInt() + @Min(0) + @Max(Number.MAX_SAFE_INTEGER) + capacityMinutes?: number | null; + + @ApiPropertyOptional({ description: 'Резерв времени в минутах' }) + @ValidateIf( + (o: { reserveMinutes?: number }) => o.reserveMinutes !== undefined, + ) + @IsInt() + @Min(0) + @Max(Number.MAX_SAFE_INTEGER) + reserveMinutes?: number; } diff --git a/alfy-bot/src/modules/project/dto/planning.dto.ts b/alfy-bot/src/modules/project/dto/planning.dto.ts new file mode 100644 index 0000000..c405e1a --- /dev/null +++ b/alfy-bot/src/modules/project/dto/planning.dto.ts @@ -0,0 +1,57 @@ +import { + ArrayUnique, + IsArray, + IsInt, + IsString, + IsUUID, + Max, + MaxLength, + Min, + ValidateIf, +} from 'class-validator'; + +export class PlanningMoveDto { + @IsArray() + @ArrayUnique() + @IsUUID('4', { each: true }) + taskIds: string[]; + + @IsArray() + @ArrayUnique() + @IsUUID('4', { each: true }) + storyIds: string[]; + + @ValidateIf((o: PlanningMoveDto) => o.sprintId !== null) + @IsUUID('4') + sprintId: string | null; +} + +export class PlanningOrderDto { + @IsArray() + @ArrayUnique() + @IsUUID('4', { each: true }) + taskIds: string[]; + + @ValidateIf((o: PlanningOrderDto) => o.sprintId !== null) + @IsUUID('4') + sprintId: string | null; +} + +export class PlanningUndoDto { + @IsUUID('4') + undoToken: string; +} + +export class PlanningProposalDto { + @IsUUID('4') + sprintId: string; + + @IsInt() + @Min(0) + @Max(Number.MAX_SAFE_INTEGER) + budgetMinutes: number; + + @IsString() + @MaxLength(5000) + goal: string; +} diff --git a/alfy-bot/src/modules/project/dto/update-sprint.dto.ts b/alfy-bot/src/modules/project/dto/update-sprint.dto.ts index f1d4924..8f38e2c 100644 --- a/alfy-bot/src/modules/project/dto/update-sprint.dto.ts +++ b/alfy-bot/src/modules/project/dto/update-sprint.dto.ts @@ -1,4 +1,7 @@ import { + IsInt, + Min, + Max, IsNotEmpty, IsOptional, IsString, @@ -28,4 +31,22 @@ export class UpdateSprintDto { @IsOptional() @Matches(/^\d{4}-\d{2}-\d{2}$/) endDate?: string | null; + @ApiPropertyOptional({ + nullable: true, + description: 'Доступное время в минутах; null — бюджет не задан', + }) + @IsOptional() + @IsInt() + @Min(0) + @Max(Number.MAX_SAFE_INTEGER) + capacityMinutes?: number | null; + + @ApiPropertyOptional({ description: 'Резерв времени в минутах' }) + @ValidateIf( + (o: { reserveMinutes?: number }) => o.reserveMinutes !== undefined, + ) + @IsInt() + @Min(0) + @Max(Number.MAX_SAFE_INTEGER) + reserveMinutes?: number; } diff --git a/alfy-bot/src/modules/project/infrastructure/planning-access.ts b/alfy-bot/src/modules/project/infrastructure/planning-access.ts new file mode 100644 index 0000000..d5d9f7b --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/planning-access.ts @@ -0,0 +1,29 @@ +import { BadRequestException, NotFoundException } from '@nestjs/common'; +import { EntityManager } from 'typeorm'; +import { Project, Sprint } from '../../../shared/entities'; + +/** Возвращает доступный agile-проект; чужие и отсутствующие проекты не раскрывает. */ +export async function planningProject( + manager: EntityManager, + userId: number, + projectId: string, +): Promise { + const project = await manager.findOneBy(Project, { id: projectId, userId }); + if (!project) throw new NotFoundException('Проект не найден'); + if (project.type !== 'agile') + throw new BadRequestException('Планирование доступно для agile-проектов'); + return project; +} + +/** Проверяет, что назначение принадлежит проекту и допускает изменение; null обозначает бэклог. */ +export async function mutableSprint( + manager: EntityManager, + projectId: string, + sprintId: string | null, +): Promise { + if (sprintId === null) return null; + const sprint = await manager.findOneBy(Sprint, { id: sprintId, projectId }); + if (!sprint || sprint.status === 'closed') + throw new BadRequestException('Нужен незакрытый спринт этого проекта'); + return sprint; +} diff --git a/alfy-bot/src/modules/project/infrastructure/planning-mutations.ts b/alfy-bot/src/modules/project/infrastructure/planning-mutations.ts new file mode 100644 index 0000000..84dda8c --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/planning-mutations.ts @@ -0,0 +1,185 @@ +import { BadRequestException, ConflictException } from '@nestjs/common'; +import { EntityManager, In } from 'typeorm'; +import { + BoardGroup, + PlanningUndo, + ProjectColumn, + Sprint, + Task, +} from '../../../shared/entities'; +import { PlanningMove, PlanningOrder } from '../domain/planning'; +import { mutableSprint } from './planning-access'; +import { planningState } from './planning-state'; + +async function selectedRows( + manager: EntityManager, + projectId: string, + input: PlanningMove, +) { + const stories = input.storyIds.length + ? await manager.findBy(BoardGroup, { + projectId, + id: In(input.storyIds), + type: 'story', + }) + : []; + const explicitTasks = input.taskIds.length + ? await manager.findBy(Task, { projectId, id: In(input.taskIds) }) + : []; + if ( + stories.length !== input.storyIds.length || + explicitTasks.length !== input.taskIds.length + ) + throw new BadRequestException( + 'Все элементы должны принадлежать этому проекту', + ); + if (!stories.length && !explicitTasks.length) + throw new BadRequestException('Выберите задачи или истории'); + const closed = new Set( + (await manager.findBy(Sprint, { projectId, status: 'closed' })).map( + (s) => s.id, + ), + ); + for (const row of [...stories, ...explicitTasks]) { + if (row.sprintId && closed.has(row.sprintId)) + throw new BadRequestException('Нельзя изменять состав закрытого спринта'); + } + const children = input.storyIds.length + ? await manager.findBy(Task, { projectId, groupId: In(input.storyIds) }) + : []; + const tasks = [ + ...new Map( + [ + ...explicitTasks, + ...children.filter((t) => !t.sprintId || !closed.has(t.sprintId)), + ].map((t) => [t.id, t]), + ).values(), + ]; + if (tasks.some((t) => t.isOverdue)) + throw new BadRequestException('Замороженную задачу нельзя переносить'); + return { stories, tasks }; +} + +/** Атомарно переносит явный выбор и незакрытые задачи выбранных историй; возвращает одноразовую отмену. */ +export async function movePlanning( + manager: EntityManager, + userId: number, + projectId: string, + input: PlanningMove, +) { + await mutableSprint(manager, projectId, input.sprintId); + const { tasks, stories } = await selectedRows(manager, projectId, input); + const before = await planningState( + manager, + tasks.map((t) => t.id), + stories.map((s) => s.id), + ); + const firstColumn = input.sprintId + ? await manager.findOne(ProjectColumn, { + where: { projectId }, + order: { order: 'ASC' }, + }) + : null; + if (input.sprintId && tasks.some((t) => !t.columnId) && !firstColumn) + throw new BadRequestException('Сначала создайте колонку проекта'); + for (const task of tasks) { + await manager.update(Task, task.id, { + sprintId: input.sprintId, + ...(input.sprintId && !task.columnId + ? { columnId: firstColumn!.id } + : {}), + }); + } + for (const story of stories) + await manager.update(BoardGroup, story.id, { sprintId: input.sprintId }); + const after = await planningState( + manager, + tasks.map((t) => t.id), + stories.map((s) => s.id), + ); + const undo = await manager.save(PlanningUndo, { + userId, + projectId, + before, + after, + used: false, + }); + return { updated: tasks.length, undoToken: undo.id }; +} + +/** Отменяет перенос только при неизменных затронутых строках и составе историй; конфликт не выполняет частичных записей. */ +export async function undoPlanning( + manager: EntityManager, + userId: number, + projectId: string, + token: string, +) { + const undo = await manager.findOneBy(PlanningUndo, { + id: token, + userId, + projectId, + }); + if (!undo || undo.used) + throw new ConflictException('Перенос уже отменён или недоступен'); + const current = await planningState( + manager, + undo.after.tasks.map((t) => String(t.id)), + undo.after.stories.map((s) => String(s.id)), + ); + if (JSON.stringify(current) !== JSON.stringify(undo.after)) + throw new ConflictException( + 'После переноса элементы изменились; отмена не выполнена', + ); + for (const row of [ + ...undo.before.tasks, + ...undo.before.stories, + ...undo.after.tasks, + ...undo.after.stories, + ]) { + await mutableSprint(manager, projectId, row.sprintId as string | null); + } + for (const task of undo.before.tasks) { + await manager.update(Task, String(task.id), { + sprintId: task.sprintId as string | null, + columnId: task.columnId as string | null, + }); + } + for (const story of undo.before.stories) + await manager.update(BoardGroup, String(story.id), { + sprintId: story.sprintId as string | null, + }); + await manager.update(PlanningUndo, undo.id, { used: true }); + return { updated: undo.before.tasks.length }; +} + +/** Сохраняет порядок выбранных задач одного спринта; неперечисленные задачи сохраняют взаимный порядок после них. */ +export async function reorderPlanning( + manager: EntityManager, + projectId: string, + input: PlanningOrder, +) { + await mutableSprint(manager, projectId, input.sprintId); + if (!input.taskIds.length) + throw new BadRequestException('Пустой порядок задач'); + const all = ( + await manager.find(Task, { + where: { projectId }, + order: { order: 'ASC', id: 'ASC' }, + }) + ).filter((t) => t.sprintId === input.sprintId); + const map = new Map(all.map((t) => [t.id, t])); + if (input.taskIds.some((id) => !map.has(id))) + throw new BadRequestException( + 'Все задачи должны принадлежать выбранному спринту', + ); + if (input.taskIds.some((id) => map.get(id)!.isOverdue)) + throw new BadRequestException('Замороженную задачу нельзя менять'); + const selected = new Set(input.taskIds); + const ordered = [ + ...input.taskIds, + ...all.filter((t) => !selected.has(t.id)).map((t) => t.id), + ]; + for (const [order, id] of ordered.entries()) + await manager.update(Task, id, { order }); + return { updated: ordered.length }; +} diff --git a/alfy-bot/src/modules/project/infrastructure/planning-state.ts b/alfy-bot/src/modules/project/infrastructure/planning-state.ts new file mode 100644 index 0000000..a458bdd --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/planning-state.ts @@ -0,0 +1,33 @@ +import { EntityManager } from 'typeorm'; +import type { PlanningUndoState } from '../../../shared/entities/planning-undo.entity'; + +async function rows( + manager: EntityManager, + table: 'tasks' | 'board_groups', + ids: string[], +): Promise[]> { + if (!ids.length) return []; + return manager.query( + `SELECT * FROM ${table} WHERE id IN (${ids.map(() => '?').join(',')}) ORDER BY id`, + ids, + ); +} + +/** Снимает точное состояние затронутых строк и состава историй для безопасной одноразовой отмены. */ +export async function planningState( + manager: EntityManager, + taskIds: string[], + storyIds: string[], +): Promise { + const storyTasks: { id: string }[] = storyIds.length + ? await manager.query( + `SELECT id FROM tasks WHERE groupId IN (${storyIds.map(() => '?').join(',')}) ORDER BY id`, + storyIds, + ) + : []; + return { + tasks: await rows(manager, 'tasks', taskIds), + stories: await rows(manager, 'board_groups', storyIds), + storyTaskIds: storyTasks.map((t) => t.id), + }; +} diff --git a/alfy-bot/src/modules/project/infrastructure/sprint-completion.ts b/alfy-bot/src/modules/project/infrastructure/sprint-completion.ts new file mode 100644 index 0000000..83724c9 --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/sprint-completion.ts @@ -0,0 +1,107 @@ +import { BadRequestException } from '@nestjs/common'; +import { EntityManager } from 'typeorm'; +import { BoardGroup, Project, Sprint, Task } from '../../../shared/entities'; +import { normalizeStoryGroup, storyWorkflow } from '../domain/story-workflow'; +import { planningSnapshot, SprintCompletion } from '../domain/planning'; + +/** Закрывает активный спринт внутри транзакции, сохраняя итог до переноса и проверяя все назначения до первой записи. */ +export async function completeSprintInTransaction( + manager: EntityManager, + sprintId: string, + defaultTarget: string | null, + completion: SprintCompletion, +): Promise { + const sprint = await manager.findOneByOrFail(Sprint, { id: sprintId }); + if (sprint.status !== 'active') + throw new BadRequestException('Only an active sprint can be completed'); + const tasks = await manager.findBy(Task, { sprintId }); + const stories = await manager.findBy(BoardGroup, { sprintId, type: 'story' }); + const taskTargets = new Map( + (completion.taskDestinations ?? []).map((d) => [d.taskId, d.sprintId]), + ); + const storyTargets = new Map( + (completion.storyDestinations ?? []).map((d) => [d.storyId, d.sprintId]), + ); + if ( + taskTargets.size !== (completion.taskDestinations?.length ?? 0) || + storyTargets.size !== (completion.storyDestinations?.length ?? 0) + ) + throw new BadRequestException('Повторяющиеся назначения'); + for (const id of taskTargets.keys()) { + if (!tasks.some((t) => t.id === id && !t.completed)) + throw new BadRequestException( + 'Переносить можно только незавершённые задачи этого спринта', + ); + } + for (const id of storyTargets.keys()) { + if (!stories.some((s) => s.id === id && s.status !== 'done')) + throw new BadRequestException( + 'Переносить можно только открытые истории этого спринта', + ); + } + const targets = new Set([ + defaultTarget, + ...taskTargets.values(), + ...storyTargets.values(), + ]); + for (const id of targets) { + if (id === null) continue; + const target = await manager.findOneBy(Sprint, { + id, + projectId: sprint.projectId, + userId: sprint.userId, + }); + if (!target || target.status !== 'planned') + throw new BadRequestException( + 'Назначение должно быть запланированным спринтом этого проекта', + ); + } + for (const story of stories.filter((s) => s.status !== 'done')) { + const destination = storyTargets.has(story.id) + ? storyTargets.get(story.id)! + : defaultTarget; + for (const task of tasks.filter( + (t) => t.groupId === story.id && !t.completed, + )) { + if (taskTargets.has(task.id) && taskTargets.get(task.id) !== destination) + throw new BadRequestException( + 'История и её незавершённые задачи должны переноситься вместе', + ); + taskTargets.set(task.id, destination); + } + } + const project = await manager.findOneByOrFail(Project, { + id: sprint.projectId, + }); + const statuses = storyWorkflow(project); + const finalSnapshot = planningSnapshot( + tasks, + stories.map((s) => normalizeStoryGroup(s, statuses)), + new Date().toISOString(), + ); + await manager.update(Sprint, sprintId, { + status: 'closed', + completedAt: new Date(), + finalSnapshot, + retrospective: { + goalOutcome: completion.goalOutcome ?? null, + retrospective: completion.retrospective ?? null, + improvement: completion.improvement ?? null, + carryoverReason: completion.carryoverReason ?? null, + }, + }); + for (const task of tasks.filter((t) => !t.completed)) { + await manager.update(Task, task.id, { + sprintId: taskTargets.has(task.id) + ? taskTargets.get(task.id)! + : defaultTarget, + }); + } + for (const story of stories.filter((s) => s.status !== 'done')) { + await manager.update(BoardGroup, story.id, { + sprintId: storyTargets.has(story.id) + ? storyTargets.get(story.id)! + : defaultTarget, + }); + } +} diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-planning.repository.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-planning.repository.ts new file mode 100644 index 0000000..b4330a3 --- /dev/null +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-planning.repository.ts @@ -0,0 +1,109 @@ +import { Injectable, NotFoundException } from '@nestjs/common'; +import { DataSource, Not } from 'typeorm'; +import { + BoardGroup, + Sprint, + SprintEvent, + Task, + User, +} from '../../../shared/entities'; +import { PlanningRepositoryPort } from '../domain/planning-repository.port'; +import { + PlanningData, + PlanningMove, + PlanningOrder, + planningSnapshot, +} from '../domain/planning'; +import { planningProject } from './planning-access'; +import { + movePlanning, + reorderPlanning, + undoPlanning, +} from './planning-mutations'; + +@Injectable() +export class TypeOrmPlanningRepository extends PlanningRepositoryPort { + constructor(private readonly source: DataSource) { + super(); + } + + async load(userId: number, projectId: string): Promise { + return this.source.transaction(async (manager) => { + const project = await planningProject(manager, userId, projectId); + const user = await manager.findOneByOrFail(User, { id: userId }); + const today = new Intl.DateTimeFormat('en-CA', { + timeZone: user.timezone || 'UTC', + year: 'numeric', + month: '2-digit', + day: '2-digit', + }).format(new Date()); + return { + project, + today, + tasks: await manager.find(Task, { + where: { projectId, userId }, + order: { order: 'ASC', id: 'ASC' }, + }), + stories: await manager.find(BoardGroup, { + where: { projectId, userId, type: 'story' }, + order: { order: 'ASC', id: 'ASC' }, + }), + sprints: await manager.findBy(Sprint, { projectId, userId }), + otherTasks: await manager.findBy(Task, { + userId, + projectId: Not(projectId), + }), + otherSprints: await manager.findBy(Sprint, { + userId, + projectId: Not(projectId), + }), + }; + }); + } + + async move(userId: number, projectId: string, input: PlanningMove) { + return this.source.transaction(async (manager) => { + await planningProject(manager, userId, projectId); + return movePlanning(manager, userId, projectId, input); + }); + } + + async undo(userId: number, projectId: string, token: string) { + return this.source.transaction(async (manager) => { + await planningProject(manager, userId, projectId); + return undoPlanning(manager, userId, projectId, token); + }); + } + + async reorder(userId: number, projectId: string, input: PlanningOrder) { + return this.source.transaction(async (manager) => { + await planningProject(manager, userId, projectId); + return reorderPlanning(manager, projectId, input); + }); + } + + async report(userId: number, projectId: string, sprintId: string) { + return this.source.transaction(async (manager) => { + await planningProject(manager, userId, projectId); + const sprint = await manager.findOneBy(Sprint, { + id: sprintId, + projectId, + userId, + }); + if (!sprint) throw new NotFoundException('Спринт не найден'); + const tasks = await manager.findBy(Task, { sprintId }); + const stories = await manager.findBy(BoardGroup, { + sprintId, + type: 'story', + }); + return { + sprint, + current: planningSnapshot(tasks, stories, new Date().toISOString()), + events: await manager.find(SprintEvent, { + where: { sprintId }, + order: { occurredAt: 'ASC', id: 'ASC' }, + }), + }; + }); + } +} diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-project.repository.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-project.repository.ts index 9d48a54..c8efce2 100644 --- a/alfy-bot/src/modules/project/infrastructure/typeorm-project.repository.ts +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-project.repository.ts @@ -82,7 +82,7 @@ export class TypeOrmProjectRepository extends ProjectRepositoryPort { const projects = await repository.find({ where: { userId }, order: { order: 'ASC', createdAt: 'DESC' } }); const updated = transform(projects); const previous = new Map(projects.map(project => [project.id, project])); - const fields = ['parentId', 'order', 'title', 'description', 'viewMode', 'icon', 'color', 'taskKeyPrefix'] as const; + const fields = ['parentId', 'order', 'title', 'description', 'viewMode', 'icon', 'color', 'taskKeyPrefix', 'storyWorkflow'] as const; for (const project of updated) { const old = previous.get(project.id)!; const changes = Object.fromEntries(fields.filter(field => old[field] !== project[field]).map(field => [field, project[field]])); diff --git a/alfy-bot/src/modules/project/infrastructure/typeorm-sprint.repository.ts b/alfy-bot/src/modules/project/infrastructure/typeorm-sprint.repository.ts index ad50a77..4668806 100644 --- a/alfy-bot/src/modules/project/infrastructure/typeorm-sprint.repository.ts +++ b/alfy-bot/src/modules/project/infrastructure/typeorm-sprint.repository.ts @@ -12,6 +12,10 @@ import { Sprint, Task, } from '../../../shared/entities'; +import { planningSnapshot, type SprintCompletion } from '../domain/planning'; +import { storyWorkflow, normalizeStoryGroup } from '../domain/story-workflow'; +import { mutableSprint } from './planning-access'; +import { completeSprintInTransaction } from './sprint-completion'; import { SprintRepositoryPort } from '../domain/sprint-repository.port'; @Injectable() @@ -46,7 +50,43 @@ export class TypeOrmSprintRepository extends SprintRepositoryPort { } async save(sprint: Sprint): Promise { - return this.repo.save(sprint); + return this.dataSource.transaction(async (manager) => { + const current = await manager.findOneByOrFail(Sprint, { id: sprint.id }); + if ( + current.status === 'closed' || + (current.status !== sprint.status && + !(current.status === 'planned' && sprint.status === 'active')) + ) + throw new BadRequestException( + 'Состояние спринта изменилось; обновите данные', + ); + sprint.initialSnapshot = current.initialSnapshot; + sprint.finalSnapshot = current.finalSnapshot; + sprint.retrospective = current.retrospective; + if (current.status === 'planned' && sprint.status === 'active') { + const active = await manager.findOneBy(Sprint, { + projectId: sprint.projectId, + status: 'active', + }); + if (active) + throw new BadRequestException('Another sprint is already active'); + const tasks = await manager.findBy(Task, { sprintId: sprint.id }); + const stories = await manager.findBy(BoardGroup, { + sprintId: sprint.id, + type: 'story', + }); + const project = await manager.findOneByOrFail(Project, { + id: sprint.projectId, + }); + const statuses = storyWorkflow(project); + sprint.initialSnapshot = planningSnapshot( + tasks, + stories.map((s) => normalizeStoryGroup(s, statuses)), + new Date().toISOString(), + ); + } + return manager.save(Sprint, sprint); + }); } async delete(id: string, projectId: string): Promise { @@ -59,23 +99,16 @@ export class TypeOrmSprintRepository extends SprintRepositoryPort { async closeAndMoveUnfinished( sprintId: string, moveToSprintId: string | null, + completion: SprintCompletion = {}, ): Promise { - await this.dataSource.transaction(async (manager) => { - await manager.update(Sprint, sprintId, { - status: 'closed', - completedAt: new Date(), - }); - await manager.update( - Task, - { sprintId, completed: false }, - { sprintId: moveToSprintId }, - ); - await manager.update( - BoardGroup, - { sprintId, status: 'open', type: 'story' }, - { sprintId: moveToSprintId }, - ); - }); + await this.dataSource.transaction((manager) => + completeSprintInTransaction( + manager, + sprintId, + moveToSprintId, + completion, + ), + ); } async setGroupSprint( @@ -84,6 +117,13 @@ export class TypeOrmSprintRepository extends SprintRepositoryPort { sprintId: string | null, ): Promise { return this.dataSource.transaction(async (manager) => { + const group = await manager.findOneBy(BoardGroup, { + id: groupId, + projectId, + type: 'story', + }); + if (!group) throw new BadRequestException('История не найдена в проекте'); + await mutableSprint(manager, projectId, sprintId); const eligible = '(sprintId IS NULL OR sprintId NOT IN (SELECT id FROM sprints WHERE status = :closed))'; await manager diff --git a/alfy-bot/src/modules/project/planning.controller.ts b/alfy-bot/src/modules/project/planning.controller.ts new file mode 100644 index 0000000..b883550 --- /dev/null +++ b/alfy-bot/src/modules/project/planning.controller.ts @@ -0,0 +1,78 @@ +import { + Body, + Controller, + Get, + Param, + Patch, + Post, + Query, + Request, + UseGuards, +} from '@nestjs/common'; +import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; +import { JwtOrApiTokenGuard } from '../auth/guards/jwt-or-api-token.guard'; +import { JwtPayload } from '../auth/strategies/jwt.strategy'; +import { PlanningService } from './planning.service'; +import { + PlanningMoveDto, + PlanningOrderDto, + PlanningProposalDto, + PlanningUndoDto, +} from './dto/planning.dto'; + +interface AuthRequest { + user: JwtPayload; +} + +@ApiTags('planning') +@ApiBearerAuth() +@UseGuards(JwtOrApiTokenGuard) +@Controller('projects/:projectId/planning') +export class PlanningController { + constructor(private readonly service: PlanningService) {} + + @Get() + context( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Query('sprintId') sprintId?: string, + ) { + return this.service.context(req.user.sub, projectId, sprintId ?? null); + } + + @Post('proposal') + proposal( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Body() dto: PlanningProposalDto, + ) { + return this.service.proposal(req.user.sub, projectId, dto); + } + + @Post('move') + move( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Body() dto: PlanningMoveDto, + ) { + return this.service.move(req.user.sub, projectId, dto); + } + + @Post('undo') + undo( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Body() dto: PlanningUndoDto, + ) { + return this.service.undo(req.user.sub, projectId, dto.undoToken); + } + + @Patch('order') + reorder( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Body() dto: PlanningOrderDto, + ) { + return this.service.reorder(req.user.sub, projectId, dto); + } +} diff --git a/alfy-bot/src/modules/project/planning.service.ts b/alfy-bot/src/modules/project/planning.service.ts new file mode 100644 index 0000000..9eebacc --- /dev/null +++ b/alfy-bot/src/modules/project/planning.service.ts @@ -0,0 +1,81 @@ +import { BadRequestException, Injectable } from '@nestjs/common'; +import { PlanningRepositoryPort } from './domain/planning-repository.port'; +import { + PlanningMove, + PlanningOrder, + PlanningProposal, +} from './domain/planning'; +import { planningContext } from './domain/planning-context'; +import { proposePlan } from './domain/planning-proposal'; + +@Injectable() +export class PlanningService { + constructor(private readonly repository: PlanningRepositoryPort) {} + + async context(userId: number, projectId: string, sprintId: string | null) { + const data = await this.repository.load(userId, projectId); + if ( + sprintId !== null && + !data.sprints.some((s) => s.id === sprintId && s.status !== 'closed') + ) + throw new BadRequestException('Нужен незакрытый спринт проекта'); + return planningContext(data, sprintId); + } + + async proposal(userId: number, projectId: string, input: PlanningProposal) { + const data = await this.repository.load(userId, projectId); + if ( + !data.sprints.some( + (s) => s.id === input.sprintId && s.status !== 'closed', + ) + ) + throw new BadRequestException('Нужен незакрытый спринт проекта'); + return proposePlan(data, input); + } + + move(userId: number, projectId: string, input: PlanningMove) { + return this.repository.move(userId, projectId, input); + } + undo(userId: number, projectId: string, token: string) { + return this.repository.undo(userId, projectId, token); + } + reorder(userId: number, projectId: string, input: PlanningOrder) { + return this.repository.reorder(userId, projectId, input); + } + + async report(userId: number, projectId: string, sprintId: string) { + const { sprint, current, events } = await this.repository.report( + userId, + projectId, + sprintId, + ); + const final = + sprint.finalSnapshot ?? (sprint.status === 'active' ? current : null); + return { + sprint, + historyComplete: Boolean( + sprint.initialSnapshot && + (sprint.status !== 'closed' || sprint.finalSnapshot), + ), + initial: sprint.initialSnapshot, + final: sprint.finalSnapshot, + events, + summary: { + planned: sprint.initialSnapshot?.tasks.length ?? 0, + added: events.filter((e) => e.kind === 'added').length, + removed: events.filter((e) => e.kind === 'removed').length, + completed: final?.tasks.filter((t) => t.completed).length ?? 0, + carried: + sprint.status === 'closed' + ? (final?.tasks.filter((t) => !t.completed).length ?? 0) + : 0, + }, + retrospective: sprint.retrospective ?? { + goalOutcome: null, + retrospective: null, + improvement: null, + carryoverReason: null, + }, + }; + } +} diff --git a/alfy-bot/src/modules/project/project.module.ts b/alfy-bot/src/modules/project/project.module.ts index 6a7c77a..68b7faf 100644 --- a/alfy-bot/src/modules/project/project.module.ts +++ b/alfy-bot/src/modules/project/project.module.ts @@ -30,6 +30,12 @@ import { ProjectColumnController } from './project-column.controller'; import { BoardGroupController } from './board-group.controller'; import { ProjectTaskController } from './project-task.controller'; import { SprintController } from './sprint.controller'; +import { StoryWorkflowController } from './story-workflow.controller'; +import { StoryWorkflowService } from './story-workflow.service'; +import { PlanningService } from './planning.service'; +import { PlanningController } from './planning.controller'; +import { PlanningRepositoryPort } from './domain/planning-repository.port'; +import { TypeOrmPlanningRepository } from './infrastructure/typeorm-planning.repository'; import { ReleaseController } from './release.controller'; @Module({ @@ -51,6 +57,8 @@ import { ReleaseController } from './release.controller'; ProjectTaskController, SprintController, ReleaseController, + StoryWorkflowController, + PlanningController, ], providers: [ { provide: ProjectRepositoryPort, useClass: TypeOrmProjectRepository }, @@ -73,6 +81,9 @@ import { ReleaseController } from './release.controller'; ProjectService, ProjectColumnService, BoardGroupService, + StoryWorkflowService, + PlanningService, + { provide: PlanningRepositoryPort, useClass: TypeOrmPlanningRepository }, ProjectTaskService, SprintService, ReleaseService, diff --git a/alfy-bot/src/modules/project/sprint.controller.ts b/alfy-bot/src/modules/project/sprint.controller.ts index 7249a44..3eff5e8 100644 --- a/alfy-bot/src/modules/project/sprint.controller.ts +++ b/alfy-bot/src/modules/project/sprint.controller.ts @@ -12,6 +12,7 @@ import { import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger'; import { JwtOrApiTokenGuard } from '../auth/guards/jwt-or-api-token.guard'; import { JwtPayload } from '../auth/strategies/jwt.strategy'; +import { PlanningService } from './planning.service'; import { SprintService } from './sprint.service'; import { CreateSprintDto } from './dto/create-sprint.dto'; import { UpdateSprintDto } from './dto/update-sprint.dto'; @@ -27,7 +28,10 @@ interface AuthRequest extends Request { @UseGuards(JwtOrApiTokenGuard) @Controller('projects/:projectId/sprints') export class SprintController { - constructor(private readonly sprintService: SprintService) {} + constructor( + private readonly sprintService: SprintService, + private readonly planningService: PlanningService, + ) {} @Get() @ApiOperation({ summary: 'Спринты проекта, включая закрытые' }) @@ -69,6 +73,15 @@ export class SprintController { return this.sprintService.delete(req.user.sub, projectId, id); } + @Get(':id/report') + report( + @Request() req: AuthRequest, + @Param('projectId') projectId: string, + @Param('id') id: string, + ) { + return this.planningService.report(req.user.sub, projectId, id); + } + @Post(':id/start') @ApiOperation({ summary: 'Запустить спринт' }) async start( diff --git a/alfy-bot/src/modules/project/sprint.service.spec.ts b/alfy-bot/src/modules/project/sprint.service.spec.ts index 1001a04..344fa13 100644 --- a/alfy-bot/src/modules/project/sprint.service.spec.ts +++ b/alfy-bot/src/modules/project/sprint.service.spec.ts @@ -29,6 +29,8 @@ function makeSprint(overrides: Partial = {}): Sprint { projectId: 'proj-1', name: 'Спринт 1', goal: null, + capacityMinutes: null, + reserveMinutes: 0, startDate: null, endDate: null, status: 'planned' as const, @@ -137,6 +139,8 @@ describe('SprintService', () => { projectId: 'proj-1', name: 'Спринт 4', goal: null, + capacityMinutes: null, + reserveMinutes: 0, order: 2, }); }); @@ -162,6 +166,8 @@ describe('SprintService', () => { projectId: 'proj-1', name: 'Релиз', goal: 'Выпустить', + capacityMinutes: null, + reserveMinutes: 0, order: 0, }); }); @@ -208,6 +214,8 @@ describe('SprintService', () => { const result = await service.update(1, 'proj-1', 'sprint-1', { goal: null, + capacityMinutes: null, + reserveMinutes: 0, startDate: null, endDate: null, }); @@ -245,6 +253,8 @@ describe('SprintService', () => { startDate: '2026-01-01', endDate: '2026-01-14', goal: 'Цель', + capacityMinutes: null, + reserveMinutes: 0, }; it('переводит planned в active с датами и целью', async () => { diff --git a/alfy-bot/src/modules/project/sprint.service.ts b/alfy-bot/src/modules/project/sprint.service.ts index a785a84..d6493d9 100644 --- a/alfy-bot/src/modules/project/sprint.service.ts +++ b/alfy-bot/src/modules/project/sprint.service.ts @@ -21,6 +21,19 @@ export class SprintService { private readonly groupRepo: BoardGroupRepositoryPort, ) {} + private assertCapacity(capacity: number | null, reserve: number): void { + if ( + !Number.isSafeInteger(reserve) || + reserve < 0 || + (capacity !== null && + (!Number.isSafeInteger(capacity) || capacity < reserve)) + ) { + throw new BadRequestException( + 'Резерв не может превышать доступное время', + ); + } + } + private assertDateOrder( startDate: string | null, endDate: string | null, @@ -68,6 +81,7 @@ export class SprintService { ): Promise { await this.validateProjectAccess(userId, projectId); + this.assertCapacity(dto.capacityMinutes ?? null, dto.reserveMinutes ?? 0); const existing = await this.sprintRepo.findAllByProject(projectId); const openOrders = existing .filter((s) => s.status !== 'closed') @@ -78,6 +92,8 @@ export class SprintService { projectId, name: dto.name ?? `Спринт ${existing.length + 1}`, goal: dto.goal ?? null, + capacityMinutes: dto.capacityMinutes ?? null, + reserveMinutes: dto.reserveMinutes ?? 0, order: openOrders.length ? Math.max(...openOrders) + 1 : 0, }); } @@ -108,6 +124,14 @@ export class SprintService { sprint.endDate = endDate; if (dto.name !== undefined) sprint.name = dto.name; if (dto.goal !== undefined) sprint.goal = dto.goal; + if (dto.capacityMinutes !== undefined) + sprint.capacityMinutes = dto.capacityMinutes; + if (dto.reserveMinutes !== undefined) + sprint.reserveMinutes = dto.reserveMinutes; + this.assertCapacity( + sprint.capacityMinutes ?? null, + sprint.reserveMinutes ?? 0, + ); return this.sprintRepo.save(sprint); } @@ -174,7 +198,11 @@ export class SprintService { moveToSprintId = target.id; } - await this.sprintRepo.closeAndMoveUnfinished(id, moveToSprintId); + if (Object.keys(dto).some((key) => key !== 'moveTo')) { + await this.sprintRepo.closeAndMoveUnfinished(id, moveToSprintId, dto); + } else { + await this.sprintRepo.closeAndMoveUnfinished(id, moveToSprintId); + } return this.getSprint(id, projectId); } diff --git a/alfy-bot/src/shared/database/board-group-constraints.service.ts b/alfy-bot/src/shared/database/board-group-constraints.service.ts index 4db7c11..5e4f972 100644 --- a/alfy-bot/src/shared/database/board-group-constraints.service.ts +++ b/alfy-bot/src/shared/database/board-group-constraints.service.ts @@ -1,5 +1,6 @@ import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common'; import { DataSource } from 'typeorm'; +import { SPRINT_HISTORY_TRIGGER_NAMES } from './sprint-history.service'; /** * Имена всех триггеров, охраняющих инварианты `board_groups`/`tasks`: @@ -28,7 +29,7 @@ export const BOARD_GROUP_TRIGGER_NAMES = [ export async function dropBoardGroupTriggers( dataSource: DataSource, ): Promise { - for (const name of BOARD_GROUP_TRIGGER_NAMES) { + for (const name of [...BOARD_GROUP_TRIGGER_NAMES, ...SPRINT_HISTORY_TRIGGER_NAMES]) { await dataSource.query(`DROP TRIGGER IF EXISTS ${name}`); } } diff --git a/alfy-bot/src/shared/database/create-data-source.ts b/alfy-bot/src/shared/database/create-data-source.ts index 9053002..274573c 100644 --- a/alfy-bot/src/shared/database/create-data-source.ts +++ b/alfy-bot/src/shared/database/create-data-source.ts @@ -1,4 +1,5 @@ import { DataSource, DataSourceOptions } from 'typeorm'; +import { createSerializedSqliteDataSource } from './serialized-sqlite'; import { dropBoardGroupTriggers } from './board-group-constraints.service'; /** @@ -14,7 +15,8 @@ import { dropBoardGroupTriggers } from './board-group-constraints.service'; export async function initializeWithSchemaSync( options: DataSourceOptions, ): Promise { - const dataSource = new DataSource({ ...options, synchronize: false }); + if (options.type !== 'sqlite') throw new Error('Expected SQLite data source'); + const dataSource = createSerializedSqliteDataSource({ ...options, synchronize: false }); await dataSource.initialize(); await dropBoardGroupTriggers(dataSource); await dataSource.synchronize(); diff --git a/alfy-bot/src/shared/database/question-migration.service.ts b/alfy-bot/src/shared/database/question-migration.service.ts index f2a9149..e618224 100644 --- a/alfy-bot/src/shared/database/question-migration.service.ts +++ b/alfy-bot/src/shared/database/question-migration.service.ts @@ -1,5 +1,6 @@ import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common'; import { DataSource } from 'typeorm'; +import { withSqliteAccess } from './serialized-sqlite'; @Injectable() export class QuestionMigrationService implements OnApplicationBootstrap { @@ -8,6 +9,10 @@ export class QuestionMigrationService implements OnApplicationBootstrap { constructor(private readonly dataSource: DataSource) {} async onApplicationBootstrap() { + return withSqliteAccess(this.dataSource, () => this.migrate()); + } + + private async migrate() { const hasOldTable = await this.tableExists('goal_questions'); if (!hasOldTable) { this.logger.log( diff --git a/alfy-bot/src/shared/database/schedule-migration.service.ts b/alfy-bot/src/shared/database/schedule-migration.service.ts index faa9876..0143d65 100644 --- a/alfy-bot/src/shared/database/schedule-migration.service.ts +++ b/alfy-bot/src/shared/database/schedule-migration.service.ts @@ -1,5 +1,6 @@ import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common'; import { DataSource } from 'typeorm'; +import { withSqliteAccess } from './serialized-sqlite'; @Injectable() export class ScheduleMigrationService implements OnApplicationBootstrap { @@ -8,6 +9,10 @@ export class ScheduleMigrationService implements OnApplicationBootstrap { constructor(private readonly dataSource: DataSource) {} async onApplicationBootstrap() { + return withSqliteAccess(this.dataSource, () => this.migrate()); + } + + private async migrate() { // Check if the old goal_schedules table still exists (pre-rename migration) const hasOldTable = await this.tableExists('goal_schedules'); if (!hasOldTable) { diff --git a/alfy-bot/src/shared/database/serialized-sqlite.spec.ts b/alfy-bot/src/shared/database/serialized-sqlite.spec.ts new file mode 100644 index 0000000..73b271b --- /dev/null +++ b/alfy-bot/src/shared/database/serialized-sqlite.spec.ts @@ -0,0 +1,209 @@ +import { DataSource } from "typeorm"; +import * as entities from "../entities"; +import { Project, User } from "../entities"; +import { + createSerializedSqliteDataSource, + withSqliteAccess, +} from "./serialized-sqlite"; +import { ScheduleMigrationService } from "./schedule-migration.service"; +import { QuestionMigrationService } from "./question-migration.service"; + +let source: DataSource; +let userId: number; +const tick = () => new Promise((resolve) => setImmediate(resolve)); +function deferred() { + let resolve!: () => void; + const promise = new Promise((done) => { + resolve = done; + }); + return { promise, resolve }; +} +beforeEach(async () => { + source = createSerializedSqliteDataSource({ + type: "sqlite", + database: ":memory:", + entities: Object.values(entities), + synchronize: true, + }); + await source.initialize(); + userId = (await source.getRepository(User).save({ username: "sqlite-test" })) + .id; +}); +afterEach(async () => { + await source.destroy(); +}); + +async function holdRollback() { + const entered = deferred(); + const gate = deferred(); + const completed = source + .transaction(async (manager) => { + await manager.save(Project, { userId, title: "Откат" }); + entered.resolve(); + await gate.promise; + throw new Error("Откат"); + }) + .catch((error) => error); + await entered.promise; + return { release: gate.resolve, completed }; +} + +it.each(["repository", "builder", "raw"] as const)( + "запись %s не попадает в чужой rollback", + async (kind) => { + const held = await holdRollback(); + const write = () => { + if (kind === "repository") + return source + .getRepository(Project) + .save({ userId, title: "Сохранено" }); + if (kind === "builder") + return source + .createQueryBuilder() + .insert() + .into(Project) + .values({ userId, title: "Сохранено" }) + .execute(); + return source.query( + "INSERT INTO projects (id, userId, title) VALUES (?, ?, ?)", + ["raw", userId, "Сохранено"], + ); + }; + let settled = false; + const outside = write().then(() => { + settled = true; + }); + await tick(); + expect(settled).toBe(false); + held.release(); + await Promise.all([held.completed, outside]); + expect(await source.getRepository(Project).find()).toEqual([ + expect.objectContaining({ title: "Сохранено" }), + ]); + }, +); + +it("QueryBuilder не читает незакоммиченные данные другого запроса", async () => { + const held = await holdRollback(); + const read = source.getRepository(Project).createQueryBuilder("p").getMany(); + held.release(); + await held.completed; + expect(await read).toEqual([]); +}); + +it("вложенные обращения разных репозиториев разделяют rollback без deadlock", async () => { + await expect( + source.transaction(async (manager) => { + await manager.save(Project, { userId, title: "A" }); + await source.getRepository(Project).save({ userId, title: "B" }); + await source.manager.transaction(async (nested) => { + await nested + .createQueryBuilder() + .update(Project) + .set({ title: "C" }) + .execute(); + }); + expect( + await source.query("SELECT COUNT(*) AS count FROM projects"), + ).toEqual([{ count: 2 }]); + throw new Error("Откат"); + }), + ).rejects.toThrow("Откат"); + expect(await source.getRepository(Project).count()).toBe(0); +}); + +it("конкурирующие транзакции читают результат предыдущей", async () => { + const project = await source + .getRepository(Project) + .save({ userId, title: "A", order: 0 }); + await Promise.all( + [1, 2].map(() => + source.transaction(async (manager) => { + const current = await manager.findOneByOrFail(Project, { + id: project.id, + }); + await manager.update(Project, project.id, { order: current.order + 1 }); + }), + ), + ); + expect( + (await source.getRepository(Project).findOneByOrFail({ id: project.id })) + .order, + ).toBe(2); +}); + +it("отложенный callback не сохраняет владение завершённой операции", async () => { + const trigger = deferred(); + let late!: Promise; + let settled = false; + await withSqliteAccess(source, async () => { + late = trigger.promise.then(async () => { + await source.getRepository(Project).save({ userId, title: "Поздний" }); + settled = true; + }); + }); + const held = await holdRollback(); + trigger.resolve(); + await tick(); + expect(settled).toBe(false); + held.release(); + await Promise.all([held.completed, late]); + expect(await source.getRepository(Project).find()).toEqual([ + expect.objectContaining({ title: "Поздний" }), + ]); +}); + +it("параллельные bootstrap-миграции завершают raw-транзакции и восстанавливают foreign_keys", async () => { + await source.query( + "CREATE TABLE goal_questions (id integer PRIMARY KEY, goal_id integer, question text, type text, can_skip integer, order_index integer, is_active integer, createdAt datetime)", + ); + await source.query( + "CREATE TABLE goal_schedules (id integer PRIMARY KEY, question_id integer UNIQUE, frequency_type text, days_of_week text, interval_days integer, effective_from text, createdAt datetime)", + ); + await source.query( + "INSERT INTO goal_questions VALUES (1, NULL, 'Вопрос', 'text', 0, 0, 1, CURRENT_TIMESTAMP)", + ); + await source.query( + "INSERT INTO goal_schedules VALUES (1, 1, 'daily', NULL, NULL, NULL, CURRENT_TIMESTAMP)", + ); + await Promise.all([ + new ScheduleMigrationService(source).onApplicationBootstrap(), + new QuestionMigrationService(source).onApplicationBootstrap(), + ]); + expect( + await source.query("SELECT question FROM questions WHERE id = 1"), + ).toEqual([{ question: "Вопрос" }]); + expect( + await source.query("SELECT question_id FROM schedules WHERE id = 1"), + ).toEqual([{ question_id: 1 }]); + expect(await source.query("PRAGMA foreign_keys")).toEqual([ + { foreign_keys: 1 }, + ]); +}); + +it("relation QueryBuilder сохраняет связь после чужого rollback", async () => { + const projects = source.getRepository(Project); + const parent = await projects.save({ userId, title: "Parent" }); + const child = await projects.save({ userId, title: "Child" }); + const held = await holdRollback(); + let settled = false; + const outside = source + .createQueryBuilder() + .relation(Project, "parent") + .of(child) + .set(parent) + .then(() => { + settled = true; + }); + await tick(); + expect(settled).toBe(false); + held.release(); + await Promise.all([held.completed, outside]); + expect( + await source + .createQueryBuilder() + .relation(Project, "parent") + .of(child) + .loadOne(), + ).toMatchObject({ id: parent.id }); +}); diff --git a/alfy-bot/src/shared/database/serialized-sqlite.ts b/alfy-bot/src/shared/database/serialized-sqlite.ts new file mode 100644 index 0000000..c161c29 --- /dev/null +++ b/alfy-bot/src/shared/database/serialized-sqlite.ts @@ -0,0 +1,228 @@ +import { AsyncLocalStorage } from 'node:async_hooks'; +import { + DataSource, + EntityManager, + SelectQueryBuilder, + InsertQueryBuilder, + UpdateQueryBuilder, + DeleteQueryBuilder, + RelationQueryBuilder, +} from 'typeorm'; +import { SoftDeleteQueryBuilder } from 'typeorm/query-builder/SoftDeleteQueryBuilder'; +import type { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'; + +type PromiseMethods = { + [K in keyof T]-?: T[K] extends (...args: any[]) => infer R + ? 0 extends 1 & R + ? never + : R extends Promise + ? K + : never + : never; +}[keyof T]; + +const managerOperations: Record, true> = { + transaction: true, + query: true, + sql: true, + preload: true, + save: true, + remove: true, + softRemove: true, + recover: true, + insert: true, + upsert: true, + update: true, + updateAll: true, + delete: true, + deleteAll: true, + softDelete: true, + restore: true, + exists: true, + existsBy: true, + count: true, + countBy: true, + sum: true, + average: true, + minimum: true, + maximum: true, + find: true, + findBy: true, + findAndCount: true, + findAndCountBy: true, + findByIds: true, + findOne: true, + findOneBy: true, + findOneById: true, + findOneOrFail: true, + findOneByOrFail: true, + clear: true, + increment: true, + decrement: true, + release: true, +}; + +type Builder = + | SelectQueryBuilder + | InsertQueryBuilder + | UpdateQueryBuilder + | DeleteQueryBuilder + | SoftDeleteQueryBuilder + | RelationQueryBuilder; +const selectOperations: Record< + PromiseMethods>, + true +> = { + execute: true, + getRawOne: true, + getRawMany: true, + getRawAndEntities: true, + getOne: true, + getOneOrFail: true, + getMany: true, + getCount: true, + getExists: true, + getManyAndCount: true, + stream: true, +}; +const mutationOperations: Record< + PromiseMethods>, + true +> = { execute: true }; +const relationOperations: Record< + PromiseMethods>, + true +> = { + execute: true, + set: true, + add: true, + remove: true, + addAndRemove: true, + loadOne: true, + loadMany: true, +}; + +class SqliteAccess { + private tail: Promise = Promise.resolve(); + private readonly context = new AsyncLocalStorage<{ active: boolean }>(); + private readonly wrapped = new WeakSet(); + + run(work: () => Promise): Promise { + if (this.context.getStore()?.active) return work(); + const operation = this.tail.then(() => { + const owner = { active: true }; + return this.context.run(owner, async () => { + try { + return await work(); + } finally { + owner.active = false; + } + }); + }); + this.tail = operation.then( + () => undefined, + () => undefined, + ); + return operation; + } + + wrapManager(manager: EntityManager): EntityManager { + if (!this.wrapped.has(manager)) { + this.wrapped.add(manager); + this.wrapOperations(manager, Object.keys(managerOperations)); + } + return manager; + } + + wrapBuilder(builder: T): T { + if (this.wrapped.has(builder)) return builder; + this.wrapped.add(builder); + const operations = + builder instanceof RelationQueryBuilder + ? relationOperations + : builder instanceof SelectQueryBuilder + ? selectOperations + : mutationOperations; + this.wrapOperations(builder, Object.keys(operations)); + for (const name of [ + 'select', + 'insert', + 'update', + 'delete', + 'softDelete', + 'restore', + 'relation', + 'clone', + 'subQuery', + ]) { + const original: unknown = Reflect.get(builder, name); + if (typeof original !== 'function') continue; + Reflect.set(builder, name, (...args: unknown[]) => + this.wrapBuilder( + (original as (...values: unknown[]) => Builder).apply( + builder, + args, + ) as Builder, + ), + ); + } + return builder; + } + + private wrapOperations(target: object, names: string[]) { + for (const name of names) { + const original: unknown = Reflect.get(target, name); + if (typeof original !== 'function') continue; + Reflect.set(target, name, (...args: unknown[]) => + this.run( + () => + (original as (...values: unknown[]) => Promise).apply( + target, + args, + ) as Promise, + ), + ); + } + } +} + +const coordinators = new WeakMap(); + +/** Создаёт SQLite DataSource с общей очередью операций; вложенные запросы одной операции используют её владение соединением. */ +export function createSerializedSqliteDataSource( + options: SqliteConnectionOptions, +): DataSource { + const source = new DataSource(options); + const access = new SqliteAccess(); + coordinators.set(source, access); + access.wrapManager(source.manager); + const createManager = source.createEntityManager.bind( + source, + ) as DataSource['createEntityManager']; + source.createEntityManager = (runner) => + access.wrapManager(createManager(runner)); + const createBuilder = source.createQueryBuilder.bind( + source, + ) as DataSource['createQueryBuilder']; + source.createQueryBuilder = ((...args: Parameters) => + access.wrapBuilder( + createBuilder(...args), + )) as typeof source.createQueryBuilder; + const query = source.query.bind(source) as DataSource['query']; + source.query = (...args: Parameters) => + access.run(() => query(...args)); + return source; +} + +/** Выполняет составную операцию целиком в очереди SQLite, включая raw BEGIN/COMMIT и PRAGMA; ошибка освобождает очередь. */ +export function withSqliteAccess( + source: DataSource, + work: () => Promise, +): Promise { + const access = coordinators.get(source); + if (!access) + throw new Error( + 'SQLite DataSource must be created with createSerializedSqliteDataSource', + ); + return access.run(work); +} diff --git a/alfy-bot/src/shared/database/sprint-history.service.ts b/alfy-bot/src/shared/database/sprint-history.service.ts new file mode 100644 index 0000000..a442326 --- /dev/null +++ b/alfy-bot/src/shared/database/sprint-history.service.ts @@ -0,0 +1,113 @@ +import { Injectable, OnApplicationBootstrap } from '@nestjs/common'; +import { DataSource } from 'typeorm'; + +const activeSprint = (id: string) => + `EXISTS (SELECT 1 FROM sprints WHERE id = ${id} AND status = 'active')`; +const eventInsert = ( + sprint: string, + task: string, + kind: string, + title: string, +) => ` + INSERT INTO sprint_events (id, sprintId, taskId, kind, occurredAt, title) + VALUES (lower(hex(randomblob(16))), ${sprint}, ${task}, '${kind}', strftime('%Y-%m-%dT%H:%M:%fZ','now'), ${title});`; + +const definitions = [ + { + name: 'trg_sprint_task_added', + on: 'AFTER INSERT ON tasks', + when: activeSprint('NEW.sprintId'), + body: eventInsert('NEW.sprintId', 'NEW.id', 'added', 'NEW.title'), + }, + { + name: 'trg_sprint_task_deleted', + on: 'BEFORE DELETE ON tasks', + when: activeSprint('OLD.sprintId'), + body: eventInsert('OLD.sprintId', 'OLD.id', 'removed', 'OLD.title'), + }, + { + name: 'trg_sprint_task_removed', + on: 'AFTER UPDATE OF sprintId ON tasks', + when: `OLD.sprintId IS NOT NEW.sprintId AND ${activeSprint('OLD.sprintId')}`, + body: eventInsert('OLD.sprintId', 'OLD.id', 'removed', 'OLD.title'), + }, + { + name: 'trg_sprint_task_assigned', + on: 'AFTER UPDATE OF sprintId ON tasks', + when: `OLD.sprintId IS NOT NEW.sprintId AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NEW.id', 'added', 'NEW.title'), + }, + ...(['completed', 'reopened'] as const).map((kind) => ({ + name: `trg_sprint_task_${kind}`, + on: 'AFTER UPDATE OF completed ON tasks', + when: `OLD.completed IS NOT NEW.completed AND NEW.completed = ${kind === 'completed' ? 1 : 0} AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NEW.id', kind, 'NEW.title'), + })), + { + name: 'trg_sprint_task_changed', + on: 'AFTER UPDATE OF title, durationMinutes ON tasks', + when: `(OLD.title IS NOT NEW.title OR OLD.durationMinutes IS NOT NEW.durationMinutes) AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NEW.id', 'updated', 'NEW.title'), + }, + { + name: 'trg_sprint_story_added', + on: 'AFTER INSERT ON board_groups', + when: `NEW.type = 'story' AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NULL', 'story_added', 'NEW.title'), + }, + { + name: 'trg_sprint_story_removed', + on: 'AFTER UPDATE OF sprintId ON board_groups', + when: `OLD.sprintId IS NOT NEW.sprintId AND ${activeSprint('OLD.sprintId')}`, + body: eventInsert('OLD.sprintId', 'NULL', 'story_removed', 'OLD.title'), + }, + { + name: 'trg_sprint_story_assigned', + on: 'AFTER UPDATE OF sprintId ON board_groups', + when: `OLD.sprintId IS NOT NEW.sprintId AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NULL', 'story_added', 'NEW.title'), + }, + { + name: 'trg_sprint_story_deleted', + on: 'BEFORE DELETE ON board_groups', + when: activeSprint('OLD.sprintId'), + body: eventInsert('OLD.sprintId', 'NULL', 'story_removed', 'OLD.title'), + }, + { + name: 'trg_sprint_story_status', + on: 'AFTER UPDATE OF status, workflowStatusId ON board_groups', + when: `(OLD.status IS NOT NEW.status OR OLD.workflowStatusId IS NOT NEW.workflowStatusId) AND ${activeSprint('NEW.sprintId')}`, + body: eventInsert('NEW.sprintId', 'NULL', 'story_status', 'NEW.title'), + }, + ...(['INSERT', 'UPDATE', 'DELETE'] as const).map((operation) => { + const row = operation === 'DELETE' ? 'OLD' : 'NEW'; + const sprint = `(SELECT sprintId FROM tasks WHERE id = ${row}.taskId)`; + return { + name: `trg_sprint_pomodoro_${operation.toLowerCase()}`, + on: `AFTER ${operation} ON pomodoro_configs`, + when: activeSprint(sprint), + body: eventInsert( + sprint, + `${row}.taskId`, + 'estimate_changed', + `(SELECT title FROM tasks WHERE id = ${row}.taskId)`, + ), + }; + }), +]; + +export const SPRINT_HISTORY_TRIGGER_NAMES = definitions.map((d) => d.name); + +/** Устанавливает идемпотентные триггеры истории для всех путей изменения задач и историй активного спринта. */ +@Injectable() +export class SprintHistoryService implements OnApplicationBootstrap { + constructor(private readonly dataSource: DataSource) {} + + async onApplicationBootstrap(): Promise { + for (const definition of definitions) { + await this.dataSource.query( + `CREATE TRIGGER IF NOT EXISTS ${definition.name} ${definition.on} WHEN ${definition.when} BEGIN ${definition.body} END;`, + ); + } + } +} diff --git a/alfy-bot/src/shared/entities/index.ts b/alfy-bot/src/shared/entities/index.ts index 02fa7ce..f4064a3 100644 --- a/alfy-bot/src/shared/entities/index.ts +++ b/alfy-bot/src/shared/entities/index.ts @@ -16,3 +16,6 @@ export { ApiToken } from './api-token.entity'; export { Link } from './link.entity'; export { Sprint } from './sprint.entity'; export { Release } from './release.entity'; + +export { SprintEvent } from './sprint-event.entity'; +export { PlanningUndo } from './planning-undo.entity'; diff --git a/alfy-bot/src/shared/entities/planning-undo.entity.ts b/alfy-bot/src/shared/entities/planning-undo.entity.ts new file mode 100644 index 0000000..ce95641 --- /dev/null +++ b/alfy-bot/src/shared/entities/planning-undo.entity.ts @@ -0,0 +1,36 @@ +import { + Column, + CreateDateColumn, + Entity, + PrimaryGeneratedColumn, +} from 'typeorm'; + +export interface PlanningUndoState { + tasks: Record[]; + stories: Record[]; + storyTaskIds: string[]; +} + +@Entity('planning_undos') +export class PlanningUndo { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column() + userId: number; + + @Column() + projectId: string; + + @Column('simple-json') + before: PlanningUndoState; + + @Column('simple-json') + after: PlanningUndoState; + + @Column({ default: false }) + used: boolean; + + @CreateDateColumn() + createdAt: Date; +} diff --git a/alfy-bot/src/shared/entities/sprint-event.entity.ts b/alfy-bot/src/shared/entities/sprint-event.entity.ts new file mode 100644 index 0000000..97b0f26 --- /dev/null +++ b/alfy-bot/src/shared/entities/sprint-event.entity.ts @@ -0,0 +1,35 @@ +import { + Column, + Entity, + Index, + JoinColumn, + ManyToOne, + PrimaryGeneratedColumn, +} from 'typeorm'; +import { Sprint } from './sprint.entity'; + +@Entity('sprint_events') +@Index(['sprintId', 'occurredAt']) +export class SprintEvent { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column() + sprintId: string; + + @Column({ type: 'text', nullable: true }) + taskId: string | null; + + @Column() + kind: string; + + @Column() + occurredAt: string; + + @Column() + title: string; + + @ManyToOne(() => Sprint, { onDelete: 'CASCADE' }) + @JoinColumn({ name: 'sprintId' }) + sprint: Sprint; +} diff --git a/alfy-bot/src/shared/entities/sprint.entity.ts b/alfy-bot/src/shared/entities/sprint.entity.ts index 1b309cf..e11e495 100644 --- a/alfy-bot/src/shared/entities/sprint.entity.ts +++ b/alfy-bot/src/shared/entities/sprint.entity.ts @@ -10,6 +10,10 @@ import { UpdateDateColumn, } from 'typeorm'; import { Project } from './project.entity'; +import type { + PlanningSnapshot, + SprintRetrospective, +} from '../types/sprint-planning.types'; export type SprintStatus = 'planned' | 'active' | 'closed'; @@ -58,6 +62,21 @@ export class Sprint { @Column({ type: 'integer', default: 0 }) order: number; + @Column({ type: 'integer', nullable: true }) + capacityMinutes: number | null; + + @Column({ type: 'integer', default: 0 }) + reserveMinutes: number; + + @Column('simple-json', { nullable: true }) + initialSnapshot: PlanningSnapshot | null; + + @Column('simple-json', { nullable: true }) + finalSnapshot: PlanningSnapshot | null; + + @Column('simple-json', { nullable: true }) + retrospective: SprintRetrospective | null; + @CreateDateColumn() createdAt: Date; diff --git a/alfy-bot/src/shared/types/sprint-planning.types.ts b/alfy-bot/src/shared/types/sprint-planning.types.ts new file mode 100644 index 0000000..10b5130 --- /dev/null +++ b/alfy-bot/src/shared/types/sprint-planning.types.ts @@ -0,0 +1,23 @@ +export interface PlanningSnapshot { + capturedAt: string; + tasks: { + id: string; + title: string; + completed: boolean; + estimateMinutes: number | null; + groupId: string | null; + }[]; + stories: { + id: string; + title: string; + status: string; + workflowStatusId: string | null; + }[]; +} + +export interface SprintRetrospective { + goalOutcome: 'achieved' | 'partial' | 'missed' | null; + retrospective: string | null; + improvement: string | null; + carryoverReason: string | null; +} diff --git a/alfy-bot/test/helpers/test-app.ts b/alfy-bot/test/helpers/test-app.ts index 6452171..1743259 100644 --- a/alfy-bot/test/helpers/test-app.ts +++ b/alfy-bot/test/helpers/test-app.ts @@ -3,6 +3,7 @@ import { Test } from '@nestjs/testing'; import { getRepositoryToken, getDataSourceToken } from '@nestjs/typeorm'; import { JwtService } from '@nestjs/jwt'; import { DataSource, Repository } from 'typeorm'; +import { createSerializedSqliteDataSource } from '../../src/shared/database/serialized-sqlite'; import { AppModule } from '../../src/app.module'; import { User, @@ -17,6 +18,8 @@ import { ProjectColumn, BoardGroup, Sprint, + SprintEvent, + PlanningUndo, Release, AuthMethod, PushSubscription, @@ -35,7 +38,7 @@ export async function createTestApp(): Promise { process.env.BOT_TOKEN = 'test-bot-token'; process.env.ENABLE_TELEGRAM = 'false'; - const testDataSource = new DataSource({ + const testDataSource = createSerializedSqliteDataSource({ type: 'sqlite', database: ':memory:', entities: [ @@ -51,6 +54,8 @@ export async function createTestApp(): Promise { ProjectColumn, BoardGroup, Sprint, + SprintEvent, + PlanningUndo, Release, AuthMethod, PushSubscription, diff --git a/alfy-bot/test/planning.e2e-spec.ts b/alfy-bot/test/planning.e2e-spec.ts new file mode 100644 index 0000000..3b293be --- /dev/null +++ b/alfy-bot/test/planning.e2e-spec.ts @@ -0,0 +1,696 @@ +import { mkdtemp, rm } from "node:fs/promises"; +import { join } from "node:path"; +import { tmpdir } from "node:os"; +import { initializeWithSchemaSync } from "../src/shared/database/create-data-source"; +import { + SprintHistoryService, + SPRINT_HISTORY_TRIGGER_NAMES, +} from "../src/shared/database/sprint-history.service"; +import { BoardGroupConstraintsMigrationService } from "../src/shared/database/board-group-constraints.service"; +import request from "supertest"; +import { INestApplication } from "@nestjs/common"; +import { DataSource } from "typeorm"; +import { createTestApp } from "./helpers/test-app"; +import { JwtService } from "@nestjs/jwt"; +import { + Task, + Sprint, + PomodoroConfig, + User, + BoardGroup, +} from "../src/shared/entities"; + +describe("Планирование и история спринта (SQLite HTTP)", () => { + let app: INestApplication; + let token: string; + let userId: number; + let db: DataSource; + let projectId: string; + const api = () => request(app.getHttpServer()); + const auth = () => `Bearer ${token}`; + const url = () => `/api/projects/${projectId}`; + const post = (path: string, body: object) => + api().post(path).set("Authorization", auth()).send(body); + const get = (path: string) => api().get(path).set("Authorization", auth()); + const patch = (path: string, body: object) => + api().patch(path).set("Authorization", auth()).send(body); + const sprint = async (body: object = {}) => + (await post(`${url()}/sprints`, body).expect(201)).body; + const task = async (body: object = {}) => + ( + await post("/api/tasks", { title: "Задача", projectId, ...body }).expect( + 201, + ) + ).body; + + beforeAll(async () => { + ({ app, token, userId } = await createTestApp()); + db = app.get(DataSource); + await app.listen(0); + }); + beforeEach(async () => { + projectId = ( + await post("/api/projects", { + title: "Планирование", + type: "agile", + }).expect(201) + ).body.id; + }); + afterAll(async () => { + await app.close(); + }); + + it("сохраняет бюджет, не удваивает оценки и показывает неизвестные", async () => { + const s = await sprint({ capacityMinutes: 120, reserveMinutes: 20 }); + const a = await task({ sprintId: s.id, durationMinutes: 40 }); + const b = await task({ sprintId: s.id }); + await task({ sprintId: s.id }); + await db.getRepository(PomodoroConfig).save([ + { taskId: a.id, pomodoroCount: 4, pomodoroDuration: 25 }, + { taskId: b.id, pomodoroCount: 2, pomodoroDuration: 25 }, + ]); + const { body } = await get(`${url()}/planning?sprintId=${s.id}`).expect( + 200, + ); + expect(body).toMatchObject({ + capacityMinutes: 120, + reserveMinutes: 20, + plannedMinutes: 90, + remainingMinutes: 10, + unestimatedCount: 1, + }); + await patch(`${url()}/sprints/${s.id}`, { reserveMinutes: 121 }).expect( + 400, + ); + await patch(`${url()}/sprints/${s.id}`, { reserveMinutes: null }).expect( + 400, + ); + }); + + it("фиксирует исходный план, изменения обычного PATCH и итог до переноса", async () => { + const s = await sprint(); + const a = await task({ + title: "Начальная", + sprintId: s.id, + durationMinutes: 50, + }); + const carried = await task({ title: "Перенос", sprintId: s.id }); + await post(`${url()}/sprints/${s.id}/start`, { + startDate: "2026-11-04", + endDate: "2026-11-10", + }).expect(201); + await patch(`/api/tasks/${a.id}`, { completed: true }).expect(200); + const added = await task({ title: "Срочная", sprintId: s.id }); + await patch(`/api/tasks/${added.id}`, { sprintId: null }).expect(200); + await post(`${url()}/sprints/${s.id}/complete`, { + moveTo: "backlog", + goalOutcome: "partial", + improvement: "Меньше задач", + carryoverReason: "Не хватило времени", + }).expect(201); + await patch(`/api/tasks/${carried.id}`, { title: "Переименована" }).expect( + 200, + ); + const { body } = await get(`${url()}/sprints/${s.id}/report`).expect(200); + expect(body.historyComplete).toBe(true); + expect(body.initial.tasks).toHaveLength(2); + expect( + body.final.tasks.find((t: { id: string }) => t.id === carried.id).title, + ).toBe("Перенос"); + expect(body.summary).toEqual({ + planned: 2, + added: 1, + removed: 1, + completed: 1, + carried: 1, + }); + expect(body.retrospective).toMatchObject({ + goalOutcome: "partial", + improvement: "Меньше задач", + }); + expect(body.events.map((e: { kind: string }) => e.kind)).toEqual( + expect.arrayContaining(["completed", "added", "removed"]), + ); + }); + + it("массовый перенос атомарен и undo обнаруживает более новые правки", async () => { + const s = await sprint(); + const a = await task(); + const b = await task(); + const { body } = await post(`${url()}/planning/move`, { + taskIds: [a.id, b.id], + storyIds: [], + sprintId: s.id, + }).expect(201); + expect(body.updated).toBe(2); + await patch(`/api/tasks/${a.id}`, { + title: "Изменение после переноса", + }).expect(200); + await post(`${url()}/planning/undo`, { undoToken: body.undoToken }).expect( + 409, + ); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: b.id })).sprintId, + ).toBe(s.id); + await post(`${url()}/planning/move`, { + taskIds: [a.id, "00000000-0000-4000-8000-000000000000"], + storyIds: [], + sprintId: null, + }).expect(400); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBe(s.id); + }); + + it("undo одноразовый и восстанавливает исходное назначение", async () => { + const s = await sprint(); + const a = await task(); + const { body } = await post(`${url()}/planning/move`, { + taskIds: [a.id], + storyIds: [], + sprintId: s.id, + }).expect(201); + await post(`${url()}/planning/undo`, { undoToken: body.undoToken }).expect( + 201, + ); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBeNull(); + await post(`${url()}/planning/undo`, { undoToken: body.undoToken }).expect( + 409, + ); + }); + + it("предложение не меняет данные и укладывается в явный бюджет", async () => { + const s = await sprint(); + const a = await task({ title: "Оплата картой", durationMinutes: 30 }); + await task({ title: "Другая задача", durationMinutes: 80 }); + const unknown = await task({ title: "Не оценена" }); + const { body } = await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 60, + goal: "Оплата", + }).expect(201); + expect(body.taskIds).toContain(a.id); + expect(body.totalMinutes).toBe(30); + expect(body.unestimatedIds).toContain(unknown.id); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBeNull(); + }); + + it("выполнение задачи не освобождает бюджет всего спринта", async () => { + const s = await sprint({ capacityMinutes: 60 }); + const a = await task({ sprintId: s.id, durationMinutes: 40 }); + const b = await task({ title: "Новая работа", durationMinutes: 30 }); + await patch(`/api/tasks/${a.id}`, { completed: true }).expect(200); + const { body: context } = await get( + `${url()}/planning?sprintId=${s.id}`, + ).expect(200); + expect(context.plannedMinutes).toBe(40); + expect(context.remainingMinutes).toBe(20); + const { body: proposal } = await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 60, + goal: "", + }).expect(201); + expect(proposal.taskIds).not.toContain(b.id); + expect(proposal.totalMinutes).toBe(40); + }); + + it("старый закрытый спринт не получает выдуманную историю", async () => { + const s = await db + .getRepository(Sprint) + .save({ projectId, userId, name: "Старый", status: "closed" }); + const { body } = await get(`${url()}/sprints/${s.id}/report`).expect(200); + expect(body.historyComplete).toBe(false); + expect(body.initial).toBeNull(); + expect(body.final).toBeNull(); + }); + it("изолирует проекты и пользователей во всех командах", async () => { + const s = await sprint(); + const a = await task(); + const otherProject = ( + await post("/api/projects", { title: "Другой", type: "agile" }).expect( + 201, + ) + ).body.id; + const foreignTask = ( + await post("/api/tasks", { + title: "Чужая проекту", + projectId: otherProject, + }).expect(201) + ).body; + const otherUser = await db.getRepository(User).save({ username: "other" }); + const otherToken = app.get(JwtService).sign({ sub: otherUser.id }); + const move = { taskIds: [a.id], storyIds: [], sprintId: s.id }; + await api() + .post(`${url()}/planning/move`) + .set("Authorization", `Bearer ${otherToken}`) + .send(move) + .expect(404); + await api() + .get(`${url()}/planning`) + .set("Authorization", `Bearer ${otherToken}`) + .expect(404); + await api() + .get(`${url()}/sprints/${s.id}/report`) + .set("Authorization", `Bearer ${otherToken}`) + .expect(404); + await post(`${url()}/planning/move`, { + ...move, + taskIds: [a.id, foreignTask.id], + }).expect(400); + await patch(`${url()}/planning/order`, { + taskIds: [foreignTask.id], + sprintId: null, + }).expect(400); + const { body } = await post(`${url()}/planning/move`, move).expect(201); + await post(`/api/projects/${otherProject}/planning/undo`, { + undoToken: body.undoToken, + }).expect(409); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBe(s.id); + await api() + .patch(`${url()}/planning/order`) + .set("Authorization", `Bearer ${otherToken}`) + .send({ taskIds: [a.id], sprintId: s.id }) + .expect(404); + await api() + .post(`${url()}/planning/undo`) + .set("Authorization", `Bearer ${otherToken}`) + .send({ undoToken: body.undoToken }) + .expect(404); + }); + + it("выборочное закрытие проверяет все назначения до записи и сохраняет результат", async () => { + const s = await sprint(); + const next = await sprint(); + const a = await task({ sprintId: s.id }); + const b = await task({ sprintId: s.id }); + await post(`${url()}/sprints/${s.id}/start`, { + startDate: "2026-11-04", + endDate: "2026-11-10", + }).expect(201); + const foreignProject = ( + await post("/api/projects", { title: "Другой", type: "agile" }).expect( + 201, + ) + ).body.id; + const foreign = ( + await post(`/api/projects/${foreignProject}/sprints`, {}).expect(201) + ).body; + await post(`${url()}/sprints/${s.id}/complete`, { + moveTo: "backlog", + taskDestinations: [ + { taskId: a.id, sprintId: next.id }, + { taskId: b.id, sprintId: foreign.id }, + ], + }).expect(400); + expect( + (await db.getRepository(Sprint).findOneByOrFail({ id: s.id })).status, + ).toBe("active"); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBe(s.id); + await post(`${url()}/sprints/${s.id}/complete`, { + moveTo: "backlog", + taskDestinations: [{ taskId: a.id, sprintId: next.id }], + }).expect(201); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBe(next.id); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: b.id })).sprintId, + ).toBeNull(); + const { body } = await get(`${url()}/sprints/${s.id}/report`).expect(200); + expect(body.final.tasks).toHaveLength(2); + await post(`${url()}/planning/move`, { + taskIds: [a.id], + storyIds: [], + sprintId: s.id, + }).expect(400); + }); + + it("предложение учитывает готовность, отложенные, архив, оценки и стоимость зависимостей", async () => { + const s = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const makeStory = async ( + title: string, + minutes: number | null, + metadata: object, + ) => { + const story = ( + await post(`${url()}/groups`, { title, parentId: epic.id }).expect(201) + ).body; + await patch(`${url()}/groups/${story.id}`, { + workflowStatusId: "ready", + ...metadata, + }).expect(200); + const t = await task({ + title, + groupId: story.id, + ...(minutes ? { durationMinutes: minutes } : {}), + }); + return { story, task: t }; + }; + const dependency = await makeStory("База", 40, {}); + const desired = await makeStory("Оплата", 30, { + dependencyIds: [dependency.story.id], + }); + const archive = await makeStory("Архив", 5, { archived: true }); + const deferred = await makeStory("Позже", 5, { + deferredUntil: "2099-01-01", + }); + const draft = await makeStory("Идея", 5, { workflowStatusId: "open" }); + const blocked = await makeStory("Блокер", 5, { + blockedReason: "Ждём доступ", + }); + const unknown = await makeStory("Без оценки", null, {}); + const small = ( + await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 60, + goal: "Оплата", + }).expect(201) + ).body; + expect(small.storyIds).not.toContain(desired.story.id); + for (const item of [archive, deferred, draft, blocked, unknown]) + expect(small.storyIds).not.toContain(item.story.id); + expect(small.unestimatedIds).toContain(unknown.task.id); + const large = ( + await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 70, + goal: "Оплата", + }).expect(201) + ).body; + expect(large.storyIds).toEqual( + expect.arrayContaining([dependency.story.id, desired.story.id]), + ); + expect(large.totalMinutes).toBe(70); + const move = await post(`${url()}/planning/move`, { + taskIds: large.taskIds, + storyIds: large.storyIds, + sprintId: s.id, + }).expect(201); + expect(move.body.updated).toBe(2); + expect( + ( + await db + .getRepository(BoardGroup) + .findOneByOrFail({ id: desired.story.id }) + ).workflowStatusId, + ).toBe("ready"); + }); + + it("массовый перенос истории сохраняет статус и undo замечает новую дочернюю задачу", async () => { + const s = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const story = ( + await post(`${url()}/groups`, { + title: "История", + parentId: epic.id, + }).expect(201) + ).body; + await patch(`${url()}/groups/${story.id}`, { + workflowStatusId: "in_progress", + blockedReason: "Доступ", + }).expect(200); + await task({ groupId: story.id }); + const { body } = await post(`${url()}/planning/move`, { + taskIds: [], + storyIds: [story.id], + sprintId: s.id, + }).expect(201); + expect( + (await db.getRepository(BoardGroup).findOneByOrFail({ id: story.id })) + .workflowStatusId, + ).toBe("in_progress"); + await task({ groupId: story.id }); + await post(`${url()}/planning/undo`, { undoToken: body.undoToken }).expect( + 409, + ); + expect( + (await db.getRepository(BoardGroup).findOneByOrFail({ id: story.id })) + .sprintId, + ).toBe(s.id); + }); + + it("bulk защищает закрытый источник, legacy перенос сохраняет снимок истории", async () => { + const s = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const story = ( + await post(`${url()}/groups`, { + title: "История", + parentId: epic.id, + }).expect(201) + ).body; + await patch(`${url()}/groups/${story.id}/sprint`, { + sprintId: s.id, + }).expect(200); + await patch(`${url()}/groups/${story.id}`, { status: "done" }).expect(200); + await post(`${url()}/sprints/${s.id}/start`, { + startDate: "2026-11-04", + endDate: "2026-11-10", + }).expect(201); + await post(`${url()}/sprints/${s.id}/complete`, { + moveTo: "backlog", + }).expect(201); + await post(`${url()}/planning/move`, { + taskIds: [], + storyIds: [story.id], + sprintId: null, + }).expect(400); + await patch(`${url()}/groups/${story.id}/sprint`, { + sprintId: null, + }).expect(200); + const report = (await get(`${url()}/sprints/${s.id}/report`).expect(200)) + .body; + expect(report.final.stories).toContainEqual( + expect.objectContaining({ id: story.id, status: "done" }), + ); + }); + + it("предложение оценивает тот же полный набор задач истории, который переносит команда", async () => { + const s = await sprint(); + const other = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const story = ( + await post(`${url()}/groups`, { + title: "История", + parentId: epic.id, + }).expect(201) + ).body; + await patch(`${url()}/groups/${story.id}`, { + workflowStatusId: "ready", + }).expect(200); + const done = await task({ groupId: story.id, durationMinutes: 300 }); + await patch(`/api/tasks/${done.id}`, { completed: true }).expect(200); + await task({ groupId: story.id, durationMinutes: 60 }); + const small = ( + await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 60, + goal: "", + }).expect(201) + ).body; + expect(small.storyIds).not.toContain(story.id); + await patch(`/api/tasks/${done.id}`, { sprintId: other.id }).expect(200); + const large = ( + await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 1000, + goal: "", + }).expect(201) + ).body; + expect(large.storyIds).not.toContain(story.id); + }); + + it("повторные переносы в отчёте сохраняют баланс состава", async () => { + const s = await sprint(); + const a = await task({ sprintId: s.id }); + await post(`${url()}/sprints/${s.id}/start`, { + startDate: "2026-11-04", + endDate: "2026-11-10", + }).expect(201); + await patch(`/api/tasks/${a.id}`, { sprintId: null }).expect(200); + await patch(`/api/tasks/${a.id}`, { sprintId: s.id }).expect(200); + await patch(`/api/tasks/${a.id}`, { sprintId: null }).expect(200); + const { body } = await get(`${url()}/sprints/${s.id}/report`).expect(200); + expect(body.summary).toMatchObject({ planned: 1, added: 1, removed: 2 }); + }); + + it("ошибка массового переноса не откатывает параллельный обычный PATCH", async () => { + const s = await sprint(); + const a = await task(); + const b = await task(); + const unrelated = await task(); + await db.query( + `CREATE TRIGGER test_planning_failure BEFORE UPDATE OF sprintId ON tasks WHEN NEW.id = '${b.id}' BEGIN SELECT RAISE(ABORT, 'injected planning failure'); END;`, + ); + const [move, edit] = await Promise.all([ + post(`${url()}/planning/move`, { + taskIds: [a.id, b.id], + storyIds: [], + sprintId: s.id, + }), + patch(`/api/tasks/${unrelated.id}`, { title: "Сохранённая правка" }), + ]); + await db.query("DROP TRIGGER test_planning_failure"); + expect(move.status).toBe(500); + expect(edit.status).toBe(200); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: a.id })).sprintId, + ).toBeNull(); + expect( + (await db.getRepository(Task).findOneByOrFail({ id: unrelated.id })) + .title, + ).toBe("Сохранённая правка"); + }); + + it("после пересборки схемы и повторного старта история продолжает фиксироваться", async () => { + const directory = await mkdtemp(join(tmpdir(), "alfy-planning-")); + const options = { + ...db.options, + type: "sqlite" as const, + database: join(directory, "history.sqlite"), + }; + let source: DataSource | null = null; + try { + source = await initializeWithSchemaSync(options); + await new BoardGroupConstraintsMigrationService( + source, + ).onApplicationBootstrap(); + await new SprintHistoryService(source).onApplicationBootstrap(); + await source.query( + "ALTER TABLE tasks ADD COLUMN obsoletePlanningField TEXT", + ); + await source.destroy(); + source = await initializeWithSchemaSync(options); + await new BoardGroupConstraintsMigrationService( + source, + ).onApplicationBootstrap(); + await new SprintHistoryService(source).onApplicationBootstrap(); + const rows: { name: string }[] = await source.query( + "SELECT name FROM sqlite_master WHERE type = 'trigger'", + ); + expect(rows.map((row) => row.name)).toEqual( + expect.arrayContaining(SPRINT_HISTORY_TRIGGER_NAMES), + ); + const user = await source + .getRepository(User) + .save({ username: "restart" }); + const project = await source + .getRepository("Project") + .save({ userId: user.id, title: "Restart", type: "agile" }); + const started = await source + .getRepository(Sprint) + .save({ + userId: user.id, + projectId: project.id, + name: "Restart", + status: "active", + }); + await source + .getRepository(Task) + .save({ + userId: user.id, + projectId: project.id, + sprintId: started.id, + title: "После старта", + }); + const events: { kind: string }[] = await source.query( + "SELECT kind FROM sprint_events WHERE sprintId = ?", + [started.id], + ); + expect(events).toEqual([{ kind: "added" }]); + } finally { + if (source?.isInitialized) await source.destroy(); + await rm(directory, { recursive: true, force: true }); + } + }); + + it("назначенная в спринт заблокированная зависимость не считается готовой", async () => { + const s = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const first = ( + await post(`${url()}/groups`, { + title: "База", + parentId: epic.id, + }).expect(201) + ).body; + const second = ( + await post(`${url()}/groups`, { + title: "Продолжение", + parentId: epic.id, + }).expect(201) + ).body; + await patch(`${url()}/groups/${first.id}`, { + workflowStatusId: "ready", + blockedReason: "Нет доступа", + }).expect(200); + await patch(`${url()}/groups/${second.id}`, { + workflowStatusId: "ready", + dependencyIds: [first.id], + }).expect(200); + await task({ groupId: first.id, durationMinutes: 10 }); + await task({ groupId: second.id, durationMinutes: 10 }); + await patch(`${url()}/groups/${first.id}/sprint`, { + sprintId: s.id, + }).expect(200); + const { body } = await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 100, + goal: "", + }).expect(201); + expect(body.storyIds).not.toContain(second.id); + expect(body.excluded).toContainEqual({ + id: second.id, + reason: expect.stringContaining("Нет доступа"), + }); + }); + + it("проверяет транзитивный блокер уже выбранной зависимости", async () => { + const s = await sprint(); + const epic = (await post(`${url()}/groups`, { title: "Эпик" }).expect(201)) + .body; + const make = async (title: string) => { + const story = ( + await post(`${url()}/groups`, { title, parentId: epic.id }).expect(201) + ).body; + await patch(`${url()}/groups/${story.id}`, { + workflowStatusId: "ready", + }).expect(200); + await task({ groupId: story.id, durationMinutes: 10 }); + return story; + }; + const base = await make("База"); + const selected = await make("Уже выбрана"); + const candidate = await make("Следующая"); + await patch(`${url()}/groups/${base.id}`, { + blockedReason: "Нет доступа", + }).expect(200); + await patch(`${url()}/groups/${selected.id}`, { + dependencyIds: [base.id], + }).expect(200); + await patch(`${url()}/groups/${selected.id}/sprint`, { + sprintId: s.id, + }).expect(200); + await patch(`${url()}/groups/${candidate.id}`, { + dependencyIds: [selected.id], + }).expect(200); + const { body } = await post(`${url()}/planning/proposal`, { + sprintId: s.id, + budgetMinutes: 100, + goal: "", + }).expect(201); + expect(body.storyIds).not.toContain(candidate.id); + }); +}); From c932aa397462c2bb0e6b77ed088609dd3438ecda Mon Sep 17 00:00:00 2001 From: "i.seliverstov" Date: Wed, 4 Nov 2026 23:27:33 +0500 Subject: [PATCH 04/12] feat(planning): build backlog workspace and story board --- .../src/features/projects/api/planning-api.ts | 35 +++ .../features/projects/model/planning-types.ts | 56 ++++ .../features/projects/model/sprint-store.ts | 6 +- .../projects/model/story-workflow-store.ts | 46 ++++ .../src/features/projects/model/types.ts | 34 ++- .../projects/model/use-planning-workspace.ts | 151 +++++++++++ .../features/projects/ui/AgileStoryBlock.vue | 2 + .../features/projects/ui/BacklogStoryRow.vue | 6 +- .../projects/ui/GroupDetailDialog.vue | 4 +- .../features/projects/ui/PlanningQueue.vue | 103 +++++++ .../projects/ui/SprintCapacityBar.vue | 37 +++ .../projects/ui/SprintCompleteDialog.vue | 62 ++++- .../features/projects/ui/SprintFocusPanel.vue | 129 +++++++++ .../features/projects/ui/SprintFormDialog.vue | 28 +- .../projects/ui/SprintPlanningWorkspace.vue | 254 ++++++++++++++++++ .../projects/ui/SprintReportPanel.vue | 127 +++++++++ .../features/projects/ui/StoryBoardView.vue | 92 +++++++ .../projects/ui/StoryPlanningFields.vue | 74 +++++ .../projects/ui/StoryStatusPicker.vue | 54 ++++ .../projects/ui/StoryWorkflowDialog.vue | 93 +++++++ .../src/views/ProjectBacklogView.vue | 38 ++- alfy-bot-frontend/src/views/ProjectView.vue | 19 +- .../model/use-planning-workspace.spec.ts | 90 +++++++ .../projects/ui/BacklogStoryRow.spec.ts | 12 +- .../projects/ui/SprintCompleteDialog.spec.ts | 14 + .../tests/views/ProjectBacklogView.spec.ts | 32 +++ 26 files changed, 1571 insertions(+), 27 deletions(-) create mode 100644 alfy-bot-frontend/src/features/projects/api/planning-api.ts create mode 100644 alfy-bot-frontend/src/features/projects/model/planning-types.ts create mode 100644 alfy-bot-frontend/src/features/projects/model/story-workflow-store.ts create mode 100644 alfy-bot-frontend/src/features/projects/model/use-planning-workspace.ts create mode 100644 alfy-bot-frontend/src/features/projects/ui/PlanningQueue.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/SprintCapacityBar.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/SprintFocusPanel.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/SprintPlanningWorkspace.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/SprintReportPanel.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/StoryBoardView.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/StoryPlanningFields.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/StoryStatusPicker.vue create mode 100644 alfy-bot-frontend/src/features/projects/ui/StoryWorkflowDialog.vue create mode 100644 alfy-bot-frontend/tests/features/projects/model/use-planning-workspace.spec.ts diff --git a/alfy-bot-frontend/src/features/projects/api/planning-api.ts b/alfy-bot-frontend/src/features/projects/api/planning-api.ts new file mode 100644 index 0000000..5ed4afd --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/api/planning-api.ts @@ -0,0 +1,35 @@ +import type { PlanningContext, PlanningProposal, SprintReport } from '../model/planning-types' +import type { StoryWorkflowStatus } from '../model/types' +import { api } from '@/api/client' + +export function fetchStoryWorkflow(projectId: string) { + return api.get<{ statuses: StoryWorkflowStatus[] }>(`/projects/${projectId}/story-workflow`) +} + +export function saveStoryWorkflow(projectId: string, statuses: StoryWorkflowStatus[]) { + return api.put<{ statuses: StoryWorkflowStatus[] }>(`/projects/${projectId}/story-workflow`, { statuses }) +} + +export function fetchPlanning(projectId: string, sprintId: string | null) { + return api.get(`/projects/${projectId}/planning`, { params: sprintId ? { sprintId } : {} }) +} + +export function proposePlan(projectId: string, payload: { sprintId: string, budgetMinutes: number, goal: string }) { + return api.post(`/projects/${projectId}/planning/proposal`, payload) +} + +export function movePlanningItems(projectId: string, payload: { taskIds: string[], storyIds: string[], sprintId: string | null }) { + return api.post<{ updated: number, undoToken: string }>(`/projects/${projectId}/planning/move`, payload) +} + +export function undoPlanningMove(projectId: string, undoToken: string) { + return api.post<{ updated: number }>(`/projects/${projectId}/planning/undo`, { undoToken }) +} + +export function orderPlanningTasks(projectId: string, taskIds: string[], sprintId: string | null) { + return api.patch<{ updated: number }>(`/projects/${projectId}/planning/order`, { taskIds, sprintId }) +} + +export function fetchSprintReport(projectId: string, sprintId: string) { + return api.get(`/projects/${projectId}/sprints/${sprintId}/report`) +} diff --git a/alfy-bot-frontend/src/features/projects/model/planning-types.ts b/alfy-bot-frontend/src/features/projects/model/planning-types.ts new file mode 100644 index 0000000..1eeb75e --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/model/planning-types.ts @@ -0,0 +1,56 @@ +import type { BoardGroup, Sprint } from './types' + +export interface PlanningTask { + updatedAt?: string + id: string + title: string + completed: boolean + groupId: string | null + sprintId: string | null + order: number + estimateMinutes: number | null + priority?: string + blocked: boolean +} + +export interface PlanningContext { + today?: string + sprintId: string | null + capacityMinutes: number | null + reserveMinutes: number + plannedMinutes: number + remainingMinutes: number | null + unestimatedCount: number + otherProjectsMinutes: number + otherProjectsUnestimatedCount?: number + historicalCapacityMinutes: number | null + historySampleCount: number + tasks: PlanningTask[] + stories: BoardGroup[] + carryoverCounts: Record +} + +export interface PlanningProposal { + taskIds: string[] + storyIds: string[] + totalMinutes: number + unestimatedIds: string[] + excluded: { id: string, reason: string }[] + reasons: { id: string, reason: string }[] +} + +export interface PlanningSnapshot { + capturedAt: string + tasks: { id: string, title: string, completed: boolean, estimateMinutes: number | null, groupId: string | null }[] + stories: { id: string, title: string, status: string, workflowStatusId: string | null }[] +} + +export interface SprintReport { + sprint: Sprint + historyComplete: boolean + initial: PlanningSnapshot | null + final: PlanningSnapshot | null + events: { id: string, sprintId: string, taskId: string | null, kind: string, occurredAt: string, title: string }[] + summary: { planned: number, added: number, removed: number, completed: number, carried: number } + retrospective: { goalOutcome: string | null, retrospective: string | null, improvement: string | null, carryoverReason: string | null } +} diff --git a/alfy-bot-frontend/src/features/projects/model/sprint-store.ts b/alfy-bot-frontend/src/features/projects/model/sprint-store.ts index bf78af1..522b538 100644 --- a/alfy-bot-frontend/src/features/projects/model/sprint-store.ts +++ b/alfy-bot-frontend/src/features/projects/model/sprint-store.ts @@ -1,4 +1,4 @@ -import type { CreateSprintPayload, Sprint, StartSprintPayload, UpdateSprintPayload } from './types' +import type { CompleteSprintPayload, CreateSprintPayload, Sprint, StartSprintPayload, UpdateSprintPayload } from './types' import { defineStore } from 'pinia' import { ref } from 'vue' import { useTaskStore } from '@/features/tasks/model/task-store' @@ -195,7 +195,7 @@ export const useSprintStore = defineStore('sprints', () => { * незавершённые задачи; после успеха API им локально выставляется * `sprintId` (`'backlog'` → `null`), выполненные задачи остаются в спринте. */ - const completeSprint = async (projectId: string, id: string, moveTo: 'backlog' | string) => { + const completeSprint = async (projectId: string, id: string, moveTo: 'backlog' | string, details?: Omit) => { const previous = sprintsOf(projectId) if (!previous.some(s => s.id === id)) return @@ -204,7 +204,7 @@ export const useSprintStore = defineStore('sprints', () => { let data: Sprint try { - ({ data } = await sprintsApi.completeSprint(projectId, id, { moveTo })) + ({ data } = await sprintsApi.completeSprint(projectId, id, { moveTo, ...details })) } catch (err) { lists.value[projectId] = previous diff --git a/alfy-bot-frontend/src/features/projects/model/story-workflow-store.ts b/alfy-bot-frontend/src/features/projects/model/story-workflow-store.ts new file mode 100644 index 0000000..5445760 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/model/story-workflow-store.ts @@ -0,0 +1,46 @@ +import type { StoryWorkflowStatus } from './types' +import { defineStore } from 'pinia' +import { ref } from 'vue' +import { fetchStoryWorkflow, saveStoryWorkflow } from '../api/planning-api' +import { apiErrorMessage } from '../lib/api-error' + +export const useStoryWorkflowStore = defineStore('story-workflow', () => { + const catalogs = ref>({}) + const errors = ref>({}) + const pending = new Map>() + + function statusesOf(projectId: string) { + return catalogs.value[projectId] ?? [] + } + + async function fetch(projectId: string): Promise { + if (pending.has(projectId)) + return pending.get(projectId) + const request = (async () => { + try { + const { data } = await fetchStoryWorkflow(projectId) + catalogs.value[projectId] = data.statuses + delete errors.value[projectId] + } + catch (err) { + errors.value[projectId] = apiErrorMessage(err, 'Не удалось загрузить статусы историй') + } + finally { pending.delete(projectId) } + })() + pending.set(projectId, request) + return request + } + + async function ensure(projectId: string) { + if (!(projectId in catalogs.value)) + await fetch(projectId) + } + + async function save(projectId: string, statuses: StoryWorkflowStatus[]) { + const { data } = await saveStoryWorkflow(projectId, statuses) + catalogs.value[projectId] = data.statuses + delete errors.value[projectId] + } + + return { catalogs, errors, statusesOf, fetch, ensure, save } +}) diff --git a/alfy-bot-frontend/src/features/projects/model/types.ts b/alfy-bot-frontend/src/features/projects/model/types.ts index 3490b61..8e67e3a 100644 --- a/alfy-bot-frontend/src/features/projects/model/types.ts +++ b/alfy-bot-frontend/src/features/projects/model/types.ts @@ -28,7 +28,25 @@ export type GroupType = 'epic' | 'story' export type GroupStatus = 'open' | 'done' -export interface BoardGroup { +export type StoryCategory = 'open' | 'ready' | 'in_progress' | 'review' | 'done' + +export interface StoryWorkflowStatus { + id: string + name: string + category: StoryCategory + color: string +} + +export interface StoryMetadata { + workflowStatusId?: string | null + blockedReason?: string | null + deferredUntil?: string | null + archived?: boolean + dependencyIds?: string[] +} + +export interface BoardGroup extends StoryMetadata { + updatedAt?: string /** Плановый релиз истории; у эпика и незапланированной истории — null. */ releaseId: string | null /** Назначенный спринт истории; у эпика и истории в бэклоге — null. */ @@ -60,7 +78,7 @@ export interface CreateGroupPayload { dueDate?: string | null } -export type UpdateGroupPayload = Partial & { +export type UpdateGroupPayload = Partial & StoryMetadata & { status?: GroupStatus } @@ -87,6 +105,8 @@ export type SprintStatus = 'planned' | 'active' | 'closed' /** Спринт agile-проекта. Даты — `YYYY-MM-DD` (локальный календарный день), `null` пока спринт не запущен. */ export interface Sprint { + capacityMinutes?: number | null + reserveMinutes?: number id: string userId: number projectId: string @@ -103,11 +123,15 @@ export interface Sprint { /** Без `name` сервер называет спринт «Спринт N». */ export interface CreateSprintPayload { + capacityMinutes?: number | null + reserveMinutes?: number name?: string goal?: string | null } export interface UpdateSprintPayload { + capacityMinutes?: number | null + reserveMinutes?: number name?: string goal?: string | null startDate?: string | null @@ -124,6 +148,12 @@ export interface StartSprintPayload { /** Завершение спринта: `moveTo` — `'backlog'` или id запланированного спринта, куда уходят незавершённые задачи. */ export interface CompleteSprintPayload { moveTo: 'backlog' | string + goalOutcome?: 'achieved' | 'partial' | 'missed' + retrospective?: string + improvement?: string + carryoverReason?: string + taskDestinations?: { taskId: string, sprintId: string | null }[] + storyDestinations?: { storyId: string, sprintId: string | null }[] } /** Статус релиза: `planned` — запланирован, `released` — выпущен (только чтение). */ diff --git a/alfy-bot-frontend/src/features/projects/model/use-planning-workspace.ts b/alfy-bot-frontend/src/features/projects/model/use-planning-workspace.ts new file mode 100644 index 0000000..38d3f56 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/model/use-planning-workspace.ts @@ -0,0 +1,151 @@ +import type { Ref } from 'vue' +import type { PlanningContext, PlanningProposal } from './planning-types' +import { computed, ref, watch } from 'vue' +import { useTaskStore } from '@/features/tasks/model/task-store' +import * as planningApi from '../api/planning-api' +import { apiErrorMessage } from '../lib/api-error' +import { useGroupStore } from './group-store' +import { useSprintStore } from './sprint-store' + +export function usePlanningWorkspace(projectId: Ref, sprintId: Ref) { + const context = ref(null) + const proposal = ref(null) + const selectedTaskIds = ref([]) + const selectedStoryIds = ref([]) + const undoToken = ref(null) + const busy = ref(false) + const loading = ref(false) + const error = ref('') + const notice = ref('') + const tasks = useTaskStore() + const groups = useGroupStore() + const sprints = useSprintStore() + let request = 0 + let scopeVersion = 0 + const hasSelection = computed(() => selectedTaskIds.value.length + selectedStoryIds.value.length > 0) + + async function load() { + const version = ++request + loading.value = true + error.value = '' + try { + const { data } = await planningApi.fetchPlanning(projectId.value, sprintId.value) + if (version === request) + context.value = data + return version === request + } + catch (err) { + if (version === request) + error.value = apiErrorMessage(err, 'Не удалось загрузить планирование') + return false + } + finally { + if (version === request) + loading.value = false + } + } + + async function refresh(id = projectId.value, scope = scopeVersion) { + await Promise.all([tasks.fetchTasks(), groups.fetchGroups(id), sprints.fetchSprints(id)]) + const failure = tasks.error || groups.error || sprints.error + if (failure) + throw new Error(`Изменения сохранены, но данные не обновлены: ${failure}`) + if (scope === scopeVersion && !await load()) + throw new Error(error.value || 'Не удалось обновить планирование после сохранения') + } + + async function run(action: () => Promise) { + const scope = scopeVersion + if (busy.value) + return + busy.value = true + error.value = '' + notice.value = '' + try { + await action() + } + catch (err) { + if (scope === scopeVersion) + error.value = apiErrorMessage(err, 'Не удалось сохранить изменения') + } + finally { busy.value = false } + } + + async function move(target: string | null) { + if (!hasSelection.value) + return + const id = projectId.value + const scope = scopeVersion + const payload = { taskIds: [...selectedTaskIds.value], storyIds: [...selectedStoryIds.value], sprintId: target } + await run(async () => { + const { data } = await planningApi.movePlanningItems(id, payload) + if (scope !== scopeVersion) + return + undoToken.value = data.undoToken + selectedTaskIds.value = [] + selectedStoryIds.value = [] + proposal.value = null + await refresh(id, scope) + if (scope !== scopeVersion) + return + notice.value = 'Перенос сохранён. Последнее действие можно отменить.' + }) + } + + async function undo() { + const token = undoToken.value + if (!token) + return + const id = projectId.value + const scope = scopeVersion + await run(async () => { + await planningApi.undoPlanningMove(id, token) + if (scope !== scopeVersion) + return + undoToken.value = null + await refresh(id, scope) + if (scope !== scopeVersion) + return + notice.value = 'Последний перенос отменён' + }) + } + + async function propose(budgetMinutes: number, goal: string) { + const id = sprintId.value + if (!id) + return + const project = projectId.value + const scope = scopeVersion + await run(async () => { + const { data } = await planningApi.proposePlan(project, { sprintId: id, budgetMinutes, goal }) + if (scope !== scopeVersion) + return + proposal.value = data + selectedTaskIds.value = [...data.taskIds] + selectedStoryIds.value = [...data.storyIds] + notice.value = 'Предложение готово. Проверьте выбранные элементы перед переносом.' + }) + } + + async function reorder(taskIds: string[], target: string | null) { + const id = projectId.value + const scope = scopeVersion + await run(async () => { + await planningApi.orderPlanningTasks(id, taskIds, target) + await refresh(id, scope) + }) + } + + watch([projectId, sprintId], () => { + scopeVersion++ + context.value = null + proposal.value = null + selectedTaskIds.value = [] + selectedStoryIds.value = [] + undoToken.value = null + notice.value = '' + load() + }, { immediate: true }) + + return { context, proposal, selectedTaskIds, selectedStoryIds, undoToken, busy, loading, error, notice, hasSelection, load, refresh, run, move, undo, propose, reorder } +} diff --git a/alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue b/alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue index be14c38..8c43200 100644 --- a/alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue +++ b/alfy-bot-frontend/src/features/projects/ui/AgileStoryBlock.vue @@ -9,6 +9,7 @@ import AgileCell from './AgileCell.vue' import GroupActionsMenu from './GroupActionsMenu.vue' import GroupOrderControls from './GroupOrderControls.vue' import InlineTitleInput from './InlineTitleInput.vue' +import StoryStatusPicker from './StoryStatusPicker.vue' const props = defineProps<{ story: BoardGroupNode @@ -73,6 +74,7 @@ function handleCreateTask(title: string) { > {{ story.title }} + {{ tasks.length }}
+ {{ entry.done }}/{{ entry.total }} diff --git a/alfy-bot-frontend/src/features/projects/ui/GroupDetailDialog.vue b/alfy-bot-frontend/src/features/projects/ui/GroupDetailDialog.vue index 05ca457..13aec79 100644 --- a/alfy-bot-frontend/src/features/projects/ui/GroupDetailDialog.vue +++ b/alfy-bot-frontend/src/features/projects/ui/GroupDetailDialog.vue @@ -39,6 +39,7 @@ import { useReleaseStore } from '../model/release-store' import { useGroupDetail } from '../model/use-group-detail' import ColorPicker from './ColorPicker.vue' import ReleasePicker from './ReleasePicker.vue' +import StoryPlanningFields from './StoryPlanningFields.vue' function parseGroupDate(value: string | null): Date | undefined { if (!value) @@ -341,7 +342,8 @@ const ownTasks = computed(() => { isMobile ? 'w-full border-t border-border/60' : 'sm:w-60 border-l border-border/60 overflow-y-auto', ]" > -
+ +
Статус
{{ statusLabel }} diff --git a/alfy-bot-frontend/src/features/projects/ui/PlanningQueue.vue b/alfy-bot-frontend/src/features/projects/ui/PlanningQueue.vue new file mode 100644 index 0000000..47183d4 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/PlanningQueue.vue @@ -0,0 +1,103 @@ + + + diff --git a/alfy-bot-frontend/src/features/projects/ui/SprintCapacityBar.vue b/alfy-bot-frontend/src/features/projects/ui/SprintCapacityBar.vue new file mode 100644 index 0000000..4ef7085 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/SprintCapacityBar.vue @@ -0,0 +1,37 @@ + + + diff --git a/alfy-bot-frontend/src/features/projects/ui/SprintCompleteDialog.vue b/alfy-bot-frontend/src/features/projects/ui/SprintCompleteDialog.vue index e40994a..08956c1 100644 --- a/alfy-bot-frontend/src/features/projects/ui/SprintCompleteDialog.vue +++ b/alfy-bot-frontend/src/features/projects/ui/SprintCompleteDialog.vue @@ -1,5 +1,5 @@ + + diff --git a/alfy-bot-frontend/src/features/projects/ui/SprintFormDialog.vue b/alfy-bot-frontend/src/features/projects/ui/SprintFormDialog.vue index 58fa5c5..02dbe20 100644 --- a/alfy-bot-frontend/src/features/projects/ui/SprintFormDialog.vue +++ b/alfy-bot-frontend/src/features/projects/ui/SprintFormDialog.vue @@ -1,5 +1,5 @@ + + diff --git a/alfy-bot-frontend/src/features/projects/ui/SprintReportPanel.vue b/alfy-bot-frontend/src/features/projects/ui/SprintReportPanel.vue new file mode 100644 index 0000000..a2577c9 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/SprintReportPanel.vue @@ -0,0 +1,127 @@ + + + diff --git a/alfy-bot-frontend/src/features/projects/ui/StoryBoardView.vue b/alfy-bot-frontend/src/features/projects/ui/StoryBoardView.vue new file mode 100644 index 0000000..db77978 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/StoryBoardView.vue @@ -0,0 +1,92 @@ + + + diff --git a/alfy-bot-frontend/src/features/projects/ui/StoryPlanningFields.vue b/alfy-bot-frontend/src/features/projects/ui/StoryPlanningFields.vue new file mode 100644 index 0000000..d83c021 --- /dev/null +++ b/alfy-bot-frontend/src/features/projects/ui/StoryPlanningFields.vue @@ -0,0 +1,74 @@ + + +