fix(orders): delete NAS folder when order delete modal's checkbox is ticked
The order delete modal sends { delete_files }, but the route ignored the
body and deleteOrder never touched the NAS — so the project folder of an
order-spawned project always stayed on the share (the only way to delete
such a project is via its order, since deleteProject blocks order-linked
projects). Project delete (standalone projects) already worked.
- orders route: read delete_files from the body, pass to deleteOrder.
- orders.service deleteOrder(id, deleteFiles): select project_number and,
after the DB transaction commits, best-effort deleteProjectFolder for
each linked project when the flag is set. Non-fatal; idempotent.
- tests: NasFileManager.deleteProjectFolder coverage — removes by number
prefix, no-op when absent, false when not mounted (158 -> 161 tests).
Bump version to 2.0.4.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "app-ts",
|
||||
"version": "2.0.3",
|
||||
"version": "2.0.4",
|
||||
"description": "",
|
||||
"main": "dist/server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -68,3 +68,39 @@ describe("NasFileManager.createProjectFolder", () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Folder deletion primitive used by the "delete folder" checkbox on both the
|
||||
* order delete (orders.service deleteOrder) and project delete (projects.service
|
||||
* deleteProject) paths. Matches the project by number prefix.
|
||||
*/
|
||||
describe("NasFileManager.deleteProjectFolder", () => {
|
||||
let tmpBase: string;
|
||||
let nas: NasFileManager;
|
||||
|
||||
beforeEach(() => {
|
||||
tmpBase = fs.mkdtempSync(path.join(os.tmpdir(), "nas-del-"));
|
||||
nas = new NasFileManager(tmpBase);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
fs.rmSync(tmpBase, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it("removes an existing project folder (matched by number prefix)", async () => {
|
||||
nas.createProjectFolder("26710010", "Hala");
|
||||
expect(fs.existsSync(path.join(tmpBase, "26710010_Hala"))).toBe(true);
|
||||
const ok = await nas.deleteProjectFolder("26710010");
|
||||
expect(ok).toBe(true);
|
||||
expect(fs.existsSync(path.join(tmpBase, "26710010_Hala"))).toBe(false);
|
||||
});
|
||||
|
||||
it("is a no-op (returns true) when no folder exists for the number", async () => {
|
||||
expect(await nas.deleteProjectFolder("26710011")).toBe(true);
|
||||
});
|
||||
|
||||
it("returns false when the NAS base is not mounted", async () => {
|
||||
const missing = new NasFileManager(path.join(tmpBase, "nope"));
|
||||
expect(await missing.deleteProjectFolder("26710012")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -310,7 +310,9 @@ export default async function ordersRoutes(
|
||||
const id = parseId(request.params.id, reply);
|
||||
if (id === null) return;
|
||||
|
||||
const result = await deleteOrder(id);
|
||||
const body = request.body as Record<string, unknown> | undefined;
|
||||
const deleteFiles = !!body?.delete_files;
|
||||
const result = await deleteOrder(id, deleteFiles);
|
||||
if ("error" in result) return error(reply, result.error!, result.status!);
|
||||
|
||||
await logAudit({
|
||||
|
||||
@@ -588,15 +588,17 @@ export async function updateOrder(id: number, body: UpdateOrderData) {
|
||||
return { data: { id, order_number: existing.order_number } };
|
||||
}
|
||||
|
||||
export async function deleteOrder(id: number) {
|
||||
export async function deleteOrder(id: number, deleteFiles = false) {
|
||||
const existing = await prisma.orders.findUnique({ where: { id } });
|
||||
if (!existing)
|
||||
return { error: "Objednávka nenalezena", status: 404 } as const;
|
||||
|
||||
// Fetch linked projects before the transaction for number release later
|
||||
// Fetch linked projects before the transaction for number release and
|
||||
// (optional) NAS folder cleanup later. project_number is needed to locate
|
||||
// the folder on the share.
|
||||
const linkedProjects = await prisma.projects.findMany({
|
||||
where: { order_id: id },
|
||||
select: { id: true, created_at: true },
|
||||
select: { id: true, created_at: true, project_number: true },
|
||||
});
|
||||
|
||||
// Guard: projects may have non-cascaded warehouse refs (sklad_issues,
|
||||
@@ -662,6 +664,24 @@ export async function deleteOrder(id: number) {
|
||||
await tx.orders.delete({ where: { id } });
|
||||
});
|
||||
|
||||
// Best-effort NAS folder cleanup for the order's project(s), outside the
|
||||
// transaction and only when the user ticked the "delete folder" checkbox in
|
||||
// the order delete modal. Non-fatal: a NAS error must not undo the
|
||||
// already-committed DB delete. deleteProjectFolder is idempotent — it returns
|
||||
// true (no-op) when the folder is already absent.
|
||||
if (deleteFiles && nasFileManager.isConfigured()) {
|
||||
for (const p of linkedProjects) {
|
||||
if (!p.project_number) continue;
|
||||
const ok = await nasFileManager.deleteProjectFolder(p.project_number);
|
||||
if (!ok) {
|
||||
console.error(
|
||||
"[orders.service] NAS folder not deleted for project",
|
||||
p.project_number,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const year = existing.created_at
|
||||
? new Date(existing.created_at).getFullYear()
|
||||
: new Date().getFullYear();
|
||||
|
||||
Reference in New Issue
Block a user