From c3c371aefe684734de96225554707f13066128ac Mon Sep 17 00:00:00 2001 From: Yugonito Date: Tue, 27 Oct 2026 21:31:44 +0100 Subject: [PATCH] fix: accept euro sign and dot thousands separators in amounts, clearer loan capital error Co-Authored-By: Claude Opus 5.5 --- src/domain/money.ts | 8 ++++++-- src/server/services/loans.ts | 2 +- tests/domain/money.test.ts | 8 ++++++++ tests/server/loans.test.ts | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/domain/money.ts b/src/domain/money.ts index 6acc932..428aef4 100644 --- a/src/domain/money.ts +++ b/src/domain/money.ts @@ -3,9 +3,13 @@ import type { Cents, Split, UserId } from "./types"; const euro = new Intl.NumberFormat("fr-FR", { style: "currency", currency: "EUR" }); const MINUS = "−"; -/** "86,40", "1 234,56", "86.40" → centimes. null si vide, nul, négatif ou invalide. */ +/** "86,40", "1 234,56", "86.40", "40.000 €" → centimes. null si vide, nul, négatif ou invalide. */ export function parseEuro(input: string): Cents | null { - const s = input.replace(/[\s  ]/g, "").replace(",", "."); + let s = input.replace(/[\s  €]/g, ""); + // Les points sont des séparateurs de milliers s'il y a une virgule décimale ("40.000,50") + // ou s'ils séparent des groupes de 3 chiffres ("40.000") ; sinon c'est la décimale ("86.40"). + if (s.includes(",") || /^\d{1,3}(\.\d{3})+$/.test(s)) s = s.replace(/\./g, ""); + s = s.replace(",", "."); if (!/^\d+(\.\d{1,2})?$/.test(s)) return null; const [units, decimals = ""] = s.split("."); const cents = Number(units) * 100 + Number(decimals.padEnd(2, "0")); diff --git a/src/server/services/loans.ts b/src/server/services/loans.ts index f4dd43e..249d01a 100644 --- a/src/server/services/loans.ts +++ b/src/server/services/loans.ts @@ -50,7 +50,7 @@ const optionalEuro = (s: string) => (s.trim() === "" ? null : (parseEuro(s) ?? u export async function saveLoan(input: LoanFormInput, today: string = todayParis()): Promise> { if (!input.name.trim()) return { ok: false, error: "Le nom est obligatoire." }; const principal = parseEuro(input.principal); - if (principal === null) return { ok: false, error: "Capital invalide." }; + if (principal === null) return { ok: false, error: "Capital emprunté invalide (ex. 40000 ou 40 000,00)." }; const rateText = input.annualRate.trim().replace(",", "."); const rate = /^\d+(\.\d{1,3})?$/.test(rateText) ? Number(rateText) : NaN; if (!(rate >= 0 && rate < 100)) return { ok: false, error: "Taux invalide." }; diff --git a/tests/domain/money.test.ts b/tests/domain/money.test.ts index b49837f..3fcca8b 100644 --- a/tests/domain/money.test.ts +++ b/tests/domain/money.test.ts @@ -25,6 +25,14 @@ describe("parseEuro", () => { expect(parseEuro("0,5")).toBe(50); }); + it("accepts a euro sign and dots as thousands separators", () => { + expect(parseEuro("40 000 €")).toBe(4000000); + expect(parseEuro("40000€")).toBe(4000000); + expect(parseEuro("40.000")).toBe(4000000); + expect(parseEuro("1.234.567")).toBe(123456700); + expect(parseEuro("40.000,50")).toBe(4000050); + }); + it("rejects empty, zero, negative and malformed amounts", () => { for (const s of ["", "0", "0,00", "-5", "abc", "12,345", "1,2,3"]) expect(parseEuro(s)).toBeNull(); }); diff --git a/tests/server/loans.test.ts b/tests/server/loans.test.ts index 160cb2c..2bac874 100644 --- a/tests/server/loans.test.ts +++ b/tests/server/loans.test.ts @@ -60,7 +60,7 @@ describe("saveLoan", () => { it("validates the rate and the capital", async () => { expect(await saveLoan({ ...input, annualRate: "abc" }, TODAY)).toEqual({ ok: false, error: "Taux invalide." }); - expect(await saveLoan({ ...input, principal: "0" }, TODAY)).toEqual({ ok: false, error: "Capital invalide." }); + expect(await saveLoan({ ...input, principal: "0" }, TODAY)).toEqual({ ok: false, error: "Capital emprunté invalide (ex. 40000 ou 40 000,00)." }); }); });