refactor(api): extract timeline allocation procedure support
This commit is contained in:
@@ -0,0 +1,180 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
vi.mock("@capakraken/application", () => ({
|
||||||
|
buildSplitAllocationReadModel: vi.fn(),
|
||||||
|
createAssignment: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../sse/event-bus.js", () => ({
|
||||||
|
emitAllocationCreated: vi.fn(),
|
||||||
|
emitAllocationUpdated: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../router/timeline-allocation-shift-support.js", () => ({
|
||||||
|
applyTimelineBatchAllocationShift: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
import {
|
||||||
|
buildSplitAllocationReadModel,
|
||||||
|
createAssignment,
|
||||||
|
} from "@capakraken/application";
|
||||||
|
import {
|
||||||
|
emitAllocationCreated,
|
||||||
|
emitAllocationUpdated,
|
||||||
|
} from "../sse/event-bus.js";
|
||||||
|
import {
|
||||||
|
createTimelineBatchQuickAssignments,
|
||||||
|
createTimelineQuickAssignment,
|
||||||
|
shiftTimelineAllocations,
|
||||||
|
} from "../router/timeline-allocation-procedure-support.js";
|
||||||
|
import { applyTimelineBatchAllocationShift } from "../router/timeline-allocation-shift-support.js";
|
||||||
|
|
||||||
|
const buildSplitAllocationReadModelMock = vi.mocked(buildSplitAllocationReadModel);
|
||||||
|
const createAssignmentMock = vi.mocked(createAssignment);
|
||||||
|
const emitAllocationCreatedMock = vi.mocked(emitAllocationCreated);
|
||||||
|
const emitAllocationUpdatedMock = vi.mocked(emitAllocationUpdated);
|
||||||
|
const applyTimelineBatchAllocationShiftMock = vi.mocked(applyTimelineBatchAllocationShift);
|
||||||
|
|
||||||
|
describe("timeline allocation procedure support", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("creates a quick assignment and emits the allocation created event", async () => {
|
||||||
|
const db = {
|
||||||
|
$transaction: vi.fn(async (callback: (tx: unknown) => unknown) => callback(db)),
|
||||||
|
} as never;
|
||||||
|
|
||||||
|
createAssignmentMock.mockResolvedValueOnce({ id: "assignment_1" } as never);
|
||||||
|
buildSplitAllocationReadModelMock.mockReturnValueOnce({
|
||||||
|
allocations: [
|
||||||
|
{
|
||||||
|
id: "allocation_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
} as never);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
createTimelineQuickAssignment(db, {
|
||||||
|
resourceId: "resource_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
startDate: new Date("2026-04-01T00:00:00.000Z"),
|
||||||
|
endDate: new Date("2026-04-05T00:00:00.000Z"),
|
||||||
|
hoursPerDay: 8,
|
||||||
|
role: "Team Member",
|
||||||
|
status: "PROPOSED",
|
||||||
|
source: "quickAssign",
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
id: "allocation_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(createAssignmentMock).toHaveBeenCalledOnce();
|
||||||
|
expect(emitAllocationCreatedMock).toHaveBeenCalledWith({
|
||||||
|
id: "allocation_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("creates batch quick assignments and emits events for each result", async () => {
|
||||||
|
const db = {
|
||||||
|
$transaction: vi.fn(async (callback: (tx: unknown) => unknown) => callback(db)),
|
||||||
|
} as never;
|
||||||
|
|
||||||
|
createAssignmentMock
|
||||||
|
.mockResolvedValueOnce({
|
||||||
|
id: "assignment_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
} as never)
|
||||||
|
.mockResolvedValueOnce({
|
||||||
|
id: "assignment_2",
|
||||||
|
projectId: "project_2",
|
||||||
|
resourceId: "resource_2",
|
||||||
|
} as never);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
createTimelineBatchQuickAssignments(db, {
|
||||||
|
assignments: [
|
||||||
|
{
|
||||||
|
resourceId: "resource_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
startDate: new Date("2026-04-01T00:00:00.000Z"),
|
||||||
|
endDate: new Date("2026-04-05T00:00:00.000Z"),
|
||||||
|
hoursPerDay: 8,
|
||||||
|
role: "Team Member",
|
||||||
|
status: "PROPOSED",
|
||||||
|
source: "batchQuickAssign",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
resourceId: "resource_2",
|
||||||
|
projectId: "project_2",
|
||||||
|
startDate: new Date("2026-04-06T00:00:00.000Z"),
|
||||||
|
endDate: new Date("2026-04-10T00:00:00.000Z"),
|
||||||
|
hoursPerDay: 6,
|
||||||
|
role: "Lead",
|
||||||
|
status: "PROPOSED",
|
||||||
|
source: "batchQuickAssign",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({ count: 2 });
|
||||||
|
|
||||||
|
expect(createAssignmentMock).toHaveBeenCalledTimes(2);
|
||||||
|
expect(emitAllocationCreatedMock).toHaveBeenNthCalledWith(1, {
|
||||||
|
id: "assignment_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
});
|
||||||
|
expect(emitAllocationCreatedMock).toHaveBeenNthCalledWith(2, {
|
||||||
|
id: "assignment_2",
|
||||||
|
projectId: "project_2",
|
||||||
|
resourceId: "resource_2",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("applies allocation shifts and emits update events", async () => {
|
||||||
|
applyTimelineBatchAllocationShiftMock.mockResolvedValueOnce([
|
||||||
|
{
|
||||||
|
id: "allocation_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "allocation_2",
|
||||||
|
projectId: "project_2",
|
||||||
|
resourceId: "resource_2",
|
||||||
|
},
|
||||||
|
] as never);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
shiftTimelineAllocations({} as never, {
|
||||||
|
allocationIds: ["allocation_1", "allocation_2"],
|
||||||
|
daysDelta: 2,
|
||||||
|
mode: "move",
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({ count: 2 });
|
||||||
|
|
||||||
|
expect(applyTimelineBatchAllocationShiftMock).toHaveBeenCalledWith({
|
||||||
|
db: {},
|
||||||
|
allocationIds: ["allocation_1", "allocation_2"],
|
||||||
|
daysDelta: 2,
|
||||||
|
mode: "move",
|
||||||
|
});
|
||||||
|
expect(emitAllocationUpdatedMock).toHaveBeenNthCalledWith(1, {
|
||||||
|
id: "allocation_1",
|
||||||
|
projectId: "project_1",
|
||||||
|
resourceId: "resource_1",
|
||||||
|
});
|
||||||
|
expect(emitAllocationUpdatedMock).toHaveBeenNthCalledWith(2, {
|
||||||
|
id: "allocation_2",
|
||||||
|
projectId: "project_2",
|
||||||
|
resourceId: "resource_2",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
import {
|
|
||||||
buildSplitAllocationReadModel,
|
|
||||||
createAssignment,
|
|
||||||
} from "@capakraken/application";
|
|
||||||
import type { PrismaClient } from "@capakraken/db";
|
import type { PrismaClient } from "@capakraken/db";
|
||||||
import {
|
import {
|
||||||
AllocationStatus,
|
AllocationStatus,
|
||||||
@@ -9,18 +5,14 @@ import {
|
|||||||
UpdateAllocationHoursSchema,
|
UpdateAllocationHoursSchema,
|
||||||
} from "@capakraken/shared";
|
} from "@capakraken/shared";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import {
|
import { emitAllocationUpdated } from "../sse/event-bus.js";
|
||||||
emitAllocationCreated,
|
|
||||||
emitAllocationUpdated,
|
|
||||||
} from "../sse/event-bus.js";
|
|
||||||
import { managerProcedure, requirePermission } from "../trpc.js";
|
import { managerProcedure, requirePermission } from "../trpc.js";
|
||||||
import {
|
import {
|
||||||
assertTimelineDateRangeValid,
|
createTimelineBatchQuickAssignments,
|
||||||
buildTimelineQuickAssignAssignmentInput,
|
createTimelineQuickAssignment,
|
||||||
validateTimelineAllocationDateRanges,
|
shiftTimelineAllocations,
|
||||||
} from "./timeline-allocation-mutation-support.js";
|
} from "./timeline-allocation-procedure-support.js";
|
||||||
import { applyTimelineInlineAllocationUpdate } from "./timeline-allocation-inline-support.js";
|
import { applyTimelineInlineAllocationUpdate } from "./timeline-allocation-inline-support.js";
|
||||||
import { applyTimelineBatchAllocationShift } from "./timeline-allocation-shift-support.js";
|
|
||||||
|
|
||||||
export const timelineAllocationMutationProcedures = {
|
export const timelineAllocationMutationProcedures = {
|
||||||
updateAllocationInline: managerProcedure
|
updateAllocationInline: managerProcedure
|
||||||
@@ -61,30 +53,10 @@ export const timelineAllocationMutationProcedures = {
|
|||||||
)
|
)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
||||||
assertTimelineDateRangeValid(input.startDate, input.endDate);
|
return createTimelineQuickAssignment(ctx.db as PrismaClient, {
|
||||||
|
...input,
|
||||||
const allocation = await ctx.db.$transaction(async (tx) => {
|
source: "quickAssign",
|
||||||
const assignment = await createAssignment(
|
|
||||||
tx as unknown as Parameters<typeof createAssignment>[0],
|
|
||||||
buildTimelineQuickAssignAssignmentInput({
|
|
||||||
...input,
|
|
||||||
source: "quickAssign",
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
return buildSplitAllocationReadModel({
|
|
||||||
demandRequirements: [],
|
|
||||||
assignments: [assignment],
|
|
||||||
}).allocations[0]!;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
emitAllocationCreated({
|
|
||||||
id: allocation.id,
|
|
||||||
projectId: allocation.projectId,
|
|
||||||
resourceId: allocation.resourceId,
|
|
||||||
});
|
|
||||||
|
|
||||||
return allocation;
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
batchQuickAssign: managerProcedure
|
batchQuickAssign: managerProcedure
|
||||||
@@ -110,32 +82,12 @@ export const timelineAllocationMutationProcedures = {
|
|||||||
)
|
)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
||||||
validateTimelineAllocationDateRanges(input.assignments);
|
return createTimelineBatchQuickAssignments(ctx.db as PrismaClient, {
|
||||||
|
assignments: input.assignments.map((assignment) => ({
|
||||||
const results = await ctx.db.$transaction(async (tx) => {
|
...assignment,
|
||||||
const created = [];
|
source: "batchQuickAssign" as const,
|
||||||
for (const assignment of input.assignments) {
|
})),
|
||||||
const createdAssignment = await createAssignment(
|
|
||||||
tx as unknown as Parameters<typeof createAssignment>[0],
|
|
||||||
buildTimelineQuickAssignAssignmentInput({
|
|
||||||
...assignment,
|
|
||||||
source: "batchQuickAssign",
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
created.push(createdAssignment);
|
|
||||||
}
|
|
||||||
return created;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const assignment of results) {
|
|
||||||
emitAllocationCreated({
|
|
||||||
id: assignment.id,
|
|
||||||
projectId: assignment.projectId,
|
|
||||||
resourceId: assignment.resourceId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return { count: results.length };
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
batchShiftAllocations: managerProcedure
|
batchShiftAllocations: managerProcedure
|
||||||
@@ -148,22 +100,10 @@ export const timelineAllocationMutationProcedures = {
|
|||||||
)
|
)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
requirePermission(ctx, PermissionKey.MANAGE_ALLOCATIONS);
|
||||||
|
return shiftTimelineAllocations(ctx.db as PrismaClient, {
|
||||||
const results = await applyTimelineBatchAllocationShift({
|
|
||||||
db: ctx.db as PrismaClient,
|
|
||||||
allocationIds: input.allocationIds,
|
allocationIds: input.allocationIds,
|
||||||
daysDelta: input.daysDelta,
|
daysDelta: input.daysDelta,
|
||||||
mode: input.mode,
|
mode: input.mode,
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const allocation of results) {
|
|
||||||
emitAllocationUpdated({
|
|
||||||
id: allocation.id,
|
|
||||||
projectId: allocation.projectId,
|
|
||||||
resourceId: allocation.resourceId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return { count: results.length };
|
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import {
|
||||||
|
buildSplitAllocationReadModel,
|
||||||
|
createAssignment,
|
||||||
|
} from "@capakraken/application";
|
||||||
|
import type { PrismaClient } from "@capakraken/db";
|
||||||
|
import {
|
||||||
|
emitAllocationCreated,
|
||||||
|
emitAllocationUpdated,
|
||||||
|
} from "../sse/event-bus.js";
|
||||||
|
import {
|
||||||
|
assertTimelineDateRangeValid,
|
||||||
|
buildTimelineQuickAssignAssignmentInput,
|
||||||
|
validateTimelineAllocationDateRanges,
|
||||||
|
} from "./timeline-allocation-mutation-support.js";
|
||||||
|
import { applyTimelineBatchAllocationShift } from "./timeline-allocation-shift-support.js";
|
||||||
|
|
||||||
|
export async function createTimelineQuickAssignment(
|
||||||
|
db: PrismaClient,
|
||||||
|
input: Parameters<typeof buildTimelineQuickAssignAssignmentInput>[0],
|
||||||
|
) {
|
||||||
|
assertTimelineDateRangeValid(input.startDate, input.endDate);
|
||||||
|
|
||||||
|
const allocation = await db.$transaction(async (tx) => {
|
||||||
|
const assignment = await createAssignment(
|
||||||
|
tx as unknown as Parameters<typeof createAssignment>[0],
|
||||||
|
buildTimelineQuickAssignAssignmentInput(input),
|
||||||
|
);
|
||||||
|
|
||||||
|
return buildSplitAllocationReadModel({
|
||||||
|
demandRequirements: [],
|
||||||
|
assignments: [assignment],
|
||||||
|
}).allocations[0]!;
|
||||||
|
});
|
||||||
|
|
||||||
|
emitAllocationCreated({
|
||||||
|
id: allocation.id,
|
||||||
|
projectId: allocation.projectId,
|
||||||
|
resourceId: allocation.resourceId,
|
||||||
|
});
|
||||||
|
|
||||||
|
return allocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createTimelineBatchQuickAssignments(
|
||||||
|
db: PrismaClient,
|
||||||
|
input: {
|
||||||
|
assignments: Array<Parameters<typeof buildTimelineQuickAssignAssignmentInput>[0]>;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
validateTimelineAllocationDateRanges(input.assignments);
|
||||||
|
|
||||||
|
const results = await db.$transaction(async (tx) => {
|
||||||
|
const created = [];
|
||||||
|
for (const assignment of input.assignments) {
|
||||||
|
const createdAssignment = await createAssignment(
|
||||||
|
tx as unknown as Parameters<typeof createAssignment>[0],
|
||||||
|
buildTimelineQuickAssignAssignmentInput(assignment),
|
||||||
|
);
|
||||||
|
created.push(createdAssignment);
|
||||||
|
}
|
||||||
|
return created;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const assignment of results) {
|
||||||
|
emitAllocationCreated({
|
||||||
|
id: assignment.id,
|
||||||
|
projectId: assignment.projectId,
|
||||||
|
resourceId: assignment.resourceId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return { count: results.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function shiftTimelineAllocations(
|
||||||
|
db: PrismaClient,
|
||||||
|
input: Omit<Parameters<typeof applyTimelineBatchAllocationShift>[0], "db">,
|
||||||
|
) {
|
||||||
|
const results = await applyTimelineBatchAllocationShift({
|
||||||
|
db,
|
||||||
|
allocationIds: input.allocationIds,
|
||||||
|
daysDelta: input.daysDelta,
|
||||||
|
mode: input.mode,
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const allocation of results) {
|
||||||
|
emitAllocationUpdated({
|
||||||
|
id: allocation.id,
|
||||||
|
projectId: allocation.projectId,
|
||||||
|
resourceId: allocation.resourceId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return { count: results.length };
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user