Fix paid personal invoice client storage

db.py

@@ -1,11 +1,13 @@
-import os
-from contextlib import contextmanager
-from typing import Any, Dict, List, Optional, Sequence
+import os
+import hashlib
+from contextlib import contextmanager
+from typing import Any, Dict, List, Optional, Sequence
 
 import psycopg2
 from psycopg2.extras import RealDictCursor
 
-DATABASE_URL = os.environ.get("NEON_DATABASE_URL")
+DATABASE_URL = os.environ.get("NEON_DATABASE_URL")
+PRIVATE_TAX_ID_PREFIX = "__PRIVATE__:"
 
 if not DATABASE_URL:
     raise RuntimeError(
@@ -125,37 +127,50 @@ def update_business_logo(account_id: int, mime: Optional[str], data_base64: Opti
 
 def upsert_client(account_id: int, payload: Dict[str, str]) -> int:
     tax_id = (payload.get("tax_id") or "").strip()
-    stored_tax_id = tax_id or None
     if tax_id:
-        row = fetch_one(
+        stored_tax_id = tax_id
+    else:
+        identity = "|".join(
+            [
+                str(account_id),
+                (payload.get("name") or "").strip().lower(),
+                (payload.get("address_line") or "").strip().lower(),
+                (payload.get("postal_code") or "").strip().lower(),
+                (payload.get("city") or "").strip().lower(),
+                (payload.get("phone") or "").strip().lower(),
+            ]
+        )
+        stored_tax_id = f"{PRIVATE_TAX_ID_PREFIX}{hashlib.sha1(identity.encode('utf-8')).hexdigest()[:20]}"
+
+    row = fetch_one(
+        """
+        SELECT id FROM clients
+        WHERE account_id = %s AND tax_id = %s
+        """,
+        (account_id, stored_tax_id),
+    )
+    if row:
+        client_id = row["id"]
+        execute(
             """
-            SELECT id FROM clients
-            WHERE account_id = %s AND tax_id = %s
+            UPDATE clients
+            SET name = %s,
+                address_line = %s,
+                postal_code = %s,
+                city = %s,
+                phone = %s
+            WHERE id = %s
             """,
-            (account_id, tax_id),
+            (
+                payload["name"],
+                payload["address_line"],
+                payload["postal_code"],
+                payload["city"],
+                payload.get("phone"),
+                client_id,
+            ),
         )
-        if row:
-            client_id = row["id"]
-            execute(
-                """
-                UPDATE clients
-                SET name = %s,
-                    address_line = %s,
-                    postal_code = %s,
-                    city = %s,
-                    phone = %s
-                WHERE id = %s
-                """,
-                (
-                    payload["name"],
-                    payload["address_line"],
-                    payload["postal_code"],
-                    payload["city"],
-                    payload.get("phone"),
-                    client_id,
-                ),
-            )
-            return client_id
+        return client_id
 
     with db_conn() as conn, conn.cursor() as cur:
         cur.execute(
@@ -182,7 +197,9 @@ def search_clients(account_id: int, term: str, limit: int = 10) -> List[Dict[str
     like = f"%{query}%"
     return fetch_all(
         """
-        SELECT name, tax_id, address_line, postal_code, city, phone
+        SELECT name,
+               CASE WHEN tax_id LIKE %s THEN '' ELSE tax_id END AS tax_id,
+               address_line, postal_code, city, phone
         FROM clients
         WHERE account_id = %s
           AND (
@@ -193,7 +210,7 @@ def search_clients(account_id: int, term: str, limit: int = 10) -> List[Dict[str
         ORDER BY LOWER(COALESCE(name, tax_id, '')) ASC
         LIMIT %s
         """,
-        (account_id, query, like, like, limit),
+        (f"{PRIVATE_TAX_ID_PREFIX}%", account_id, query, like, like, limit),
     )
 
 

server.py

@@ -31,7 +31,8 @@ DATA_FILE = DATA_DIR / "web_invoice_store.json"
 INVOICE_HISTORY_LIMIT = 200
 MAX_LOGO_SIZE = 512 * 1024  # 512 KB
 TOKEN_TTL = timedelta(hours=12)
-ALLOWED_LOGO_MIME_TYPES = {"image/png", "image/jpeg"}
+ALLOWED_LOGO_MIME_TYPES = {"image/png", "image/jpeg"}
+PRIVATE_TAX_ID_PREFIX = "__PRIVATE__:"
 
 DATABASE_AVAILABLE = bool(os.environ.get("NEON_DATABASE_URL"))
 
@@ -503,11 +504,18 @@ def api_logo() -> Any:
     save_store(data)
     return jsonify({"logo": stored_logo})
 
-def normalize_phone(phone: Optional[str]) -> Optional[str]:
+def normalize_phone(phone: Optional[str]) -> Optional[str]:
     if not phone:
         return None
-    digits = re.sub(r"[^\d+]", "", phone)
-    return digits or None
+    digits = re.sub(r"[^\d+]", "", phone)
+    return digits or None
+
+
+def public_tax_id(value: Optional[str]) -> str:
+    tax_id = (value or "").strip()
+    if tax_id.startswith(PRIVATE_TAX_ID_PREFIX):
+        return ""
+    return tax_id
 
 
 def validate_client(payload: Dict[str, Any]) -> Dict[str, str]:
@@ -750,7 +758,7 @@ def api_invoices() -> Any:
                         "address_line": row.get("client_address"),
                         "postal_code": row.get("client_postal_code"),
                         "city": row.get("client_city"),
-                        "tax_id": row.get("client_tax_id"),
+                        "tax_id": public_tax_id(row.get("client_tax_id")),
                         "phone": row.get("client_phone"),
                     }
                 invoices.append(