Übernahme der V70-Sicherung und Liquidität aus Projekten nach V70-Regeln
- Import der JSON-Sicherung in ein leeres Programm (eine Transaktion), mit Hinweisliste - Freitag als Arbeitstag erkannt, alle Termine bleiben gleich - Liquidität aus Projekten, Vorgängen, Abschlägen und Einzelkosten; Angebote zählen nicht (P5) - Vergleich gegen einen Nachbau der V70-Rechnung: je Woche und Monat centgenau gleich Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AmyPfuNc4sCRfaF3oURXZz
This commit is contained in:
@@ -4,6 +4,11 @@ import type { FastifyInstance } from "fastify";
|
||||
import { erstellePool, type Pool } from "../src/server/db.js";
|
||||
import { migriere } from "../src/server/migrate.js";
|
||||
import { baueApp } from "../src/server/app.js";
|
||||
import { readFileSync } from "node:fs";
|
||||
import { uebernimmV70 } from "../src/domain/v70.js";
|
||||
import { liquiditaetsDaten } from "../src/domain/projektplan.js";
|
||||
import { liquiditaet } from "../src/domain/liquiditaet.js";
|
||||
import { bestandAus } from "./v70-referenz.js";
|
||||
|
||||
const url = process.env.TEST_DATABASE_URL;
|
||||
|
||||
@@ -97,3 +102,51 @@ describe.skipIf(!url)("API mit Datenbank", () => {
|
||||
expect(j.daten.kontakte.length).toBeGreaterThan(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe.skipIf(!url)("Übernahme aus V70 über die API", () => {
|
||||
let pool: Pool;
|
||||
let app: FastifyInstance;
|
||||
const sicherung = JSON.parse(readFileSync(new URL("./daten/v70-sicherung-2026-10-19.json", import.meta.url), "utf8"));
|
||||
|
||||
beforeAll(async () => {
|
||||
pool = erstellePool(url!);
|
||||
await pool.query("drop schema public cascade; create schema public;");
|
||||
await migriere(pool);
|
||||
app = await baueApp({ pool, webOrdner: "/gibt-es-nicht" });
|
||||
});
|
||||
afterAll(async () => {
|
||||
await app?.close();
|
||||
await pool?.end();
|
||||
});
|
||||
|
||||
const importiere = (payload: object) => app.inject({ method: "POST", url: "/api/import/v70", payload, headers: { "x-benutzer": "henning" } });
|
||||
|
||||
it("lehnt fremde Dateien ab", async () => {
|
||||
const r = await importiere({ format: "etwas anderes" });
|
||||
expect(r.statusCode).toBe(400);
|
||||
expect(r.json().fehler).toMatch(/keine Sicherung/);
|
||||
});
|
||||
|
||||
it("übernimmt die Sicherung einmal, danach nicht mehr", async () => {
|
||||
const r = await importiere(sicherung);
|
||||
expect(r.statusCode, r.body).toBe(201);
|
||||
expect(r.json().anzahl).toMatchObject({ projekte: 9, kontakte: 7, vorgaenge: 13, zahlungen: 5, kosten: 2, laufendeKosten: 10 });
|
||||
expect((await importiere(sicherung)).statusCode).toBe(409);
|
||||
const e = (await app.inject("/api/einstellungen")).json();
|
||||
expect(e).toMatchObject({ arbeitstage: [1, 2, 3, 4, 5], rundung: "halb", zahlungsziele: { kundenTage: 14, materialTage: 7 } });
|
||||
const protokoll = (await app.inject("/api/protokoll?limit=1")).json();
|
||||
expect(protokoll[0].benutzer).toBe("henning");
|
||||
});
|
||||
|
||||
it("Liquidität aus der Datenbank wie aus der Sicherung gerechnet", async () => {
|
||||
const u = uebernimmV70(sicherung);
|
||||
const erwartet = liquiditaet(liquiditaetsDaten(bestandAus(u), { tage: u.einstellungen.arbeitstage }), {
|
||||
ansicht: "monat", start: "2026-07-01", anzahl: 12, startsaldo: 0, ziele: u.einstellungen.zahlungsziele,
|
||||
});
|
||||
const l = (await app.inject("/api/liquiditaet?ansicht=monat&start=2026-07-01&anzahl=12")).json();
|
||||
const kurz = (p: { von: string; einnahmen: number; ausgaben: number; kontostand: number }[]) =>
|
||||
p.map(({ von, einnahmen, ausgaben, kontostand }) => ({ von, einnahmen, ausgaben, kontostand }));
|
||||
expect(kurz(l)).toEqual(kurz(erwartet));
|
||||
expect(erwartet.some((p) => p.einnahmen > 0)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
496
test/daten/v70-sicherung-2026-10-19.json
Normal file
496
test/daten/v70-sicherung-2026-10-19.json
Normal file
@@ -0,0 +1,496 @@
|
||||
{
|
||||
"format": "projektplaner",
|
||||
"version": 1,
|
||||
"gesichert": "2026-10-19",
|
||||
"gesichertAm": "2026-10-19T04:25:59.526Z",
|
||||
"stand": 1792005531875,
|
||||
"projekte": [
|
||||
{
|
||||
"name": "Bohlentausch",
|
||||
"nr": "26-014",
|
||||
"bauherr": "Stadt Ratzeburg",
|
||||
"umsatz": 3484,
|
||||
"material": 1431,
|
||||
"fremd": 0,
|
||||
"sonst": 0,
|
||||
"mann": 1,
|
||||
"tage": 2,
|
||||
"status": "Auftrag",
|
||||
"tasks": [
|
||||
{
|
||||
"id": "bhtm5z",
|
||||
"t": "a",
|
||||
"name": "Abbund",
|
||||
"no": 1001,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "aa8j9z",
|
||||
"t": "a",
|
||||
"name": "Materialbestellung",
|
||||
"start": "2026-10-22",
|
||||
"end": "2026-10-22",
|
||||
"dep": null,
|
||||
"abs": 0,
|
||||
"no": 1002,
|
||||
"col": false,
|
||||
"ms": true
|
||||
},
|
||||
{
|
||||
"id": "nnap85",
|
||||
"t": "v",
|
||||
"no": 1003,
|
||||
"par": "bhtm5z",
|
||||
"name": "Abbund",
|
||||
"start": "2026-10-23",
|
||||
"end": "2026-10-23",
|
||||
"dep": "aa8j9z",
|
||||
"abs": 1000,
|
||||
"dir": null,
|
||||
"col": false,
|
||||
"ms": false,
|
||||
"typ": "EA",
|
||||
"lag": 0
|
||||
},
|
||||
{
|
||||
"id": "pmv4xw",
|
||||
"t": "v",
|
||||
"no": 1007,
|
||||
"par": "bhtm5z",
|
||||
"name": "Montage",
|
||||
"start": "2026-10-26",
|
||||
"end": "2026-10-26",
|
||||
"dep": "nnap85",
|
||||
"abs": 0,
|
||||
"ms": false,
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"col": false,
|
||||
"farbe": "#2f6b5a"
|
||||
},
|
||||
{
|
||||
"name": "Anbau",
|
||||
"nr": "26-015",
|
||||
"bauherr": "Most",
|
||||
"umsatz": 24445.01,
|
||||
"material": 500,
|
||||
"fremd": 11663.64,
|
||||
"sonst": 4700,
|
||||
"mann": 1,
|
||||
"tage": 10,
|
||||
"status": "Auftrag",
|
||||
"tasks": [
|
||||
{
|
||||
"id": "p9qiuh",
|
||||
"t": "a",
|
||||
"no": 1006,
|
||||
"name": "Materialbestellung",
|
||||
"col": false,
|
||||
"dep": "yvnqja",
|
||||
"typ": "AE",
|
||||
"lag": -15
|
||||
},
|
||||
{
|
||||
"id": "yvnqja",
|
||||
"t": "a",
|
||||
"no": 1013,
|
||||
"name": "Montage",
|
||||
"start": "2026-10-12",
|
||||
"end": "2026-10-16",
|
||||
"abs": 0,
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"col": false,
|
||||
"farbe": "#2b6cb0"
|
||||
},
|
||||
{
|
||||
"name": "Unterstellplatz Wohnmobil",
|
||||
"nr": "27-001",
|
||||
"bauherr": "Ehep. Schlünsen",
|
||||
"umsatz": 15776,
|
||||
"material": 5735,
|
||||
"fremd": 0,
|
||||
"sonst": 55,
|
||||
"mann": 2,
|
||||
"tage": 7,
|
||||
"status": "Angebot",
|
||||
"zb": "std",
|
||||
"std": 110,
|
||||
"tasks": [
|
||||
{
|
||||
"id": "8i4g7v",
|
||||
"t": "a",
|
||||
"no": 1008,
|
||||
"name": "Bauantrag",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "5mfc6b",
|
||||
"t": "v",
|
||||
"no": 1009,
|
||||
"par": "8i4g7v",
|
||||
"name": "Entwurf",
|
||||
"start": "2026-12-07",
|
||||
"end": "2026-12-07",
|
||||
"dep": null,
|
||||
"abs": 0,
|
||||
"ms": false,
|
||||
"pers": 1,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "o0y9pf",
|
||||
"t": "v",
|
||||
"no": 1010,
|
||||
"par": "8i4g7v",
|
||||
"name": "Bauantrag",
|
||||
"start": "2026-12-22",
|
||||
"end": "2026-12-22",
|
||||
"dep": "5mfc6b",
|
||||
"abs": 1000,
|
||||
"ms": false,
|
||||
"lag": 10,
|
||||
"dir": null,
|
||||
"pers": 1,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "da7uyt",
|
||||
"t": "a",
|
||||
"no": 1012,
|
||||
"name": "Baugenehmigung",
|
||||
"start": "2027-02-02",
|
||||
"end": "2027-02-02",
|
||||
"dep": "o0y9pf",
|
||||
"abs": 0,
|
||||
"ms": true,
|
||||
"lag": 28,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "4btedb",
|
||||
"t": "a",
|
||||
"no": 1011,
|
||||
"name": "Ausführung",
|
||||
"start": "2027-02-03",
|
||||
"end": "2027-02-09",
|
||||
"abs": 14776,
|
||||
"dep": "da7uyt",
|
||||
"typ": "EA",
|
||||
"lag": 0,
|
||||
"dir": null,
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"col": false,
|
||||
"farbe": "#b7791f",
|
||||
"kcol": false
|
||||
},
|
||||
{
|
||||
"name": "Fassadensanierung",
|
||||
"nr": "0",
|
||||
"bauherr": "Ehep. Kodal",
|
||||
"umsatz": 55531,
|
||||
"material": 22998,
|
||||
"fremd": 0,
|
||||
"sonst": 55,
|
||||
"mann": 2,
|
||||
"tage": 20,
|
||||
"status": "Angebot",
|
||||
"tasks": [
|
||||
{
|
||||
"id": "kci1dc",
|
||||
"t": "a",
|
||||
"no": 1014,
|
||||
"name": "Planung",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "ixguxn",
|
||||
"t": "v",
|
||||
"no": 1015,
|
||||
"par": "kci1dc",
|
||||
"name": "Entwurfsplanung",
|
||||
"start": "2026-11-23",
|
||||
"end": "2026-11-23",
|
||||
"dep": null,
|
||||
"abs": 500,
|
||||
"ms": false,
|
||||
"pers": 1,
|
||||
"std": 4,
|
||||
"stdD": 1,
|
||||
"stdP": 1,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "6y8fbe",
|
||||
"t": "a",
|
||||
"no": 1017,
|
||||
"name": "Materialbestellung",
|
||||
"start": "2027-01-13",
|
||||
"end": "2027-01-13",
|
||||
"abs": 0,
|
||||
"ms": false,
|
||||
"pers": 1,
|
||||
"std": 2,
|
||||
"stdD": 1,
|
||||
"stdP": 1,
|
||||
"dep": "8uba50",
|
||||
"typ": "AE",
|
||||
"lag": -20,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "8uba50",
|
||||
"t": "a",
|
||||
"no": 1018,
|
||||
"name": "Ausführung",
|
||||
"start": "2027-02-10",
|
||||
"end": "2027-03-09",
|
||||
"abs": 0,
|
||||
"ms": false,
|
||||
"dep": "4btedb",
|
||||
"typ": "EA",
|
||||
"lag": 0,
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"col": false,
|
||||
"farbe": "#c05621",
|
||||
"kcol": false
|
||||
},
|
||||
{
|
||||
"name": "Sanierung Sitzstufenanlage",
|
||||
"nr": "0",
|
||||
"bauherr": "Stadt Ratzeburg",
|
||||
"umsatz": 1333,
|
||||
"material": 423,
|
||||
"fremd": 0,
|
||||
"sonst": 150,
|
||||
"mann": 1,
|
||||
"tage": 1,
|
||||
"status": "Angebot",
|
||||
"zb": "std",
|
||||
"std": 8,
|
||||
"tasks": [],
|
||||
"farbe": "#805ad5",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"name": "Staubschutzmaßnahme",
|
||||
"nr": "26-019",
|
||||
"bauherr": "Kirche St. Lorenz",
|
||||
"umsatz": 1890,
|
||||
"material": 200,
|
||||
"fremd": 0,
|
||||
"sonst": 150,
|
||||
"mann": 1,
|
||||
"tage": 2.5,
|
||||
"status": "Auftrag",
|
||||
"zb": "std",
|
||||
"std": 17,
|
||||
"tasks": [],
|
||||
"farbe": "#c53030",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"name": "Aufstockung",
|
||||
"nr": "26-018",
|
||||
"bauherr": "Fam. Kasza",
|
||||
"umsatz": 5000,
|
||||
"material": 0,
|
||||
"fremd": 0,
|
||||
"sonst": 0,
|
||||
"mann": 1,
|
||||
"tage": 7.5,
|
||||
"status": "Auftrag",
|
||||
"zb": "std",
|
||||
"std": 60,
|
||||
"tasks": [],
|
||||
"farbe": "#2c7a7b",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"name": "Fassade EFH",
|
||||
"nr": "26-007.2",
|
||||
"bauherr": "Ehep. Braun/Müller",
|
||||
"umsatz": 36867,
|
||||
"material": 14051,
|
||||
"fremd": 0,
|
||||
"sonst": 1334,
|
||||
"mann": 1,
|
||||
"tage": 28.5,
|
||||
"status": "Auftrag",
|
||||
"zb": "std",
|
||||
"std": 225,
|
||||
"tasks": [],
|
||||
"farbe": "#97266d",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"name": "Trockenbauarbeiten EFH",
|
||||
"nr": "26-007.1",
|
||||
"bauherr": "Ehep. Braun/Müller",
|
||||
"umsatz": 19877,
|
||||
"material": 5787,
|
||||
"fremd": 0,
|
||||
"sonst": 1336,
|
||||
"mann": 2,
|
||||
"tage": 9,
|
||||
"status": "Auftrag",
|
||||
"zb": "std",
|
||||
"std": 144,
|
||||
"tasks": [
|
||||
{
|
||||
"id": "tg5ses",
|
||||
"t": "a",
|
||||
"no": 1019,
|
||||
"name": "Wände einseitig stellen",
|
||||
"start": "2026-07-27",
|
||||
"end": "2026-08-06",
|
||||
"abs": 7953.79,
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "x4qevp",
|
||||
"t": "a",
|
||||
"no": 1020,
|
||||
"name": "Wände dämmen und schließen",
|
||||
"col": false
|
||||
},
|
||||
{
|
||||
"id": "dfol9z",
|
||||
"t": "v",
|
||||
"no": 1021,
|
||||
"par": "x4qevp",
|
||||
"name": "Trockenbauwände ohne WC und Bäder",
|
||||
"start": "2026-10-12",
|
||||
"end": "2026-10-16",
|
||||
"dep": null,
|
||||
"abs": 0,
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"farbe": "#4a5568",
|
||||
"col": false
|
||||
}
|
||||
],
|
||||
"kontakte": [],
|
||||
"kosten": [
|
||||
{
|
||||
"id": "hbz2l9",
|
||||
"p": 2,
|
||||
"t": "Materialkosten",
|
||||
"b": 5790,
|
||||
"d": "2027-02-02"
|
||||
},
|
||||
{
|
||||
"id": "gnq4yw",
|
||||
"p": 3,
|
||||
"t": "Materialkosten",
|
||||
"b": 23053,
|
||||
"d": "2027-02-09"
|
||||
}
|
||||
],
|
||||
"einnahmen": [],
|
||||
"zahlungsziel": 14,
|
||||
"materialziel": 7,
|
||||
"firmenkosten_monatlich": [
|
||||
{
|
||||
"t": "Architektenkammer",
|
||||
"g": "Versicherungen/Beiträge",
|
||||
"c": "Verbände / Vereine",
|
||||
"b": 220,
|
||||
"d": "2027-01-02",
|
||||
"r": 12
|
||||
},
|
||||
{
|
||||
"t": "Handwerkskammer Lübeck",
|
||||
"g": "Versicherungen/Beiträge",
|
||||
"c": "Verbände / Vereine",
|
||||
"b": 260,
|
||||
"d": "2027-01-02",
|
||||
"r": 12
|
||||
},
|
||||
{
|
||||
"t": "Innung",
|
||||
"g": "Versicherungen/Beiträge",
|
||||
"c": "Verbände / Vereine",
|
||||
"b": 700,
|
||||
"d": "2027-03-01",
|
||||
"r": 12
|
||||
},
|
||||
{
|
||||
"t": "Steuerberatungskosten - Haselon",
|
||||
"g": "Sonstige Kosten",
|
||||
"c": "Beratung",
|
||||
"b": 120,
|
||||
"d": "2026-11-15",
|
||||
"r": 1
|
||||
},
|
||||
{
|
||||
"t": "Plancraft",
|
||||
"g": "Sonstige Kosten",
|
||||
"c": "Unternehmenssoftware",
|
||||
"b": 131,
|
||||
"d": "2026-11-01",
|
||||
"r": 1
|
||||
},
|
||||
{
|
||||
"t": "Gehalt Eigner",
|
||||
"g": "Personalkosten",
|
||||
"c": "Personalkosten Henning",
|
||||
"b": 4000,
|
||||
"d": "2026-11-01",
|
||||
"r": 1
|
||||
},
|
||||
{
|
||||
"t": "Krankenversicherungskosten",
|
||||
"g": "Personalkosten",
|
||||
"c": "Personalkosten Henning",
|
||||
"b": 300,
|
||||
"d": "2026-11-01",
|
||||
"r": 1
|
||||
},
|
||||
{
|
||||
"t": "Datev UnternehmenOnline",
|
||||
"g": "Sonstige Kosten",
|
||||
"c": "Unternehmenssoftware",
|
||||
"b": 16.5,
|
||||
"d": "2026-11-01",
|
||||
"r": 1
|
||||
},
|
||||
{
|
||||
"t": "Betriebshaftpflicht VHV",
|
||||
"g": "Versicherungen/Beiträge",
|
||||
"c": "Versicherung",
|
||||
"b": 1000,
|
||||
"d": "2027-01-02",
|
||||
"r": 12
|
||||
},
|
||||
{
|
||||
"t": "BG Bau",
|
||||
"g": "Versicherungen/Beiträge",
|
||||
"c": "Versicherung",
|
||||
"b": 30,
|
||||
"d": "2026-11-01",
|
||||
"r": 1
|
||||
}
|
||||
],
|
||||
"firmenkosten_einmalig": [],
|
||||
"kategorien": [
|
||||
"Personalkosten Henning",
|
||||
"Verbände / Vereine",
|
||||
"Unternehmenssoftware",
|
||||
"Beratung",
|
||||
"Versicherung"
|
||||
],
|
||||
"arbeitszeit": {
|
||||
"h": 8,
|
||||
"eff": 100,
|
||||
"rund": "halb"
|
||||
},
|
||||
"aufgaben": []
|
||||
}
|
||||
@@ -110,7 +110,7 @@ describe("Projekt nach V70-Regeln", () => {
|
||||
};
|
||||
|
||||
it("Rest als Schlussrechnung am Projektende, Pauschale anteilig gemindert am Projektstart", () => {
|
||||
const b = projektBewegungen(plan)!;
|
||||
const b = projektBewegungen(plan);
|
||||
expect(b.einnahmen.map((e) => [e.bezeichnung, e.netto, e.termin])).toEqual([
|
||||
["Abschlag Abbund", 4_000_000, "2026-11-10"],
|
||||
["Schlussrechnung (Rest)", 6_000_000, "2026-11-20"],
|
||||
@@ -124,17 +124,17 @@ describe("Projekt nach V70-Regeln", () => {
|
||||
});
|
||||
|
||||
it("Anteile kaufmännisch gerundet, Summe bleibt exakt", () => {
|
||||
const b = projektBewegungen({ ...plan, material: 33_333, fremd: 66_667, kosten: [{ ...plan.kosten[0]!, netto: 100 }] })!;
|
||||
const b = projektBewegungen({ ...plan, material: 33_333, fremd: 66_667, kosten: [{ ...plan.kosten[0]!, netto: 100 }] });
|
||||
expect(b.ausgaben.slice(1).map((a) => a.netto)).toEqual([33_300, 66_600]);
|
||||
});
|
||||
|
||||
it("Einzelkosten über der Pauschale: keine Pauschale mehr; voll abgerechnet: kein Rest", () => {
|
||||
const b = projektBewegungen({ ...plan, zahlungen: [{ ...plan.zahlungen[0]!, netto: 10_000_000 }], kosten: [{ ...plan.kosten[0]!, netto: 4_000_000 }] })!;
|
||||
const b = projektBewegungen({ ...plan, zahlungen: [{ ...plan.zahlungen[0]!, netto: 10_000_000 }], kosten: [{ ...plan.kosten[0]!, netto: 4_000_000 }] });
|
||||
expect(b.einnahmen).toHaveLength(1);
|
||||
expect(b.ausgaben).toHaveLength(1);
|
||||
});
|
||||
|
||||
it("ohne Termine fließt das Projekt nicht ein", () => {
|
||||
expect(projektBewegungen({ ...plan, zeitraum: undefined })).toBeUndefined();
|
||||
it("ohne Termine zählen nur die Einzelposten", () => {
|
||||
expect(projektBewegungen({ ...plan, zeitraum: undefined })).toEqual({ einnahmen: plan.zahlungen, ausgaben: plan.kosten });
|
||||
});
|
||||
});
|
||||
|
||||
76
test/v70-referenz.ts
Normal file
76
test/v70-referenz.ts
Normal file
@@ -0,0 +1,76 @@
|
||||
// Nachbau der V70-Liquidität (lqEvents) mit Gleitkommazahlen wie im Original,
|
||||
// nur für den Vergleich in den Tests. Brutto-Ansicht, Dauerfristverlängerung (uv = 2).
|
||||
import type { V70Sicherung, V70Projekt, V70Task, Uebernahme } from "../src/domain/v70.js";
|
||||
import type { Bestand } from "../src/domain/projektplan.js";
|
||||
|
||||
const DAY = 864e5;
|
||||
const S2D = (s: string) => Date.UTC(+s.slice(0, 4), +s.slice(5, 7) - 1, +s.slice(8, 10));
|
||||
const D2S = (t: number) => new Date(t).toISOString().slice(0, 10);
|
||||
const addD = (s: string, n: number) => D2S(S2D(s) + n * DAY);
|
||||
const dow = (s: string) => new Date(S2D(s)).getUTCDay();
|
||||
const pad2 = (n: number) => ("0" + n).slice(-2);
|
||||
const HC: Record<number, Record<string, 1>> = {};
|
||||
function hol(y: number) {
|
||||
if (HC[y]) return HC[y];
|
||||
const a = y % 19, b = Math.floor(y / 100), c = y % 100, d = Math.floor(b / 4), e = b % 4, f = Math.floor((b + 8) / 25),
|
||||
g = Math.floor((b - f + 1) / 3), h = (19 * a + b - d - g + 15) % 30, i = Math.floor(c / 4), k = c % 4,
|
||||
l = (32 + 2 * e + 2 * i - h - k) % 7, m = Math.floor((a + 11 * h + 22 * l) / 451),
|
||||
mo = Math.floor((h + l - 7 * m + 114) / 31), da = ((h + l - 7 * m + 114) % 31) + 1;
|
||||
const es = y + "-" + pad2(mo) + "-" + pad2(da), o: Record<string, 1> = {};
|
||||
[y + "-01-01", y + "-05-01", y + "-10-03", y + "-10-31", y + "-12-25", y + "-12-26", addD(es, -2), addD(es, 1), addD(es, 39), addD(es, 50)].forEach((x) => (o[x] = 1));
|
||||
return (HC[y] = o);
|
||||
}
|
||||
const isHol = (s: string) => !!hol(+s.slice(0, 4))[s];
|
||||
const isBiz = (s: string) => { const w = dow(s); return w !== 0 && w !== 6 && !isHol(s); };
|
||||
const nextBiz = (s: string) => { while (!isBiz(s)) s = addD(s, 1); return s; };
|
||||
|
||||
export interface V70Ereignis { d: string; a: number; g: "e" | "k" | "u" }
|
||||
|
||||
export function v70Ereignisse(s: V70Sicherung, uv = 2): V70Ereignis[] {
|
||||
const TAX = 0.19, f = 1 + TAX, ZZ = s.zahlungsziel ?? 14, MZ = s.materialziel ?? 7;
|
||||
const ev: V70Ereignis[] = [], vi: Record<string, number> = {}, vm: Record<string, number> = {};
|
||||
const costs = s.kosten, incomes = s.einnahmen ?? [];
|
||||
const tk = (p: V70Projekt) => p.tasks ?? [];
|
||||
const kids = (p: V70Projekt, a: V70Task) => tk(p).filter((t) => t.t === "v" && t.par === a.id);
|
||||
const leaf = (p: V70Projekt, t: V70Task) => t.t === "v" || (t.t === "a" && !kids(p, t).length);
|
||||
const span = (arr: V70Task[]) => { let a: string | null = null, b: string | null = null; arr.forEach((t) => { if (!t.start) return; if (!a || t.start < a) a = t.start; if (!b || t.end! > b) b = t.end!; }); return a ? [a, b!] : null; };
|
||||
const sumAbs = (p: V70Projekt) => { let x = 0; tk(p).forEach((t) => { if (leaf(p, t)) x += t.abs || 0; }); return x; };
|
||||
const sumInc = (pi: number) => { let x = 0; incomes.forEach((c) => { if (+c.p === pi && c.d) x += c.b; }); return x; };
|
||||
const inc = (d: string, net: number) => { ev.push({ d, a: net * f, g: "e" }); const mk = d.slice(0, 7); vi[mk] = (vi[mk] || 0) + net; };
|
||||
s.projekte.forEach((p, pi) => {
|
||||
if (p.arch) return;
|
||||
const lv = tk(p).filter((t) => leaf(p, t) && t.start && t.end), sp = span(lv);
|
||||
if (!sp) return;
|
||||
const mat0 = p.material || 0, tot0 = mat0 + (p.fremd || 0) + (p.sonst || 0);
|
||||
let sc = 0; costs.forEach((c) => { if (+c.p === pi && c.d) sc += c.b; });
|
||||
const rf = tot0 > 0 ? Math.max(0, tot0 - sc) / tot0 : 0, mat = mat0 * rf, kost = (mat0 * f + (p.fremd || 0) + (p.sonst || 0)) * rf, dm = addD(sp[0]!, MZ);
|
||||
if (kost > 0) ev.push({ d: dm, a: -kost, g: "k" });
|
||||
if (mat > 0) { const mk = dm.slice(0, 7); vm[mk] = (vm[mk] || 0) + mat; }
|
||||
lv.forEach((t) => { if ((t.abs ?? 0) > 0) inc(addD(t.end!, ZZ), t.abs!); });
|
||||
const rest = (p.umsatz ?? 0) - sumAbs(p) - sumInc(pi);
|
||||
if (rest > 0.005) inc(addD(sp[1]!, ZZ), rest);
|
||||
});
|
||||
incomes.forEach((c) => { if (c.d && s.projekte[+c.p]) inc(c.d, c.b); });
|
||||
costs.forEach((c) => { if (c.d) ev.push({ d: c.d, a: -c.b, g: "k" }); });
|
||||
const ms: Record<string, 1> = {};
|
||||
Object.keys(vi).concat(Object.keys(vm)).forEach((k) => (ms[k] = 1));
|
||||
Object.keys(ms).forEach((mk) => {
|
||||
const z = Math.round(TAX * ((vi[mk] || 0) - (vm[mk] || 0)) * 100) / 100;
|
||||
const ab = +mk.slice(0, 4) * 12 + (+mk.slice(5, 7) - 1) + uv;
|
||||
if (z) ev.push({ d: nextBiz(Math.floor(ab / 12) + "-" + pad2((ab % 12) + 1) + "-10"), a: -z, g: "u" });
|
||||
});
|
||||
return ev;
|
||||
}
|
||||
|
||||
/** Bestand so, wie er nach dem Import in der Datenbank steht. */
|
||||
export function bestandAus(x: Uebernahme): Bestand {
|
||||
const projektVonAbschnitt = new Map(x.abschnitte.map((a) => [a.schluessel, a.projekt]));
|
||||
return {
|
||||
projekte: x.projekte.map((p) => ({ id: p.schluessel, ...p })),
|
||||
vorgaenge: x.vorgaenge.map((v) => ({ id: v.schluessel, projekt_id: projektVonAbschnitt.get(v.abschnitt)!, start: v.start, dauer: v.dauer })),
|
||||
zahlungen: x.zahlungen.map((z) => ({ ...z, projekt_id: z.projekt, vorgang_id: z.vorgang })),
|
||||
kosten: x.kosten.map((k) => ({ ...k, projekt_id: k.projekt })),
|
||||
laufend: x.laufend,
|
||||
};
|
||||
}
|
||||
|
||||
118
test/v70.test.ts
Normal file
118
test/v70.test.ts
Normal file
@@ -0,0 +1,118 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { readFileSync } from "node:fs";
|
||||
import { uebernimmV70, euroZuCent, pruefeSicherung } from "../src/domain/v70.js";
|
||||
import { liquiditaetsDaten, vorgangsEnde } from "../src/domain/projektplan.js";
|
||||
import { liquiditaet, periodenGrenzen, type Gruppe } from "../src/domain/liquiditaet.js";
|
||||
import { v70Ereignisse, bestandAus } from "./v70-referenz.js";
|
||||
|
||||
const roh = JSON.parse(readFileSync(new URL("./daten/v70-sicherung-2026-10-19.json", import.meta.url), "utf8"));
|
||||
const u = uebernimmV70(roh);
|
||||
const woche = { tage: u.einstellungen.arbeitstage };
|
||||
|
||||
describe("Euro in Cent", () => {
|
||||
it.each([[24445.01, 2444501], [11663.64, 1166364], [7953.79, 795379], [16.5, 1650], [1.005, 101], [-2.675, -268], [0, 0]])(
|
||||
"%s €", (e, c) => expect(euroZuCent(e)).toBe(c));
|
||||
});
|
||||
|
||||
describe("Übernahme der V70-Sicherung vom 19.10.2026", () => {
|
||||
it("lehnt fremde Dateien ab", () => {
|
||||
expect(() => pruefeSicherung({ format: "anders" })).toThrow(/keine Sicherung/);
|
||||
});
|
||||
|
||||
it("übernimmt alle Datensätze", () => {
|
||||
expect(u.projekte).toHaveLength(9);
|
||||
expect(u.laufend).toHaveLength(10);
|
||||
expect(u.kosten).toHaveLength(2);
|
||||
// 7 verschiedene Bauherren als Kontakte
|
||||
expect(u.kontakte.map((k) => k.name)).toEqual([
|
||||
"Stadt Ratzeburg", "Most", "Ehep. Schlünsen", "Ehep. Kodal", "Kirche St. Lorenz", "Fam. Kasza", "Ehep. Braun/Müller",
|
||||
]);
|
||||
expect(u.projekte.map((p) => [p.nummer, p.status])).toEqual([
|
||||
["P-26-014", "auftrag"], ["P-26-015", "auftrag"], ["A-27-001", "angebot"], ["A-OHNE-1", "angebot"], ["A-OHNE-2", "angebot"],
|
||||
["P-26-019", "auftrag"], ["P-26-018", "auftrag"], ["P-26-007.2", "auftrag"], ["P-26-007.1", "auftrag"],
|
||||
]);
|
||||
expect(u.projekte[1]).toMatchObject({ umsatz_netto: 2444501, fremd_kosten: 1166364, sonstige_kosten: 470000 });
|
||||
});
|
||||
|
||||
it("Freitage in V70 -> Arbeitswoche Mo–Fr, Einstellungen wie V70", () => {
|
||||
expect(u.einstellungen).toEqual({
|
||||
arbeitstage: [1, 2, 3, 4, 5], stundenProTag: 8, produktivitaet: 1, rundung: "halb",
|
||||
zahlungsziele: { kundenTage: 14, materialTage: 7, fremdTage: 7, sonstigeTage: 7 },
|
||||
});
|
||||
expect(u.hinweise[0]).toMatch(/Freitag frei/);
|
||||
});
|
||||
|
||||
it("alle Termine bleiben gleich", () => {
|
||||
const termine = u.vorgaenge.map((v) => [v.name, v.start, vorgangsEnde(v, woche)]);
|
||||
const v70: [string, string, string][] = [];
|
||||
for (const p of roh.projekte) for (const t of p.tasks ?? []) {
|
||||
const blatt = t.t === "v" || !(p.tasks as { t: string; par?: string }[]).some((k) => k.t === "v" && k.par === t.id);
|
||||
if (blatt && t.start) v70.push([t.name, t.start, t.end]);
|
||||
}
|
||||
expect(termine.sort()).toEqual(v70.sort());
|
||||
expect(u.hinweise.filter((h) => /passt nicht/.test(h))).toEqual([]);
|
||||
});
|
||||
|
||||
it("Verknüpfungen mit Art und Verzögerung, auch projektübergreifend", () => {
|
||||
const name = (s: string) => u.vorgaenge.find((v) => v.schluessel === s)!.name;
|
||||
expect(u.verknuepfungen.map((k) => [name(k.vorgang), name(k.vorgaenger), k.art, k.verzoegerung])).toEqual(
|
||||
expect.arrayContaining([
|
||||
["Abbund", "Materialbestellung", "EA", 0],
|
||||
["Materialbestellung", "Ausführung", "AE", -20],
|
||||
["Ausführung", "Ausführung", "EA", 0], // Fassadensanierung nach Unterstellplatz
|
||||
["Bauantrag", "Entwurf", "EA", 10],
|
||||
]),
|
||||
);
|
||||
expect(u.hinweise.some((h) => /Anbau.*Materialbestellung.*keinen Termin/.test(h))).toBe(true);
|
||||
});
|
||||
|
||||
it("Abschläge hängen am Vorgang, Einzelkosten ohne Vorsteuer am eigenen Tag", () => {
|
||||
expect(u.zahlungen.map((z) => [z.bezeichnung, z.netto, z.termin])).toEqual([
|
||||
["Abschlag Abbund", 100000, "2026-10-23"],
|
||||
["Abschlag Ausführung", 1477600, "2027-02-09"],
|
||||
["Abschlag Bauantrag", 100000, "2026-12-22"],
|
||||
["Abschlag Entwurfsplanung", 50000, "2026-11-23"],
|
||||
["Abschlag Wände einseitig stellen", 795379, "2026-08-06"],
|
||||
]);
|
||||
expect(u.kosten[0]).toMatchObject({ projekt: "p2", netto: 579000, termin: "2027-02-02", mit_vorsteuer: false, zahlungsziel_tage: 0 });
|
||||
});
|
||||
|
||||
it("laufende Kosten mit Rhythmus, Gruppe und Kategorie", () => {
|
||||
expect(u.laufend.find((l) => l.bezeichnung === "Datev UnternehmenOnline")).toEqual({
|
||||
bezeichnung: "Datev UnternehmenOnline", gruppe: "Sonstige Kosten", kategorie: "Unternehmenssoftware", betrag: 1650, rhythmus: "monatlich", start: "2026-11-01",
|
||||
});
|
||||
expect(u.laufend.filter((l) => l.rhythmus === "jaehrlich")).toHaveLength(4);
|
||||
});
|
||||
});
|
||||
|
||||
describe("Liquidität centgenau wie V70", () => {
|
||||
const GRUPPE: Record<"e" | "k" | "u", Gruppe> = { e: "Projekteinnahmen", k: "Projektkosten", u: "Umsatzsteuer" };
|
||||
|
||||
it.each([
|
||||
["woche", "2026-07-01", 60],
|
||||
["monat", "2026-07-01", 12],
|
||||
] as const)("%s ab %s", (ansicht, start, anzahl) => {
|
||||
const daten = liquiditaetsDaten({ ...bestandAus(u), laufend: [] }, woche, true);
|
||||
const neu = liquiditaet(daten, { ansicht, start, anzahl, startsaldo: 0, ziele: u.einstellungen.zahlungsziele });
|
||||
const alt = v70Ereignisse(roh);
|
||||
const grenzen = periodenGrenzen({ ansicht, start, anzahl });
|
||||
let ereignisse = 0;
|
||||
grenzen.forEach((g, i) => {
|
||||
for (const k of ["e", "k", "u"] as const) {
|
||||
const imZeitraum = alt.filter((x) => x.g === k && x.d >= g.von && x.d <= g.bis);
|
||||
ereignisse += imZeitraum.length;
|
||||
const v70 = Math.round(imZeitraum.reduce((s, x) => s + x.a, 0) * 100);
|
||||
const wir = neu[i]!.posten.filter((p) => p.gruppe === GRUPPE[k]).reduce((s, p) => s + p.betrag, 0);
|
||||
expect(wir, `${g.von} ${GRUPPE[k]}`).toBe(v70);
|
||||
}
|
||||
});
|
||||
expect(ereignisse).toBe(alt.length); // nichts fällt aus dem Zeitraum
|
||||
});
|
||||
|
||||
it("P5: Angebote fließen nicht ein (V70 hat sie mitgerechnet)", () => {
|
||||
const mit = liquiditaetsDaten(bestandAus(u), woche, true);
|
||||
const ohne = liquiditaetsDaten(bestandAus(u), woche);
|
||||
const projekte = (d: typeof mit) => new Set([...d.einnahmen, ...d.ausgaben].map((x) => x.projekt));
|
||||
expect([...projekte(mit)].filter((p) => !projekte(ohne).has(p)).sort()).toEqual(["A-27-001", "A-OHNE-1"]);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user