Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ae69e09a3 | ||
|
|
df83eb2091 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "2.0.2",
|
"version": "2.0.4",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
106
src/__tests__/nas-project-folder.test.ts
Normal file
106
src/__tests__/nas-project-folder.test.ts
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
import { describe, it, expect, beforeEach, afterEach } from "vitest";
|
||||||
|
import fs from "fs";
|
||||||
|
import os from "os";
|
||||||
|
import path from "path";
|
||||||
|
import { NasFileManager } from "../services/nas-file-manager";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Folder auto-creation primitive used by both the manual project-create path
|
||||||
|
* (projects.service createProject) and the order→project paths (orders.service
|
||||||
|
* createOrder / createOrderFromQuotation). Uses an isolated temp dir via the
|
||||||
|
* constructor seam so it is deterministic and passes even where the real NAS
|
||||||
|
* (Z:) is not mounted.
|
||||||
|
*/
|
||||||
|
describe("NasFileManager.createProjectFolder", () => {
|
||||||
|
let tmpBase: string;
|
||||||
|
let nas: NasFileManager;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
tmpBase = fs.mkdtempSync(path.join(os.tmpdir(), "nas-proj-"));
|
||||||
|
nas = new NasFileManager(tmpBase);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
fs.rmSync(tmpBase, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("creates a <number>_<name> folder for a new project", () => {
|
||||||
|
const ok = nas.createProjectFolder("26710001", "Rekonstrukce haly");
|
||||||
|
expect(ok).toBe(true);
|
||||||
|
expect(
|
||||||
|
fs.existsSync(path.join(tmpBase, "26710001_Rekonstrukce_haly")),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is idempotent — a second call does not create a duplicate", () => {
|
||||||
|
expect(nas.createProjectFolder("26710002", "Hala")).toBe(true);
|
||||||
|
expect(nas.createProjectFolder("26710002", "Hala")).toBe(true);
|
||||||
|
const matches = fs
|
||||||
|
.readdirSync(tmpBase)
|
||||||
|
.filter((e) => e.startsWith("26710002_"));
|
||||||
|
expect(matches).toEqual(["26710002_Hala"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves Czech diacritics (no transliteration)", () => {
|
||||||
|
expect(nas.createProjectFolder("26710003", "Měření haly")).toBe(true);
|
||||||
|
expect(fs.existsSync(path.join(tmpBase, "26710003_Měření_haly"))).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("strips illegal characters and collapses spaces", () => {
|
||||||
|
expect(nas.createProjectFolder("26710004", "A / B: C")).toBe(true);
|
||||||
|
expect(fs.existsSync(path.join(tmpBase, "26710004_A_B_C"))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("handles an empty name without crashing (trailing underscore)", () => {
|
||||||
|
expect(nas.createProjectFolder("26710005", "")).toBe(true);
|
||||||
|
expect(fs.existsSync(path.join(tmpBase, "26710005_"))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns false and creates nothing when the NAS base is not mounted", () => {
|
||||||
|
const missing = new NasFileManager(
|
||||||
|
path.join(tmpBase, "does-not-exist-subdir"),
|
||||||
|
);
|
||||||
|
expect(missing.createProjectFolder("26710006", "X")).toBe(false);
|
||||||
|
expect(fs.existsSync(path.join(tmpBase, "does-not-exist-subdir"))).toBe(
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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);
|
const id = parseId(request.params.id, reply);
|
||||||
if (id === null) return;
|
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!);
|
if ("error" in result) return error(reply, result.error!, result.status!);
|
||||||
|
|
||||||
await logAudit({
|
await logAudit({
|
||||||
|
|||||||
@@ -105,8 +105,12 @@ interface DownloadResult {
|
|||||||
export class NasFileManager {
|
export class NasFileManager {
|
||||||
private readonly basePath: string;
|
private readonly basePath: string;
|
||||||
|
|
||||||
constructor() {
|
constructor(basePath?: string) {
|
||||||
this.basePath = path.resolve(config.nas.path).replace(/\\/g, "/");
|
// basePath is an injection seam for tests; production callers pass nothing
|
||||||
|
// and get the configured NAS_PATH.
|
||||||
|
this.basePath = path
|
||||||
|
.resolve(basePath ?? config.nas.path)
|
||||||
|
.replace(/\\/g, "/");
|
||||||
}
|
}
|
||||||
|
|
||||||
public isConfigured(): boolean {
|
public isConfigured(): boolean {
|
||||||
|
|||||||
@@ -5,6 +5,11 @@ import {
|
|||||||
releaseSharedNumber,
|
releaseSharedNumber,
|
||||||
isOrderNumberTaken,
|
isOrderNumberTaken,
|
||||||
} from "./numbering.service";
|
} from "./numbering.service";
|
||||||
|
import { NasFileManager } from "./nas-file-manager";
|
||||||
|
|
||||||
|
// Best-effort NAS folder creation for order-spawned projects, mirroring
|
||||||
|
// projects.service. Stateless singleton; reads NAS_PATH at construction.
|
||||||
|
const nasFileManager = new NasFileManager();
|
||||||
|
|
||||||
interface OrderItemInput {
|
interface OrderItemInput {
|
||||||
description?: string | null;
|
description?: string | null;
|
||||||
@@ -262,6 +267,23 @@ export async function createOrderFromQuotation(
|
|||||||
return { order, project, orderNumber };
|
return { order, project, orderNumber };
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Best-effort NAS project folder, outside the transaction (mirrors
|
||||||
|
// createProject). A project created from an accepted offer must get the same
|
||||||
|
// 02_PROJEKTY/<number>_<name> folder as a manually-created one. Non-fatal: a
|
||||||
|
// NAS outage must never roll back the order.
|
||||||
|
if (result.project.project_number && nasFileManager.isConfigured()) {
|
||||||
|
const created = nasFileManager.createProjectFolder(
|
||||||
|
result.project.project_number,
|
||||||
|
result.project.name || "",
|
||||||
|
);
|
||||||
|
if (!created) {
|
||||||
|
console.error(
|
||||||
|
"[orders.service] NAS folder not created for project",
|
||||||
|
result.project.project_number,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
data: {
|
data: {
|
||||||
order_id: result.order.id,
|
order_id: result.order.id,
|
||||||
@@ -297,7 +319,7 @@ export async function createOrder(
|
|||||||
attachmentName?: string | null,
|
attachmentName?: string | null,
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
return await prisma.$transaction(async (tx) => {
|
const result = await prisma.$transaction(async (tx) => {
|
||||||
const orderNumber =
|
const orderNumber =
|
||||||
body.order_number !== undefined && body.order_number !== null
|
body.order_number !== undefined && body.order_number !== null
|
||||||
? String(body.order_number)
|
? String(body.order_number)
|
||||||
@@ -362,6 +384,8 @@ export async function createOrder(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let projectId: number | undefined;
|
let projectId: number | undefined;
|
||||||
|
let createdProject: { project_number: string; name: string } | null =
|
||||||
|
null;
|
||||||
// Only auto-create a project for genuine offer-less orders; share the
|
// Only auto-create a project for genuine offer-less orders; share the
|
||||||
// order's number (same shared pool) exactly like the from-quotation flow.
|
// order's number (same shared pool) exactly like the from-quotation flow.
|
||||||
if (body.create_project !== false && body.quotation_id == null) {
|
if (body.create_project !== false && body.quotation_id == null) {
|
||||||
@@ -375,14 +399,42 @@ export async function createOrder(
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
projectId = project.id;
|
projectId = project.id;
|
||||||
|
if (project.project_number) {
|
||||||
|
createdProject = {
|
||||||
|
project_number: project.project_number,
|
||||||
|
name: project.name || "",
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: order.id,
|
id: order.id,
|
||||||
order_number: order.order_number,
|
order_number: order.order_number,
|
||||||
project_id: projectId,
|
project_id: projectId,
|
||||||
|
createdProject,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Best-effort NAS project folder, outside the transaction (mirrors
|
||||||
|
// createProject). Non-fatal so a NAS outage can't roll back the order.
|
||||||
|
if (result.createdProject && nasFileManager.isConfigured()) {
|
||||||
|
const created = nasFileManager.createProjectFolder(
|
||||||
|
result.createdProject.project_number,
|
||||||
|
result.createdProject.name,
|
||||||
|
);
|
||||||
|
if (!created) {
|
||||||
|
console.error(
|
||||||
|
"[orders.service] NAS folder not created for project",
|
||||||
|
result.createdProject.project_number,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: result.id,
|
||||||
|
order_number: result.order_number,
|
||||||
|
project_id: result.project_id,
|
||||||
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof Error && "status" in err) {
|
if (err instanceof Error && "status" in err) {
|
||||||
return {
|
return {
|
||||||
@@ -536,15 +588,17 @@ export async function updateOrder(id: number, body: UpdateOrderData) {
|
|||||||
return { data: { id, order_number: existing.order_number } };
|
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 } });
|
const existing = await prisma.orders.findUnique({ where: { id } });
|
||||||
if (!existing)
|
if (!existing)
|
||||||
return { error: "Objednávka nenalezena", status: 404 } as const;
|
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({
|
const linkedProjects = await prisma.projects.findMany({
|
||||||
where: { order_id: id },
|
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,
|
// Guard: projects may have non-cascaded warehouse refs (sklad_issues,
|
||||||
@@ -610,6 +664,24 @@ export async function deleteOrder(id: number) {
|
|||||||
await tx.orders.delete({ where: { id } });
|
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
|
const year = existing.created_at
|
||||||
? new Date(existing.created_at).getFullYear()
|
? new Date(existing.created_at).getFullYear()
|
||||||
: new Date().getFullYear();
|
: new Date().getFullYear();
|
||||||
|
|||||||
@@ -189,10 +189,16 @@ export async function createProject(data: CreateProjectInput) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (project.project_number && nasFileManager.isConfigured()) {
|
if (project.project_number && nasFileManager.isConfigured()) {
|
||||||
nasFileManager.createProjectFolder(
|
const created = nasFileManager.createProjectFolder(
|
||||||
project.project_number,
|
project.project_number,
|
||||||
project.name || "",
|
project.name || "",
|
||||||
);
|
);
|
||||||
|
if (!created) {
|
||||||
|
console.error(
|
||||||
|
"[projects.service] NAS folder not created for project",
|
||||||
|
project.project_number,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return project;
|
return project;
|
||||||
|
|||||||
Reference in New Issue
Block a user