feat(m11): calendar + milestones with progress calc, tests, e2e
- CalendarRepository (event CRUD, range query, soft-delete, project isolation) + MilestoneRepository (CRUD, findToDosByMilestone) + ScheduleService (aggregated getCalendarEvents = custom events+milestones+todos in range, milestone CRUD, milestone_updated activity, progress auto-calc 0-100) - APIs: calendar events GET/POST/PATCH/DELETE, milestones GET/POST/PATCH + progress - Screens: calendar list view + CalendarEventForm, milestones list with progress bars + MilestoneForm, ProjectNav links - Unit tests (CalendarRepository, MilestoneRepository, ScheduleService incl. progress calc 0/33/100) + e2e calendar
This commit is contained in:
Ken Yasue
99
tests/e2e/calendar.spec.ts
Normal file
99
tests/e2e/calendar.spec.ts
Normal file
@ -0,0 +1,99 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
|
||||
function unique(prefix: string): string {
|
||||
return `${prefix}-${Date.now()}-${Math.floor(Math.random() * 1_000_000)}`;
|
||||
}
|
||||
|
||||
async function setupOwner(page: import('@playwright/test').Page) {
|
||||
const email = unique('owner') + '@example.com';
|
||||
await page.goto('/login');
|
||||
await page.getByRole('button', { name: '新規登録はこちら' }).click();
|
||||
await page.getByLabel('表示名').fill('Owner');
|
||||
await page.getByLabel('メールアドレス').fill(email);
|
||||
await page.getByLabel('パスワード').fill('password123');
|
||||
await page.getByRole('button', { name: '登録する' }).click();
|
||||
await expect(page).toHaveURL(/\/dashboard/);
|
||||
await page.getByLabel('プロジェクト名').fill(unique('Proj'));
|
||||
await page.getByRole('button', { name: '新規プロジェクト' }).click();
|
||||
await expect(page).toHaveURL(/\/projects\/\d+$/);
|
||||
return Number(page.url().match(/\/projects\/(\d+)/)![1]);
|
||||
}
|
||||
|
||||
test.describe('calendar & milestones', () => {
|
||||
test('milestone progress reflects related todo completion; calendar aggregates', async ({
|
||||
page,
|
||||
}) => {
|
||||
const projectId = await setupOwner(page);
|
||||
const now = new Date();
|
||||
const y = now.getFullYear();
|
||||
const m = String(now.getMonth() + 1).padStart(2, '0');
|
||||
const midMonth = `${y}-${m}-15`;
|
||||
|
||||
// マイルストーン作成
|
||||
const msRes = await page.request.post(
|
||||
`/api/projects/${projectId}/milestones`,
|
||||
{ data: { title: unique('MS'), dueDate: midMonth } }
|
||||
);
|
||||
expect(msRes.ok()).toBeTruthy();
|
||||
const { milestone } = (await msRes.json()) as { milestone: { id: number } };
|
||||
|
||||
// ToDoを作成しマイルストーンに紐付け
|
||||
const cols = (
|
||||
(await (
|
||||
await page.request.get(`/api/projects/${projectId}/todos/columns`)
|
||||
).json()) as {
|
||||
columns: { id: number }[];
|
||||
}
|
||||
).columns;
|
||||
const itemRes = await page.request.post(
|
||||
`/api/projects/${projectId}/todos/items`,
|
||||
{
|
||||
data: { title: 'linked task', columnId: cols[0].id, dueDate: midMonth },
|
||||
}
|
||||
);
|
||||
const { item } = (await itemRes.json()) as { item: { id: number } };
|
||||
await page.request.patch(
|
||||
`/api/projects/${projectId}/todos/items/${item.id}`,
|
||||
{
|
||||
data: { milestoneId: milestone.id },
|
||||
}
|
||||
);
|
||||
|
||||
// マイルストーン画面: 進捗 0%
|
||||
await page.goto(`/projects/${projectId}/milestones`);
|
||||
await expect(page.getByTestId(`milestone-${milestone.id}`)).toBeVisible();
|
||||
await expect(
|
||||
page.getByTestId(`milestone-progress-${milestone.id}`)
|
||||
).toHaveText('0%');
|
||||
|
||||
// ToDo完了 → 進捗 100%
|
||||
await page.request.patch(
|
||||
`/api/projects/${projectId}/todos/items/${item.id}`,
|
||||
{
|
||||
data: { toggleComplete: true },
|
||||
}
|
||||
);
|
||||
await page.reload();
|
||||
await expect(
|
||||
page.getByTestId(`milestone-progress-${milestone.id}`)
|
||||
).toHaveText('100%');
|
||||
|
||||
// カレンダーイベント作成
|
||||
const evRes = await page.request.post(
|
||||
`/api/projects/${projectId}/calendar/events`,
|
||||
{
|
||||
data: {
|
||||
title: unique('Event'),
|
||||
type: 'custom',
|
||||
startAt: `${midMonth}T10:00:00`,
|
||||
},
|
||||
}
|
||||
);
|
||||
expect(evRes.ok()).toBeTruthy();
|
||||
|
||||
// カレンダー画面にイベント+マイルストーン+ToDoが集約表示される
|
||||
await page.goto(`/projects/${projectId}/calendar`);
|
||||
await expect(page.getByText(/マイルストーン:/)).toBeVisible();
|
||||
await expect(page.getByText(/ToDo:/)).toBeVisible();
|
||||
});
|
||||
});
|
||||
93
tests/unit/repositories/CalendarRepository.test.ts
Normal file
93
tests/unit/repositories/CalendarRepository.test.ts
Normal file
@ -0,0 +1,93 @@
|
||||
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
||||
import { createMigratedTestDb } from '@/tests/helpers/db';
|
||||
import type { SqliteDatabase } from '@/lib/db/sqlite';
|
||||
import { UserRepository } from '@/repositories/UserRepository';
|
||||
import { ProjectRepository } from '@/repositories/ProjectRepository';
|
||||
import { ProjectMemberRepository } from '@/repositories/ProjectMemberRepository';
|
||||
import { CalendarRepository } from '@/repositories/CalendarRepository';
|
||||
|
||||
describe('CalendarRepository', () => {
|
||||
let db: SqliteDatabase;
|
||||
let repo: CalendarRepository;
|
||||
let projectId: number;
|
||||
let userId: number;
|
||||
|
||||
beforeEach(() => {
|
||||
db = createMigratedTestDb();
|
||||
repo = new CalendarRepository(db);
|
||||
userId = new UserRepository(db).create({
|
||||
name: 'U',
|
||||
email: 'u@example.com',
|
||||
passwordHash: 'h',
|
||||
}).id;
|
||||
projectId = new ProjectRepository(db).create({
|
||||
name: 'P',
|
||||
ownerId: userId,
|
||||
}).id;
|
||||
new ProjectMemberRepository(db).add(projectId, userId, 'admin');
|
||||
});
|
||||
|
||||
afterEach(() => db.close());
|
||||
|
||||
function createEvent(title: string, startAt: string) {
|
||||
return repo.create({
|
||||
projectId,
|
||||
title,
|
||||
type: 'custom',
|
||||
startAt,
|
||||
createdById: userId,
|
||||
});
|
||||
}
|
||||
|
||||
it('creates and finds an event by id', () => {
|
||||
const e = createEvent('E', '2026-06-15T10:00:00');
|
||||
expect(repo.findEventById(e.id)?.title).toBe('E');
|
||||
});
|
||||
|
||||
it('finds events in range and excludes out-of-range', () => {
|
||||
createEvent('in', '2026-06-15T10:00:00');
|
||||
createEvent('out', '2026-07-15T10:00:00');
|
||||
const events = repo.findByProjectInRange(
|
||||
projectId,
|
||||
'2026-06-01',
|
||||
'2026-06-30'
|
||||
);
|
||||
expect(events).toHaveLength(1);
|
||||
expect(events[0].title).toBe('in');
|
||||
});
|
||||
|
||||
it('excludes soft-deleted events', () => {
|
||||
const e = createEvent('E', '2026-06-15T10:00:00');
|
||||
repo.delete(e.id);
|
||||
expect(repo.findEventById(e.id)).toBeNull();
|
||||
expect(
|
||||
repo.findByProjectInRange(projectId, '2026-06-01', '2026-06-30')
|
||||
).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('isolates events by project', () => {
|
||||
createEvent('mine', '2026-06-15T10:00:00');
|
||||
const p2 = new ProjectRepository(db).create({
|
||||
name: 'P2',
|
||||
ownerId: userId,
|
||||
}).id;
|
||||
repo.create({
|
||||
projectId: p2,
|
||||
title: 'theirs',
|
||||
type: 'custom',
|
||||
startAt: '2026-06-15T10:00:00',
|
||||
createdById: userId,
|
||||
});
|
||||
expect(
|
||||
repo.findByProjectInRange(projectId, '2026-06-01', '2026-06-30')
|
||||
).toHaveLength(1);
|
||||
expect(
|
||||
repo.findByProjectInRange(p2, '2026-06-01', '2026-06-30')
|
||||
).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('updates an event', () => {
|
||||
const e = createEvent('E', '2026-06-15T10:00:00');
|
||||
expect(repo.update(e.id, { title: 'E2' })?.title).toBe('E2');
|
||||
});
|
||||
});
|
||||
84
tests/unit/repositories/MilestoneRepository.test.ts
Normal file
84
tests/unit/repositories/MilestoneRepository.test.ts
Normal file
@ -0,0 +1,84 @@
|
||||
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
||||
import { createMigratedTestDb } from '@/tests/helpers/db';
|
||||
import type { SqliteDatabase } from '@/lib/db/sqlite';
|
||||
import { UserRepository } from '@/repositories/UserRepository';
|
||||
import { ProjectRepository } from '@/repositories/ProjectRepository';
|
||||
import { ProjectMemberRepository } from '@/repositories/ProjectMemberRepository';
|
||||
import { TodoRepository } from '@/repositories/TodoRepository';
|
||||
import { MilestoneRepository } from '@/repositories/MilestoneRepository';
|
||||
|
||||
describe('MilestoneRepository', () => {
|
||||
let db: SqliteDatabase;
|
||||
let repo: MilestoneRepository;
|
||||
let todoRepo: TodoRepository;
|
||||
let projectId: number;
|
||||
let userId: number;
|
||||
let columnId: number;
|
||||
|
||||
beforeEach(() => {
|
||||
db = createMigratedTestDb();
|
||||
repo = new MilestoneRepository(db);
|
||||
todoRepo = new TodoRepository(db);
|
||||
userId = new UserRepository(db).create({
|
||||
name: 'U',
|
||||
email: 'u@example.com',
|
||||
passwordHash: 'h',
|
||||
}).id;
|
||||
projectId = new ProjectRepository(db).create({
|
||||
name: 'P',
|
||||
ownerId: userId,
|
||||
}).id;
|
||||
new ProjectMemberRepository(db).add(projectId, userId, 'admin');
|
||||
columnId = todoRepo.createColumn({
|
||||
projectId,
|
||||
name: 'Todo',
|
||||
orderIndex: 0,
|
||||
}).id;
|
||||
});
|
||||
|
||||
afterEach(() => db.close());
|
||||
|
||||
it('creates and lists milestones ordered by due_date', () => {
|
||||
repo.create({ projectId, title: 'M2', dueDate: '2026-12-31' });
|
||||
repo.create({ projectId, title: 'M1', dueDate: '2026-06-30' });
|
||||
const list = repo.findByProject(projectId);
|
||||
expect(list.map((m) => m.title)).toEqual(['M1', 'M2']);
|
||||
});
|
||||
|
||||
it('updates and deletes a milestone', () => {
|
||||
const m = repo.create({ projectId, title: 'M' });
|
||||
expect(repo.update(m.id, { status: 'closed' })?.status).toBe('closed');
|
||||
repo.delete(m.id);
|
||||
expect(repo.findById(m.id)).toBeNull();
|
||||
});
|
||||
|
||||
it('excludes soft-deleted milestones', () => {
|
||||
const m = repo.create({ projectId, title: 'M' });
|
||||
repo.delete(m.id);
|
||||
expect(repo.findByProject(projectId)).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('findToDosByMilestone returns only linked, non-deleted todos', () => {
|
||||
const m = repo.create({ projectId, title: 'M' });
|
||||
const t1 = todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 't1',
|
||||
creatorId: userId,
|
||||
orderIndex: 0,
|
||||
});
|
||||
const t2 = todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 't2',
|
||||
creatorId: userId,
|
||||
orderIndex: 1,
|
||||
});
|
||||
todoRepo.updateItem(t1.id, { milestoneId: m.id });
|
||||
todoRepo.updateItem(t2.id, { milestoneId: m.id });
|
||||
todoRepo.deleteItem(t2.id); // soft delete
|
||||
const todos = repo.findToDosByMilestone(m.id);
|
||||
expect(todos).toHaveLength(1);
|
||||
expect(todos[0].id).toBe(t1.id);
|
||||
});
|
||||
});
|
||||
183
tests/unit/services/ScheduleService.test.ts
Normal file
183
tests/unit/services/ScheduleService.test.ts
Normal file
@ -0,0 +1,183 @@
|
||||
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
||||
import { createMigratedTestDb } from '@/tests/helpers/db';
|
||||
import type { SqliteDatabase } from '@/lib/db/sqlite';
|
||||
import { UserRepository } from '@/repositories/UserRepository';
|
||||
import { ProjectRepository } from '@/repositories/ProjectRepository';
|
||||
import { ProjectMemberRepository } from '@/repositories/ProjectMemberRepository';
|
||||
import { CalendarRepository } from '@/repositories/CalendarRepository';
|
||||
import { MilestoneRepository } from '@/repositories/MilestoneRepository';
|
||||
import { TodoRepository } from '@/repositories/TodoRepository';
|
||||
import { ActivityLogRepository } from '@/repositories/ActivityLogRepository';
|
||||
import { ActivityLogService } from '@/services/ActivityLogService';
|
||||
import { ScheduleService } from '@/services/ScheduleService';
|
||||
import { ForbiddenError, NotFoundError } from '@/lib/errors';
|
||||
|
||||
function makeService(db: SqliteDatabase) {
|
||||
return new ScheduleService(
|
||||
new CalendarRepository(db),
|
||||
new MilestoneRepository(db),
|
||||
new TodoRepository(db),
|
||||
new ProjectMemberRepository(db),
|
||||
new ActivityLogService(new ActivityLogRepository(db))
|
||||
);
|
||||
}
|
||||
|
||||
describe('ScheduleService', () => {
|
||||
let db: SqliteDatabase;
|
||||
let service: ScheduleService;
|
||||
let projectId: number;
|
||||
let authorId: number;
|
||||
let outsiderId: number;
|
||||
let columnId: number;
|
||||
|
||||
beforeEach(() => {
|
||||
db = createMigratedTestDb();
|
||||
service = makeService(db);
|
||||
const users = new UserRepository(db);
|
||||
authorId = users.create({
|
||||
name: 'A',
|
||||
email: 'a@example.com',
|
||||
passwordHash: 'h',
|
||||
}).id;
|
||||
outsiderId = users.create({
|
||||
name: 'O',
|
||||
email: 'o@example.com',
|
||||
passwordHash: 'h',
|
||||
}).id;
|
||||
projectId = new ProjectRepository(db).create({
|
||||
name: 'P',
|
||||
ownerId: authorId,
|
||||
}).id;
|
||||
const members = new ProjectMemberRepository(db);
|
||||
members.add(projectId, authorId, 'admin');
|
||||
columnId = new TodoRepository(db).createColumn({
|
||||
projectId,
|
||||
name: 'Todo',
|
||||
orderIndex: 0,
|
||||
}).id;
|
||||
});
|
||||
|
||||
afterEach(() => db.close());
|
||||
|
||||
describe('getCalendarEvents (aggregation)', () => {
|
||||
it('aggregates custom events + milestones + todos within range', () => {
|
||||
service.createEvent(authorId, {
|
||||
projectId,
|
||||
title: 'Meeting',
|
||||
type: 'meeting',
|
||||
startAt: '2026-06-10T10:00:00',
|
||||
});
|
||||
service.createMilestone(authorId, projectId, {
|
||||
title: 'M1',
|
||||
dueDate: '2026-06-20',
|
||||
});
|
||||
const todoRepo = new TodoRepository(db);
|
||||
todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 'task',
|
||||
creatorId: authorId,
|
||||
orderIndex: 0,
|
||||
dueDate: '2026-06-15',
|
||||
});
|
||||
const views = service.getCalendarEvents(authorId, projectId, {
|
||||
from: '2026-06-01',
|
||||
to: '2026-06-30',
|
||||
});
|
||||
const sources = views.map((v) => v.source).sort();
|
||||
expect(sources).toEqual(['event', 'milestone', 'todo']);
|
||||
expect(views[0].startAt).toBe('2026-06-10T10:00:00'); // earliest first
|
||||
});
|
||||
|
||||
it('excludes items outside the range', () => {
|
||||
service.createMilestone(authorId, projectId, {
|
||||
title: 'M',
|
||||
dueDate: '2026-07-15',
|
||||
});
|
||||
const views = service.getCalendarEvents(authorId, projectId, {
|
||||
from: '2026-06-01',
|
||||
to: '2026-06-30',
|
||||
});
|
||||
expect(views).toHaveLength(0);
|
||||
});
|
||||
|
||||
it('forbids a non-member', () => {
|
||||
expect(() =>
|
||||
service.getCalendarEvents(outsiderId, projectId, {
|
||||
from: '2026-06-01',
|
||||
to: '2026-06-30',
|
||||
})
|
||||
).toThrow(ForbiddenError);
|
||||
});
|
||||
});
|
||||
|
||||
describe('milestone progress', () => {
|
||||
it('returns 0% when there are no related todos', () => {
|
||||
const m = service.createMilestone(authorId, projectId, { title: 'M' });
|
||||
expect(service.calcMilestoneProgress(m.id)).toBe(0);
|
||||
expect(service.getMilestoneProgress(authorId, m.id)).toBe(0);
|
||||
});
|
||||
|
||||
it('returns the completion ratio rounded', () => {
|
||||
const m = service.createMilestone(authorId, projectId, { title: 'M' });
|
||||
const todoRepo = new TodoRepository(db);
|
||||
const t1 = todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 'a',
|
||||
creatorId: authorId,
|
||||
orderIndex: 0,
|
||||
});
|
||||
const t2 = todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 'b',
|
||||
creatorId: authorId,
|
||||
orderIndex: 1,
|
||||
});
|
||||
const t3 = todoRepo.createItem({
|
||||
projectId,
|
||||
columnId,
|
||||
title: 'c',
|
||||
creatorId: authorId,
|
||||
orderIndex: 2,
|
||||
});
|
||||
for (const t of [t1, t2, t3])
|
||||
todoRepo.updateItem(t.id, { milestoneId: m.id });
|
||||
// 1/3 完了
|
||||
todoRepo.updateItem(t1.id, { completedAt: '2026-06-01T00:00:00.000Z' });
|
||||
expect(service.calcMilestoneProgress(m.id)).toBe(33);
|
||||
// 3/3 完了 → 100
|
||||
todoRepo.updateItem(t2.id, { completedAt: '2026-06-02T00:00:00.000Z' });
|
||||
todoRepo.updateItem(t3.id, { completedAt: '2026-06-03T00:00:00.000Z' });
|
||||
expect(service.calcMilestoneProgress(m.id)).toBe(100);
|
||||
});
|
||||
|
||||
it('getMilestones attaches progress', () => {
|
||||
const m = service.createMilestone(authorId, projectId, { title: 'M' });
|
||||
const list = service.getMilestones(authorId, projectId);
|
||||
expect(list[0].progress).toBe(0);
|
||||
expect(list[0].id).toBe(m.id);
|
||||
});
|
||||
});
|
||||
|
||||
describe('milestone CRUD', () => {
|
||||
it('update logs milestone_updated activity', () => {
|
||||
const m = service.createMilestone(authorId, projectId, { title: 'M' });
|
||||
service.updateMilestone(authorId, m.id, { status: 'closed' });
|
||||
expect(
|
||||
new ActivityLogRepository(db)
|
||||
.findByProject(projectId)
|
||||
.items.some((l) => l.action === 'milestone_updated')
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it('delete requires admin', () => {
|
||||
const m = service.createMilestone(authorId, projectId, { title: 'M' });
|
||||
service.deleteMilestone(authorId, m.id); // authorId is admin
|
||||
expect(() =>
|
||||
service.updateMilestone(authorId, m.id, { title: 'x' })
|
||||
).toThrow(NotFoundError);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user