rename(phase 1): CapaKraken → Nexus across code, UI, docs, CI (#61)
CI / Architecture Guardrails (push) Successful in 2m38s
CI / Assistant Split Regression (push) Successful in 3m33s
CI / Typecheck (push) Successful in 3m51s
CI / Lint (push) Successful in 5m2s
CI / E2E Tests (push) Has been cancelled
CI / Fresh-Linux Docker Deploy (push) Has been cancelled
CI / Release Images (push) Has been cancelled
CI / Build (push) Has been cancelled
CI / Unit Tests (push) Has been cancelled

rename(phase 1): CapaKraken → Nexus across code, UI, docs, CI (#61)

Co-authored-by: Hartmut Nörenberg <hn@hartmut-noerenberg.com>
Co-committed-by: Hartmut Nörenberg <hn@hartmut-noerenberg.com>
This commit was merged in pull request #61.
This commit is contained in:
2026-05-21 16:28:40 +02:00
committed by Hartmut
parent d9a7ec0338
commit b41c1d2501
943 changed files with 24548 additions and 16832 deletions
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import { updateAllocationEntry } from "../index.js";
@@ -174,5 +174,4 @@ describe("allocation entry resolution helpers", () => {
message: "Allocation not found",
});
});
});
@@ -1,10 +1,6 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import {
createAssignment,
updateAssignment,
updateDemandRequirement,
} from "../index.js";
import { createAssignment, updateAssignment, updateDemandRequirement } from "../index.js";
describe("allocation entry update flows", () => {
it("excludes the current assignment from conflict checks during update", async () => {
@@ -233,5 +229,4 @@ describe("allocation entry update flows", () => {
}),
);
});
});
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
import { AllocationStatus, type AllocationWithDetails } from "@capakraken/shared";
import { AllocationStatus, type AllocationWithDetails } from "@nexus/shared";
import { buildAllocationReadModel } from "../index.js";
function makeAllocation(overrides: Partial<AllocationWithDetails>): AllocationWithDetails {
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import { countEstimateHandoffPlanningEntries } from "../index.js";
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import { countPlanningEntries } from "../index.js";
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import {
createAssignment,
@@ -172,7 +172,6 @@ describe("demand and assignment use-cases", () => {
);
});
it("fills one seat of a multi-headcount demand requirement", async () => {
const initialDemandRequirement = {
id: "demand_1",
@@ -260,7 +259,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.PROPOSED,
});
const assignmentUpdate = vi.fn();
const allocationCreate = vi.fn();
@@ -301,7 +299,6 @@ describe("demand and assignment use-cases", () => {
id: "demand_1",
headcount: 1,
status: AllocationStatus.PROPOSED,
});
expect(demandRequirementUpdate).toHaveBeenCalledWith(
expect.objectContaining({
@@ -430,7 +427,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.COMPLETED,
});
const allocationUpdate = vi.fn();
const allocationDelete = vi.fn().mockResolvedValue({});
@@ -468,7 +464,6 @@ describe("demand and assignment use-cases", () => {
expect(result.updatedDemandRequirement).toMatchObject({
id: "demand_2",
status: AllocationStatus.COMPLETED,
});
expect(demandRequirementUpdate).toHaveBeenCalledWith(
expect.objectContaining({
@@ -551,7 +546,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.COMPLETED,
});
const auditLogCreate = vi.fn().mockResolvedValue({});
@@ -582,11 +576,10 @@ describe("demand and assignment use-cases", () => {
});
expect(result.assignment.id).toBe("assignment_stale");
expect(result.updatedDemandRequirement).toMatchObject({
id: "demand_stale",
status: AllocationStatus.COMPLETED,
});
expect(demandRequirementUpdate).toHaveBeenCalledWith(
expect.objectContaining({
@@ -615,11 +608,14 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.PROPOSED,
};
// loadAllocationEntry reads demand by id for resolution,
// then fillDemandRequirement reads it again for the fill operation.
const demandIdReads = [initialDemandRequirement, initialDemandRequirement, updatedDemandRequirement];
const demandIdReads = [
initialDemandRequirement,
initialDemandRequirement,
updatedDemandRequirement,
];
const demandRequirementFindUnique = vi.fn().mockImplementation(({ where }) => {
if (where.id === "demand_compat") {
return Promise.resolve(demandIdReads.shift() ?? null);
@@ -798,7 +794,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.PROPOSED,
});
const auditLogCreate = vi.fn().mockResolvedValue({});
@@ -959,7 +954,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_1",
headcount: 1,
status: AllocationStatus.PROPOSED,
});
const auditLogCreate = vi.fn().mockResolvedValue({});
@@ -1097,7 +1091,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_2",
headcount: 1,
status: AllocationStatus.COMPLETED,
});
const auditLogCreate = vi.fn().mockResolvedValue({});
@@ -1222,7 +1215,6 @@ describe("demand and assignment use-cases", () => {
projectId: "project_3",
headcount: 1,
status: AllocationStatus.PROPOSED,
});
const auditLogCreate = vi.fn().mockResolvedValue({});
@@ -427,7 +427,7 @@ describe("syncEntitlement", () => {
});
it("accumulates usedDays from APPROVED vacations and pendingDays from PENDING vacations", async () => {
const { VacationStatus } = await import("@capakraken/db");
const { VacationStatus } = await import("@nexus/db");
const existingEnt = makeEntitlement({ entitledDays: 28, carryoverDays: 0 });
const updatedEnt = makeEntitlement({
entitledDays: 28,
@@ -496,7 +496,7 @@ describe("syncEntitlement", () => {
});
it("uses persisted snapshot days when countVacationChargeableDaysFromSnapshot returns a non-null value", async () => {
const { VacationStatus } = await import("@capakraken/db");
const { VacationStatus } = await import("@nexus/db");
const existingEnt = makeEntitlement({ entitledDays: 28, carryoverDays: 0 });
const updatedEnt = makeEntitlement({ entitledDays: 28, usedDays: 7, pendingDays: 0 });
@@ -658,7 +658,7 @@ describe("getEntitlementBalance", () => {
});
it("counts sick days separately from annual leave balance", async () => {
const { VacationStatus } = await import("@capakraken/db");
const { VacationStatus } = await import("@nexus/db");
const syncedEnt = makeEntitlement({
entitledDays: 28,
carryoverDays: 0,
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from "vitest";
import { EstimateStatus } from "@capakraken/shared";
import { EstimateStatus } from "@nexus/shared";
import { createEstimate } from "../use-cases/estimate/create-estimate.js";
import { cloneEstimate } from "../use-cases/estimate/clone-estimate.js";
import { listEstimates } from "../use-cases/estimate/list-estimates.js";
@@ -3,7 +3,7 @@ import {
EstimateExportFormat,
EstimateStatus,
EstimateVersionStatus,
} from "@capakraken/shared";
} from "@nexus/shared";
import { describe, expect, it, vi } from "vitest";
import {
approveEstimateVersion,
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { describe, expect, it, vi } from "vitest";
import { fillDemandRequirement } from "../index.js";
@@ -40,7 +40,10 @@ function makeAssignment(overrides: Record<string, unknown> = {}) {
};
}
function makeDb(demandOverride: Record<string, unknown> = {}, txOverrides: Record<string, unknown> = {}) {
function makeDb(
demandOverride: Record<string, unknown> = {},
txOverrides: Record<string, unknown> = {},
) {
const demand = {
id: "demand_1",
projectId: "project_1",
@@ -285,7 +288,15 @@ describe("fillDemandRequirement", () => {
findUnique: vi.fn().mockResolvedValue({
id: "resource_1",
lcrCents: 5000,
availability: { monday: 8, tuesday: 8, wednesday: 8, thursday: 8, friday: 8, saturday: 0, sunday: 0 },
availability: {
monday: 8,
tuesday: 8,
wednesday: 8,
thursday: 8,
friday: 8,
saturday: 0,
sunday: 0,
},
}),
},
demandRequirement: {
@@ -355,7 +366,15 @@ describe("fillDemandRequirement", () => {
findUnique: vi.fn().mockResolvedValue({
id: "resource_1",
lcrCents: 5000,
availability: { monday: 8, tuesday: 8, wednesday: 8, thursday: 8, friday: 8, saturday: 0, sunday: 0 },
availability: {
monday: 8,
tuesday: 8,
wednesday: 8,
thursday: 8,
friday: 8,
saturday: 0,
sunday: 0,
},
}),
},
demandRequirement: {
@@ -1,4 +1,4 @@
import { AllocationStatus } from "@capakraken/shared";
import { AllocationStatus } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { describe, expect, it, vi } from "vitest";
import { fillOpenDemand } from "../index.js";
@@ -175,7 +175,10 @@ describe("fillOpenDemand", () => {
it("propagates CANCELLED demand rejection from fillDemandRequirement", async () => {
const db = makeDb({
demandRecord: makeDemandRequirement({ status: AllocationStatus.CANCELLED }) as Record<string, unknown>,
demandRecord: makeDemandRequirement({ status: AllocationStatus.CANCELLED }) as Record<
string,
unknown
>,
});
// fillDemandRequirement will re-fetch the demand by ID and throw BAD_REQUEST
@@ -56,7 +56,7 @@ afterEach(async () => {
});
async function makeTempDirectory(): Promise<string> {
const directory = await mkdtemp(path.join(os.tmpdir(), "capakraken-read-workbook-"));
const directory = await mkdtemp(path.join(os.tmpdir(), "nexus-read-workbook-"));
tempDirectories.push(directory);
return directory;
}
@@ -1,8 +1,6 @@
import { describe, expect, it } from "vitest";
import { AllocationStatus, type AllocationWithDetails } from "@capakraken/shared";
import {
buildSplitAllocationReadModel,
} from "../index.js";
import { AllocationStatus, type AllocationWithDetails } from "@nexus/shared";
import { buildSplitAllocationReadModel } from "../index.js";
const project = {
id: "project_1",
@@ -1,5 +1,13 @@
import { VacationStatus } from "@capakraken/db";
import { getPublicHolidays, toIsoDate, MILLISECONDS_PER_DAY, DAY_KEYS, normalizeCityName, normalizeStateCode, type WeekdayAvailability } from "@capakraken/shared";
import { VacationStatus } from "@nexus/db";
import {
getPublicHolidays,
toIsoDate,
MILLISECONDS_PER_DAY,
DAY_KEYS,
normalizeCityName,
normalizeStateCode,
type WeekdayAvailability,
} from "@nexus/shared";
type CalendarScope = "COUNTRY" | "STATE" | "CITY";
@@ -64,10 +72,7 @@ const CITY_HOLIDAY_RULES: Array<{
},
];
export function getAvailabilityHoursForDate(
availability: WeekdayAvailability,
date: Date,
): number {
export function getAvailabilityHoursForDate(availability: WeekdayAvailability, date: Date): number {
const key = DAY_KEYS[date.getUTCDay()];
return key ? (availability[key] ?? 0) : 0;
}
@@ -99,8 +104,8 @@ function listBuiltinHolidayDates(input: {
if (input.countryCode && normalizedCityName) {
for (const rule of CITY_HOLIDAY_RULES) {
if (
rule.countryCode === input.countryCode
&& normalizeCityName(rule.cityName) === normalizedCityName
rule.countryCode === input.countryCode &&
normalizeCityName(rule.cityName) === normalizedCityName
) {
for (let year = startYear; year <= endYear; year += 1) {
for (const date of rule.resolveDates(year)) {
@@ -204,23 +209,24 @@ export async function loadResourceDailyAvailabilityContexts(
const profileHolidayCache = new Map<string, Promise<Set<string>>>();
const resourceIds = resources.map((resource) => resource.id);
const vacations = resourceIds.length > 0 && typeof db.vacation?.findMany === "function"
? await db.vacation.findMany({
where: {
resourceId: { in: resourceIds },
status: VacationStatus.APPROVED,
startDate: { lte: periodEnd },
endDate: { gte: periodStart },
},
select: {
resourceId: true,
startDate: true,
endDate: true,
type: true,
isHalfDay: true,
},
})
: [];
const vacations =
resourceIds.length > 0 && typeof db.vacation?.findMany === "function"
? await db.vacation.findMany({
where: {
resourceId: { in: resourceIds },
status: VacationStatus.APPROVED,
startDate: { lte: periodEnd },
endDate: { gte: periodStart },
},
select: {
resourceId: true,
startDate: true,
endDate: true,
type: true,
isHalfDay: true,
},
})
: [];
const vacationsByResourceId = new Map<string, VacationRecord[]>();
for (const vacation of vacations as VacationRecord[]) {
@@ -233,8 +239,9 @@ export async function loadResourceDailyAvailabilityContexts(
for (const resource of resources) {
const profileKey = buildProfileKey(resource);
const holidayPromise = profileHolidayCache.get(profileKey)
?? (async () => {
const holidayPromise =
profileHolidayCache.get(profileKey) ??
(async () => {
const builtin = listBuiltinHolidayDates({
periodStart,
periodEnd,
@@ -368,11 +375,13 @@ export function countEffectiveWorkingDays(input: {
end.setUTCHours(0, 0, 0, 0);
while (cursor <= end) {
if (calculateEffectiveDayAvailability({
availability: input.availability,
date: cursor,
context: input.context,
}) > 0) {
if (
calculateEffectiveDayAvailability({
availability: input.availability,
date: cursor,
context: input.context,
}) > 0
) {
days += 1;
}
cursor.setUTCDate(cursor.getUTCDate() + 1);
@@ -406,7 +415,8 @@ export function calculateEffectiveBookedHours(input: {
while (cursor <= end) {
const dayBaseHours = getAvailabilityHoursForDate(input.availability, cursor);
if (dayBaseHours > 0) {
hours += input.hoursPerDay * calculateDayAvailabilityFraction(input.context, toIsoDate(cursor));
hours +=
input.hoursPerDay * calculateDayAvailabilityFraction(input.context, toIsoDate(cursor));
}
cursor.setUTCDate(cursor.getUTCDate() + 1);
}
@@ -436,12 +446,8 @@ export function calculateEffectiveAllocationCostCents(input: {
context: ResourceDailyAvailabilityContext | undefined;
}): number {
let costCents = 0;
const overlapStart = new Date(
Math.max(input.startDate.getTime(), input.periodStart.getTime()),
);
const overlapEnd = new Date(
Math.min(input.endDate.getTime(), input.periodEnd.getTime()),
);
const overlapStart = new Date(Math.max(input.startDate.getTime(), input.periodStart.getTime()));
const overlapEnd = new Date(Math.min(input.endDate.getTime(), input.periodEnd.getTime()));
if (overlapStart > overlapEnd) {
return 0;
@@ -455,7 +461,8 @@ export function calculateEffectiveAllocationCostCents(input: {
while (cursor <= end) {
const baseHours = getAvailabilityHoursForDate(input.availability, cursor);
if (baseHours > 0) {
costCents += input.dailyCostCents * calculateDayAvailabilityFraction(input.context, toIsoDate(cursor));
costCents +=
input.dailyCostCents * calculateDayAvailabilityFraction(input.context, toIsoDate(cursor));
}
cursor.setUTCDate(cursor.getUTCDate() + 1);
}
@@ -463,10 +470,7 @@ export function calculateEffectiveAllocationCostCents(input: {
return Math.round(costCents);
}
export function enumerateIsoDates(
periodStart: Date,
periodEnd: Date,
): string[] {
export function enumerateIsoDates(periodStart: Date, periodEnd: Date): string[] {
const dates: string[] = [];
const cursor = new Date(periodStart);
cursor.setUTCHours(0, 0, 0, 0);
@@ -1,5 +1,5 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import { AllocationStatus } from "@capakraken/shared";
import type { Prisma, PrismaClient } from "@nexus/db";
import { AllocationStatus } from "@nexus/shared";
type DbClient = PrismaClient | Prisma.TransactionClient;
@@ -3,7 +3,7 @@ import type {
AllocationReadModel,
Assignment,
DemandRequirement,
} from "@capakraken/shared";
} from "@nexus/shared";
function toDemandRequirement<TAllocation extends AllocationLike>(
allocation: TAllocation,
@@ -3,7 +3,7 @@ import type {
AllocationReadModel,
Assignment,
DemandRequirement,
} from "@capakraken/shared";
} from "@nexus/shared";
type SplitAllocationEntry = AllocationLike;
type SplitProjectSummary = NonNullable<SplitAllocationEntry["project"]>;
type SplitResourceSummary = NonNullable<SplitAllocationEntry["resource"]>;
@@ -65,8 +65,7 @@ function compareEntries(
left: Pick<SplitAllocationEntry, "startDate" | "resourceId" | "id">,
right: Pick<SplitAllocationEntry, "startDate" | "resourceId" | "id">,
): number {
const startDelta =
new Date(left.startDate).getTime() - new Date(right.startDate).getTime();
const startDelta = new Date(left.startDate).getTime() - new Date(right.startDate).getTime();
if (startDelta !== 0) {
return startDelta;
}
@@ -1,4 +1,4 @@
import type { Prisma } from "@capakraken/db";
import type { Prisma } from "@nexus/db";
import type { AssignmentBookingWithFallback } from "./list-assignment-bookings.js";
type ChargeabilityProjectLike = AssignmentBookingWithFallback["project"];
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import { buildSplitAllocationReadModel } from "./build-split-allocation-read-model.js";
type DbClient =
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import { buildSplitAllocationReadModel } from "./build-split-allocation-read-model.js";
type DbClient =
@@ -114,10 +114,7 @@ export async function countPlanningEntries(
);
if (allocation.roleId) {
countsByRoleId.set(
allocation.roleId,
(countsByRoleId.get(allocation.roleId) ?? 0) + 1,
);
countsByRoleId.set(allocation.roleId, (countsByRoleId.get(allocation.roleId) ?? 0) + 1);
}
}
@@ -1,10 +1,10 @@
import { calculateAllocation, validateAvailability, checkDuplicateAssignment } from "@capakraken/engine";
import type { PrismaClient, Prisma } from "@capakraken/db";
import { calculateAllocation, validateAvailability, checkDuplicateAssignment } from "@nexus/engine";
import type { PrismaClient, Prisma } from "@nexus/db";
import {
type Allocation,
type CreateAssignmentInput,
type WeekdayAvailability,
} from "@capakraken/shared";
} from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { listAssignmentBookings } from "./list-assignment-bookings.js";
@@ -110,7 +110,7 @@ export async function createAssignment(
input.projectId,
input.startDate,
input.endDate,
existingBookings.map(b => ({
existingBookings.map((b) => ({
id: b.id,
resourceId: b.resourceId ?? "",
projectId: b.projectId,
@@ -123,7 +123,9 @@ export async function createAssignment(
if (duplicateResult.isDuplicate) {
throw new TRPCError({
code: "CONFLICT",
message: duplicateResult.message ?? "Resource is already assigned to this project with overlapping dates",
message:
duplicateResult.message ??
"Resource is already assigned to this project with overlapping dates",
});
}
@@ -230,8 +232,8 @@ export async function createAssignmentFragment(
role: input.role ?? null,
roleId: input.roleId ?? null,
dailyCostCents: input.dailyCostCents,
status: input.status as import("@capakraken/db").AllocationStatus,
metadata: input.metadata as import("@capakraken/db").Prisma.InputJsonValue,
status: input.status as import("@nexus/db").AllocationStatus,
metadata: input.metadata as import("@nexus/db").Prisma.InputJsonValue,
},
include: ASSIGNMENT_RELATIONS_INCLUDE,
});
@@ -241,7 +243,7 @@ export async function createAssignmentFragment(
entityType: "Assignment",
entityId: assignment.id,
action: "CREATE",
changes: { after: assignment } as unknown as import("@capakraken/db").Prisma.InputJsonValue,
changes: { after: assignment } as unknown as import("@nexus/db").Prisma.InputJsonValue,
},
});
@@ -1,5 +1,5 @@
import type { PrismaClient, Prisma } from "@capakraken/db";
import { type CreateDemandRequirementInput } from "@capakraken/shared";
import type { PrismaClient, Prisma } from "@nexus/db";
import { type CreateDemandRequirementInput } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
type DbClient = PrismaClient | Prisma.TransactionClient;
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import { TRPCError } from "@trpc/server";
import type { AllocationEntryResolution } from "./load-allocation-entry.js";
import { deleteAssignment } from "./delete-assignment.js";
@@ -1,5 +1,5 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import { AllocationStatus } from "@capakraken/shared";
import type { Prisma, PrismaClient } from "@nexus/db";
import { AllocationStatus } from "@nexus/shared";
type DbClient =
| Pick<PrismaClient, "assignment" | "demandRequirement">
@@ -12,10 +12,7 @@ export interface DeleteAssignmentResult {
reopenedDemandId: string | null;
}
export async function deleteAssignment(
db: DbClient,
id: string,
): Promise<DeleteAssignmentResult> {
export async function deleteAssignment(db: DbClient, id: string): Promise<DeleteAssignmentResult> {
const assignment = await db.assignment.findUnique({
where: { id },
select: {
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
type DbClient =
| Pick<PrismaClient, "demandRequirement" | "assignment">
@@ -1,12 +1,6 @@
import type { PrismaClient } from "@capakraken/db";
import {
AllocationStatus,
type FillDemandRequirementInput,
} from "@capakraken/shared";
import {
createAssignment,
type AssignmentWithRelations,
} from "./create-assignment.js";
import type { PrismaClient } from "@nexus/db";
import { AllocationStatus, type FillDemandRequirementInput } from "@nexus/shared";
import { createAssignment, type AssignmentWithRelations } from "./create-assignment.js";
import { applyDemandRequirementFillProgress } from "./apply-demand-requirement-fill-progress.js";
export interface DemandRequirementFillTarget {
@@ -23,9 +17,7 @@ export interface DemandRequirementFillTarget {
export interface FillDemandRequirementWithLegacySyncResult {
assignment: AssignmentWithRelations;
updatedDemandRequirement: Awaited<
ReturnType<typeof applyDemandRequirementFillProgress>
>;
updatedDemandRequirement: Awaited<ReturnType<typeof applyDemandRequirementFillProgress>>;
}
export async function fillDemandRequirementWithLegacySync(
@@ -1,6 +1,6 @@
import type { PrismaClient } from "@capakraken/db";
import { AllocationStatus, type FillDemandRequirementInput } from "@capakraken/shared";
import { checkDuplicateAssignment } from "@capakraken/engine";
import type { PrismaClient } from "@nexus/db";
import { AllocationStatus, type FillDemandRequirementInput } from "@nexus/shared";
import { checkDuplicateAssignment } from "@nexus/engine";
import { TRPCError } from "@trpc/server";
import { type AssignmentWithRelations } from "./create-assignment.js";
import { fillDemandRequirementWithLegacySync } from "./fill-demand-requirement-with-legacy-sync.js";
@@ -16,8 +16,7 @@ export interface FillDemandRequirementResult {
};
}
export interface FillDemandRequirementOptions {
}
export interface FillDemandRequirementOptions {}
export async function fillDemandRequirement(
db: PrismaClient,
input: FillDemandRequirementInput,
@@ -68,7 +67,7 @@ export async function fillDemandRequirement(
demandRequirement.projectId,
demandRequirement.startDate,
demandRequirement.endDate,
existingBookings.map(b => ({
existingBookings.map((b) => ({
id: b.id,
resourceId: b.resourceId ?? "",
projectId: b.projectId,
@@ -81,7 +80,9 @@ export async function fillDemandRequirement(
if (duplicateResult.isDuplicate) {
throw new TRPCError({
code: "CONFLICT",
message: duplicateResult.message ?? "Resource is already assigned to this project with overlapping dates",
message:
duplicateResult.message ??
"Resource is already assigned to this project with overlapping dates",
});
}
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import type { FillOpenDemandByAllocationInput } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import type { FillOpenDemandByAllocationInput } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { fillDemandRequirement } from "./fill-demand-requirement.js";
import { loadAllocationEntry } from "./load-allocation-entry.js";
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
type AssignmentBookingsDbClient = Pick<PrismaClient, "assignment">;
@@ -1,5 +1,5 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { AllocationWithDetails } from "@capakraken/shared";
import type { Prisma, PrismaClient } from "@nexus/db";
import type { AllocationWithDetails } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { buildSplitAllocationReadModel } from "./build-split-allocation-read-model.js";
import { ASSIGNMENT_RELATIONS_INCLUDE, type AssignmentWithRelations } from "./create-assignment.js";
@@ -1,9 +1,9 @@
import type { PrismaClient, Prisma } from "@capakraken/db";
import type { PrismaClient, Prisma } from "@nexus/db";
import type {
AllocationWithDetails,
UpdateAssignmentInput,
UpdateDemandRequirementInput,
} from "@capakraken/shared";
} from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { findAllocationEntry } from "./load-allocation-entry.js";
import { updateAssignment } from "./update-assignment.js";
@@ -1,10 +1,7 @@
import type { PrismaClient, Prisma } from "@capakraken/db";
import { type UpdateAssignmentInput } from "@capakraken/shared";
import type { PrismaClient, Prisma } from "@nexus/db";
import { type UpdateAssignmentInput } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import {
ASSIGNMENT_RELATIONS_INCLUDE,
type AssignmentWithRelations,
} from "./create-assignment.js";
import { ASSIGNMENT_RELATIONS_INCLUDE, type AssignmentWithRelations } from "./create-assignment.js";
type DbClient = PrismaClient | Prisma.TransactionClient;
@@ -1,5 +1,5 @@
import type { PrismaClient, Prisma } from "@capakraken/db";
import { type UpdateDemandRequirementInput } from "@capakraken/shared";
import type { PrismaClient, Prisma } from "@nexus/db";
import { type UpdateDemandRequirementInput } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import {
DEMAND_REQUIREMENT_RELATIONS_INCLUDE,
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@nexus/shared";
import { calculateInclusiveDays, MILLISECONDS_PER_DAY } from "./shared.js";
import {
calculateEffectiveAllocationCostCents,
@@ -46,10 +46,7 @@ export interface BudgetForecastRow {
derivation?: BudgetForecastDerivationSummary;
}
function getDailyAvailabilityHours(
availability: WeekdayAvailability,
date: Date,
): number {
function getDailyAvailabilityHours(availability: WeekdayAvailability, date: Date): number {
const dayKey = DAY_KEYS[date.getUTCDay()];
return dayKey ? (availability[dayKey] ?? 0) : 0;
}
@@ -57,10 +54,12 @@ function getDailyAvailabilityHours(
function hasAvailability<T extends { availability?: unknown }>(
resource: T | null | undefined,
): resource is T & { availability: WeekdayAvailability } {
return resource !== null
&& resource !== undefined
&& resource.availability !== null
&& resource.availability !== undefined;
return (
resource !== null &&
resource !== undefined &&
resource.availability !== null &&
resource.availability !== undefined
);
}
function buildLocationKey(input: {
@@ -84,7 +83,10 @@ function summarizeBurnDerivation(input: {
dailyCostCents: number;
periodStart: Date;
periodEnd: Date;
context: Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<string, infer TValue>
context: Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<
string,
infer TValue
>
? TValue | undefined
: never;
}) {
@@ -107,12 +109,8 @@ function summarizeBurnDerivation(input: {
context: input.context,
});
const overlapStart = new Date(
Math.max(input.startDate.getTime(), input.periodStart.getTime()),
);
const overlapEnd = new Date(
Math.min(input.endDate.getTime(), input.periodEnd.getTime()),
);
const overlapStart = new Date(Math.max(input.startDate.getTime(), input.periodStart.getTime()));
const overlapEnd = new Date(Math.min(input.endDate.getTime(), input.periodEnd.getTime()));
let publicHolidayDayEquivalent = 0;
let publicHolidayCostDeductionCents = 0;
@@ -157,9 +155,7 @@ function summarizeBurnDerivation(input: {
};
}
export async function getDashboardBudgetForecast(
db: PrismaClient,
): Promise<BudgetForecastRow[]> {
export async function getDashboardBudgetForecast(db: PrismaClient): Promise<BudgetForecastRow[]> {
const projects = await db.project.findMany({
where: { status: "ACTIVE" },
select: {
@@ -214,22 +210,24 @@ export async function getDashboardBudgetForecast(
const now = new Date();
const monthStart = new Date(now.getFullYear(), now.getMonth(), 1);
const monthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0);
const contextStart = assignments.length > 0
? new Date(
Math.min(
...assignments.map((assignment) => assignment.startDate.getTime()),
monthStart.getTime(),
),
)
: monthStart;
const contextEnd = assignments.length > 0
? new Date(
Math.max(
...assignments.map((assignment) => assignment.endDate.getTime()),
monthEnd.getTime(),
),
)
: monthEnd;
const contextStart =
assignments.length > 0
? new Date(
Math.min(
...assignments.map((assignment) => assignment.startDate.getTime()),
monthStart.getTime(),
),
)
: monthStart;
const contextEnd =
assignments.length > 0
? new Date(
Math.max(
...assignments.map((assignment) => assignment.endDate.getTime()),
monthEnd.getTime(),
),
)
: monthEnd;
const contexts = await loadDailyAvailabilityContexts(
db,
assignments
@@ -251,21 +249,24 @@ export async function getDashboardBudgetForecast(
const monthlyBurnByProject = new Map<string, number>();
const activeAssignmentCountByProject = new Map<string, number>();
const activeLocationsByProject = new Map<string, Map<string, BudgetForecastLocationSummary>>();
const derivationByProject = new Map<string, Omit<BudgetForecastDerivationSummary, "periodStart" | "periodEnd" | "calendarContextCount">>();
const derivationByProject = new Map<
string,
Omit<BudgetForecastDerivationSummary, "periodStart" | "periodEnd" | "calendarContextCount">
>();
for (const assignment of assignments) {
const totalCost = hasAvailability(assignment.resource)
? calculateEffectiveAllocationCostCents({
availability: assignment.resource.availability as unknown as WeekdayAvailability,
startDate: assignment.startDate,
endDate: assignment.endDate,
dailyCostCents: assignment.dailyCostCents ?? 0,
periodStart: assignment.startDate,
periodEnd: assignment.endDate,
context: contexts.get(assignment.resource.id),
})
: (assignment.dailyCostCents ?? 0)
* calculateInclusiveDays(assignment.startDate, assignment.endDate);
availability: assignment.resource.availability as unknown as WeekdayAvailability,
startDate: assignment.startDate,
endDate: assignment.endDate,
dailyCostCents: assignment.dailyCostCents ?? 0,
periodStart: assignment.startDate,
periodEnd: assignment.endDate,
context: contexts.get(assignment.resource.id),
})
: (assignment.dailyCostCents ?? 0) *
calculateInclusiveDays(assignment.startDate, assignment.endDate);
spentByProject.set(
assignment.projectId,
@@ -275,16 +276,17 @@ export async function getDashboardBudgetForecast(
if (assignment.startDate <= now && assignment.endDate >= now) {
const derivation = hasAvailability(assignment.resource)
? summarizeBurnDerivation({
availability: assignment.resource.availability as unknown as WeekdayAvailability,
startDate: assignment.startDate,
endDate: assignment.endDate,
dailyCostCents: assignment.dailyCostCents ?? 0,
periodStart: monthStart,
periodEnd: monthEnd,
context: contexts.get(assignment.resource.id),
})
availability: assignment.resource.availability as unknown as WeekdayAvailability,
startDate: assignment.startDate,
endDate: assignment.endDate,
dailyCostCents: assignment.dailyCostCents ?? 0,
periodStart: monthStart,
periodEnd: monthEnd,
context: contexts.get(assignment.resource.id),
})
: null;
const monthlyContribution = derivation?.adjustedBurnRateCents ?? (assignment.dailyCostCents ?? 0) * 22;
const monthlyContribution =
derivation?.adjustedBurnRateCents ?? (assignment.dailyCostCents ?? 0) * 22;
const baseMonthlyContribution = derivation?.baseBurnRateCents ?? monthlyContribution;
monthlyBurnByProject.set(
assignment.projectId,
@@ -309,7 +311,8 @@ export async function getDashboardBudgetForecast(
if (derivation) {
existingDerivation.holidayAwareAssignmentCount += 1;
existingDerivation.publicHolidayDayEquivalent += derivation.publicHolidayDayEquivalent;
existingDerivation.publicHolidayCostDeductionCents += derivation.publicHolidayCostDeductionCents;
existingDerivation.publicHolidayCostDeductionCents +=
derivation.publicHolidayCostDeductionCents;
existingDerivation.absenceDayEquivalent += derivation.absenceDayEquivalent;
existingDerivation.absenceCostDeductionCents += derivation.absenceCostDeductionCents;
} else {
@@ -343,16 +346,13 @@ export async function getDashboardBudgetForecast(
const spentCents = spentByProject.get(project.id) ?? 0;
const burnRate = monthlyBurnByProject.get(project.id) ?? 0;
const remainingCents = Math.max(0, project.budgetCents - spentCents);
const pctUsed = project.budgetCents > 0
? Math.round((spentCents / project.budgetCents) * 100)
: 0;
const pctUsed =
project.budgetCents > 0 ? Math.round((spentCents / project.budgetCents) * 100) : 0;
let estimatedExhaustionDate: string | null = null;
if (burnRate > 0 && project.budgetCents > spentCents) {
const monthsRemaining = remainingCents / burnRate;
const exhaustionDate = new Date(
now.getTime() + monthsRemaining * 30 * MILLISECONDS_PER_DAY,
);
const exhaustionDate = new Date(now.getTime() + monthsRemaining * 30 * MILLISECONDS_PER_DAY);
estimatedExhaustionDate = exhaustionDate.toISOString().slice(0, 10);
}
@@ -371,17 +371,18 @@ export async function getDashboardBudgetForecast(
estimatedExhaustionDate,
pctUsed,
activeAssignmentCount: activeAssignmentCountByProject.get(project.id) ?? 0,
calendarLocations: Array.from(activeLocationsByProject.get(project.id)?.values() ?? [])
.sort((left, right) => right.burnRateCents - left.burnRateCents),
calendarLocations: Array.from(activeLocationsByProject.get(project.id)?.values() ?? []).sort(
(left, right) => right.burnRateCents - left.burnRateCents,
),
...(derivation
? {
derivation: {
periodStart: toIsoDate(monthStart),
periodEnd: toIsoDate(monthEnd),
calendarContextCount: activeLocationsByProject.get(project.id)?.size ?? 0,
...derivation,
},
}
derivation: {
periodStart: toIsoDate(monthStart),
periodEnd: toIsoDate(monthEnd),
calendarContextCount: activeLocationsByProject.get(project.id)?.size ?? 0,
...derivation,
},
}
: {}),
};
});
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@nexus/shared";
import {
isChargeabilityActualBooking,
isChargeabilityRelevantProject,
@@ -62,10 +62,7 @@ export interface DashboardChargeabilityOverview {
month: string;
}
function getDailyAvailabilityHours(
availability: WeekdayAvailability,
date: Date,
): number {
function getDailyAvailabilityHours(availability: WeekdayAvailability, date: Date): number {
const dayKey = DAY_KEYS[date.getUTCDay()];
return dayKey ? (availability[dayKey] ?? 0) : 0;
}
@@ -219,8 +216,8 @@ export async function getDashboardChargeabilityOverview(
const actualAllocations = resourceBookings.filter((booking) =>
isChargeabilityActualBooking(booking, input.includeProposed === true),
);
const expectedAllocations = resourceBookings.filter(
(booking) => isChargeabilityRelevantProject(booking.project, true),
const expectedAllocations = resourceBookings.filter((booking) =>
isChargeabilityRelevantProject(booking.project, true),
);
const availableHours = calculateEffectiveAvailableHours({
availability,
@@ -229,35 +226,41 @@ export async function getDashboardChargeabilityOverview(
context,
});
const actualBookedHours = actualAllocations.reduce(
(sum, allocation) => sum + calculateEffectiveAllocationHours({
availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: start,
periodEnd: end,
context,
}),
(sum, allocation) =>
sum +
calculateEffectiveAllocationHours({
availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: start,
periodEnd: end,
context,
}),
0,
);
const expectedBookedHours = expectedAllocations.reduce(
(sum, allocation) => sum + calculateEffectiveAllocationHours({
availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: start,
periodEnd: end,
context,
}),
(sum, allocation) =>
sum +
calculateEffectiveAllocationHours({
availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: start,
periodEnd: end,
context,
}),
0,
);
const actualChargeability = availableHours > 0
? Math.min(100, Math.round((actualBookedHours / availableHours) * 100))
: 0;
const expectedChargeability = availableHours > 0
? Math.min(100, Math.round((expectedBookedHours / availableHours) * 100))
: 0;
const actualChargeability =
availableHours > 0
? Math.min(100, Math.round((actualBookedHours / availableHours) * 100))
: 0;
const expectedChargeability =
availableHours > 0
? Math.min(100, Math.round((expectedBookedHours / availableHours) * 100))
: 0;
const chargeabilityTarget = resource.chargeabilityTarget ?? 0;
return {
@@ -288,13 +291,11 @@ export async function getDashboardChargeabilityOverview(
return {
rows: stats,
top: [...stats]
.sort((left, right) => right.actualChargeability - left.actualChargeability),
top: [...stats].sort((left, right) => right.actualChargeability - left.actualChargeability),
watchlist: [...stats]
.filter(
(resource) =>
resource.actualChargeability <
resource.chargeabilityTarget - input.watchlistThreshold,
resource.actualChargeability < resource.chargeabilityTarget - input.watchlistThreshold,
)
.sort((left, right) => left.actualChargeability - right.actualChargeability),
month: `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`,
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { toIsoDate, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { toIsoDate, type WeekdayAvailability } from "@nexus/shared";
import { loadDashboardPlanningReadModel } from "./load-dashboard-planning-read-model.js";
import { calculateAllocationHours } from "./shared.js";
import {
@@ -54,7 +54,12 @@ interface ProjectSummary {
function hasAvailability<T extends { availability?: unknown }>(
resource: T | null | undefined,
): resource is T & { availability: WeekdayAvailability } {
return resource !== null && resource !== undefined && resource.availability !== null && resource.availability !== undefined;
return (
resource !== null &&
resource !== undefined &&
resource.availability !== null &&
resource.availability !== undefined
);
}
function getDemandFteFactor(hoursPerDay: number, percentage: number): number {
@@ -113,18 +118,29 @@ function summarizeCalendarLocations(
endDate: Date | string;
hoursPerDay: number;
}>,
resourceInfoById: Map<string, {
id: string;
availability: WeekdayAvailability;
countryCode: string | null | undefined;
countryName: string | null | undefined;
federalState: string | null | undefined;
metroCityName: string | null | undefined;
}>,
contexts: Map<string, Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<string, infer T> ? T : never>,
resourceInfoById: Map<
string,
{
id: string;
availability: WeekdayAvailability;
countryCode: string | null | undefined;
countryName: string | null | undefined;
federalState: string | null | undefined;
metroCityName: string | null | undefined;
}
>,
contexts: Map<
string,
Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<string, infer T>
? T
: never
>,
input: GetDashboardDemandInput,
): DemandCalendarLocationSummary[] {
const locationMap = new Map<string, DemandCalendarLocationSummary & { resourceIds: Set<string> }>();
const locationMap = new Map<
string,
DemandCalendarLocationSummary & { resourceIds: Set<string> }
>();
for (const assignment of assignments) {
const resourceId = assignment.resource?.id ?? undefined;
@@ -184,10 +200,7 @@ export async function getDashboardDemand(
});
const demandRequirementById = new Map(
demandRequirements.map((demandRequirement) => [
demandRequirement.id,
demandRequirement,
]),
demandRequirements.map((demandRequirement) => [demandRequirement.id, demandRequirement]),
);
const normalizedAssignments = readModel.assignments;
const normalizedDemands = readModel.demands;
@@ -204,9 +217,7 @@ export async function getDashboardDemand(
metroCityId: resource.metroCityId,
metroCityName: resource.metroCity?.name,
}));
const resourceInfoById = new Map(
resourceProfiles.map((resource) => [resource.id, resource]),
);
const resourceInfoById = new Map(resourceProfiles.map((resource) => [resource.id, resource]));
const contexts = await loadDailyAvailabilityContexts(
db,
[...new Map(resourceProfiles.map((resource) => [resource.id, resource])).values()],
@@ -267,18 +278,16 @@ export async function getDashboardDemand(
const projectAssignments = normalizedAssignments.filter(
(assignment) => assignment.projectId === projectId,
);
const projectDemands = normalizedDemands.filter(
(demand) => demand.projectId === projectId,
);
const projectDemands = normalizedDemands.filter((demand) => demand.projectId === projectId);
const allocatedHours = projectAssignments.reduce(
(sum, assignment) => {
const resource = assignment.resource?.id
? resourceInfoById.get(assignment.resource.id)
: undefined;
return sum + (
resource
? calculateEffectiveAllocationHours({
const allocatedHours = projectAssignments.reduce((sum, assignment) => {
const resource = assignment.resource?.id
? resourceInfoById.get(assignment.resource.id)
: undefined;
return (
sum +
(resource
? calculateEffectiveAllocationHours({
availability: resource.availability,
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
@@ -287,22 +296,17 @@ export async function getDashboardDemand(
periodEnd: input.endDate,
context: contexts.get(resource.id),
})
: calculateAllocationHours({
: calculateAllocationHours({
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
})
);
},
0,
);
}))
);
}, 0);
const requiredFTEs =
projectDemands.length > 0
? projectDemands.reduce((sum, demand) => {
const demandFteFactor = getDemandFteFactor(
demand.hoursPerDay,
demand.percentage,
);
const demandFteFactor = getDemandFteFactor(demand.hoursPerDay, demand.percentage);
const explicitDemand = demandRequirementById.get(demand.id);
if (!explicitDemand) {
return sum + demand.requestedHeadcount * demandFteFactor;
@@ -316,12 +320,12 @@ export async function getDashboardDemand(
return sum + plannedHeadcount * demandFteFactor;
}, 0)
: getProjectRequiredFTEs(project.staffingReqs);
const requiredHours = requiredFTEs > 0
? Math.round(requiredFTEs * periodWorkingHoursBase * 10) / 10
: null;
const fillPct = requiredHours && requiredHours > 0
? Math.round((allocatedHours / requiredHours) * 100)
: null;
const requiredHours =
requiredFTEs > 0 ? Math.round(requiredFTEs * periodWorkingHoursBase * 10) / 10 : null;
const fillPct =
requiredHours && requiredHours > 0
? Math.round((allocatedHours / requiredHours) * 100)
: null;
const calendarLocations = summarizeCalendarLocations(
projectAssignments,
resourceInfoById,
@@ -345,9 +349,7 @@ export async function getDashboardDemand(
requiredHours,
requiredFTEs: Math.round(requiredFTEs * 100) / 100,
fillPct,
demandSource: projectDemands.length > 0
? "DEMAND_REQUIREMENTS"
: "PROJECT_STAFFING_REQS",
demandSource: projectDemands.length > 0 ? "DEMAND_REQUIREMENTS" : "PROJECT_STAFFING_REQS",
calendarLocations,
},
};
@@ -355,10 +357,7 @@ export async function getDashboardDemand(
}
if (input.groupBy === "chapter") {
const chapterMap = new Map<
string,
{ allocatedHours: number; resourceIds: Set<string> }
>();
const chapterMap = new Map<string, { allocatedHours: number; resourceIds: Set<string> }>();
for (const assignment of normalizedAssignments) {
const chapter = assignment.resource?.chapter ?? "Unassigned";
@@ -376,19 +375,19 @@ export async function getDashboardDemand(
existing.allocatedHours += resource
? calculateEffectiveAllocationHours({
availability: resource.availability,
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
periodStart: input.startDate,
periodEnd: input.endDate,
context: contexts.get(resource.id),
})
availability: resource.availability,
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
periodStart: input.startDate,
periodEnd: input.endDate,
context: contexts.get(resource.id),
})
: calculateAllocationHours({
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
});
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
});
chapterMap.set(chapter, existing);
}
@@ -449,19 +448,19 @@ export async function getDashboardDemand(
existing.allocatedHours += resource
? calculateEffectiveAllocationHours({
availability: resource.availability,
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
periodStart: input.startDate,
periodEnd: input.endDate,
context: contexts.get(resource.id),
})
availability: resource.availability,
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
periodStart: input.startDate,
periodEnd: input.endDate,
context: contexts.get(resource.id),
})
: calculateAllocationHours({
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
});
startDate: toDate(assignment.startDate),
endDate: toDate(assignment.endDate),
hoursPerDay: assignment.hoursPerDay,
});
existing.projectIds.add(assignment.projectId);
personMap.set(assignment.resource.id, existing);
@@ -1,9 +1,9 @@
import type { PrismaClient } from "@capakraken/db";
import { VacationStatus } from "@capakraken/db";
import { AllocationStatus } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { VacationStatus } from "@nexus/db";
import { AllocationStatus } from "@nexus/shared";
import { buildSplitAllocationReadModel } from "../allocation/build-split-allocation-read-model.js";
import { calculateInclusiveDays } from "./shared.js";
import type { WeekdayAvailability } from "@capakraken/shared";
import type { WeekdayAvailability } from "@nexus/shared";
import {
calculateEffectiveAllocationCostCents,
loadDailyAvailabilityContexts,
@@ -12,7 +12,12 @@ import {
function hasAvailability<T extends { availability?: unknown }>(
resource: T | null | undefined,
): resource is T & { availability: WeekdayAvailability } {
return resource !== null && resource !== undefined && resource.availability !== null && resource.availability !== undefined;
return (
resource !== null &&
resource !== undefined &&
resource.availability !== null &&
resource.availability !== undefined
);
}
export async function getDashboardOverview(db: PrismaClient) {
@@ -110,12 +115,14 @@ export async function getDashboardOverview(db: PrismaClient) {
const activeAllocations = planningReadModel.allocations.filter(
(allocation) => allocation.status !== AllocationStatus.CANCELLED,
).length;
const contextStart = budgetAssignments.length > 0
? new Date(Math.min(...budgetAssignments.map((assignment) => assignment.startDate.getTime())))
: new Date();
const contextEnd = budgetAssignments.length > 0
? new Date(Math.max(...budgetAssignments.map((assignment) => assignment.endDate.getTime())))
: new Date();
const contextStart =
budgetAssignments.length > 0
? new Date(Math.min(...budgetAssignments.map((assignment) => assignment.startDate.getTime())))
: new Date();
const contextEnd =
budgetAssignments.length > 0
? new Date(Math.max(...budgetAssignments.map((assignment) => assignment.endDate.getTime())))
: new Date();
const contexts = await loadDailyAvailabilityContexts(
db,
budgetAssignments
@@ -136,9 +143,9 @@ export async function getDashboardOverview(db: PrismaClient) {
const totalCostCents = budgetAssignments.reduce(
(sum, assignment) =>
sum + (
hasAvailability(assignment.resource)
? calculateEffectiveAllocationCostCents({
sum +
(hasAvailability(assignment.resource)
? calculateEffectiveAllocationCostCents({
availability: assignment.resource.availability as unknown as WeekdayAvailability,
startDate: assignment.startDate,
endDate: assignment.endDate,
@@ -147,9 +154,8 @@ export async function getDashboardOverview(db: PrismaClient) {
periodEnd: assignment.endDate,
context: contexts.get(assignment.resource.id),
})
: (assignment.dailyCostCents ?? 0) *
calculateInclusiveDays(assignment.startDate, assignment.endDate)
),
: (assignment.dailyCostCents ?? 0) *
calculateInclusiveDays(assignment.startDate, assignment.endDate)),
0,
);
@@ -165,22 +171,14 @@ export async function getDashboardOverview(db: PrismaClient) {
const remainingBudgetCents = totalBudgetCents - totalCostCents;
const avgUtilizationPercent =
totalBudgetCents > 0
? Math.round((totalCostCents / totalBudgetCents) * 100)
: 0;
totalBudgetCents > 0 ? Math.round((totalCostCents / totalBudgetCents) * 100) : 0;
const statusCountMap = new Map<string, number>();
for (const project of allProjects) {
statusCountMap.set(
project.status,
(statusCountMap.get(project.status) ?? 0) + 1,
);
statusCountMap.set(project.status, (statusCountMap.get(project.status) ?? 0) + 1);
}
const chapterMap = new Map<
string,
{ resourceCount: number; chargeabilitySum: number }
>();
const chapterMap = new Map<string, { resourceCount: number; chargeabilitySum: number }>();
for (const resource of allResources) {
const chapter = resource.chapter ?? "Unassigned";
const existing = chapterMap.get(chapter) ?? {
@@ -190,8 +188,7 @@ export async function getDashboardOverview(db: PrismaClient) {
chapterMap.set(chapter, {
resourceCount: existing.resourceCount + 1,
chargeabilitySum:
existing.chargeabilitySum + (resource.chargeabilityTarget ?? 0),
chargeabilitySum: existing.chargeabilitySum + (resource.chargeabilityTarget ?? 0),
});
}
@@ -234,9 +231,7 @@ export async function getDashboardOverview(db: PrismaClient) {
chapter,
resourceCount: data.resourceCount,
avgChargeabilityTarget:
data.resourceCount > 0
? Math.round(data.chargeabilitySum / data.resourceCount)
: 0,
data.resourceCount > 0 ? Math.round(data.chargeabilitySum / data.resourceCount) : 0,
})),
};
}
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { toIsoDate, DAY_KEYS, type WeekdayAvailability } from "@nexus/shared";
import { listAssignmentBookings } from "../allocation/list-assignment-bookings.js";
import { getMonthBucketKey, getWeekBucketKey } from "./shared.js";
import {
@@ -99,10 +99,7 @@ function buildLocationKey(input: {
});
}
function getDailyAvailabilityHours(
availability: WeekdayAvailability,
date: Date,
): number {
function getDailyAvailabilityHours(availability: WeekdayAvailability, date: Date): number {
const dayKey = DAY_KEYS[date.getUTCDay()];
return dayKey ? (availability[dayKey] ?? 0) : 0;
}
@@ -178,7 +175,10 @@ function summarizeCalendarLocations(
periodStart: Date,
periodEnd: Date,
): PeakTimesCalendarLocationSummary[] {
const locationMap = new Map<string, PeakTimesCalendarLocationSummary & { resourceIds: Set<string> }>();
const locationMap = new Map<
string,
PeakTimesCalendarLocationSummary & { resourceIds: Set<string> }
>();
for (const resource of resources) {
const capacityDerivation = summarizeCapacityDerivation(
@@ -306,19 +306,19 @@ export async function getDashboardPeakTimes(
input.groupBy === "project"
? allocation.project.shortCode
: input.groupBy === "chapter"
? allocation.resource?.chapter ?? "Unassigned"
: allocation.resource?.displayName ?? "Unknown";
? (allocation.resource?.chapter ?? "Unassigned")
: (allocation.resource?.displayName ?? "Unknown");
for (const [bucketKey, bucketPeriod] of bucketPeriods.entries()) {
const hours = resource
? calculateEffectiveAllocationHours({
availability: resource.availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: bucketPeriod.start,
periodEnd: bucketPeriod.end,
context: contexts.get(resource.id),
})
availability: resource.availability,
startDate: allocation.startDate,
endDate: allocation.endDate,
hoursPerDay: allocation.hoursPerDay,
periodStart: bucketPeriod.start,
periodEnd: bucketPeriod.end,
context: contexts.get(resource.id),
})
: 0;
if (hours <= 0) {
continue;
@@ -351,15 +351,16 @@ export async function getDashboardPeakTimes(
capacityHours += effectiveAvailableHours;
derivationTotals.baseAvailableHours += capacityDerivation.baseAvailableHours;
derivationTotals.effectiveAvailableHours += capacityDerivation.effectiveAvailableHours;
derivationTotals.publicHolidayHoursDeduction += capacityDerivation.publicHolidayHoursDeduction;
derivationTotals.publicHolidayHoursDeduction +=
capacityDerivation.publicHolidayHoursDeduction;
derivationTotals.absenceDayEquivalent += capacityDerivation.absenceDayEquivalent;
derivationTotals.absenceHoursDeduction += capacityDerivation.absenceHoursDeduction;
if (input.groupBy !== "project" && effectiveAvailableHours > 0) {
const group =
input.groupBy === "chapter"
? resource.chapter ?? "Unassigned"
: resource.displayName ?? "Unknown";
? (resource.chapter ?? "Unassigned")
: (resource.displayName ?? "Unknown");
const groupCapacityBucket = groupCapacityBuckets.get(bucketKey)!;
groupCapacityBucket.set(
group,
@@ -398,15 +399,11 @@ export async function getDashboardPeakTimes(
.map((name) => {
const hours = groups.get(name) ?? 0;
const groupCapacityHours =
input.groupBy === "project" ? undefined : groupCapacities.get(name) ?? 0;
input.groupBy === "project" ? undefined : (groupCapacities.get(name) ?? 0);
const remainingHours =
groupCapacityHours === undefined
? undefined
: Math.max(0, groupCapacityHours - hours);
groupCapacityHours === undefined ? undefined : Math.max(0, groupCapacityHours - hours);
const overbookedHours =
groupCapacityHours === undefined
? undefined
: Math.max(0, hours - groupCapacityHours);
groupCapacityHours === undefined ? undefined : Math.max(0, hours - groupCapacityHours);
return {
name,
hours,
@@ -429,8 +426,9 @@ export async function getDashboardPeakTimes(
);
const totalHours = [...groups.values()].reduce((sum, hours) => sum + hours, 0);
const capacityHours = capacityByBucket.get(period) ?? 0;
const capacityDerivation: PeakTimesCapacityDerivationSummary =
derivationByBucket.get(period) ?? {
const capacityDerivation: PeakTimesCapacityDerivationSummary = derivationByBucket.get(
period,
) ?? {
baseAvailableHours: capacityHours,
effectiveAvailableHours: capacityHours,
publicHolidayHoursDeduction: 0,
@@ -452,9 +450,7 @@ export async function getDashboardPeakTimes(
bookedHours: totalHours,
remainingHours: remainingCapacityHours,
overbookedHours,
utilizationPct: capacityHours > 0
? Math.round((totalHours / capacityHours) * 100)
: 0,
utilizationPct: capacityHours > 0 ? Math.round((totalHours / capacityHours) * 100) : 0,
groupCount: groupRows.length,
resourceCount: resourceMap.size,
derivation: {
@@ -473,9 +469,7 @@ export async function getDashboardPeakTimes(
capacityHours,
remainingCapacityHours,
overbookedHours,
utilizationPct: capacityHours > 0
? Math.round((totalHours / capacityHours) * 100)
: 0,
utilizationPct: capacityHours > 0 ? Math.round((totalHours / capacityHours) * 100) : 0,
},
};
});
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { toIsoDate, MILLISECONDS_PER_DAY, DAY_KEYS, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { toIsoDate, MILLISECONDS_PER_DAY, DAY_KEYS, type WeekdayAvailability } from "@nexus/shared";
import { calculateInclusiveDays } from "./shared.js";
import {
calculateEffectiveAllocationCostCents,
@@ -54,23 +54,21 @@ export interface ProjectHealthRow {
function hasAvailability<T extends { availability?: unknown }>(
resource: T | null | undefined,
): resource is T & { availability: WeekdayAvailability } {
return resource !== null && resource !== undefined && resource.availability !== null && resource.availability !== undefined;
return (
resource !== null &&
resource !== undefined &&
resource.availability !== null &&
resource.availability !== undefined
);
}
function getDailyAvailabilityHours(
availability: WeekdayAvailability,
date: Date,
): number {
function getDailyAvailabilityHours(availability: WeekdayAvailability, date: Date): number {
const dayKey = DAY_KEYS[date.getUTCDay()];
return dayKey ? (availability[dayKey] ?? 0) : 0;
}
function toUtcDayStart(value: Date): Date {
return new Date(Date.UTC(
value.getUTCFullYear(),
value.getUTCMonth(),
value.getUTCDate(),
));
return new Date(Date.UTC(value.getUTCFullYear(), value.getUTCMonth(), value.getUTCDate()));
}
function buildLocationKey(input: {
@@ -92,7 +90,10 @@ function summarizeSpentDerivation(input: {
startDate: Date;
endDate: Date;
dailyCostCents: number;
context: Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<string, infer TValue>
context: Awaited<ReturnType<typeof loadDailyAvailabilityContexts>> extends Map<
string,
infer TValue
>
? TValue | undefined
: never;
}) {
@@ -156,9 +157,7 @@ function summarizeSpentDerivation(input: {
};
}
export async function getDashboardProjectHealth(
db: PrismaClient,
): Promise<ProjectHealthRow[]> {
export async function getDashboardProjectHealth(db: PrismaClient): Promise<ProjectHealthRow[]> {
const projects = await db.project.findMany({
where: { status: "ACTIVE" },
select: {
@@ -199,26 +198,28 @@ export async function getDashboardProjectHealth(
startDate: true,
endDate: true,
dailyCostCents: true,
resource: {
select: {
id: true,
availability: true,
countryId: true,
federalState: true,
metroCityId: true,
country: { select: { code: true, name: true } },
metroCity: { select: { name: true } },
},
resource: {
select: {
id: true,
availability: true,
countryId: true,
federalState: true,
metroCityId: true,
country: { select: { code: true, name: true } },
metroCity: { select: { name: true } },
},
},
},
});
const contextStart = assignments.length > 0
? new Date(Math.min(...assignments.map((assignment) => assignment.startDate.getTime())))
: new Date();
const contextEnd = assignments.length > 0
? new Date(Math.max(...assignments.map((assignment) => assignment.endDate.getTime())))
: new Date();
const contextStart =
assignments.length > 0
? new Date(Math.min(...assignments.map((assignment) => assignment.startDate.getTime())))
: new Date();
const contextEnd =
assignments.length > 0
? new Date(Math.max(...assignments.map((assignment) => assignment.endDate.getTime())))
: new Date();
const contexts = await loadDailyAvailabilityContexts(
db,
assignments
@@ -237,32 +238,39 @@ export async function getDashboardProjectHealth(
contextEnd,
);
const spentByProject = new Map<string, number>();
const derivationByProject = new Map<string, {
periodStart: string;
periodEnd: string;
calendarContextCount: number;
holidayAwareAssignmentCount: number;
fallbackAssignmentCount: number;
baseSpentCents: number;
adjustedSpentCents: number;
publicHolidayDayEquivalent: number;
publicHolidayCostDeductionCents: number;
absenceDayEquivalent: number;
absenceCostDeductionCents: number;
}>();
const calendarLocationsByProject = new Map<string, Map<string, NonNullable<ProjectHealthRow["calendarLocations"]>[number]>>();
const derivationByProject = new Map<
string,
{
periodStart: string;
periodEnd: string;
calendarContextCount: number;
holidayAwareAssignmentCount: number;
fallbackAssignmentCount: number;
baseSpentCents: number;
adjustedSpentCents: number;
publicHolidayDayEquivalent: number;
publicHolidayCostDeductionCents: number;
absenceDayEquivalent: number;
absenceCostDeductionCents: number;
}
>();
const calendarLocationsByProject = new Map<
string,
Map<string, NonNullable<ProjectHealthRow["calendarLocations"]>[number]>
>();
for (const a of assignments) {
const derivation = hasAvailability(a.resource)
? summarizeSpentDerivation({
availability: a.resource.availability as unknown as WeekdayAvailability,
startDate: a.startDate,
endDate: a.endDate,
dailyCostCents: a.dailyCostCents ?? 0,
context: contexts.get(a.resource.id),
})
availability: a.resource.availability as unknown as WeekdayAvailability,
startDate: a.startDate,
endDate: a.endDate,
dailyCostCents: a.dailyCostCents ?? 0,
context: contexts.get(a.resource.id),
})
: null;
const cost = derivation?.adjustedSpentCents
?? (a.dailyCostCents ?? 0) * calculateInclusiveDays(a.startDate, a.endDate);
const cost =
derivation?.adjustedSpentCents ??
(a.dailyCostCents ?? 0) * calculateInclusiveDays(a.startDate, a.endDate);
spentByProject.set(a.projectId, (spentByProject.get(a.projectId) ?? 0) + cost);
const existingDerivation = derivationByProject.get(a.projectId) ?? {
periodStart: toIsoDate(a.startDate),
@@ -289,7 +297,8 @@ export async function getDashboardProjectHealth(
existingDerivation.baseSpentCents += derivation.baseSpentCents;
existingDerivation.adjustedSpentCents += derivation.adjustedSpentCents;
existingDerivation.publicHolidayDayEquivalent += derivation.publicHolidayDayEquivalent;
existingDerivation.publicHolidayCostDeductionCents += derivation.publicHolidayCostDeductionCents;
existingDerivation.publicHolidayCostDeductionCents +=
derivation.publicHolidayCostDeductionCents;
existingDerivation.absenceDayEquivalent += derivation.absenceDayEquivalent;
existingDerivation.absenceCostDeductionCents += derivation.absenceCostDeductionCents;
} else {
@@ -326,10 +335,7 @@ export async function getDashboardProjectHealth(
const rows: ProjectHealthRow[] = projects.map((p) => {
// Budget health: 100 - pctUsed (capped at 100)
const spentCents = spentByProject.get(p.id) ?? 0;
const pctUsed =
(p.budgetCents ?? 0) > 0
? Math.round((spentCents / p.budgetCents) * 100)
: 0;
const pctUsed = (p.budgetCents ?? 0) > 0 ? Math.round((spentCents / p.budgetCents) * 100) : 0;
const budgetHealth = Math.max(0, 100 - Math.min(pctUsed, 100));
// Staffing health: filledDemands / totalDemands * 100
@@ -348,23 +354,18 @@ export async function getDashboardProjectHealth(
const daysUntilEndDate = endDate
? Math.round((endDate.getTime() - today.getTime()) / MILLISECONDS_PER_DAY)
: null;
const timelineStatus = endDate === null
? "UNSCHEDULED"
: daysUntilEndDate! < 0
? "OVERDUE"
: daysUntilEndDate! <= 14
? "DUE_SOON"
: "ON_TRACK";
const timelineHealth = endDate === null
? 100
: endDate > today
? 100
: 0;
const timelineStatus =
endDate === null
? "UNSCHEDULED"
: daysUntilEndDate! < 0
? "OVERDUE"
: daysUntilEndDate! <= 14
? "DUE_SOON"
: "ON_TRACK";
const timelineHealth = endDate === null ? 100 : endDate > today ? 100 : 0;
// Composite = average of 3 dimensions
const compositeScore = Math.round(
(budgetHealth + staffingHealth + timelineHealth) / 3,
);
const compositeScore = Math.round((budgetHealth + staffingHealth + timelineHealth) / 3);
const remainingBudgetCents = p.budgetCents == null ? null : p.budgetCents - spentCents;
const derivation = derivationByProject.get(p.id);
@@ -390,8 +391,9 @@ export async function getDashboardProjectHealth(
plannedEndDate: p.endDate ?? null,
daysUntilEndDate,
timelineStatus,
calendarLocations: Array.from(calendarLocationsByProject.get(p.id)?.values() ?? [])
.sort((left, right) => right.spentCents - left.spentCents),
calendarLocations: Array.from(calendarLocationsByProject.get(p.id)?.values() ?? []).sort(
(left, right) => right.spentCents - left.spentCents,
),
...(derivation ? { derivation } : {}),
};
});
@@ -1,4 +1,4 @@
import type { PrismaClient } from "@capakraken/db";
import type { PrismaClient } from "@nexus/db";
export interface SkillGapRow {
skill: string;
@@ -37,9 +37,7 @@ export interface DashboardSkillGapSummary {
resourcesByRole: ResourcesByRoleSummaryRow[];
}
export async function getDashboardSkillGaps(
db: PrismaClient,
): Promise<SkillGapRow[]> {
export async function getDashboardSkillGaps(db: PrismaClient): Promise<SkillGapRow[]> {
// Count open demand requirements grouped by required skill (from role name)
const openDemands = await db.demandRequirement.findMany({
where: {
@@ -154,14 +152,15 @@ export async function getDashboardSkillGapSummary(
for (const resource of resources) {
const rawSkills = Array.isArray(resource.skills)
? resource.skills as Array<Record<string, unknown>>
? (resource.skills as Array<Record<string, unknown>>)
: [];
for (const entry of rawSkills) {
const skillName = typeof entry.skill === "string"
? entry.skill
: typeof entry.name === "string"
? entry.name
: null;
const skillName =
typeof entry.skill === "string"
? entry.skill
: typeof entry.name === "string"
? entry.name
: null;
if (!skillName) continue;
skillSupply.set(skillName.toLowerCase(), (skillSupply.get(skillName.toLowerCase()) ?? 0) + 1);
}
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import type { ValueScoreBreakdown } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import type { ValueScoreBreakdown } from "@nexus/shared";
export interface GetDashboardTopValueResourcesInput {
limit: number;
@@ -48,51 +48,54 @@ export async function getDashboardTopValueResources(
where: { id: "singleton" },
});
const visibleRoles =
(settings?.scoreVisibleRoles as unknown as string[]) ?? ["ADMIN", "MANAGER"];
const visibleRoles = (settings?.scoreVisibleRoles as unknown as string[]) ?? ["ADMIN", "MANAGER"];
if (!visibleRoles.includes(input.userRole)) {
return [];
}
return db.resource.findMany({
where: { isActive: true, valueScore: { not: null } },
select: {
id: true,
eid: true,
displayName: true,
chapter: true,
valueScore: true,
valueScoreBreakdown: true,
valueScoreUpdatedAt: true,
lcrCents: true,
country: {
select: {
code: true,
name: true,
return db.resource
.findMany({
where: { isActive: true, valueScore: { not: null } },
select: {
id: true,
eid: true,
displayName: true,
chapter: true,
valueScore: true,
valueScoreBreakdown: true,
valueScoreUpdatedAt: true,
lcrCents: true,
country: {
select: {
code: true,
name: true,
},
},
federalState: true,
metroCity: {
select: {
name: true,
},
},
},
federalState: true,
metroCity: {
select: {
name: true,
},
},
},
orderBy: { valueScore: "desc" },
take: input.limit,
}).then((resources) => resources.map((resource) => ({
id: resource.id,
eid: resource.eid,
displayName: resource.displayName,
chapter: resource.chapter,
valueScore: resource.valueScore,
valueScoreBreakdown: normalizeValueScoreBreakdown(resource.valueScoreBreakdown),
valueScoreUpdatedAt: resource.valueScoreUpdatedAt,
lcrCents: resource.lcrCents,
countryCode: resource.country?.code ?? null,
countryName: resource.country?.name ?? null,
federalState: resource.federalState ?? null,
metroCityName: resource.metroCity?.name ?? null,
})));
orderBy: { valueScore: "desc" },
take: input.limit,
})
.then((resources) =>
resources.map((resource) => ({
id: resource.id,
eid: resource.eid,
displayName: resource.displayName,
chapter: resource.chapter,
valueScore: resource.valueScore,
valueScoreBreakdown: normalizeValueScoreBreakdown(resource.valueScoreBreakdown),
valueScoreUpdatedAt: resource.valueScoreUpdatedAt,
lcrCents: resource.lcrCents,
countryCode: resource.country?.code ?? null,
countryName: resource.country?.name ?? null,
federalState: resource.federalState ?? null,
metroCityName: resource.metroCity?.name ?? null,
})),
);
}
@@ -1,5 +1,5 @@
import type { PrismaClient } from "@capakraken/db";
import { AllocationStatus } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { AllocationStatus } from "@nexus/shared";
import { buildSplitAllocationReadModel } from "../allocation/build-split-allocation-read-model.js";
export const DASHBOARD_PLANNING_ALLOCATION_INCLUDE = {
@@ -1,5 +1,5 @@
export { MILLISECONDS_PER_DAY } from "@capakraken/shared";
import { MILLISECONDS_PER_DAY } from "@capakraken/shared";
export { MILLISECONDS_PER_DAY } from "@nexus/shared";
import { MILLISECONDS_PER_DAY } from "@nexus/shared";
export function calculateInclusiveDays(startDate: Date, endDate: Date): number {
return (endDate.getTime() - startDate.getTime()) / MILLISECONDS_PER_DAY + 1;
@@ -1,4 +1,4 @@
import { ImportBatchStatus, type Prisma } from "@capakraken/db";
import { ImportBatchStatus, type Prisma } from "@nexus/db";
import { parseDispoChargeabilityWorkbook } from "./parse-chargeability-workbook.js";
import { parseDispoPlanningWorkbook } from "./parse-dispo-matrix.js";
import { parseDispoRosterWorkbook } from "./parse-dispo-roster-workbook.js";
@@ -125,18 +125,17 @@ export async function assessDispoImportReadiness(
planningWorkbook,
resourceMasterPresent,
rosterWorkbook,
] =
await Promise.all([
parseMandatoryDispoReferenceWorkbook(input.referenceWorkbookPath),
parseDispoChargeabilityWorkbook(input.chargeabilityWorkbookPath),
parseDispoPlanningWorkbook(input.planningWorkbookPath),
hasResourceMasterRows(input.referenceWorkbookPath),
input.rosterWorkbookPath
? parseDispoRosterWorkbook(input.rosterWorkbookPath, {
] = await Promise.all([
parseMandatoryDispoReferenceWorkbook(input.referenceWorkbookPath),
parseDispoChargeabilityWorkbook(input.chargeabilityWorkbookPath),
parseDispoPlanningWorkbook(input.planningWorkbookPath),
hasResourceMasterRows(input.referenceWorkbookPath),
input.rosterWorkbookPath
? parseDispoRosterWorkbook(input.rosterWorkbookPath, {
...(input.costWorkbookPath ? { costWorkbookPath: input.costWorkbookPath } : {}),
})
: null,
]);
: null,
]);
const mergedResources = new Map<string, MergedResourceReadinessRecord>();
const excludedIds = new Set(rosterWorkbook?.excludedCanonicalExternalIds ?? []);
@@ -1,8 +1,5 @@
import type { WeekdayAvailability } from "@capakraken/shared";
import {
createWeekdayAvailabilityFromFte,
normalizeDispoRoleToken,
} from "@capakraken/shared";
import type { WeekdayAvailability } from "@nexus/shared";
import { createWeekdayAvailabilityFromFte, normalizeDispoRoleToken } from "@nexus/shared";
import type { TxClient, MergedStagedResource } from "./commit-dispo-batch-types.js";
import { deriveRoleTokens } from "./shared.js";
@@ -24,10 +21,7 @@ function asObject(value: unknown): Record<string, unknown> {
: {};
}
function mergeScalar<T>(
current: T | null,
incoming: T | null | undefined,
): T | null {
function mergeScalar<T>(current: T | null, incoming: T | null | undefined): T | null {
return incoming ?? current;
}
@@ -117,7 +111,10 @@ export function mergeStagedResources(
existing.availability = mergeScalar(existing.availability, row.availability);
existing.chapter = mergeScalar(existing.chapter, row.chapter);
existing.chargeabilityTarget = mergeScalar(existing.chargeabilityTarget, row.chargeabilityTarget);
existing.chargeabilityTarget = mergeScalar(
existing.chargeabilityTarget,
row.chargeabilityTarget,
);
existing.clientUnitName = mergeScalar(existing.clientUnitName, row.clientUnitName);
existing.countryCode = mergeScalar(existing.countryCode, row.countryCode);
existing.displayName = mergeScalar(existing.displayName, row.displayName);
@@ -128,7 +125,10 @@ export function mergeStagedResources(
existing.managementLevelGroupName,
row.managementLevelGroupName,
);
existing.managementLevelName = mergeScalar(existing.managementLevelName, row.managementLevelName);
existing.managementLevelName = mergeScalar(
existing.managementLevelName,
row.managementLevelName,
);
existing.metroCityName = mergeScalar(existing.metroCityName, row.metroCityName);
existing.resourceType = mergeScalar(existing.resourceType, row.resourceType);
existing.ucrCents = mergeScalar(existing.ucrCents, row.ucrCents);
@@ -194,27 +194,22 @@ export function buildReferenceDataMaps(data: {
clientIdByCode: new Map(
data.clients.filter((client) => client.code).map((client) => [client.code!, client.id]),
),
clientIdByName: new Map(
data.clients.map((client) => [client.name.toLowerCase(), client.id]),
),
countryIdByCode: new Map(
data.countries.map((country) => [country.code, country.id]),
),
clientIdByName: new Map(data.clients.map((client) => [client.name.toLowerCase(), client.id])),
countryIdByCode: new Map(data.countries.map((country) => [country.code, country.id])),
managementLevelGroupByName: new Map(
data.managementLevelGroups.map((group) => [group.name, group]),
),
managementLevelIdByName: new Map(
data.managementLevels.map((level) => [level.name, level.id]),
),
managementLevelIdByName: new Map(data.managementLevels.map((level) => [level.name, level.id])),
metroCityIdByName: new Map(
data.metroCities.map((metroCity) => [metroCity.name.toLowerCase(), metroCity.id]),
),
orgUnitIdByLevelAndName: new Map(
data.orgUnits.map((orgUnit) => [`${orgUnit.level}:${orgUnit.name.toLowerCase()}`, orgUnit.id]),
),
roleIdByName: new Map(
data.roles.map((role) => [role.name, role.id]),
data.orgUnits.map((orgUnit) => [
`${orgUnit.level}:${orgUnit.name.toLowerCase()}`,
orgUnit.id,
]),
),
roleIdByName: new Map(data.roles.map((role) => [role.name, role.id])),
utilizationCategoryIdByCode: new Map(
data.utilizationCategories.map((category) => [category.code, category.id]),
),
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
export type CommitDbClient = Pick<
PrismaClient,
@@ -44,7 +44,9 @@ export interface MergedStagedResource {
managementLevelName: string | null;
metroCityName: string | null;
rawPayload: Record<string, unknown>;
resourceType: NonNullable<Awaited<ReturnType<TxClient["stagedResource"]["findMany"]>>[number]["resourceType"]> | null;
resourceType: NonNullable<
Awaited<ReturnType<TxClient["stagedResource"]["findMany"]>>[number]["resourceType"]
> | null;
roleTokens: Set<string>;
sourceKinds: string[];
ucrCents: number | null;
@@ -2,20 +2,16 @@ import {
DISPO_REQUIRED_ROLE_SEEDS,
DISPO_UTILIZATION_CATEGORIES,
normalizeDispoRoleToken,
} from "@capakraken/shared";
import type { Prisma } from "@capakraken/db";
} from "@nexus/shared";
import type { Prisma } from "@nexus/db";
import {
AllocationStatus,
ImportBatchStatus,
ProjectStatus,
StagedRecordStatus,
VacationStatus,
} from "@capakraken/db";
import {
buildBatchSummaryEntry,
buildFallbackAccentureEmail,
toJsonObject,
} from "./shared.js";
} from "@nexus/db";
import { buildBatchSummaryEntry, buildFallbackAccentureEmail, toJsonObject } from "./shared.js";
import { recomputeResourceValueScores } from "../resource/recompute-resource-value-scores.js";
import { classifyDispoProject } from "./tbd-projects.js";
import type { CommitDbClient, MergedStagedResource, TxClient } from "./commit-dispo-batch-types.js";
@@ -27,10 +23,7 @@ import {
mergeStagedResources,
parseWeekdayAvailability,
} from "./build-dispo-maps.js";
import {
aggregateAssignments,
deriveOverlayAvailability,
} from "./determine-placement.js";
import { aggregateAssignments, deriveOverlayAvailability } from "./determine-placement.js";
export interface CommitDispoImportBatchInput {
allowTbdUnresolved?: boolean;
@@ -147,14 +140,20 @@ function buildResourceData(
chapter: resource.chapter,
chargeabilityTarget: resource.chargeabilityTarget ?? defaultChargeabilityTarget,
clientUnitId: resource.clientUnitName
? (maps.clientIdByCode.get(resource.clientUnitName) ?? maps.clientIdByName.get(resource.clientUnitName.toLowerCase()) ?? null)
? (maps.clientIdByCode.get(resource.clientUnitName) ??
maps.clientIdByName.get(resource.clientUnitName.toLowerCase()) ??
null)
: null,
countryId: resource.countryCode
? (maps.countryIdByCode.get(resource.countryCode) ?? null)
: null,
countryId: resource.countryCode ? (maps.countryIdByCode.get(resource.countryCode) ?? null) : null,
displayName: resource.displayName ?? resource.canonicalExternalId,
email: resource.email ?? buildFallbackAccentureEmail(resource.canonicalExternalId),
fte: resource.fte ?? 1,
lcrCents: resource.lcrCents ?? 0,
managementLevelGroupId: resource.managementLevelGroupName ? (managementGroup?.id ?? null) : null,
managementLevelGroupId: resource.managementLevelGroupName
? (managementGroup?.id ?? null)
: null,
managementLevelId: resource.managementLevelName
? (maps.managementLevelIdByName.get(resource.managementLevelName) ?? null)
: null,
@@ -291,7 +290,13 @@ async function commitResources(
}
}
return { resourceIdByKey, resourceRoleNameByKey, updatedEntitlements, updatedResourceAvailabilities, upsertedResourceRoles };
return {
resourceIdByKey,
resourceRoleNameByKey,
updatedEntitlements,
updatedResourceAvailabilities,
upsertedResourceRoles,
};
}
async function commitProjects(
@@ -326,7 +331,9 @@ async function commitProjects(
update: {
allocationType: stagedProject.allocationType ?? classification.allocationType,
budgetCents: 0,
clientId: stagedProject.clientCode ? (maps.clientIdByCode.get(stagedProject.clientCode) ?? null) : null,
clientId: stagedProject.clientCode
? (maps.clientIdByCode.get(stagedProject.clientCode) ?? null)
: null,
dynamicFields,
endDate: normalizeDate(stagedProject.endDate ?? stagedProject.startDate ?? new Date()),
name: stagedProject.name ?? shortCode,
@@ -351,7 +358,9 @@ async function commitProjects(
utilizationCategoryId: stagedProject.utilizationCategoryCode
? (maps.utilizationCategoryIdByCode.get(stagedProject.utilizationCategoryCode) ?? null)
: null,
clientId: stagedProject.clientCode ? (maps.clientIdByCode.get(stagedProject.clientCode) ?? null) : null,
clientId: stagedProject.clientCode
? (maps.clientIdByCode.get(stagedProject.clientCode) ?? null)
: null,
dynamicFields,
},
select: { id: true },
@@ -368,202 +377,266 @@ export async function commitDispoImportBatch(
): Promise<CommitDispoImportBatchResult> {
const validation = await validateDispoBatch(db, input);
const result = await db.$transaction(async (tx) => {
await tx.importBatch.update({
where: { id: validation.batchId },
data: { status: ImportBatchStatus.COMMITTING },
});
await upsertUtilizationCategories(tx);
await upsertRoleSeeds(tx);
const [
stagedResources, stagedProjects, stagedAssignments, stagedVacations,
stagedAvailabilityRules, adminUser, countries, metroCities,
managementLevelGroups, managementLevels, clients, orgUnits, roles,
utilizationCategories,
] = await Promise.all([
tx.stagedResource.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedProject.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedAssignment.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedVacation.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedAvailabilityRule.findMany({ where: { importBatchId: validation.batchId } }),
tx.user.findFirst({ where: { systemRole: "ADMIN" }, select: { id: true } }),
tx.country.findMany({ select: { id: true, code: true } }),
tx.metroCity.findMany({ select: { id: true, name: true } }),
tx.managementLevelGroup.findMany({ select: { id: true, name: true, targetPercentage: true } }),
tx.managementLevel.findMany({ select: { id: true, name: true } }),
tx.client.findMany({ select: { id: true, code: true, name: true } }),
tx.orgUnit.findMany({ select: { id: true, level: true, name: true } }),
tx.role.findMany({ select: { id: true, name: true } }),
tx.utilizationCategory.findMany({ select: { id: true, code: true } }),
]);
if (!adminUser) {
throw new Error("Cannot commit Dispo import without an ADMIN user in the database");
}
const maps = buildReferenceDataMaps({
clients, countries, managementLevelGroups, managementLevels,
metroCities, orgUnits, roles, utilizationCategories,
});
const mergedResources = mergeStagedResources(stagedResources);
await ensureInferredRolesExist(tx, mergedResources, maps.roleIdByName);
const resourceResult = await commitResources(
tx, mergedResources, maps, validation.batchId,
stagedVacations, stagedAvailabilityRules,
);
const projectIdByShortCode = await commitProjects(
tx, stagedProjects, maps, validation.batchId, input.importTbdProjects ?? false,
);
// Commit assignments
const aggregatedAssignments = aggregateAssignments(
stagedAssignments, resourceResult.resourceIdByKey, projectIdByShortCode,
maps.roleIdByName, resourceResult.resourceRoleNameByKey, input.importTbdProjects ?? false,
);
for (const assignment of aggregatedAssignments) {
const dailyCostCents = Math.round(
assignment.hoursPerDay * (mergedResources.get(assignment.resourceKey)?.lcrCents ?? 0),
);
const metadata = {
dispoImport: {
importBatchId: validation.batchId,
sourceDates: assignment.sourceDates,
utilizationCategoryCode: assignment.utilizationCategoryCode,
},
} as Prisma.InputJsonValue;
await tx.assignment.upsert({
where: {
unique_assignment: {
resourceId: assignment.resourceId,
projectId: assignment.projectId,
startDate: assignment.startDate,
endDate: assignment.endDate,
},
},
update: {
dailyCostCents, metadata,
percentage: assignment.percentage,
role: assignment.roleName,
roleId: assignment.roleId,
status: AllocationStatus.PROPOSED,
},
create: {
dailyCostCents, metadata,
endDate: assignment.endDate,
hoursPerDay: assignment.hoursPerDay,
percentage: assignment.percentage,
projectId: assignment.projectId,
resourceId: assignment.resourceId,
role: assignment.roleName,
roleId: assignment.roleId,
startDate: assignment.startDate,
status: AllocationStatus.PROPOSED,
},
const result = await db.$transaction(
async (tx) => {
await tx.importBatch.update({
where: { id: validation.batchId },
data: { status: ImportBatchStatus.COMMITTING },
});
await tx.resourceRole.upsert({
where: { resourceId_roleId: { resourceId: assignment.resourceId, roleId: assignment.roleId } },
update: {},
create: { resourceId: assignment.resourceId, roleId: assignment.roleId },
});
resourceResult.upsertedResourceRoles += 1;
}
await upsertUtilizationCategories(tx);
await upsertRoleSeeds(tx);
// Commit vacations
for (const stagedVacation of stagedVacations) {
const resourceId = resourceResult.resourceIdByKey.get(stagedVacation.resourceExternalId);
if (!resourceId) {
throw new Error(`Unable to resolve resource "${stagedVacation.resourceExternalId}" during vacation commit`);
const [
stagedResources,
stagedProjects,
stagedAssignments,
stagedVacations,
stagedAvailabilityRules,
adminUser,
countries,
metroCities,
managementLevelGroups,
managementLevels,
clients,
orgUnits,
roles,
utilizationCategories,
] = await Promise.all([
tx.stagedResource.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedProject.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedAssignment.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedVacation.findMany({ where: { importBatchId: validation.batchId } }),
tx.stagedAvailabilityRule.findMany({ where: { importBatchId: validation.batchId } }),
tx.user.findFirst({ where: { systemRole: "ADMIN" }, select: { id: true } }),
tx.country.findMany({ select: { id: true, code: true } }),
tx.metroCity.findMany({ select: { id: true, name: true } }),
tx.managementLevelGroup.findMany({
select: { id: true, name: true, targetPercentage: true },
}),
tx.managementLevel.findMany({ select: { id: true, name: true } }),
tx.client.findMany({ select: { id: true, code: true, name: true } }),
tx.orgUnit.findMany({ select: { id: true, level: true, name: true } }),
tx.role.findMany({ select: { id: true, name: true } }),
tx.utilizationCategory.findMany({ select: { id: true, code: true } }),
]);
if (!adminUser) {
throw new Error("Cannot commit Dispo import without an ADMIN user in the database");
}
const existing = await tx.vacation.findFirst({
where: {
endDate: stagedVacation.endDate, halfDayPart: stagedVacation.halfDayPart,
isHalfDay: stagedVacation.isHalfDay, note: stagedVacation.note, resourceId,
startDate: stagedVacation.startDate, status: VacationStatus.APPROVED,
type: stagedVacation.vacationType,
},
select: { id: true },
const maps = buildReferenceDataMaps({
clients,
countries,
managementLevelGroups,
managementLevels,
metroCities,
orgUnits,
roles,
utilizationCategories,
});
if (existing) {
await tx.vacation.update({
where: { id: existing.id },
data: { approvedAt: new Date(), approvedById: adminUser.id, note: stagedVacation.note, requestedById: adminUser.id },
const mergedResources = mergeStagedResources(stagedResources);
await ensureInferredRolesExist(tx, mergedResources, maps.roleIdByName);
const resourceResult = await commitResources(
tx,
mergedResources,
maps,
validation.batchId,
stagedVacations,
stagedAvailabilityRules,
);
const projectIdByShortCode = await commitProjects(
tx,
stagedProjects,
maps,
validation.batchId,
input.importTbdProjects ?? false,
);
// Commit assignments
const aggregatedAssignments = aggregateAssignments(
stagedAssignments,
resourceResult.resourceIdByKey,
projectIdByShortCode,
maps.roleIdByName,
resourceResult.resourceRoleNameByKey,
input.importTbdProjects ?? false,
);
for (const assignment of aggregatedAssignments) {
const dailyCostCents = Math.round(
assignment.hoursPerDay * (mergedResources.get(assignment.resourceKey)?.lcrCents ?? 0),
);
const metadata = {
dispoImport: {
importBatchId: validation.batchId,
sourceDates: assignment.sourceDates,
utilizationCategoryCode: assignment.utilizationCategoryCode,
},
} as Prisma.InputJsonValue;
await tx.assignment.upsert({
where: {
unique_assignment: {
resourceId: assignment.resourceId,
projectId: assignment.projectId,
startDate: assignment.startDate,
endDate: assignment.endDate,
},
},
update: {
dailyCostCents,
metadata,
percentage: assignment.percentage,
role: assignment.roleName,
roleId: assignment.roleId,
status: AllocationStatus.PROPOSED,
},
create: {
dailyCostCents,
metadata,
endDate: assignment.endDate,
hoursPerDay: assignment.hoursPerDay,
percentage: assignment.percentage,
projectId: assignment.projectId,
resourceId: assignment.resourceId,
role: assignment.roleName,
roleId: assignment.roleId,
startDate: assignment.startDate,
status: AllocationStatus.PROPOSED,
},
});
} else {
await tx.vacation.create({
data: {
approvedAt: new Date(), approvedById: adminUser.id,
endDate: stagedVacation.endDate, halfDayPart: stagedVacation.halfDayPart,
isHalfDay: stagedVacation.isHalfDay, note: stagedVacation.note,
requestedById: adminUser.id, resourceId,
startDate: stagedVacation.startDate, status: VacationStatus.APPROVED,
await tx.resourceRole.upsert({
where: {
resourceId_roleId: { resourceId: assignment.resourceId, roleId: assignment.roleId },
},
update: {},
create: { resourceId: assignment.resourceId, roleId: assignment.roleId },
});
resourceResult.upsertedResourceRoles += 1;
}
// Commit vacations
for (const stagedVacation of stagedVacations) {
const resourceId = resourceResult.resourceIdByKey.get(stagedVacation.resourceExternalId);
if (!resourceId) {
throw new Error(
`Unable to resolve resource "${stagedVacation.resourceExternalId}" during vacation commit`,
);
}
const existing = await tx.vacation.findFirst({
where: {
endDate: stagedVacation.endDate,
halfDayPart: stagedVacation.halfDayPart,
isHalfDay: stagedVacation.isHalfDay,
note: stagedVacation.note,
resourceId,
startDate: stagedVacation.startDate,
status: VacationStatus.APPROVED,
type: stagedVacation.vacationType,
},
select: { id: true },
});
if (existing) {
await tx.vacation.update({
where: { id: existing.id },
data: {
approvedAt: new Date(),
approvedById: adminUser.id,
note: stagedVacation.note,
requestedById: adminUser.id,
},
});
} else {
await tx.vacation.create({
data: {
approvedAt: new Date(),
approvedById: adminUser.id,
endDate: stagedVacation.endDate,
halfDayPart: stagedVacation.halfDayPart,
isHalfDay: stagedVacation.isHalfDay,
note: stagedVacation.note,
requestedById: adminUser.id,
resourceId,
startDate: stagedVacation.startDate,
status: VacationStatus.APPROVED,
type: stagedVacation.vacationType,
},
});
}
}
}
// Mark staged records as committed
await Promise.all([
tx.stagedResource.updateMany({ where: { importBatchId: validation.batchId }, data: { status: StagedRecordStatus.COMMITTED } }),
tx.stagedProject.updateMany({
where: input.importTbdProjects ? { importBatchId: validation.batchId } : { importBatchId: validation.batchId, isTbd: false },
data: { status: StagedRecordStatus.COMMITTED },
}),
tx.stagedAssignment.updateMany({
where: input.importTbdProjects
? { importBatchId: validation.batchId, isUnassigned: false }
: { importBatchId: validation.batchId, isTbd: false, isUnassigned: false },
data: { status: StagedRecordStatus.COMMITTED },
}),
tx.stagedVacation.updateMany({ where: { importBatchId: validation.batchId }, data: { status: StagedRecordStatus.COMMITTED } }),
tx.stagedAvailabilityRule.updateMany({ where: { importBatchId: validation.batchId }, data: { status: StagedRecordStatus.COMMITTED } }),
]);
await tx.importBatch.update({
where: { id: validation.batchId },
data: {
committedAt: new Date(),
status: ImportBatchStatus.COMMITTED,
summary: buildBatchSummaryEntry({
...toJsonObject(validation.batchSummary),
commit: {
committedAssignments: aggregatedAssignments.length,
committedProjects: projectIdByShortCode.size,
committedResources: mergedResources.size,
committedVacations: stagedVacations.length,
skippedTbdUnresolved: validation.skippedTbdUnresolved,
updatedEntitlements: resourceResult.updatedEntitlements,
updatedResourceAvailabilities: resourceResult.updatedResourceAvailabilities,
upsertedResourceRoles: resourceResult.upsertedResourceRoles,
},
// Mark staged records as committed
await Promise.all([
tx.stagedResource.updateMany({
where: { importBatchId: validation.batchId },
data: { status: StagedRecordStatus.COMMITTED },
}),
},
});
tx.stagedProject.updateMany({
where: input.importTbdProjects
? { importBatchId: validation.batchId }
: { importBatchId: validation.batchId, isTbd: false },
data: { status: StagedRecordStatus.COMMITTED },
}),
tx.stagedAssignment.updateMany({
where: input.importTbdProjects
? { importBatchId: validation.batchId, isUnassigned: false }
: { importBatchId: validation.batchId, isTbd: false, isUnassigned: false },
data: { status: StagedRecordStatus.COMMITTED },
}),
tx.stagedVacation.updateMany({
where: { importBatchId: validation.batchId },
data: { status: StagedRecordStatus.COMMITTED },
}),
tx.stagedAvailabilityRule.updateMany({
where: { importBatchId: validation.batchId },
data: { status: StagedRecordStatus.COMMITTED },
}),
]);
return {
batchId: validation.batchId,
counts: {
committedAssignments: aggregatedAssignments.length,
committedProjects: projectIdByShortCode.size,
committedResources: mergedResources.size,
committedVacations: stagedVacations.length,
updatedEntitlements: resourceResult.updatedEntitlements,
updatedResourceAvailabilities: resourceResult.updatedResourceAvailabilities,
upsertedResourceRoles: resourceResult.upsertedResourceRoles,
},
unresolved: { blocked: 0, skippedTbd: validation.skippedTbdUnresolved },
} satisfies CommitDispoImportBatchResult;
}, { maxWait: 30_000, timeout: 600_000 });
await tx.importBatch.update({
where: { id: validation.batchId },
data: {
committedAt: new Date(),
status: ImportBatchStatus.COMMITTED,
summary: buildBatchSummaryEntry({
...toJsonObject(validation.batchSummary),
commit: {
committedAssignments: aggregatedAssignments.length,
committedProjects: projectIdByShortCode.size,
committedResources: mergedResources.size,
committedVacations: stagedVacations.length,
skippedTbdUnresolved: validation.skippedTbdUnresolved,
updatedEntitlements: resourceResult.updatedEntitlements,
updatedResourceAvailabilities: resourceResult.updatedResourceAvailabilities,
upsertedResourceRoles: resourceResult.upsertedResourceRoles,
},
}),
},
});
return {
batchId: validation.batchId,
counts: {
committedAssignments: aggregatedAssignments.length,
committedProjects: projectIdByShortCode.size,
committedResources: mergedResources.size,
committedVacations: stagedVacations.length,
updatedEntitlements: resourceResult.updatedEntitlements,
updatedResourceAvailabilities: resourceResult.updatedResourceAvailabilities,
upsertedResourceRoles: resourceResult.upsertedResourceRoles,
},
unresolved: { blocked: 0, skippedTbd: validation.skippedTbdUnresolved },
} satisfies CommitDispoImportBatchResult;
},
{ maxWait: 30_000, timeout: 600_000 },
);
if ("resource" in db && db.resource) {
await recomputeResourceValueScores(db);
@@ -1,8 +1,5 @@
import type { WeekdayAvailability } from "@capakraken/shared";
import {
DISPO_INTERNAL_PROJECT_BUCKETS,
normalizeDispoRoleToken,
} from "@capakraken/shared";
import type { WeekdayAvailability } from "@nexus/shared";
import { DISPO_INTERNAL_PROJECT_BUCKETS, normalizeDispoRoleToken } from "@nexus/shared";
import type { TxClient, AggregatedAssignment } from "./commit-dispo-batch-types.js";
import { deriveTbdDispoProjectIdentity } from "./tbd-projects.js";
@@ -30,7 +27,15 @@ function roundToOneDecimal(value: number): number {
return Math.round(value * 10) / 10;
}
const WEEKDAY_KEYS = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"] as const;
const WEEKDAY_KEYS = [
"sunday",
"monday",
"tuesday",
"wednesday",
"thursday",
"friday",
"saturday",
] as const;
const WORKDAY_KEYS = ["monday", "tuesday", "wednesday", "thursday", "friday"] as const;
function resolveInternalProjectShortCode(utilizationCategoryCode: string | null): string | null {
@@ -56,9 +61,9 @@ export function aggregateAssignments(
? resolveInternalProjectShortCode(row.utilizationCategoryCode)
: row.isTbd
? deriveTbdDispoProjectIdentity(
String(asObject(row.rawPayload).rawToken ?? ""),
row.utilizationCategoryCode ?? null,
).shortCode
String(asObject(row.rawPayload).rawToken ?? ""),
row.utilizationCategoryCode ?? null,
).shortCode
: (row.projectKey ?? null);
const roleName =
row.roleName ??
@@ -70,7 +75,9 @@ export function aggregateAssignments(
const roleId = roleName ? roleIdByName.get(roleName) : null;
if (!resourceId) {
throw new Error(`Unable to resolve resource "${row.resourceExternalId}" during assignment commit`);
throw new Error(
`Unable to resolve resource "${row.resourceExternalId}" during assignment commit`,
);
}
if (!projectShortCode || !projectId) {
throw new Error(
@@ -83,7 +90,9 @@ export function aggregateAssignments(
);
}
if (row.assignmentDate === null || row.hoursPerDay === null || row.percentage === null) {
throw new Error(`Assignment row "${row.id}" is missing normalized date or load information`);
throw new Error(
`Assignment row "${row.id}" is missing normalized date or load information`,
);
}
return {
@@ -99,18 +108,20 @@ export function aggregateAssignments(
utilizationCategoryCode: row.utilizationCategoryCode ?? null,
};
})
.sort((left, right) =>
left.resourceKey.localeCompare(right.resourceKey) ||
left.projectShortCode.localeCompare(right.projectShortCode) ||
left.roleName.localeCompare(right.roleName) ||
left.assignmentDate.getTime() - right.assignmentDate.getTime(),
.sort(
(left, right) =>
left.resourceKey.localeCompare(right.resourceKey) ||
left.projectShortCode.localeCompare(right.projectShortCode) ||
left.roleName.localeCompare(right.roleName) ||
left.assignmentDate.getTime() - right.assignmentDate.getTime(),
);
const aggregated: AggregatedAssignment[] = [];
for (const row of resolvedRows) {
const previous = aggregated.at(-1);
const canMerge = previous &&
const canMerge =
previous &&
previous.resourceId === row.resourceId &&
previous.projectId === row.projectId &&
previous.roleId === row.roleId &&
@@ -163,11 +174,11 @@ export function deriveOverlayAvailability(
if (!weekdayKey || !WORKDAY_KEYS.includes(weekdayKey)) {
continue;
}
const availableHours = rule.availableHours ?? (
rule.percentage !== null && rule.percentage !== undefined
const availableHours =
rule.availableHours ??
(rule.percentage !== null && rule.percentage !== undefined
? roundToOneDecimal((rule.percentage / 100) * 8)
: null
);
: null);
if (availableHours === null) {
continue;
}
@@ -1,5 +1,21 @@
import { DispoStagedRecordType } from "@capakraken/db";
import { DISPO_CHARGEABILITY_SHEET, type ParsedChargeabilityResource, type ParsedChargeabilityWorkbook, type ParsedUnresolvedRecord, buildFallbackAccentureEmail, createAvailabilityFromFte, deriveCountryCodeFromMetroCity, deriveDisplayNameFromEnterpriseId, deriveNormalizedChapter, deriveRoleTokens, ensurePercentageValue, mapChargeabilityResourceType, normalizeNullableWorkbookValue, normalizeText, resolveCanonicalEnterpriseIdentity } from "./shared.js";
import { DispoStagedRecordType } from "@nexus/db";
import {
DISPO_CHARGEABILITY_SHEET,
type ParsedChargeabilityResource,
type ParsedChargeabilityWorkbook,
type ParsedUnresolvedRecord,
buildFallbackAccentureEmail,
createAvailabilityFromFte,
deriveCountryCodeFromMetroCity,
deriveDisplayNameFromEnterpriseId,
deriveNormalizedChapter,
deriveRoleTokens,
ensurePercentageValue,
mapChargeabilityResourceType,
normalizeNullableWorkbookValue,
normalizeText,
resolveCanonicalEnterpriseIdentity,
} from "./shared.js";
import { readWorksheetMatrix } from "./read-workbook.js";
const CHGFC_HEADERS = {
@@ -107,9 +123,10 @@ export async function parseDispoChargeabilityWorkbook(
getCellValue(row, headerMap, CHGFC_HEADERS.managementLevelGroup),
);
const rawTarget = getCellValue(row, headerMap, CHGFC_HEADERS.target);
const fte = typeof getCellValue(row, headerMap, CHGFC_HEADERS.fte) === "number"
? Number(getCellValue(row, headerMap, CHGFC_HEADERS.fte))
: null;
const fte =
typeof getCellValue(row, headerMap, CHGFC_HEADERS.fte) === "number"
? Number(getCellValue(row, headerMap, CHGFC_HEADERS.fte))
: null;
const metroCityName = normalizeNullableWorkbookValue(
getCellValue(row, headerMap, CHGFC_HEADERS.metroCity),
);
@@ -170,7 +187,9 @@ export async function parseDispoChargeabilityWorkbook(
continue;
}
existing.warnings.push(`Conflicting duplicate ChgFC row ${rowNumber} found for ${canonicalExternalId}`);
existing.warnings.push(
`Conflicting duplicate ChgFC row ${rowNumber} found for ${canonicalExternalId}`,
);
unresolved.push({
sourceRow: rowNumber,
sourceColumn: "A",
@@ -1,10 +1,10 @@
import { DispoStagedRecordType } from "@capakraken/db";
import { DispoStagedRecordType } from "@nexus/db";
import {
VacationType,
normalizeCanonicalResourceIdentity,
normalizeDispoRoleToken,
normalizeDispoUtilizationToken,
} from "@capakraken/shared";
} from "@nexus/shared";
import { readWorksheetMatrix, toColumnLetter, type WorksheetCellValue } from "./read-workbook.js";
import {
DISPO_PLANNING_SHEET,
@@ -182,27 +182,37 @@ function isPlanningSummaryRow(row: ReadonlyArray<WorksheetCellValue>): boolean {
const normalizedLabels = new Set(repeatedLabels.map((value) => value.toLowerCase()));
const label = repeatedLabels[0] ?? null;
return normalizedLabels.size === 1 && label !== null && label.startsWith("(") && label.endsWith(")");
return (
normalizedLabels.size === 1 && label !== null && label.startsWith("(") && label.endsWith(")")
);
}
function buildPlanningColumns(rows: ReadonlyArray<ReadonlyArray<WorksheetCellValue>>) {
const columns: PlanningColumn[] = [];
const headerWidth = Math.max(rows[DISPO_DATE_ROW - 1]?.length ?? 0, rows[DISPO_SLOT_ROW - 1]?.length ?? 0);
const headerWidth = Math.max(
rows[DISPO_DATE_ROW - 1]?.length ?? 0,
rows[DISPO_SLOT_ROW - 1]?.length ?? 0,
);
for (let columnNumber = DISPO_PLANNING_START_COLUMN; columnNumber <= headerWidth; columnNumber += 1) {
for (
let columnNumber = DISPO_PLANNING_START_COLUMN;
columnNumber <= headerWidth;
columnNumber += 1
) {
const slotLabel = normalizeNullableWorkbookValue(rows[DISPO_SLOT_ROW - 1]?.[columnNumber - 1]);
if (!slotLabel) {
continue;
}
const currentHeaderValue = rows[DISPO_DATE_ROW - 1]?.[columnNumber - 1] ?? null;
const previousHeaderLabel = normalizeNullableWorkbookValue(rows[DISPO_DATE_ROW - 1]?.[columnNumber - 2]);
const previousHeaderLabel = normalizeNullableWorkbookValue(
rows[DISPO_DATE_ROW - 1]?.[columnNumber - 2],
);
const currentHeaderLabel = normalizeNullableWorkbookValue(currentHeaderValue);
const nextHeaderValue = rows[DISPO_DATE_ROW - 1]?.[columnNumber] ?? null;
const assignmentDate =
toDateOnlyInBerlin(currentHeaderValue) ??
toDateOnlyInBerlin(nextHeaderValue);
toDateOnlyInBerlin(currentHeaderValue) ?? toDateOnlyInBerlin(nextHeaderValue);
if (!assignmentDate) {
continue;
@@ -236,10 +246,15 @@ function normalizePlanningToken(token: string): string {
}
function extractBracketTokens(token: string): string[] {
return Array.from(token.matchAll(/\[([^\]]+)\]/g), (match) => match[1]?.trim() ?? "").filter(Boolean);
return Array.from(token.matchAll(/\[([^\]]+)\]/g), (match) => match[1]?.trim() ?? "").filter(
Boolean,
);
}
function extractUtilizationToken(token: string): { utilizationToken: string | null; winProbability: number | null } {
function extractUtilizationToken(token: string): {
utilizationToken: string | null;
winProbability: number | null;
} {
const matches = Array.from(token.matchAll(/\{([A-Z]+)(\d{0,3})\}/gi));
const lastMatch = matches.at(-1);
if (!lastMatch) {
@@ -263,7 +278,9 @@ function extractRoleToken(token: string, metadata: PlanningRowMetadata): string
return explicitRoleToken;
}
return deriveRoleTokens(metadata.chapter, metadata.typeOfWork, metadata.unitSpecificField)[0] ?? null;
return (
deriveRoleTokens(metadata.chapter, metadata.typeOfWork, metadata.unitSpecificField)[0] ?? null
);
}
function extractProjectKey(token: string): string | null {
@@ -466,9 +483,10 @@ function buildAvailabilityAccumulator(
} = {},
): AvailabilityAccumulator {
const percentage = input.percentage ?? parsePercentage(rawToken);
const availableHours = percentage !== null
? Math.round((percentage / 100) * 8 * 100) / 100
: (input.availableHours ?? (8 - SLOT_HOURS));
const availableHours =
percentage !== null
? Math.round((percentage / 100) * 8 * 100) / 100
: (input.availableHours ?? 8 - SLOT_HOURS);
const warnings = new Set<string>();
if (input.warning) {
warnings.add(input.warning);
@@ -548,7 +566,9 @@ export async function parseDispoPlanningWorkbook(
if (normalizedToken.startsWith("[_AB]")) {
const note = extractLabel(rawToken);
const vacationType = note?.toLowerCase().includes("sick") ? VacationType.SICK : VacationType.ANNUAL;
const vacationType = note?.toLowerCase().includes("sick")
? VacationType.SICK
: VacationType.ANNUAL;
const key = `${metadata.eid}|${getDateKey(column.assignmentDate)}|VAC|${rawToken}`;
const existing = vacations.get(key);
if (existing) {
@@ -577,11 +597,17 @@ export async function parseDispoPlanningWorkbook(
existing.halfDayParts.add(column.halfDayPart);
}
} else {
const vacation = buildVacationAccumulator(column, metadata, rawToken, VacationType.PUBLIC_HOLIDAY, {
holidayName,
isPublicHoliday: true,
note: holidayName,
});
const vacation = buildVacationAccumulator(
column,
metadata,
rawToken,
VacationType.PUBLIC_HOLIDAY,
{
holidayName,
isPublicHoliday: true,
note: holidayName,
},
);
vacation.sourceRow = rowNumber;
vacations.set(key, vacation);
}
@@ -595,7 +621,9 @@ export async function parseDispoPlanningWorkbook(
const existing = availabilityRules.get(key);
if (existing) {
const nextAvailability = buildAvailabilityAccumulator(column, metadata, rawToken, {
...(naHandling.availableHours !== undefined ? { availableHours: naHandling.availableHours } : {}),
...(naHandling.availableHours !== undefined
? { availableHours: naHandling.availableHours }
: {}),
...(naHandling.percentage !== undefined ? { percentage: naHandling.percentage } : {}),
...(naHandling.ruleType !== undefined ? { ruleType: naHandling.ruleType } : {}),
...(naHandling.warning !== undefined ? { warning: naHandling.warning } : {}),
@@ -607,7 +635,9 @@ export async function parseDispoPlanningWorkbook(
}
} else {
const availabilityRule = buildAvailabilityAccumulator(column, metadata, rawToken, {
...(naHandling.availableHours !== undefined ? { availableHours: naHandling.availableHours } : {}),
...(naHandling.availableHours !== undefined
? { availableHours: naHandling.availableHours }
: {}),
...(naHandling.percentage !== undefined ? { percentage: naHandling.percentage } : {}),
...(naHandling.ruleType !== undefined ? { ruleType: naHandling.ruleType } : {}),
...(naHandling.warning !== undefined ? { warning: naHandling.warning } : {}),
@@ -673,7 +703,8 @@ export async function parseDispoPlanningWorkbook(
resourceExternalId: metadata.eid,
projectKey: null,
message: `Unable to resolve project key from planning token "${rawToken}"`,
resolutionHint: "Add a WBS token or classify this cell as an internal bucket before commit",
resolutionHint:
"Add a WBS token or classify this cell as an internal bucket before commit",
warnings: Array.from(assignment.warnings),
normalizedData: {
assignmentDate: getDateKey(column.assignmentDate),
@@ -716,30 +747,32 @@ export async function parseDispoPlanningWorkbook(
}
}
const parsedAssignments: ParsedPlanningAssignment[] = Array.from(assignments.values()).map((entry) => ({
assignmentDate: entry.assignmentDate,
chapterToken: entry.chapterToken,
hoursPerDay: entry.hoursPerDay,
isInternal: entry.isInternal,
isTbd: entry.isTbd,
isUnassigned: entry.isUnassigned,
percentage: entry.slotCount * 50,
projectKey: entry.projectKey,
rawToken: entry.rawToken,
resourceExternalId: entry.resourceExternalId,
roleName: entry.roleName,
roleToken: entry.roleToken,
slotFraction: entry.slotCount / 2,
sourceColumn: toColumnLetter(entry.firstColumnNumber),
sourceRow: entry.sourceRow,
utilizationCategoryCode: entry.utilizationCategoryCode,
warnings: Array.from(entry.warnings),
winProbability: entry.winProbability,
}));
const parsedAssignments: ParsedPlanningAssignment[] = Array.from(assignments.values()).map(
(entry) => ({
assignmentDate: entry.assignmentDate,
chapterToken: entry.chapterToken,
hoursPerDay: entry.hoursPerDay,
isInternal: entry.isInternal,
isTbd: entry.isTbd,
isUnassigned: entry.isUnassigned,
percentage: entry.slotCount * 50,
projectKey: entry.projectKey,
rawToken: entry.rawToken,
resourceExternalId: entry.resourceExternalId,
roleName: entry.roleName,
roleToken: entry.roleToken,
slotFraction: entry.slotCount / 2,
sourceColumn: toColumnLetter(entry.firstColumnNumber),
sourceRow: entry.sourceRow,
utilizationCategoryCode: entry.utilizationCategoryCode,
warnings: Array.from(entry.warnings),
winProbability: entry.winProbability,
}),
);
const parsedVacations: ParsedPlanningVacation[] = Array.from(vacations.values()).map((entry) => ({
endDate: entry.endDate,
halfDayPart: entry.halfDayParts.size === 1 ? Array.from(entry.halfDayParts)[0] ?? null : null,
halfDayPart: entry.halfDayParts.size === 1 ? (Array.from(entry.halfDayParts)[0] ?? null) : null,
holidayName: entry.holidayName,
isHalfDay: entry.halfDayParts.size === 1,
isPublicHoliday: entry.isPublicHoliday,
@@ -753,7 +786,9 @@ export async function parseDispoPlanningWorkbook(
warnings: Array.from(entry.warnings),
}));
const parsedAvailabilityRules: ParsedPlanningAvailabilityRule[] = Array.from(availabilityRules.values()).map((entry) => ({
const parsedAvailabilityRules: ParsedPlanningAvailabilityRule[] = Array.from(
availabilityRules.values(),
).map((entry) => ({
availableHours: entry.availableHours,
effectiveEndDate: entry.effectiveEndDate,
effectiveStartDate: entry.effectiveStartDate,
@@ -1,5 +1,5 @@
import { DispoStagedRecordType, ResourceType } from "@capakraken/db";
import { createWeekdayAvailabilityFromFte } from "@capakraken/shared";
import { DispoStagedRecordType, ResourceType } from "@nexus/db";
import { createWeekdayAvailabilityFromFte } from "@nexus/shared";
import {
parseResourceRosterMasterWorkbook,
type ParsedResourceRosterLevelAverage,
@@ -291,7 +291,9 @@ export async function parseDispoRosterWorkbook(
for (let rowNumber = 2; rowNumber <= rosterRows.length; rowNumber += 1) {
const row = rosterRows[rowNumber - 1] ?? [];
const eidValue = normalizeNullableWorkbookValue(getCellValue(row, rosterHeaderMap, ROSTER_HEADERS.eid));
const eidValue = normalizeNullableWorkbookValue(
getCellValue(row, rosterHeaderMap, ROSTER_HEADERS.eid),
);
if (!eidValue) {
if (row.some((value) => normalizeText(value) !== null)) {
warnings.push(`Ignoring DispoRoster row ${rowNumber} because EID is missing`);
@@ -423,9 +425,10 @@ export async function parseDispoRosterWorkbook(
employeeName: normalizeNullableWorkbookValue(
getCellValue(row, sapHeaderMap, SAP_HEADERS.employeeName),
),
employeeEmail: normalizeNullableWorkbookValue(
getCellValue(row, sapHeaderMap, SAP_HEADERS.employeeEmail),
)?.toLowerCase() ?? null,
employeeEmail:
normalizeNullableWorkbookValue(
getCellValue(row, sapHeaderMap, SAP_HEADERS.employeeEmail),
)?.toLowerCase() ?? null,
metroCityName: normalizeNullableWorkbookValue(
getCellValue(row, sapHeaderMap, SAP_HEADERS.metroCity),
),
@@ -472,15 +475,19 @@ export async function parseDispoRosterWorkbook(
normalizeSapDisplayName(sap?.employeeName ?? null) ??
deriveDisplayNameFromEnterpriseId(canonicalExternalId);
const metroCityName = sap?.metroCityName ?? roster?.metroCityName ?? null;
const managementLevelName =
sap?.managementLevelName ?? roster?.managementLevelName ?? null;
const resourceWarnings = buildResourceWarnings(resourceType, resourceTypeResult.warning, roster, sap);
const managementLevelName = sap?.managementLevelName ?? roster?.managementLevelName ?? null;
const resourceWarnings = buildResourceWarnings(
resourceType,
resourceTypeResult.warning,
roster,
sap,
);
const rateResolution = applyRateResolution({
canonicalExternalId,
level: managementLevelName,
rateRecord: rateWorkbook?.rates.get(canonicalExternalId) ?? null,
levelAverage: managementLevelName
? rateWorkbook?.levelAverages.get(managementLevelName) ?? null
? (rateWorkbook?.levelAverages.get(managementLevelName) ?? null)
: null,
warnings: resourceWarnings,
});
@@ -495,7 +502,8 @@ export async function parseDispoRosterWorkbook(
email: sap?.employeeEmail ?? buildFallbackAccentureEmail(canonicalExternalId),
chapter: normalizedChapter.chapter,
chapterCode: normalizedChapter.chapterCode,
managementLevelGroupName: sap?.managementLevelGroupName ?? roster?.managementLevelGroupName ?? null,
managementLevelGroupName:
sap?.managementLevelGroupName ?? roster?.managementLevelGroupName ?? null,
managementLevelName,
countryCode: deriveCountryCodeFromMetroCity(metroCityName),
metroCityName,
@@ -547,7 +555,9 @@ export async function parseDispoRosterWorkbook(
warnings.push(`Ignored ${ignoredPseudoDemandRows} pseudo-demand rows from DispoRoster`);
}
resources.sort((left, right) => left.canonicalExternalId.localeCompare(right.canonicalExternalId));
resources.sort((left, right) =>
left.canonicalExternalId.localeCompare(right.canonicalExternalId),
);
return {
excludedCanonicalExternalIds: Array.from(excludedCanonicalExternalIds).sort((left, right) =>
@@ -1,4 +1,4 @@
import { normalizeCanonicalResourceIdentity } from "@capakraken/shared";
import { normalizeCanonicalResourceIdentity } from "@nexus/shared";
import { readWorksheetMatrix } from "./read-workbook.js";
import { normalizeNullableWorkbookValue, normalizeText } from "./shared.js";
@@ -1,17 +1,17 @@
import path from "node:path";
import type { Prisma, PrismaClient } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import {
DispoImportSourceKind,
DispoStagedRecordType,
ImportBatchStatus,
ResourceType,
StagedRecordStatus,
} from "@capakraken/db";
} from "@nexus/db";
import {
createWeekdayAvailabilityFromFte,
normalizeCanonicalResourceIdentity,
normalizeDispoChapterToken,
} from "@capakraken/shared";
} from "@nexus/shared";
export type DispoImportDbClient = Pick<
PrismaClient,
@@ -1,7 +1,13 @@
import type { Prisma } from "@capakraken/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@capakraken/db";
import type { Prisma } from "@nexus/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@nexus/db";
import { parseDispoChargeabilityWorkbook } from "./parse-chargeability-workbook.js";
import { ensureImportBatch, finalizeImportBatchStage, getWorkbookFileName, type DispoChargeabilityImportInput, type DispoImportDbClient } from "./shared.js";
import {
ensureImportBatch,
finalizeImportBatchStage,
getWorkbookFileName,
type DispoChargeabilityImportInput,
type DispoImportDbClient,
} from "./shared.js";
export interface StageDispoChargeabilityResourcesResult {
batchId: string;
@@ -53,9 +59,8 @@ export async function stageDispoChargeabilityResources(
await db.stagedResource.createMany({
data: filteredResources.map((resource) => ({
importBatchId: batch.id,
status: resource.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status:
resource.warnings.length > 0 ? StagedRecordStatus.PARSED : StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.CHARGEABILITY,
sourceWorkbook,
sourceSheet: "ChgFC",
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@capakraken/db";
import type { Prisma } from "@nexus/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@nexus/db";
import { parseDispoPlanningWorkbook } from "./parse-dispo-matrix.js";
import {
DISPO_PLANNING_SHEET,
@@ -96,9 +96,10 @@ export async function stageDispoPlanningData(
await db.stagedAssignment.createMany({
data: filteredAssignments.map((assignment) => ({
importBatchId: batch.id,
status: assignment.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status:
assignment.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.PLANNING,
sourceWorkbook,
sourceSheet: DISPO_PLANNING_SHEET,
@@ -141,9 +142,8 @@ export async function stageDispoPlanningData(
await db.stagedVacation.createMany({
data: filteredVacations.map((vacation) => ({
importBatchId: batch.id,
status: vacation.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status:
vacation.warnings.length > 0 ? StagedRecordStatus.PARSED : StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.PLANNING,
sourceWorkbook,
sourceSheet: DISPO_PLANNING_SHEET,
@@ -176,9 +176,8 @@ export async function stageDispoPlanningData(
await db.stagedAvailabilityRule.createMany({
data: filteredAvailabilityRules.map((rule) => ({
importBatchId: batch.id,
status: rule.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status:
rule.warnings.length > 0 ? StagedRecordStatus.PARSED : StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.PLANNING,
sourceWorkbook,
sourceSheet: DISPO_PLANNING_SHEET,
@@ -1,6 +1,6 @@
import type { Prisma } from "@capakraken/db";
import { AllocationType, DispoImportSourceKind, OrderType, StagedRecordStatus } from "@capakraken/db";
import { DISPO_INTERNAL_PROJECT_BUCKETS } from "@capakraken/shared";
import type { Prisma } from "@nexus/db";
import { AllocationType, DispoImportSourceKind, OrderType, StagedRecordStatus } from "@nexus/db";
import { DISPO_INTERNAL_PROJECT_BUCKETS } from "@nexus/shared";
import { parseDispoPlanningWorkbook } from "./parse-dispo-matrix.js";
import {
classifyDispoProject,
@@ -113,8 +113,8 @@ export async function stageDispoProjects(
}
if (assignment.isInternal) {
const internalBucket = DISPO_INTERNAL_PROJECT_BUCKETS.find(
(bucket) => assignment.rawToken.includes(`{${bucket.sourceToken}}`),
const internalBucket = DISPO_INTERNAL_PROJECT_BUCKETS.find((bucket) =>
assignment.rawToken.includes(`{${bucket.sourceToken}}`),
);
if (!internalBucket) {
continue;
@@ -227,9 +227,7 @@ export async function stageDispoProjects(
})
.map((project) => ({
importBatchId: batch.id,
status: project.warnings.size > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status: project.warnings.size > 0 ? StagedRecordStatus.PARSED : StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.PLANNING,
sourceWorkbook,
sourceSheet: DISPO_PLANNING_SHEET,
@@ -265,7 +263,10 @@ export async function stageDispoProjects(
});
}
const warningCount = stagedProjects.reduce((count, project) => count + project.warnings.length, 0);
const warningCount = stagedProjects.reduce(
(count, project) => count + project.warnings.length,
0,
);
const summary = {
stagedProjects: stagedProjects.length,
warnings: warningCount,
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@capakraken/db";
import type { Prisma } from "@nexus/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@nexus/db";
import { parseDispoRosterWorkbook } from "./parse-dispo-roster-workbook.js";
import {
ensureImportBatch,
@@ -53,9 +53,8 @@ export async function stageDispoRosterResources(
await db.stagedResource.createMany({
data: parsed.resources.map((resource) => ({
importBatchId: batch.id,
status: resource.warnings.length > 0
? StagedRecordStatus.PARSED
: StagedRecordStatus.NORMALIZED,
status:
resource.warnings.length > 0 ? StagedRecordStatus.PARSED : StagedRecordStatus.NORMALIZED,
sourceKind: DispoImportSourceKind.ROSTER,
sourceWorkbook,
sourceSheet: resource.sourceSheet,
@@ -131,7 +130,8 @@ export async function stageDispoRosterResources(
status: StagedRecordStatus.UNRESOLVED,
sourceKind: DispoImportSourceKind.ROSTER,
sourceWorkbook,
sourceSheet: record.sourceRow >= 3 && record.sourceColumn === "C" ? "SAP_data" : "DispoRoster",
sourceSheet:
record.sourceRow >= 3 && record.sourceColumn === "C" ? "SAP_data" : "DispoRoster",
sourceRow: record.sourceRow,
sourceColumn: record.sourceColumn ?? null,
recordType: record.recordType,
@@ -1,7 +1,14 @@
import type { Prisma } from "@capakraken/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@capakraken/db";
import type { Prisma } from "@nexus/db";
import { DispoImportSourceKind, StagedRecordStatus } from "@nexus/db";
import { parseMandatoryDispoReferenceWorkbook } from "./parse-reference-workbook.js";
import { ensureImportBatch, finalizeImportBatchStage, getWorkbookFileName, type DispoImportDbClient, type DispoReferenceImportInput, toJsonObject } from "./shared.js";
import {
ensureImportBatch,
finalizeImportBatchStage,
getWorkbookFileName,
type DispoImportDbClient,
type DispoReferenceImportInput,
toJsonObject,
} from "./shared.js";
async function upsertRootClient(
db: DispoImportDbClient,
@@ -1,11 +1,10 @@
import { createHash } from "node:crypto";
import { AllocationType, OrderType } from "@capakraken/db";
import { AllocationType, OrderType } from "@nexus/db";
function extractBracketTokens(token: string): string[] {
return Array.from(
token.matchAll(/\[([^\]]+)\]/g),
(match) => match[1]?.trim() ?? "",
).filter(Boolean);
return Array.from(token.matchAll(/\[([^\]]+)\]/g), (match) => match[1]?.trim() ?? "").filter(
Boolean,
);
}
function extractClientCode(token: string): string | null {
@@ -39,7 +38,11 @@ function slugifyFragment(value: string): string {
.replace(/^-+|-+$/g, "");
}
function shortSegment(value: string | null | undefined, fallback: string, maxLength: number): string {
function shortSegment(
value: string | null | undefined,
fallback: string,
maxLength: number,
): string {
const normalized = slugifyFragment(value ?? "");
return (normalized.length > 0 ? normalized : fallback).slice(0, maxLength);
}
@@ -56,7 +59,9 @@ export interface DerivedDispoProjectClassification {
orderType: OrderType;
}
export function classifyDispoProject(utilizationCategoryCode: string | null): DerivedDispoProjectClassification {
export function classifyDispoProject(
utilizationCategoryCode: string | null,
): DerivedDispoProjectClassification {
if (utilizationCategoryCode === "Chg") {
return {
allocationType: AllocationType.EXT,
@@ -1,5 +1,5 @@
import type { CommitDbClient } from "./commit-dispo-batch-types.js";
import { StagedRecordStatus } from "@capakraken/db";
import { StagedRecordStatus } from "@nexus/db";
function asObject(value: unknown): Record<string, unknown> {
return value && typeof value === "object" && !Array.isArray(value)
@@ -14,10 +14,9 @@ function isAllowedUnresolvedRecord(
const hint = (record.resolutionHint ?? "").toLowerCase();
const rawToken = String(asObject(record.normalizedData).rawToken ?? "").toLowerCase();
return record.recordType === "PROJECT" && (
message.includes("[tbd]") ||
hint.includes("[tbd]") ||
rawToken.includes("[tbd]")
return (
record.recordType === "PROJECT" &&
(message.includes("[tbd]") || hint.includes("[tbd]") || rawToken.includes("[tbd]"))
);
}
@@ -46,7 +45,9 @@ export async function validateDispoBatch(
}
if (!["STAGED", "REVIEW_READY", "APPROVED"].includes(batch.status)) {
throw new Error(`Import batch "${batch.id}" is not ready to commit from status "${batch.status}"`);
throw new Error(
`Import batch "${batch.id}" is not ready to commit from status "${batch.status}"`,
);
}
const unresolved = await db.stagedUnresolvedRecord.findMany({
@@ -1,13 +1,21 @@
import { VacationType, VacationStatus } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@capakraken/db";
import { toIsoDate } from "@capakraken/shared";
import { VacationType, VacationStatus } from "@nexus/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import { toIsoDate } from "@nexus/shared";
import { TRPCError } from "@trpc/server";
import { type EntitlementSnapshot, type ResourceHolidayContext, type SyncEntitlementDeps, syncEntitlement } from "./sync-entitlement.js";
import {
type EntitlementSnapshot,
type ResourceHolidayContext,
type SyncEntitlementDeps,
syncEntitlement,
} from "./sync-entitlement.js";
/** Types that consume from annual leave balance */
const BALANCE_TYPES: VacationType[] = [VacationType.ANNUAL, VacationType.OTHER];
type DbClient = Pick<PrismaClient, "vacation" | "vacationEntitlement" | "systemSettings" | "resource">;
type DbClient = Pick<
PrismaClient,
"vacation" | "vacationEntitlement" | "systemSettings" | "resource"
>;
type EntitlementVacationStatus = "APPROVED" | "PENDING";
@@ -113,13 +121,15 @@ function hasPersistedHolidaySnapshot(vacation: {
holidayCalendarDates: Prisma.JsonValue | null;
holidayLegacyPublicHolidayDates: Prisma.JsonValue | null;
}): boolean {
return vacation.deductedDays != null
|| vacation.holidayCountryCode != null
|| vacation.holidayCountryName != null
|| vacation.holidayFederalState != null
|| vacation.holidayMetroCityName != null
|| vacation.holidayCalendarDates != null
|| vacation.holidayLegacyPublicHolidayDates != null;
return (
vacation.deductedDays != null ||
vacation.holidayCountryCode != null ||
vacation.holidayCountryName != null ||
vacation.holidayFederalState != null ||
vacation.holidayMetroCityName != null ||
vacation.holidayCalendarDates != null ||
vacation.holidayLegacyPublicHolidayDates != null
);
}
function mapEntitlementVacationStatus(status: VacationStatus): EntitlementVacationStatus {
@@ -133,49 +143,62 @@ function mapEntitlementVacationStatus(status: VacationStatus): EntitlementVacati
});
}
function buildEntitlementHolidayDateUnion(vacations: EntitlementVacationExplainability[]): string[] {
return [...new Set(vacations.flatMap((vacation) => vacation.holidayDetails.map((detail) => detail.date)))].sort();
function buildEntitlementHolidayDateUnion(
vacations: EntitlementVacationExplainability[],
): string[] {
return [
...new Set(
vacations.flatMap((vacation) => vacation.holidayDetails.map((detail) => detail.date)),
),
].sort();
}
function formatEntitlementHolidayBasis(vacation: Pick<
EntitlementVacationExplainability,
"holidayCountryName" | "holidayCountryCode" | "holidayFederalState" | "holidayMetroCityName"
>): string {
function formatEntitlementHolidayBasis(
vacation: Pick<
EntitlementVacationExplainability,
"holidayCountryName" | "holidayCountryCode" | "holidayFederalState" | "holidayMetroCityName"
>,
): string {
return [
vacation.holidayCountryName ?? vacation.holidayCountryCode ?? null,
vacation.holidayFederalState ?? null,
vacation.holidayMetroCityName ?? null,
].filter((value): value is string => Boolean(value)).join(" / ");
]
.filter((value): value is string => Boolean(value))
.join(" / ");
}
function mapBalanceDetail(resource: {
displayName: string;
eid: string;
}, balance: {
year: number;
entitledDays: number;
carryoverDays: number;
usedDays: number;
pendingDays: number;
remainingDays: number;
sickDays: number;
deductionSummary?: {
formula: string;
approvedVacationCount: number;
pendingVacationCount: number;
approvedRequestedDays: number;
pendingRequestedDays: number;
approvedDeductedDays: number;
pendingDeductedDays: number;
excludedHolidayDates: string[];
holidayBasisVariants: string[];
sources: {
hasCalendarHolidays: boolean;
hasLegacyPublicHolidayEntries: boolean;
function mapBalanceDetail(
resource: {
displayName: string;
eid: string;
},
balance: {
year: number;
entitledDays: number;
carryoverDays: number;
usedDays: number;
pendingDays: number;
remainingDays: number;
sickDays: number;
deductionSummary?: {
formula: string;
approvedVacationCount: number;
pendingVacationCount: number;
approvedRequestedDays: number;
pendingRequestedDays: number;
approvedDeductedDays: number;
pendingDeductedDays: number;
excludedHolidayDates: string[];
holidayBasisVariants: string[];
sources: {
hasCalendarHolidays: boolean;
hasLegacyPublicHolidayEntries: boolean;
};
};
};
vacations?: EntitlementVacationExplainability[];
}) {
vacations?: EntitlementVacationExplainability[];
},
) {
return {
resource: resource.displayName,
eid: resource.eid,
@@ -212,11 +235,13 @@ async function readBalanceSnapshot(
});
const sickVacations = Array.isArray(sickVacationsResult) ? sickVacationsResult : [];
const sickDays = sickVacations.reduce(
(sum, vacation) => sum + deps.countCalendarDaysInPeriod(
vacation,
new Date(`${input.year}-01-01T00:00:00.000Z`),
new Date(`${input.year}-12-31T00:00:00.000Z`),
),
(sum, vacation) =>
sum +
deps.countCalendarDaysInPeriod(
vacation,
new Date(`${input.year}-01-01T00:00:00.000Z`),
new Date(`${input.year}-12-31T00:00:00.000Z`),
),
0,
);
@@ -268,68 +293,83 @@ async function readEntitlementVacationExplainability(
orderBy: [{ startDate: "asc" }, { endDate: "asc" }],
});
return Promise.all(vacations.map(async (vacation) => {
const period = clampVacationPeriodToYear(vacation, yearStart, yearEnd);
let vacationHolidayContextPromise: Promise<ResourceHolidayContext> | null = null;
const getVacationHolidayContext = async () => {
if (!vacationHolidayContextPromise) {
vacationHolidayContextPromise = deps.loadResourceHolidayContext(
db,
input.resourceId,
period.startDate,
period.endDate,
);
}
return vacationHolidayContextPromise;
};
const fallbackHolidayContext = await getVacationHolidayContext();
const preview = deps.buildVacationPreview({
type: vacation.type,
startDate: period.startDate,
endDate: period.endDate,
isHalfDay: vacation.isHalfDay,
holidayContext: hasPersistedHolidaySnapshot(vacation)
? {
countryCode: vacation.holidayCountryCode ?? fallbackHolidayContext.countryCode ?? null,
countryName: vacation.holidayCountryName ?? fallbackHolidayContext.countryName ?? null,
federalState: vacation.holidayFederalState ?? fallbackHolidayContext.federalState ?? null,
metroCityName: vacation.holidayMetroCityName ?? fallbackHolidayContext.metroCityName ?? null,
calendarHolidayStrings: filterIsoDatesToRange(
deps.parseVacationSnapshotDateList(vacation.holidayCalendarDates),
period.startDate,
period.endDate,
),
publicHolidayStrings: filterIsoDatesToRange(
deps.parseVacationSnapshotDateList(vacation.holidayLegacyPublicHolidayDates),
period.startDate,
period.endDate,
),
}
: fallbackHolidayContext,
});
const persistedDeductedDays = deps.countVacationChargeableDaysFromSnapshot(vacation, yearStart, yearEnd);
return {
type: vacation.type,
status: mapEntitlementVacationStatus(vacation.status),
startDate: toIsoDate(vacation.startDate),
endDate: toIsoDate(vacation.endDate),
isHalfDay: vacation.isHalfDay,
requestedDays: preview.requestedDays,
deductedDays: persistedDeductedDays ?? preview.deductedDays,
holidayCountryCode: preview.holidayContext.countryCode,
holidayCountryName: preview.holidayContext.countryName,
holidayFederalState: preview.holidayContext.federalState,
holidayMetroCityName: preview.holidayContext.metroCityName,
holidayCalendarDates: preview.holidayDetails
.filter((detail) => detail.source === "CALENDAR" || detail.source === "CALENDAR_AND_LEGACY")
.map((detail) => detail.date),
holidayLegacyPublicHolidayDates: preview.holidayDetails
.filter((detail) => detail.source === "LEGACY_PUBLIC_HOLIDAY" || detail.source === "CALENDAR_AND_LEGACY")
.map((detail) => detail.date),
holidayDetails: preview.holidayDetails,
holidayContext: preview.holidayContext,
};
}));
return Promise.all(
vacations.map(async (vacation) => {
const period = clampVacationPeriodToYear(vacation, yearStart, yearEnd);
let vacationHolidayContextPromise: Promise<ResourceHolidayContext> | null = null;
const getVacationHolidayContext = async () => {
if (!vacationHolidayContextPromise) {
vacationHolidayContextPromise = deps.loadResourceHolidayContext(
db,
input.resourceId,
period.startDate,
period.endDate,
);
}
return vacationHolidayContextPromise;
};
const fallbackHolidayContext = await getVacationHolidayContext();
const preview = deps.buildVacationPreview({
type: vacation.type,
startDate: period.startDate,
endDate: period.endDate,
isHalfDay: vacation.isHalfDay,
holidayContext: hasPersistedHolidaySnapshot(vacation)
? {
countryCode:
vacation.holidayCountryCode ?? fallbackHolidayContext.countryCode ?? null,
countryName:
vacation.holidayCountryName ?? fallbackHolidayContext.countryName ?? null,
federalState:
vacation.holidayFederalState ?? fallbackHolidayContext.federalState ?? null,
metroCityName:
vacation.holidayMetroCityName ?? fallbackHolidayContext.metroCityName ?? null,
calendarHolidayStrings: filterIsoDatesToRange(
deps.parseVacationSnapshotDateList(vacation.holidayCalendarDates),
period.startDate,
period.endDate,
),
publicHolidayStrings: filterIsoDatesToRange(
deps.parseVacationSnapshotDateList(vacation.holidayLegacyPublicHolidayDates),
period.startDate,
period.endDate,
),
}
: fallbackHolidayContext,
});
const persistedDeductedDays = deps.countVacationChargeableDaysFromSnapshot(
vacation,
yearStart,
yearEnd,
);
return {
type: vacation.type,
status: mapEntitlementVacationStatus(vacation.status),
startDate: toIsoDate(vacation.startDate),
endDate: toIsoDate(vacation.endDate),
isHalfDay: vacation.isHalfDay,
requestedDays: preview.requestedDays,
deductedDays: persistedDeductedDays ?? preview.deductedDays,
holidayCountryCode: preview.holidayContext.countryCode,
holidayCountryName: preview.holidayContext.countryName,
holidayFederalState: preview.holidayContext.federalState,
holidayMetroCityName: preview.holidayContext.metroCityName,
holidayCalendarDates: preview.holidayDetails
.filter(
(detail) => detail.source === "CALENDAR" || detail.source === "CALENDAR_AND_LEGACY",
)
.map((detail) => detail.date),
holidayLegacyPublicHolidayDates: preview.holidayDetails
.filter(
(detail) =>
detail.source === "LEGACY_PUBLIC_HOLIDAY" || detail.source === "CALENDAR_AND_LEGACY",
)
.map((detail) => detail.date),
holidayDetails: preview.holidayDetails,
holidayContext: preview.holidayContext,
};
}),
);
}
async function readYearSummarySnapshot(
@@ -415,8 +455,12 @@ export async function getEntitlementBalanceDetail(
});
}
const approvedVacations = vacations.filter((vacation) => vacation.status === VacationStatus.APPROVED);
const pendingVacations = vacations.filter((vacation) => vacation.status === VacationStatus.PENDING);
const approvedVacations = vacations.filter(
(vacation) => vacation.status === VacationStatus.APPROVED,
);
const pendingVacations = vacations.filter(
(vacation) => vacation.status === VacationStatus.PENDING,
);
return mapBalanceDetail(resource, {
...balance,
@@ -424,15 +468,35 @@ export async function getEntitlementBalanceDetail(
formula: "remaining = entitlement - taken - pending",
approvedVacationCount: approvedVacations.length,
pendingVacationCount: pendingVacations.length,
approvedRequestedDays: approvedVacations.reduce((sum, vacation) => sum + vacation.requestedDays, 0),
pendingRequestedDays: pendingVacations.reduce((sum, vacation) => sum + vacation.requestedDays, 0),
approvedDeductedDays: approvedVacations.reduce((sum, vacation) => sum + vacation.deductedDays, 0),
pendingDeductedDays: pendingVacations.reduce((sum, vacation) => sum + vacation.deductedDays, 0),
approvedRequestedDays: approvedVacations.reduce(
(sum, vacation) => sum + vacation.requestedDays,
0,
),
pendingRequestedDays: pendingVacations.reduce(
(sum, vacation) => sum + vacation.requestedDays,
0,
),
approvedDeductedDays: approvedVacations.reduce(
(sum, vacation) => sum + vacation.deductedDays,
0,
),
pendingDeductedDays: pendingVacations.reduce(
(sum, vacation) => sum + vacation.deductedDays,
0,
),
excludedHolidayDates: buildEntitlementHolidayDateUnion(vacations),
holidayBasisVariants: [...new Set(vacations.map(formatEntitlementHolidayBasis).filter((value) => value.length > 0))],
holidayBasisVariants: [
...new Set(
vacations.map(formatEntitlementHolidayBasis).filter((value) => value.length > 0),
),
],
sources: {
hasCalendarHolidays: vacations.some((vacation) => vacation.holidayContext.sources.hasCalendarHolidays),
hasLegacyPublicHolidayEntries: vacations.some((vacation) => vacation.holidayContext.sources.hasLegacyPublicHolidayEntries),
hasCalendarHolidays: vacations.some(
(vacation) => vacation.holidayContext.sources.hasCalendarHolidays,
),
hasLegacyPublicHolidayEntries: vacations.some(
(vacation) => vacation.holidayContext.sources.hasLegacyPublicHolidayEntries,
),
},
},
vacations,
@@ -462,10 +526,14 @@ export async function getEntitlementYearSummaryDetail(
input: EntitlementYearSummaryDetailInput,
deps: ReadEntitlementBalanceDeps,
) {
const summaries = await readYearSummarySnapshot(db, {
year: input.year,
...(input.chapter ? { chapter: input.chapter } : {}),
}, deps);
const summaries = await readYearSummarySnapshot(
db,
{
year: input.year,
...(input.chapter ? { chapter: input.chapter } : {}),
},
deps,
);
const needle = input.resourceName?.toLowerCase();
@@ -474,8 +542,10 @@ export async function getEntitlementYearSummaryDetail(
if (!needle) {
return true;
}
return summary.displayName.toLowerCase().includes(needle)
|| summary.eid.toLowerCase().includes(needle);
return (
summary.displayName.toLowerCase().includes(needle) ||
summary.eid.toLowerCase().includes(needle)
);
})
.slice(0, 50)
.map((summary) => ({
@@ -1,6 +1,9 @@
import type { PrismaClient } from "@capakraken/db";
import type { PrismaClient } from "@nexus/db";
type DbClient = Pick<PrismaClient, "vacation" | "vacationEntitlement" | "systemSettings" | "resource">;
type DbClient = Pick<
PrismaClient,
"vacation" | "vacationEntitlement" | "systemSettings" | "resource"
>;
export type SetEntitlementInput = {
resourceId: string;
@@ -14,8 +17,12 @@ export type BulkSetEntitlementsInput = {
resourceIds?: string[] | undefined;
};
export type SetEntitlementResult = Awaited<ReturnType<PrismaClient["vacationEntitlement"]["update"]>>;
export type CreateEntitlementResult = Awaited<ReturnType<PrismaClient["vacationEntitlement"]["create"]>>;
export type SetEntitlementResult = Awaited<
ReturnType<PrismaClient["vacationEntitlement"]["update"]>
>;
export type CreateEntitlementResult = Awaited<
ReturnType<PrismaClient["vacationEntitlement"]["create"]>
>;
export type SetEntitlementReturn = {
result: SetEntitlementResult | CreateEntitlementResult;
@@ -1,11 +1,14 @@
import { VacationType, VacationStatus } from "@capakraken/db";
import type { Prisma, PrismaClient } from "@capakraken/db";
import { VacationType, VacationStatus } from "@nexus/db";
import type { Prisma, PrismaClient } from "@nexus/db";
import { TRPCError } from "@trpc/server";
/** Types that consume from annual leave balance */
const BALANCE_TYPES: VacationType[] = [VacationType.ANNUAL, VacationType.OTHER];
type DbClient = Pick<PrismaClient, "vacation" | "vacationEntitlement" | "systemSettings" | "resource">;
type DbClient = Pick<
PrismaClient,
"vacation" | "vacationEntitlement" | "systemSettings" | "resource"
>;
export type EntitlementSnapshot = {
id: string;
@@ -151,9 +154,11 @@ export async function syncEntitlement(
}
visitedYears.add(year);
let previousYearEntitlement: EntitlementSnapshot | null = await db.vacationEntitlement.findUnique({
where: { resourceId_year: { resourceId, year: year - 1 } },
});
let previousYearEntitlement: EntitlementSnapshot | null = await db.vacationEntitlement.findUnique(
{
where: { resourceId_year: { resourceId, year: year - 1 } },
},
);
if (previousYearEntitlement) {
previousYearEntitlement = await syncEntitlement(
@@ -171,18 +176,16 @@ export async function syncEntitlement(
? calculateCarryoverDays(previousYearEntitlement)
: 0;
const expectedEntitledDays = defaultDays + carryoverDays;
const entitlementWithCarryover = (
entitlement.carryoverDays !== carryoverDays
|| entitlement.entitledDays !== expectedEntitledDays
)
? await db.vacationEntitlement.update({
where: { id: entitlement.id },
data: {
carryoverDays,
entitledDays: expectedEntitledDays,
},
})
: entitlement;
const entitlementWithCarryover =
entitlement.carryoverDays !== carryoverDays || entitlement.entitledDays !== expectedEntitledDays
? await db.vacationEntitlement.update({
where: { id: entitlement.id },
data: {
carryoverDays,
entitledDays: expectedEntitledDays,
},
})
: entitlement;
const yearStart = new Date(`${year}-01-01T00:00:00.000Z`);
const yearEnd = new Date(`${year}-12-31T00:00:00.000Z`);
@@ -214,7 +217,12 @@ export async function syncEntitlement(
let legacyHolidayContextPromise: Promise<ResourceHolidayContext> | null = null;
const getLegacyHolidayContext = async () => {
if (!legacyHolidayContextPromise) {
legacyHolidayContextPromise = deps.loadResourceHolidayContext(db, resourceId, yearStart, yearEnd);
legacyHolidayContextPromise = deps.loadResourceHolidayContext(
db,
resourceId,
yearStart,
yearEnd,
);
}
return legacyHolidayContextPromise;
};
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { EstimateStatus, EstimateVersionStatus } from "@capakraken/shared";
import type { Prisma } from "@nexus/db";
import { EstimateStatus, EstimateVersionStatus } from "@nexus/shared";
import {
buildProjectSnapshot,
ESTIMATE_DETAIL_INCLUDE,
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { EstimateVersionStatus, type CreateEstimateInput } from "@capakraken/shared";
import type { Prisma } from "@nexus/db";
import { EstimateVersionStatus, type CreateEstimateInput } from "@nexus/shared";
import {
buildProjectSnapshot,
ESTIMATE_DETAIL_INCLUDE,
@@ -17,9 +17,7 @@ export async function createEstimate(
data: {
...(input.projectId !== undefined ? { projectId: input.projectId } : {}),
name: input.name,
...(input.opportunityId !== undefined
? { opportunityId: input.opportunityId }
: {}),
...(input.opportunityId !== undefined ? { opportunityId: input.opportunityId } : {}),
baseCurrency: input.baseCurrency,
status: input.status,
latestVersionNumber: 1,
@@ -28,9 +26,7 @@ export async function createEstimate(
versionNumber: 1,
...(input.versionLabel !== undefined ? { label: input.versionLabel } : {}),
status: EstimateVersionStatus.WORKING,
...(input.versionNotes !== undefined
? { notes: input.versionNotes }
: {}),
...(input.versionNotes !== undefined ? { notes: input.versionNotes } : {}),
projectSnapshot,
assumptions: {
create: input.assumptions.map((assumption) => ({
@@ -56,22 +52,14 @@ export async function createEstimate(
: {}),
...(scopeItem.scene !== undefined ? { scene: scopeItem.scene } : {}),
...(scopeItem.page !== undefined ? { page: scopeItem.page } : {}),
...(scopeItem.location !== undefined
? { location: scopeItem.location }
: {}),
...(scopeItem.location !== undefined ? { location: scopeItem.location } : {}),
...(scopeItem.assumptionCategory !== undefined
? { assumptionCategory: scopeItem.assumptionCategory }
: {}),
technicalSpec: scopeItem.technicalSpec as Prisma.InputJsonValue,
...(scopeItem.frameCount !== undefined
? { frameCount: scopeItem.frameCount }
: {}),
...(scopeItem.itemCount !== undefined
? { itemCount: scopeItem.itemCount }
: {}),
...(scopeItem.unitMode !== undefined
? { unitMode: scopeItem.unitMode }
: {}),
...(scopeItem.frameCount !== undefined ? { frameCount: scopeItem.frameCount } : {}),
...(scopeItem.itemCount !== undefined ? { itemCount: scopeItem.itemCount } : {}),
...(scopeItem.unitMode !== undefined ? { unitMode: scopeItem.unitMode } : {}),
...(scopeItem.internalComments !== undefined
? { internalComments: scopeItem.internalComments }
: {}),
@@ -86,18 +74,14 @@ export async function createEstimate(
create: input.demandLines.map((line) => ({
...(line.scopeItemId !== undefined ? { scopeItemId: line.scopeItemId } : {}),
...(line.roleId !== undefined ? { roleId: line.roleId } : {}),
...(line.resourceId !== undefined
? { resourceId: line.resourceId }
: {}),
...(line.resourceId !== undefined ? { resourceId: line.resourceId } : {}),
lineType: line.lineType,
name: line.name,
...(line.chapter !== undefined ? { chapter: line.chapter } : {}),
hours: line.hours,
...(line.days !== undefined ? { days: line.days } : {}),
...(line.fte !== undefined ? { fte: line.fte } : {}),
...(line.rateSource !== undefined
? { rateSource: line.rateSource }
: {}),
...(line.rateSource !== undefined ? { rateSource: line.rateSource } : {}),
costRateCents: line.costRateCents,
billRateCents: line.billRateCents,
currency: line.currency,
@@ -110,12 +94,8 @@ export async function createEstimate(
},
resourceSnapshots: {
create: input.resourceSnapshots.map((snapshot) => ({
...(snapshot.resourceId !== undefined
? { resourceId: snapshot.resourceId }
: {}),
...(snapshot.sourceEid !== undefined
? { sourceEid: snapshot.sourceEid }
: {}),
...(snapshot.resourceId !== undefined ? { resourceId: snapshot.resourceId } : {}),
...(snapshot.sourceEid !== undefined ? { sourceEid: snapshot.sourceEid } : {}),
displayName: snapshot.displayName,
...(snapshot.chapter !== undefined ? { chapter: snapshot.chapter } : {}),
...(snapshot.roleId !== undefined ? { roleId: snapshot.roleId } : {}),
@@ -123,14 +103,10 @@ export async function createEstimate(
lcrCents: snapshot.lcrCents,
ucrCents: snapshot.ucrCents,
...(snapshot.fte !== undefined ? { fte: snapshot.fte } : {}),
...(snapshot.location !== undefined
? { location: snapshot.location }
: {}),
...(snapshot.location !== undefined ? { location: snapshot.location } : {}),
...(snapshot.country !== undefined ? { country: snapshot.country } : {}),
...(snapshot.level !== undefined ? { level: snapshot.level } : {}),
...(snapshot.workType !== undefined
? { workType: snapshot.workType }
: {}),
...(snapshot.workType !== undefined ? { workType: snapshot.workType } : {}),
attributes: snapshot.attributes as Prisma.InputJsonValue,
})),
},
@@ -138,13 +114,9 @@ export async function createEstimate(
create: input.metrics.map((metric) => ({
key: metric.key,
label: metric.label,
...(metric.metricGroup !== undefined
? { metricGroup: metric.metricGroup }
: {}),
...(metric.metricGroup !== undefined ? { metricGroup: metric.metricGroup } : {}),
valueDecimal: metric.valueDecimal,
...(metric.valueCents !== undefined
? { valueCents: metric.valueCents }
: {}),
...(metric.valueCents !== undefined ? { valueCents: metric.valueCents } : {}),
...(metric.currency !== undefined ? { currency: metric.currency } : {}),
metadata: metric.metadata as Prisma.InputJsonValue,
})),
@@ -1,4 +1,4 @@
import { countWorkingDays } from "@capakraken/engine";
import { countWorkingDays } from "@nexus/engine";
import { countEstimateHandoffPlanningEntries } from "../allocation/count-estimate-handoff-planning-entries.js";
import { createAssignment } from "../allocation/create-assignment.js";
import { createDemandRequirement } from "../allocation/create-demand-requirement.js";
@@ -9,7 +9,7 @@ import {
type EstimatePlanningHandoffAllocationRef,
type EstimatePlanningHandoffResult,
type WeekdayAvailability,
} from "@capakraken/shared";
} from "@nexus/shared";
import {
ESTIMATE_DETAIL_INCLUDE,
PROJECT_SNAPSHOT_SELECT,
@@ -103,11 +103,10 @@ export async function createEstimatePlanningHandoff(
throw new Error("Linked project has an invalid date range");
}
const existingHandoffPlanningEntryCount =
await countEstimateHandoffPlanningEntries(db, {
projectId: estimate.projectId,
estimateVersionId: targetVersion.id,
});
const existingHandoffPlanningEntryCount = await countEstimateHandoffPlanningEntries(db, {
projectId: estimate.projectId,
estimateVersionId: targetVersion.id,
});
if (existingHandoffPlanningEntryCount > 0) {
throw new Error("Planning handoff already exists for this approved version");
@@ -1,10 +1,7 @@
import type { EstimateListFilters } from "@capakraken/shared";
import type { EstimateListFilters } from "@nexus/shared";
import type { EstimateDbClient } from "./shared.js";
export async function listEstimates(
db: EstimateDbClient,
filters: EstimateListFilters = {},
) {
export async function listEstimates(db: EstimateDbClient, filters: EstimateListFilters = {}) {
return db.estimate.findMany({
where: {
...(filters.projectId !== undefined ? { projectId: filters.projectId } : {}),
@@ -9,8 +9,8 @@ import type {
Project,
ResourceCostSnapshot,
ScopeItem,
} from "@capakraken/db";
import type { Prisma } from "@capakraken/db";
} from "@nexus/db";
import type { Prisma } from "@nexus/db";
export const PROJECT_SNAPSHOT_SELECT = {
id: true,
@@ -78,12 +78,7 @@ export interface EstimateWithDetails extends Estimate {
export interface EstimateListItem extends Estimate {
project?: Pick<Project, "id" | "shortCode" | "name" | "status"> | null;
versions: Array<
Pick<
EstimateVersion,
"id" | "versionNumber" | "label" | "status" | "updatedAt"
>
>;
versions: Array<Pick<EstimateVersion, "id" | "versionNumber" | "label" | "status" | "updatedAt">>;
}
export type EstimateDbClient = PrismaClient;
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { EstimateVersionStatus, type UpdateEstimateDraftInput } from "@capakraken/shared";
import type { Prisma } from "@nexus/db";
import { EstimateVersionStatus, type UpdateEstimateDraftInput } from "@nexus/shared";
import {
buildProjectSnapshot,
ESTIMATE_DETAIL_INCLUDE,
@@ -7,9 +7,7 @@ import {
type EstimateWithDetails,
} from "./shared.js";
function toAssumptionCreateInput(
assumption: UpdateEstimateDraftInput["assumptions"][number],
) {
function toAssumptionCreateInput(assumption: UpdateEstimateDraftInput["assumptions"][number]) {
return {
...(assumption.id !== undefined ? { id: assumption.id } : {}),
category: assumption.category,
@@ -22,20 +20,14 @@ function toAssumptionCreateInput(
};
}
function toScopeItemCreateInput(
scopeItem: UpdateEstimateDraftInput["scopeItems"][number],
) {
function toScopeItemCreateInput(scopeItem: UpdateEstimateDraftInput["scopeItems"][number]) {
return {
...(scopeItem.id !== undefined ? { id: scopeItem.id } : {}),
sequenceNo: scopeItem.sequenceNo,
scopeType: scopeItem.scopeType,
...(scopeItem.packageCode !== undefined
? { packageCode: scopeItem.packageCode }
: {}),
...(scopeItem.packageCode !== undefined ? { packageCode: scopeItem.packageCode } : {}),
name: scopeItem.name,
...(scopeItem.description !== undefined
? { description: scopeItem.description }
: {}),
...(scopeItem.description !== undefined ? { description: scopeItem.description } : {}),
...(scopeItem.scene !== undefined ? { scene: scopeItem.scene } : {}),
...(scopeItem.page !== undefined ? { page: scopeItem.page } : {}),
...(scopeItem.location !== undefined ? { location: scopeItem.location } : {}),
@@ -43,9 +35,7 @@ function toScopeItemCreateInput(
? { assumptionCategory: scopeItem.assumptionCategory }
: {}),
technicalSpec: scopeItem.technicalSpec as Prisma.InputJsonValue,
...(scopeItem.frameCount !== undefined
? { frameCount: scopeItem.frameCount }
: {}),
...(scopeItem.frameCount !== undefined ? { frameCount: scopeItem.frameCount } : {}),
...(scopeItem.itemCount !== undefined ? { itemCount: scopeItem.itemCount } : {}),
...(scopeItem.unitMode !== undefined ? { unitMode: scopeItem.unitMode } : {}),
...(scopeItem.internalComments !== undefined
@@ -59,9 +49,7 @@ function toScopeItemCreateInput(
};
}
function toDemandLineCreateInput(
line: UpdateEstimateDraftInput["demandLines"][number],
) {
function toDemandLineCreateInput(line: UpdateEstimateDraftInput["demandLines"][number]) {
return {
...(line.id !== undefined ? { id: line.id } : {}),
...(line.scopeItemId !== undefined ? { scopeItemId: line.scopeItemId } : {}),
@@ -150,12 +138,8 @@ export async function updateEstimateDraft(
data: {
...(input.projectId !== undefined ? { projectId: input.projectId } : {}),
...(input.name !== undefined ? { name: input.name } : {}),
...(input.opportunityId !== undefined
? { opportunityId: input.opportunityId }
: {}),
...(input.baseCurrency !== undefined
? { baseCurrency: input.baseCurrency }
: {}),
...(input.opportunityId !== undefined ? { opportunityId: input.opportunityId } : {}),
...(input.baseCurrency !== undefined ? { baseCurrency: input.baseCurrency } : {}),
...(input.status !== undefined ? { status: input.status } : {}),
},
});
@@ -1,5 +1,5 @@
import type { Prisma } from "@capakraken/db";
import { serializeEstimateExport } from "@capakraken/engine";
import type { Prisma } from "@nexus/db";
import { serializeEstimateExport } from "@nexus/engine";
import {
EstimateExportFormat,
EstimateStatus,
@@ -8,7 +8,7 @@ import {
type CreateEstimateExportInput,
type CreateEstimateRevisionInput,
type SubmitEstimateVersionInput,
} from "@capakraken/shared";
} from "@nexus/shared";
import {
ESTIMATE_DETAIL_INCLUDE,
type EstimateDbClient,
@@ -76,9 +76,7 @@ export async function submitEstimateVersion(
estimate,
input.versionId,
(version) => version.status === EstimateVersionStatus.WORKING,
input.versionId
? "Estimate version not found"
: "Estimate has no working version",
input.versionId ? "Estimate version not found" : "Estimate has no working version",
);
if (targetVersion.status !== EstimateVersionStatus.WORKING) {
@@ -88,8 +86,7 @@ export async function submitEstimateVersion(
const supersededIds = estimate.versions
.filter(
(version) =>
version.id !== targetVersion.id &&
version.status === EstimateVersionStatus.SUBMITTED,
version.id !== targetVersion.id && version.status === EstimateVersionStatus.SUBMITTED,
)
.map((version) => version.id);
@@ -127,9 +124,7 @@ export async function approveEstimateVersion(
estimate,
input.versionId,
(version) => version.status === EstimateVersionStatus.SUBMITTED,
input.versionId
? "Estimate version not found"
: "Estimate has no submitted version",
input.versionId ? "Estimate version not found" : "Estimate has no submitted version",
);
if (targetVersion.status !== EstimateVersionStatus.SUBMITTED) {
@@ -186,17 +181,13 @@ export async function createEstimateRevision(
const sourceVersion = resolveVersion(
estimate,
input.sourceVersionId,
(version) =>
version.status !== EstimateVersionStatus.WORKING || version.lockedAt != null,
(version) => version.status !== EstimateVersionStatus.WORKING || version.lockedAt != null,
input.sourceVersionId
? "Estimate version not found"
: "Estimate has no locked version to revise",
);
if (
sourceVersion.status === EstimateVersionStatus.WORKING &&
sourceVersion.lockedAt == null
) {
if (sourceVersion.status === EstimateVersionStatus.WORKING && sourceVersion.lockedAt == null) {
throw new Error("Source version must be locked before creating a revision");
}
@@ -209,8 +200,7 @@ export async function createEstimateRevision(
versionNumber: nextVersionNumber,
label: input.label ?? `Revision ${nextVersionNumber}`,
status: EstimateVersionStatus.WORKING,
notes:
input.notes ?? `Revision created from v${sourceVersion.versionNumber}`,
notes: input.notes ?? `Revision created from v${sourceVersion.versionNumber}`,
projectSnapshot: sourceVersion.projectSnapshot as Prisma.InputJsonValue,
},
});
@@ -238,13 +228,9 @@ export async function createEstimateRevision(
estimateVersionId: newVersion.id,
sequenceNo: scopeItem.sequenceNo,
scopeType: scopeItem.scopeType,
...(scopeItem.packageCode != null
? { packageCode: scopeItem.packageCode }
: {}),
...(scopeItem.packageCode != null ? { packageCode: scopeItem.packageCode } : {}),
name: scopeItem.name,
...(scopeItem.description != null
? { description: scopeItem.description }
: {}),
...(scopeItem.description != null ? { description: scopeItem.description } : {}),
...(scopeItem.scene != null ? { scene: scopeItem.scene } : {}),
...(scopeItem.page != null ? { page: scopeItem.page } : {}),
...(scopeItem.location != null ? { location: scopeItem.location } : {}),
@@ -252,9 +238,7 @@ export async function createEstimateRevision(
? { assumptionCategory: scopeItem.assumptionCategory }
: {}),
technicalSpec: scopeItem.technicalSpec as Prisma.InputJsonValue,
...(scopeItem.frameCount != null
? { frameCount: scopeItem.frameCount }
: {}),
...(scopeItem.frameCount != null ? { frameCount: scopeItem.frameCount } : {}),
...(scopeItem.itemCount != null ? { itemCount: scopeItem.itemCount } : {}),
...(scopeItem.unitMode != null ? { unitMode: scopeItem.unitMode } : {}),
...(scopeItem.internalComments != null
@@ -276,9 +260,7 @@ export async function createEstimateRevision(
data: sourceVersion.demandLines.map((line) => ({
estimateVersionId: newVersion.id,
scopeItemId:
line.scopeItemId != null
? (scopeItemIdMap.get(line.scopeItemId) ?? null)
: null,
line.scopeItemId != null ? (scopeItemIdMap.get(line.scopeItemId) ?? null) : null,
roleId: line.roleId ?? null,
resourceId: line.resourceId ?? null,
lineType: line.lineType,
@@ -328,9 +310,7 @@ export async function createEstimateRevision(
estimateVersionId: newVersion.id,
key: metric.key,
label: metric.label,
...(metric.metricGroup != null
? { metricGroup: metric.metricGroup }
: {}),
...(metric.metricGroup != null ? { metricGroup: metric.metricGroup } : {}),
valueDecimal: metric.valueDecimal,
...(metric.valueCents != null ? { valueCents: metric.valueCents } : {}),
...(metric.currency != null ? { currency: metric.currency } : {}),
@@ -360,9 +340,7 @@ export async function createEstimateExport(
estimate,
input.versionId,
() => true,
input.versionId
? "Estimate version not found"
: "Estimate has no version to export",
input.versionId ? "Estimate version not found" : "Estimate has no version to export",
);
const projectSnapshot =
typeof targetVersion.projectSnapshot === "object" &&
@@ -379,13 +357,8 @@ export async function createEstimateExport(
? {
...estimate.project,
startDate:
typeof projectSnapshot?.startDate === "string"
? projectSnapshot.startDate
: null,
endDate:
typeof projectSnapshot?.endDate === "string"
? projectSnapshot.endDate
: null,
typeof projectSnapshot?.startDate === "string" ? projectSnapshot.startDate : null,
endDate: typeof projectSnapshot?.endDate === "string" ? projectSnapshot.endDate : null,
}
: null,
},
@@ -396,11 +369,7 @@ export async function createEstimateExport(
data: {
estimateVersionId: targetVersion.id,
format: input.format,
fileName: buildExportFileName(
estimate.name,
targetVersion.versionNumber,
input.format,
),
fileName: buildExportFileName(estimate.name, targetVersion.versionNumber, input.format),
payload: payload as unknown as Prisma.InputJsonValue,
},
});
@@ -1,6 +1,6 @@
import type { PrismaClient } from "@capakraken/db";
import { computeValueScore } from "@capakraken/staffing";
import { VALUE_SCORE_WEIGHTS, type WeekdayAvailability } from "@capakraken/shared";
import type { PrismaClient } from "@nexus/db";
import { computeValueScore } from "@nexus/staffing";
import { VALUE_SCORE_WEIGHTS, type WeekdayAvailability } from "@nexus/shared";
import { listAssignmentBookings } from "../allocation/list-assignment-bookings.js";
import {
calculateEffectiveAllocationHours,
@@ -8,7 +8,9 @@ import {
loadDailyAvailabilityContexts,
} from "../dashboard/holiday-capacity.js";
type ResourceValueScoreDbClient = Partial<Pick<PrismaClient, "systemSettings" | "holidayCalendar" | "vacation">> &
type ResourceValueScoreDbClient = Partial<
Pick<PrismaClient, "systemSettings" | "holidayCalendar" | "vacation">
> &
Pick<PrismaClient, "assignment" | "resource" | "$transaction">;
export interface RecomputeResourceValueScoresInput {
@@ -19,10 +21,7 @@ export async function recomputeResourceValueScores(
db: ResourceValueScoreDbClient,
input: RecomputeResourceValueScoresInput = {},
) {
if (
typeof db.resource?.findMany !== "function" ||
typeof db.resource?.update !== "function"
) {
if (typeof db.resource?.findMany !== "function" || typeof db.resource?.update !== "function") {
return { updated: 0 };
}
@@ -104,7 +103,8 @@ export async function recomputeResourceValueScores(
});
const bookedHours = resourceBookings.reduce(
(sum, booking) =>
sum + calculateEffectiveAllocationHours({
sum +
calculateEffectiveAllocationHours({
availability,
startDate: booking.startDate,
endDate: booking.endDate,
@@ -121,7 +121,7 @@ export async function recomputeResourceValueScores(
const breakdown = computeValueScore(
{
skills: skills as unknown as import("@capakraken/shared").SkillEntry[],
skills: skills as unknown as import("@nexus/shared").SkillEntry[],
lcrCents: resource.lcrCents,
chargeabilityTarget: resource.chargeabilityTarget,
currentChargeability,
@@ -134,8 +134,7 @@ export async function recomputeResourceValueScores(
where: { id: resource.id },
data: {
valueScore: breakdown.total,
valueScoreBreakdown:
breakdown as unknown as import("@capakraken/db").Prisma.InputJsonValue,
valueScoreBreakdown: breakdown as unknown as import("@nexus/db").Prisma.InputJsonValue,
valueScoreUpdatedAt: now,
},
});
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient, VacationStatus, VacationType } from "@capakraken/db";
import type { Prisma, PrismaClient, VacationStatus, VacationType } from "@nexus/db";
import { TRPCError } from "@trpc/server";
type DbClient = PrismaClient;
@@ -1,4 +1,4 @@
import type { PrismaClient, VacationStatus } from "@capakraken/db";
import type { PrismaClient, VacationStatus } from "@nexus/db";
import { TRPCError } from "@trpc/server";
type DbClient = Pick<PrismaClient, "vacation" | "resource">;
@@ -40,8 +40,7 @@ export async function cancelVacation(
// Only fetch the linked resource when the actor is not a manager and didn't
// originally request the vacation — we need to check resource ownership.
const needsResourceCheck =
!deps.isVacationManagerRole(input.actorRole) &&
existing.requestedById !== input.actorId;
!deps.isVacationManagerRole(input.actorRole) && existing.requestedById !== input.actorId;
const resource = needsResourceCheck
? await db.resource.findUnique({
@@ -1,4 +1,4 @@
import type { Prisma, PrismaClient, VacationStatus } from "@capakraken/db";
import type { Prisma, PrismaClient, VacationStatus } from "@nexus/db";
import { TRPCError } from "@trpc/server";
type DbClient = Pick<PrismaClient, "vacation">;
@@ -62,11 +62,10 @@ export async function batchRejectVacations(
input: BatchRejectVacationInput,
deps: BatchRejectVacationDeps,
): Promise<BatchRejectVacationResult> {
const vacations: Array<{ id: string; resourceId: string }> =
await db.vacation.findMany({
where: { id: { in: input.ids }, status: "PENDING" },
select: { id: true, resourceId: true },
});
const vacations: Array<{ id: string; resourceId: string }> = await db.vacation.findMany({
where: { id: { in: input.ids }, status: "PENDING" },
select: { id: true, resourceId: true },
});
await db.vacation.updateMany({
where: { id: { in: vacations.map((v) => v.id) } },