Sprint: Stories en taken krijgen één voorspelbare volgorde gekoppeld aan hun code; drag-and-drop herordening voor stories/taken verdwijnt, priority wordt puur label. (#201)

* feat(code): add parseCodeNumber helper to lib/code.ts Pure helper that extracts the trailing numeric sequence from a code string (ST-007 → 7, T-42 → 42). Non-conforming codes fall back to Number.MAX_SAFE_INTEGER so they sort to the end. Includes 5 unit tests. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(tasks): add code field to BacklogTask type and all task selects Adds `code: string | null` to BacklogTask interface and includes it in all Prisma task.findMany selects (backlog API, stories tasks API, page hydration routes). Updates coerceTaskPayload and test fixtures to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(sort-order): derive story/task sort_order from parseCodeNumber(code) All create paths (createStoryAction, saveTask, createTaskAction, materializeIdeaPlanAction) and code-edit paths (updateStoryAction, saveTask update) now set sort_order = parseCodeNumber(code) instead of last+1. Removes stale last-record queries from create paths. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(sort-order): decouple sprint membership actions from sort_order createSprintAction and addStoryToSprintAction no longer write sort_order when adding stories to a sprint. sort_order is derived from code via parseCodeNumber, so membership should only set sprint_id + status. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor(ordering): remove priority from all story/task orderBy Story- en taak-ordering is nu puur sort_order asc (created_at als tiebreaker). PBI-ordering (priority + sort_order) blijft ongewijzigd. Gewijzigd: backlog/route, pbis/stories/route, claude-context/route, next-story/route, workspace/route, tasks/route, sprint-runs (query + in-memory sort), solo-workspace-server, page.tsx (app + mobile + sprint), store compareStory, actions/sprints story-query, next-story test. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor(dnd): remove drag-and-drop reorder for stories and tasks - Remove reorderStoriesAction, reorderTasksAction, reorderSprintStoriesAction - Delete REST route app/api/stories/[id]/tasks/reorder/route.ts - Remove DnD from backlog story-panel and task-panel (flat list) - Remove reorder-within-sprint branch from sprint-board-client handleDragEnd - Switch SortableSprintRow to plain SprintRow using useDraggable (membership drag kept) - Remove all DnD from task-list (status toggle + edit kept) - Remove story-order/task-order/sprint-story-order/sprint-task-order mutation types and store handlers - Remove related tests for deleted reorder route; fix sprint store tests * feat(backlog): toon code-badge op backlog-taakkaarten Geeft code={task.code} door aan <BacklogCard> in TaskCard (task-panel.tsx). BacklogCard rendert de CodeBadge al conditionally — alleen de prop ontbrak. * feat(migration): backfill story/task sort_order from code numeric suffix One-time Prisma migration that sets sort_order = trailing numeric part of code for all existing stories and tasks, consistent with parseCodeNumber (fallback = Number.MAX_SAFE_INTEGER for non-conforming codes). PBIs are intentionally excluded. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs+tests(sort-order): update for code-binding order on stories/tasks - Rewrite docs/patterns/sort-order.md: float-insertion PBI only; story/task sort_order = parseCodeNumber(code), never drag/membership mutated - Update plan-to-pbi-flow.md: sort_order auto, sprint_id param, priority=label - Update make-plan.md: priority=label, array order = execution order - Update rest-contract.md: fix sprint-tasks ordering, remove reorder endpoint - Add ADR-0011: code is bindende volgordesleutel voor stories/taken - Regenerate docs/INDEX.md via npm run docs - Remove reorderStoriesAction/reorderTasksAction mocks from backlog tests - Remove dnd-kit mocks from task-panel test (panel no longer uses dnd) - Extend materializeIdeaPlanAction test: assert sort_order=parseCodeNumber(code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-14 19:02:36 +02:00 · 2026-05-14 19:02:36 +02:00 · ff22196714
commit ff22196714
parent b6249a41c0
43 changed files with 296 additions and 951 deletions
--- a/tests/actions/ideas-crud.test.ts
+++ b/tests/actions/ideas-crud.test.ts
@ -520,7 +520,7 @@ body
      .mockResolvedValueOnce({ id: 't-B1' })
  })

