From 79dd6ed591bc0805bc8789de907448c54b56b826 Mon Sep 17 00:00:00 2001 From: Munkherdene Date: Sun, 23 Aug 2026 00:41:58 +0800 Subject: [PATCH] fix(web): parse real merchant out of card-string :MCI: segment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Card charges were showing as raw masked-card strings with no suggestion. prettyMerchant/suggestCategory now extract the merchant after the last :MCI: segment (e.g. "...:MCI:ANTHROPIC 1" -> "ANTHROPIC"), and the keyword map is grounded in real uncategorized merchants (card-processed software/cloud, cross-border marketplaces, local lenders, grocers, carriers, electronics, gaming). Also fixes a Cyrillic \b word-boundary bug (JS's \b never matches non-ASCII text) and moves CAFE/КАФЕ to the Coffee rule instead of Food & Drink. --- src/features/accounting/CategorizeReview.tsx | 7 +- .../accounting/suggestCategory.test.ts | 134 ++++++++++++++---- src/features/accounting/suggestCategory.ts | 75 ++++++---- 3 files changed, 159 insertions(+), 57 deletions(-) diff --git a/src/features/accounting/CategorizeReview.tsx b/src/features/accounting/CategorizeReview.tsx index 9ca4276..695685c 100644 --- a/src/features/accounting/CategorizeReview.tsx +++ b/src/features/accounting/CategorizeReview.tsx @@ -10,7 +10,7 @@ import { categoryStyle } from "@/ds/categoryStyle"; import { Icon } from "@/ds/icons"; import { MASKED, tugrikRaw } from "@/ds/money"; import { CategorizeSheet } from "./CategorizeSheet"; -import { suggestCategory } from "./suggestCategory"; +import { suggestCategory, extractMerchant, looksLikeCardNumber } from "./suggestCategory"; import { accountingStrings as s } from "./strings"; import { useHiddenAmounts } from "./useHiddenAmounts"; @@ -74,10 +74,11 @@ function buildQueue(txns: Txn[]): ReviewItem[] { const CARD_LIKE = /^(\d{3,})\*{2,}(\d{2,})/; function prettyMerchant(raw: string): string { + const name = extractMerchant(raw); // recovers "ANTHROPIC"/"TAOBAO" from card strings + if (name && !looksLikeCardNumber(name)) return name; const head = (raw.split(":")[0] ?? raw).trim(); const m = head.match(CARD_LIKE); - if (m) return `Карт •••• ${m[2]}`; - return head || raw; + return m ? `Карт •••• ${m[2]}` : head || raw; } interface Row extends ReviewItem { diff --git a/src/features/accounting/suggestCategory.test.ts b/src/features/accounting/suggestCategory.test.ts index f75a436..a5d3b3e 100644 --- a/src/features/accounting/suggestCategory.test.ts +++ b/src/features/accounting/suggestCategory.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "vitest"; -import { suggestCategory } from "./suggestCategory"; +import { suggestCategory, extractMerchant, looksLikeCardNumber } from "./suggestCategory"; import type { Category } from "@/api/schemas"; function cat(name: string, kind: "income" | "expense" = "expense", depth = 1): Category { @@ -15,67 +15,145 @@ const CATEGORIES: Category[] = [ cat("Entertainment"), cat("Groceries"), cat("Insurance"), + cat("Electronics"), ]; -describe("suggestCategory", () => { - it("matches loan/leasing keywords (Cyrillic)", () => { - expect(suggestCategory("ЛИЗИНГ ХХК", CATEGORIES)).toBe("Bills & Services"); // no "Loan" category present +describe("extractMerchant", () => { + it("pulls the real merchant out of a card string's :MCI: segment", () => { + expect(extractMerchant("554835******6886:30-07-2026 11:02:10:MCI:ANTHROPIC 1")).toBe("ANTHROPIC"); + expect(extractMerchant("554835******6886:13-08-2026 12:13:52:MCI:WWW HOSTI 5")).toBe("WWW HOSTI"); + expect(extractMerchant("554835******6886:11-08-2026 10:07:35:MCI:TAOBAO CO 4")).toBe("TAOBAO CO"); }); - it("prefers Loan when it exists", () => { + it("falls back to the head before the first colon when there's no :MCI: segment", () => { + expect(extractMerchant("ЛИЗИНГ ХХК")).toBe("ЛИЗИНГ ХХК"); + expect(extractMerchant("1234******5678")).toBe("1234******5678"); + }); +}); + +describe("suggestCategory — real card charges (:MCI: merchant extraction)", () => { + it("suggests Bills & Services for ANTHROPIC (no Software/Subscriptions category present)", () => { + expect(suggestCategory("554835******6886:30-07-2026 11:02:10:MCI:ANTHROPIC 1", CATEGORIES)).toBe( + "Bills & Services", + ); + }); + + it("prefers Software over Bills & Services when the category exists", () => { + const withSoftware = [...CATEGORIES, cat("Software")]; + expect(suggestCategory("554835******6886:30-07-2026 11:02:10:MCI:ANTHROPIC 1", withSoftware)).toBe("Software"); + }); + + it("suggests Bills & Services for a hosting merchant (WWW HOSTI)", () => { + expect(suggestCategory("554835******6886:13-08-2026 12:13:52:MCI:WWW HOSTI 5", CATEGORIES)).toBe( + "Bills & Services", + ); + }); + + it("suggests Shopping for TAOBAO", () => { + expect(suggestCategory("554835******6886:11-08-2026 10:07:35:MCI:TAOBAO CO 4", CATEGORIES)).toBe("Shopping"); + }); +}); + +describe("suggestCategory — local merchants", () => { + it("matches ТОКИ (non-bank lender) to Loan", () => { + const withLoan = [...CATEGORIES, cat("Loan")]; + expect(suggestCategory("ТОКИ ББСБ ХХК", withLoan)).toBe("Loan"); + }); + + it("falls back to Bills & Services when Loan doesn't exist", () => { + expect(suggestCategory("ЛИЗИНГ ХХК", CATEGORIES)).toBe("Bills & Services"); + }); + + it("matches the Cyrillic ЗЭЭЛ keyword (word-boundary-free, Cyrillic-safe)", () => { const withLoan = [...CATEGORIES, cat("Loan")]; expect(suggestCategory("ХААН ЗЭЭЛ ТӨЛБӨР", withLoan)).toBe("Loan"); }); + it("matches TUSHIG to Groceries", () => { + expect(suggestCategory("TUSHIG SUPERMARKET", CATEGORIES)).toBe("Groceries"); + }); + + it("matches other grocery keywords", () => { + expect(suggestCategory("NOMIN SUPERMARKET", CATEGORIES)).toBe("Groceries"); + expect(suggestCategory("CU-24 CONVENIENCE", CATEGORIES)).toBe("Groceries"); + expect(suggestCategory("ХҮНСНИЙ ДЭЛГҮҮР", CATEGORIES)).toBe("Groceries"); + }); + it("matches insurance keywords", () => { expect(suggestCategory("MONGOL ДААТГАЛ LLC", CATEGORIES)).toBe("Insurance"); expect(suggestCategory("SOME INSURANCE CO", CATEGORIES)).toBe("Insurance"); }); - it("matches grocery keywords", () => { - expect(suggestCategory("NOMIN SUPERMARKET", CATEGORIES)).toBe("Groceries"); - expect(suggestCategory("CU-24 CONVENIENCE", CATEGORIES)).toBe("Groceries"); - expect(suggestCategory("ХҮНСНИЙ ДЭЛГҮҮР", CATEGORIES)).toBe("Groceries"); + it("matches electronics retailers", () => { + expect(suggestCategory("MAGIC TECH STORE", CATEGORIES)).toBe("Electronics"); + expect(suggestCategory("ITOPIA MALL", CATEGORIES)).toBe("Electronics"); }); - it("matches food & drink keywords", () => { - expect(suggestCategory("KFC ULAANBAATAR", CATEGORIES)).toBe("Food & Drink"); - expect(suggestCategory("КАФЕ МОДЕРН", CATEGORIES)).toBe("Food & Drink"); + it("matches mobile carriers to Bills & Services", () => { + expect(suggestCategory("MOBICOM PAYMENT", CATEGORIES)).toBe("Bills & Services"); + expect(suggestCategory("UNITEL TOP UP", CATEGORIES)).toBe("Bills & Services"); }); - it("matches a coffee-only merchant (no food keyword present)", () => { - expect(suggestCategory("TOM N TOMS COFFEE", CATEGORIES)).toBe("Coffee"); - expect(suggestCategory("STARBUCKS COFFEE", CATEGORIES)).toBe("Coffee"); + it("matches apparel/shopping brands", () => { + expect(suggestCategory("CONVERSE STORE", CATEGORIES)).toBe("Shopping"); + expect(suggestCategory("SANT ASAR TRADE", CATEGORIES)).toBe("Shopping"); + }); + + it("matches gaming merchants to Entertainment", () => { + expect(suggestCategory("STEAM GAMES", CATEGORIES)).toBe("Entertainment"); + expect(suggestCategory("PGAMING WALLET", CATEGORIES)).toBe("Entertainment"); + }); + + it("matches CAFE/КАФЕ to Coffee, not Food & Drink", () => { + expect(suggestCategory("КАФЕ МОДЕРН", CATEGORIES)).toBe("Coffee"); + expect(suggestCategory("TOM CAFE LLC", CATEGORIES)).toBe("Coffee"); expect(suggestCategory("КОФЕ ЦЭГ", CATEGORIES)).toBe("Coffee"); + expect(suggestCategory("STARBUCKS COFFEE", CATEGORIES)).toBe("Coffee"); }); - it("matches transport keywords", () => { + it("matches restaurant/food keywords (no CAFE overlap) to Food & Drink", () => { + expect(suggestCategory("KFC ULAANBAATAR", CATEGORIES)).toBe("Food & Drink"); + expect(suggestCategory("ХООЛНЫ ГАЗАР", CATEGORIES)).toBe("Food & Drink"); + expect(suggestCategory("BURGER KING", CATEGORIES)).toBe("Food & Drink"); + }); + + it("matches transport/fuel keywords", () => { expect(suggestCategory("UBCAB TRIP", CATEGORIES)).toBe("Transport"); expect(suggestCategory("ШАТАХУУНЫ СТАНЦ", CATEGORIES)).toBe("Transport"); }); +}); - it("matches shopping keywords", () => { - expect(suggestCategory("CONVERSE STORE", CATEGORIES)).toBe("Shopping"); - // Cyrillic "НОМИН" doesn't match the Latin "NOMIN" keyword, so this only - // hits the Shopping rule's "ДЭЛГҮҮР" ("store") keyword. - expect(suggestCategory("НОМИН ДЭЛГҮҮР ХХК", CATEGORIES)).toBe("Shopping"); - }); - - it("returns null for a masked card number", () => { +describe("suggestCategory — no signal", () => { + it("returns null for a masked card number with no :MCI: merchant segment", () => { expect(suggestCategory("554835******6886:13-08-2026 09:41:22", CATEGORIES)).toBeNull(); expect(suggestCategory("1234******5678", CATEGORIES)).toBeNull(); }); it("returns null when nothing matches", () => { - expect(suggestCategory("SOME RANDOM MERCHANT XYZ", CATEGORIES)).toBeNull(); + expect(suggestCategory("TLJ CENTR", CATEGORIES)).toBeNull(); + expect(suggestCategory("TSENGELDE", CATEGORIES)).toBeNull(); }); - it("returns null when the only matching candidate category doesn't exist", () => { - const noInsurance = CATEGORIES.filter((c) => c.name !== "Insurance"); - expect(suggestCategory("ДААТГАЛ", noInsurance)).toBeNull(); + it("returns null when every matching rule's candidates are all absent", () => { + // The phone-carrier rule has a single candidate ("Bills & Services") with + // no fallback, unlike Loan/Insurance/Groceries/Electronics which fall + // back to a broader category — removing it leaves nothing to suggest. + const noBills = CATEGORIES.filter((c) => c.name !== "Bills & Services"); + expect(suggestCategory("MOBICOM PAYMENT", noBills)).toBeNull(); }); it("returns null for empty input", () => { expect(suggestCategory("", CATEGORIES)).toBeNull(); }); }); + +describe("looksLikeCardNumber", () => { + it("recognizes a masked card head as a card number", () => { + expect(looksLikeCardNumber("554835******6886")).toBe(true); + }); + + it("does not flag a normal merchant name", () => { + expect(looksLikeCardNumber("ANTHROPIC")).toBe(false); + expect(looksLikeCardNumber("ТОКИ ББСБ ХХК")).toBe(false); + }); +}); diff --git a/src/features/accounting/suggestCategory.ts b/src/features/accounting/suggestCategory.ts index 58a6a10..9ad5af3 100644 --- a/src/features/accounting/suggestCategory.ts +++ b/src/features/accounting/suggestCategory.ts @@ -1,49 +1,72 @@ import type { Category } from "@/api/schemas"; -/** A merchant/matchKey string that is mostly a masked card number (e.g. - * `"554835******6886:13-08-2026 09:41:22"`) carries no merchant-name signal — - * never suggest a category for these, let the user pick. */ -function looksLikeCardNumber(s: string): boolean { - const head = s.split(":")[0] ?? s; +/** Card/online charges arrive as a masked-card string with the real merchant + * buried after the last `:MCI:` segment, e.g. + * `"554835******6886:30-07-2026 11:02:10:MCI:ANTHROPIC 1"` → `"ANTHROPIC"`. + * Returns the cleaned merchant name (trailing sequence number stripped), or the + * head before the first colon for normal names. */ +export function extractMerchant(raw: string): string { + const s = (raw ?? "").trim(); + const mci = s.split(/:MCI:/i); + if (mci.length > 1) { + const m = mci[mci.length - 1].replace(/\s+\d+$/, "").trim(); + if (m) return m; + } + return (s.split(":")[0] ?? s).trim(); +} + +/** True when the string is (still) mostly a masked card number with no merchant + * signal — e.g. a card charge with no `:MCI:` merchant segment. */ +export function looksLikeCardNumber(s: string): boolean { + const head = (s.split(":")[0] ?? s).trim(); if (/^\d{4,}\*{2,}/.test(head)) return true; const digits = (s.match(/\d/g) ?? []).length; const stars = (s.match(/\*/g) ?? []).length; return stars >= 2 && digits / Math.max(s.length, 1) > 0.4; } -/** Keyword rule: if the merchant text matches `pattern`, suggest the first - * name in `candidates` that actually exists in the user's category list — - * later candidates are fallbacks for accounts that don't have the specific - * category. Case-insensitive, Cyrillic + Latin. */ interface Rule { pattern: RegExp; candidates: string[]; } -// Kept small and ordered: earlier rules win when a merchant string matches -// more than one (e.g. a name containing both "ХООЛ" and "CAFE"). Add new +// Ordered — earlier rules win when a merchant matches more than one. Keyed to +// the REAL uncategorized merchants in the data (incl. the merchant extracted +// from card strings). Each rule's candidates are tried in order; the first that +// exists in the user's category list is used, so a specific child (Groceries, +// Loan, Electronics) falls back to its depth-1 parent when absent. Add new // merchants here rather than growing suggestCategory()'s logic. const RULES: Rule[] = [ - { pattern: /ЛИЗИНГ|ЗЭЭЛ|ББСБ|LOAN/i, candidates: ["Loan", "Bills & Services"] }, - { pattern: /ДААТГАЛ|INSURANCE/i, candidates: ["Insurance"] }, - { pattern: /MART|МАРКЕТ|CU-|NOMIN|ХҮНС|GROCER/i, candidates: ["Groceries"] }, - { pattern: /ХООЛ|CAFE|КАФЕ|RESTAURANT|KFC|PIZZA/i, candidates: ["Food & Drink"] }, - { pattern: /КОФЕ|COFFEE|TOM N TOMS/i, candidates: ["Coffee"] }, - { pattern: /TAXI|UBCAB|ТЭЭВЭР|PETROL|ШАТАХУУН/i, candidates: ["Transport"] }, - { pattern: /STORE|SHOP|ДЭЛГҮҮР|CONVERSE/i, candidates: ["Shopping"] }, + { pattern: /ANTHROPIC|OPENAI|CLAUDE|GITHUB|VERCEL|\bAWS\b|HOSTI|\bWWW\b|GOOGLE|NETLIFY/i, candidates: ["Software", "Subscriptions", "Bills & Services"] }, + { pattern: /TAOBAO|ALIEXPRESS|ALIPAY|AMAZON|WISH/i, candidates: ["Shopping"] }, + // Note: no `\b` word-boundary around the Cyrillic keywords — JS's `\b` is + // defined in terms of `\w` ([A-Za-z0-9_]), which doesn't include Cyrillic + // letters, so `\bЗЭЭЛ\b` would never match any Cyrillic text at all. + { pattern: /ЛИЗИНГ|ТОКИ|АВДАР|ББСБ|ЗЭЭЛ|LOAN|LEASING/i, candidates: ["Loan", "Bills & Services"] }, + { pattern: /ДААТГАЛ|INSURANCE/i, candidates: ["Insurance", "Bills & Services"] }, + { pattern: /MOBICOM|UNITEL|SKYTEL|GMOBILE|ONDO/i, candidates: ["Bills & Services"] }, + { pattern: /TUSHIG|CARREFOUR|NOMIN|MART|МАРКЕТ|CU-|GS25|MINII|ХҮНС|GROCER/i, candidates: ["Groceries", "Food & Drink"] }, + { pattern: /MAGIC TEC|ELECTRONI|ITOPIA|TOPAZ|ELECTRO/i, candidates: ["Electronics", "Shopping"] }, + { pattern: /PGAMING|GAMING|STEAM|PLAYSTATION|XBOX/i, candidates: ["Entertainment"] }, + // CAFE/КАФЕ live here (not in the Food & Drink rule below) per the latest + // keyword grounding — a bare "cafe" name reads as a coffee spot first. + { pattern: /КОФЕ|COFFEE|TOM N TOMS|CAFE|КАФЕ/i, candidates: ["Coffee", "Food & Drink"] }, + { pattern: /ХООЛ|RESTAURANT|KFC|PIZZA|BURGER/i, candidates: ["Food & Drink"] }, + { pattern: /TAXI|UBCAB|ТЭЭВЭР|PETROL|ШАТАХУУН|BENZIN/i, candidates: ["Transport"] }, + { pattern: /CONVERSE|WARRIOR|PASTEL|OLYMPIC|НЭКСУС|SANT ASAR|STORE|SHOP|ДЭЛГҮҮР/i, candidates: ["Shopping"] }, ]; /** - * Suggests one of the user's existing categories for an uncategorized - * merchant, from a small keyword heuristic. Returns `null` (no suggestion — - * the user picks manually) when nothing matches, or when every matching - * rule's candidates are all absent from `categories`, or when `merchant` - * looks like a masked card number rather than a real merchant name. + * Suggests one of the user's existing categories for an uncategorized merchant, + * from a keyword heuristic keyed to the real merchants seen in the data. The + * merchant name is first extracted from any card string (`:MCI:ANTHROPIC`). + * Returns `null` (user picks) when nothing matches, when the matching rule's + * candidates are all absent, or when the string is a card number with no + * recoverable merchant. */ export function suggestCategory(merchant: string, categories: Category[]): string | null { - const text = merchant?.trim(); - if (!text) return null; - if (looksLikeCardNumber(text)) return null; + const text = extractMerchant(merchant); + if (!text || looksLikeCardNumber(text)) return null; const names = new Set(categories.map((c) => c.name)); for (const rule of RULES) {