-  it('happy: creates PBI + 2 stories + 3 tasks, links idea, returns ids', async () => {
+  it('happy: creates PBI + 2 stories + 3 tasks, links idea, returns ids; sort_order = parseCodeNumber(code)', async () => {
    const r = await materializeIdeaPlanAction('idea-1')
    expect(r).toMatchObject({
      success: true,
@ -534,6 +534,15 @@ body
    expect(m.pbi.create).toHaveBeenCalledTimes(1)
    expect(m.story.create).toHaveBeenCalledTimes(2)
    expect(m.task.create).toHaveBeenCalledTimes(3)
+
+    // story sort_order = parseCodeNumber(auto-code): ST-001→1, ST-002→2
+    expect(m.story.create.mock.calls[0][0].data.sort_order).toBe(1)
+    expect(m.story.create.mock.calls[1][0].data.sort_order).toBe(2)
+
+    // task sort_order = parseCodeNumber(auto-code): T-1→1, T-2→2, T-3→3
+    expect(m.task.create.mock.calls[0][0].data.sort_order).toBe(1)
+    expect(m.task.create.mock.calls[1][0].data.sort_order).toBe(2)
+    expect(m.task.create.mock.calls[2][0].data.sort_order).toBe(3)
  })

  it('blocks when not PLAN_READY (e.g. GRILLED)', async () => {
--- a/tests/api/next-story.test.ts
+++ b/tests/api/next-story.test.ts
@ -95,7 +95,7 @@ describe('GET /api/products/:id/next-story', () => {
    expect(data.tasks[0]).toMatchObject({ id: 'task-1', status: 'todo' })
  })

-  it('queries story ordered by priority then sort_order', async () => {
+  it('queries story ordered by sort_order only', async () => {
    mockPrisma.sprint.findFirst.mockResolvedValue(SPRINT)
    mockPrisma.story.findFirst.mockResolvedValue(STORY)

@ -103,7 +103,7 @@ describe('GET /api/products/:id/next-story', () => {

    expect(mockPrisma.story.findFirst).toHaveBeenCalledWith(
      expect.objectContaining({
-        orderBy: [{ priority: 'asc' }, { sort_order: 'asc' }],
+        orderBy: [{ sort_order: 'asc' }],
      })
    )
  })
--- a/tests/api/reorder.test.ts
+++ b/tests/api/reorder.test.ts
@ -1,111 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-
-vi.mock('@/lib/prisma', () => ({
-  prisma: {
-    story: {
-      findFirst: vi.fn(),
-    },
-    task: {
-      update: vi.fn(),
-    },
-    $transaction: vi.fn(),
-  },
-}))
-
-vi.mock('@/lib/api-auth', () => ({
-  authenticateApiRequest: vi.fn(),
-}))
-
-import { prisma } from '@/lib/prisma'
-import { authenticateApiRequest } from '@/lib/api-auth'
-import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
-
-const mockPrisma = prisma as unknown as {
-  story: { findFirst: ReturnType<typeof vi.fn> }
-  task: { update: ReturnType<typeof vi.fn> }
-  $transaction: ReturnType<typeof vi.fn>
-}
-const mockAuth = authenticateApiRequest as ReturnType<typeof vi.fn>
-
-function makeStory(taskIds: string[]) {
-  return {
-    id: 'story-1',
-    product_id: 'prod-1',
-    tasks: taskIds.map(id => ({ id })),
-  }
-}
-
-function makeRequest(body: unknown, storyId = 'story-1'): [Request, { params: Promise<{ id: string }> }] {
-  return [
-    new Request(`http://localhost/api/stories/${storyId}/tasks/reorder`, {
-      method: 'PATCH',
-      headers: { Authorization: 'Bearer test-token', 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    }),
-    { params: Promise.resolve({ id: storyId }) },
-  ]
-}
-
-describe('PATCH /api/stories/:id/tasks/reorder', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockAuth.mockResolvedValue({ userId: 'user-1', isDemo: false })
-    mockPrisma.$transaction.mockResolvedValue([])
-    mockPrisma.task.update.mockResolvedValue({ id: 'task-1', sort_order: 1 })
-  })
-
-  // TC-RO-06 — body validation fires before story lookup
-  it('returns 422 when task_ids is an empty array', async () => {
-    const res = await patchReorder(...makeRequest({ task_ids: [] }))
-    expect(res.status).toBe(422)
-    expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
-  })
-
-  // TC-RO-07
-  it('returns 422 when task_ids is not an array', async () => {
-    const res = await patchReorder(...makeRequest({ task_ids: 'task-1' }))
-    expect(res.status).toBe(422)
-    expect(mockPrisma.story.findFirst).not.toHaveBeenCalled()
-  })
-
-  it('returns 422 when task_ids is missing entirely', async () => {
-    const res = await patchReorder(...makeRequest({}))
-    expect(res.status).toBe(422)
-  })
-
-  // TC-RO-08
-  it('returns 422 when task_ids contains an ID not belonging to the story', async () => {
-    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
-
-    const res = await patchReorder(...makeRequest({ task_ids: ['task-1', 'task-from-other-story'] }))
-    const data = await res.json()
-
-    expect(res.status).toBe(422)
-    expect(data.error).toContain('task-from-other-story')
-  })
-
-  // TC-RO-09
-  it('reorders tasks and returns 200 with success: true', async () => {
-    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2', 'task-3']))
-
-    const res = await patchReorder(...makeRequest({ task_ids: ['task-3', 'task-1', 'task-2'] }))
-    const data = await res.json()
-
-    expect(res.status).toBe(200)
-    expect(data).toEqual({ success: true })
-    expect(mockPrisma.$transaction).toHaveBeenCalled()
-  })
-
-  it('updates each task with its new sort_order index', async () => {
-    mockPrisma.story.findFirst.mockResolvedValue(makeStory(['task-1', 'task-2']))
-
-    await patchReorder(...makeRequest({ task_ids: ['task-2', 'task-1'] }))
-
-    expect(mockPrisma.task.update).toHaveBeenCalledWith(
-      expect.objectContaining({ where: { id: 'task-2' }, data: { sort_order: 1 } })
-    )
-    expect(mockPrisma.task.update).toHaveBeenCalledWith(
-      expect.objectContaining({ where: { id: 'task-1' }, data: { sort_order: 2 } })
-    )
-  })
-})
--- a/tests/api/security.test.ts
+++ b/tests/api/security.test.ts
@ -54,7 +54,6 @@ import { authenticateApiRequest } from '@/lib/api-auth'
 import { GET as getProducts } from '@/app/api/products/route'
 import { GET as getNextStory } from '@/app/api/products/[id]/next-story/route'
 import { GET as getSprintTasks } from '@/app/api/sprints/[id]/tasks/route'
-import { PATCH as patchReorder } from '@/app/api/stories/[id]/tasks/reorder/route'
 import { POST as postStoryLog } from '@/app/api/stories/[id]/log/route'
 import { PATCH as patchTask } from '@/app/api/tasks/[id]/route'

@ -276,56 +275,6 @@ describe('GET /api/sprints/:id/tasks', () => {
  })
 })

-// ─── PATCH /api/stories/:id/tasks/reorder ────────────────────────────────────
-
-describe('PATCH /api/stories/:id/tasks/reorder', () => {
-  const VALID_BODY = { task_ids: ['task-x'] }
-
-  // TC-RO-01
-  it('returns 401 when no valid token provided', async () => {
-    mockAuth.mockResolvedValue(UNAUTHORIZED)
-    const res = await patchReorder(
-      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
-      routeCtx('story-1')
-    )
-    expect(res.status).toBe(401)
-  })
-
-  // TC-RO-03
-  it('returns 403 for demo users', async () => {
-    mockAuth.mockResolvedValue(DEMO_AUTH)
-    const res = await patchReorder(
-      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
-      routeCtx('story-1')
-    )
-    expect(res.status).toBe(403)
-    const data = await res.json()
-    expect(data.error).toBe('Niet beschikbaar in demo-modus')
-  })
-
-  // TC-RO-04 / TC-RO-05
-  it('returns 404 when story is not accessible to the authenticated user', async () => {
-    mockAuth.mockResolvedValue(USER_2_AUTH)
-    mockPrisma.story.findFirst.mockResolvedValue(null)
-
-    const res = await patchReorder(
-      makePatch('http://localhost/api/stories/story-1/tasks/reorder', VALID_BODY),
-      routeCtx('story-1')
-    )
-    expect(res.status).toBe(404)
-    expect(mockPrisma.story.findFirst).toHaveBeenCalledWith(
-      expect.objectContaining({
-        where: expect.objectContaining({
-          id: 'story-1',
-          product: expect.objectContaining({
-            OR: expect.arrayContaining([{ user_id: 'user-2' }]),
-          }),
-        }),
-      })
-    )
-  })
-})
-
 // ─── POST /api/stories/:id/log ────────────────────────────────────────────────

 describe('POST /api/stories/:id/log', () => {
--- a/tests/components/backlog/integration.test.tsx
+++ b/tests/components/backlog/integration.test.tsx
@ -25,18 +25,16 @@ Object.defineProperty(globalThis, 'localStorage', { value: localStorageMock, wri

 // Mock server actions
 vi.mock('@/actions/stories', () => ({
-  reorderStoriesAction: vi.fn().mockResolvedValue({ success: true }),
  reorderPbisAction: vi.fn().mockResolvedValue({ success: true }),
  updatePbiPriorityAction: vi.fn().mockResolvedValue({ success: true }),
 }))
 vi.mock('@/actions/pbis', () => ({ deletePbiAction: vi.fn().mockResolvedValue({ success: true }) }))
-vi.mock('@/actions/tasks', () => ({ reorderTasksAction: vi.fn().mockResolvedValue({ success: true }) }))
 vi.mock('@/actions/user-settings', () => ({
  updateUserSettingsAction: vi.fn().mockResolvedValue({ success: true, settings: {} }),
 }))
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }))

-// Mock dnd-kit
+// Mock dnd-kit (still needed for PBI panel which supports drag-and-drop)
 vi.mock('@dnd-kit/core', () => ({
  DndContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
  PointerSensor: class {},
@ -71,7 +69,7 @@ const STORIES: BacklogStory[] = [
  { id: STORY_ID, code: 'ST-1', title: 'Eerste story', description: null, acceptance_criteria: null, priority: 2, sort_order: 1, status: 'OPEN', pbi_id: PBI_ID, sprint_id: null, created_at: new Date() },
 ]
 const TASKS: BacklogTask[] = [
-  { id: 'task-1', title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
+  { id: 'task-1', code: null, title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
 ]

 function resetStores() {
--- a/tests/components/backlog/task-panel.test.tsx
+++ b/tests/components/backlog/task-panel.test.tsx
@ -33,37 +33,8 @@ function setActiveStoryAndTasks(storyId: string | null, tasks: BacklogTask[] = [
 const mockPush = vi.fn()
 vi.mock('next/navigation', () => ({ useRouter: () => ({ push: mockPush }) }))

-// Mock reorderTasksAction
-vi.mock('@/actions/tasks', () => ({ reorderTasksAction: vi.fn().mockResolvedValue({ success: true }) }))
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }))

-// Mock dnd-kit to avoid jsdom drag complexity
-vi.mock('@dnd-kit/core', () => ({
-  DndContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  PointerSensor: class {},
-  KeyboardSensor: class {},
-  useSensor: vi.fn(),
-  useSensors: vi.fn(() => []),
-  closestCenter: vi.fn(),
-  DragOverlay: () => null,
-}))
-vi.mock('@dnd-kit/sortable', () => ({
-  SortableContext: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  useSortable: () => ({
-    attributes: {}, listeners: {}, setNodeRef: vi.fn(),
-    transform: null, transition: undefined, isDragging: false,
-  }),
-  rectSortingStrategy: {},
-  sortableKeyboardCoordinates: {},
-  arrayMove: (arr: unknown[], from: number, to: number) => {
-    const next = [...arr]
-    next.splice(from, 1)
-    next.splice(to, 0, arr[from])
-    return next
-  },
-}))
-vi.mock('@dnd-kit/utilities', () => ({ CSS: { Transform: { toString: () => '' } } }))
-
 import { TaskPanel } from '@/components/backlog/task-panel'

 const PRODUCT_ID = 'prod-1'
@ -71,8 +42,8 @@ const STORY_ID = 'story-1'
 const CLOSE_PATH = `/products/${PRODUCT_ID}`

 const TASKS = [
-  { id: 'task-1', title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
-  { id: 'task-2', title: 'Tweede taak', description: null, priority: 3, status: 'IN_PROGRESS', sort_order: 2, story_id: STORY_ID, created_at: new Date() },
+  { id: 'task-1', code: null, title: 'Eerste taak', description: null, priority: 2, status: 'TO_DO', sort_order: 1, story_id: STORY_ID, created_at: new Date() },
+  { id: 'task-2', code: null, title: 'Tweede taak', description: null, priority: 3, status: 'IN_PROGRESS', sort_order: 2, story_id: STORY_ID, created_at: new Date() },
 ]

 function renderPanel(isDemo = false) {
@ -141,12 +112,4 @@ describe('TaskPanel', () => {
    expect((btn as HTMLButtonElement).disabled).toBe(true)
  })

-  it('cards have no drag listeners in demo mode (whole-card drag disabled)', () => {
-    setActiveStoryAndTasks(STORY_ID, TASKS)
-    // In demo mode, listeners ({} from useSortable mock) are not spread onto the card.
-    // The mock always returns empty listeners, so we just verify the cards render without error.
-    renderPanel(true)
-    expect(screen.getByText('Eerste taak')).toBeTruthy()
-    expect(screen.getByText('Tweede taak')).toBeTruthy()
-  })
 })
--- a/tests/lib/code.test.ts
+++ b/tests/lib/code.test.ts
@ -0,0 +1,25 @@
+import { describe, it, expect } from 'vitest'
+
+import { parseCodeNumber } from '@/lib/code'
+
+describe('parseCodeNumber', () => {
+  it('parses a standard story code', () => {
+    expect(parseCodeNumber('ST-001')).toBe(1)
+  })
+
+  it('parses a task code', () => {
+    expect(parseCodeNumber('T-42')).toBe(42)
+  })
+
+  it('parses a large number', () => {
+    expect(parseCodeNumber('ST-1000')).toBe(1000)
+  })
+
+  it('returns MAX_SAFE_INTEGER for a code with no trailing digits', () => {
+    expect(parseCodeNumber('FOO')).toBe(Number.MAX_SAFE_INTEGER)
+  })
+
+  it('returns MAX_SAFE_INTEGER for an empty string', () => {
+    expect(parseCodeNumber('')).toBe(Number.MAX_SAFE_INTEGER)
+  })
+})
--- a/tests/stores/product-workspace/store.test.ts
+++ b/tests/stores/product-workspace/store.test.ts
@ -106,6 +106,7 @@ function makeStory(overrides: Partial<BacklogStory> & { id: string; pbi_id: stri
 function makeTask(overrides: Partial<BacklogTask> & { id: string; story_id: string }): BacklogTask {
  return {
    id: overrides.id,
+    code: overrides.code ?? null,
    title: overrides.title ?? `Task ${overrides.id}`,
    description: overrides.description ?? null,
    priority: overrides.priority ?? 2,
--- a/tests/stores/sprint-workspace/store.test.ts
+++ b/tests/stores/sprint-workspace/store.test.ts
@ -852,56 +852,6 @@ describe('restore-hint flow — chain triggert na ensure*Loaded', () => {
 // ─────────────────────────────────────────────────────────────────────────

 describe('optimistic mutations', () => {
-  it('rollback herstelt vorige sprint-story-order', () => {
-    useSprintWorkspaceStore.getState().hydrateSnapshot(
-      snapshotWith(
-        makeSprint({ id: 'sp-1', product_id: 'prod-1' }),
-        [
-          makeStory({ id: 'a', pbi_id: 'p', sprint_id: 'sp-1', sort_order: 1 }),
-          makeStory({ id: 'b', pbi_id: 'p', sprint_id: 'sp-1', sort_order: 2 }),
-        ],
-      ),
-    )
-    const prevOrder = [
-      ...useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1'],
-    ]
-
-    const id = useSprintWorkspaceStore.getState().applyOptimisticMutation({
-      kind: 'sprint-story-order',
-      sprintId: 'sp-1',
-      prevStoryIds: prevOrder,
-    })
-    useSprintWorkspaceStore.setState((s) => {
-      s.relations.storyIdsBySprint['sp-1'] = ['b', 'a']
-    })
-
-    useSprintWorkspaceStore.getState().rollbackMutation(id)
-    expect(useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1']).toEqual(
-      prevOrder,
-    )
-    expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeUndefined()
-  })
-
-  it('settle ruimt pending op zonder state te wijzigen', () => {
-    useSprintWorkspaceStore.getState().hydrateSnapshot(
-      snapshotWith(makeSprint({ id: 'sp-1', product_id: 'prod-1' }), [
-        makeStory({ id: 'a', pbi_id: 'p', sprint_id: 'sp-1' }),
-      ]),
-    )
-    const id = useSprintWorkspaceStore.getState().applyOptimisticMutation({
-      kind: 'sprint-story-order',
-      sprintId: 'sp-1',
-      prevStoryIds: ['a'],
-    })
-    expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeDefined()
-
-    useSprintWorkspaceStore.getState().settleMutation(id)
-    expect(useSprintWorkspaceStore.getState().pendingMutations[id]).toBeUndefined()
-    expect(useSprintWorkspaceStore.getState().relations.storyIdsBySprint['sp-1']).toEqual([
-      'a',
-    ])
-  })
-
  it('SSE-echo van een al-bestaande sprint is idempotent', () => {
    useSprintWorkspaceStore.setState((s) => {
      s.context.activeProduct = { id: 'prod-1', name: 'P' }