more iban fixes not there yet

Author: houke

apps/api/src/db/index.ts

@@ -18,6 +18,9 @@ export const db: DatabaseType = new Database(DB_PATH);
 // Enable WAL mode for better performance
 db.pragma('journal_mode = WAL');
 
+// Enable foreign keys for cascading deletes
+db.pragma('foreign_keys = ON');
+
 // Initialize database schema
 export function initializeDatabase(): void {
   const schemaPath = join(__dirname, 'schema.sql');
@@ -29,9 +32,6 @@ export function initializeDatabase(): void {
   // Update categories to Dutch if they're still in English
   updateCategoriesToDutch();
 
-  // Update categories to Dutch if they're still in English
-  updateCategoriesToDutch();
-
   // Seed defaults if table is empty
   seedDefaultCategories();
 
@@ -104,6 +104,13 @@ export function initializeDatabase(): void {
   } catch {
     // Column already exists
   }
+  try {
+    db.exec(
+      'ALTER TABLE imports ADD COLUMN profile_id INTEGER DEFAULT 1 REFERENCES profiles(id) ON DELETE CASCADE'
+    );
+  } catch {
+    // Column already exists
+  }
 
   // Add payment_method column to transactions if it doesn't exist
   try {
@@ -128,11 +135,14 @@ export function initializeDatabase(): void {
 
   // Ensure we have a usable unique constraint for import_hash (skip duplicates on import)
   try {
+    // Drop old global index if it exists
+    db.exec('DROP INDEX IF EXISTS idx_transactions_import_hash');
+    // Create new profile-scoped unique index
     db.exec(
-      "CREATE UNIQUE INDEX IF NOT EXISTS idx_transactions_import_hash ON transactions(import_hash) WHERE import_hash IS NOT NULL AND TRIM(import_hash) != ''"
+      "CREATE UNIQUE INDEX IF NOT EXISTS idx_transactions_import_hash_scoped ON transactions(import_hash, profile_id) WHERE import_hash IS NOT NULL AND TRIM(import_hash) != ''"
     );
-  } catch {
-    // Ignore index creation failures (e.g. on corrupted/unsupported schema)
+  } catch (error) {
+    console.warn('Failed to update import_hash index (might be expected):', error);
   }
 
   // Backfill missing import_hash values so older data also dedupes correctly
@@ -312,12 +322,71 @@ export function initializeDatabase(): void {
   // MAJOR MIGRATION: Consolidate shared_iban_merchants into address_book
   consolidateSharedIbanMerchantsIntoAddressBook();
 
-  // MIGRATION: Multi-tenant profile support
-  // migrateToMultiTenant(); // Commented out since schema.sql already defines the columns
+  // Ensure all data has a profile_id
+  backfillMissingProfileIds();
+
+  // Ensure all transactions have the correct profile_id from their account
+  syncTransactionProfileIds();
 
   console.warn('Database initialized successfully');
 }
 
+/**
+ * Ensures all existing records have a profile_id
+ */
+function backfillMissingProfileIds(): void {
+  try {
+    // Get default profile ID (usually 1, but check DB to be sure)
+    const result = db
+      .prepare('SELECT id FROM profiles ORDER BY created_at ASC LIMIT 1')
+      .get() as { id: number } | undefined;
+    const defaultProfileId = result?.id ?? 1;
+
+    const tables = [
+      'accounts',
+      'transactions',
+      'categories',
+      'budgets',
+      'category_rules',
+      'address_book',
+      'imports',
+    ];
+
+    for (const table of tables) {
+      const result = db
+        .prepare(`UPDATE ${table} SET profile_id = ? WHERE profile_id IS NULL`)
+        .run(defaultProfileId);
+      if (result.changes > 0) {
+        console.warn(`Backfilled profile_id for ${result.changes} rows in ${table}`);
+      }
+    }
+  } catch (error) {
+    console.error('Failed to backfill profile IDs:', error);
+  }
+}
+
+/**
+ * Ensures all transactions have the correct profile_id based on their account
+ */
+function syncTransactionProfileIds(): void {
+  try {
+    const result = db
+      .prepare(
+        `
+      UPDATE transactions 
+      SET profile_id = (SELECT profile_id FROM accounts WHERE accounts.id = transactions.account_id)
+      WHERE profile_id IS NULL OR profile_id != (SELECT profile_id FROM accounts WHERE accounts.id = transactions.account_id)
+    `
+      )
+      .run();
+    if (result.changes > 0) {
+      console.warn(`Synced profile_id for ${result.changes} transactions`);
+    }
+  } catch (error) {
+    console.error('Failed to sync transaction profile IDs:', error);
+  }
+}
+
 /**
  * Migration for multi-tenant profile support
  * Creates profiles table and adds profile_id columns to existing tables

apps/api/src/db/schema.sql

@@ -17,7 +17,9 @@ CREATE TABLE IF NOT EXISTS profiles (
     name TEXT NOT NULL,
     type TEXT CHECK(type IN ('personal', 'business', 'shared', 'savings')) DEFAULT 'personal',
     avatar_url TEXT,
+    is_hidden INTEGER DEFAULT 0,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
 );
 
@@ -34,7 +36,8 @@ CREATE TABLE IF NOT EXISTS accounts (
     current_balance DECIMAL(10,2),
     order_index INTEGER DEFAULT 0,
     profile_id INTEGER DEFAULT 1 REFERENCES profiles(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 
 -- Categories table
@@ -46,7 +49,8 @@ CREATE TABLE IF NOT EXISTS categories (
     color TEXT,
     description TEXT,
     profile_id INTEGER REFERENCES profiles(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 
 -- Transactions table
@@ -65,9 +69,11 @@ CREATE TABLE IF NOT EXISTS transactions (
     balance_after DECIMAL(10,2),
     payment_method TEXT,
     raw_data JSON,
-    import_hash TEXT UNIQUE,
+    import_hash TEXT,
     profile_id INTEGER REFERENCES profiles(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(import_hash, profile_id)
 );
 
 -- Budgets table
@@ -79,7 +85,8 @@ CREATE TABLE IF NOT EXISTS budgets (
     start_date DATE,
     end_date DATE,
     profile_id INTEGER DEFAULT 1 REFERENCES profiles(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 
 -- Category rules for auto-categorization
@@ -89,7 +96,8 @@ CREATE TABLE IF NOT EXISTS category_rules (
     category_id INTEGER REFERENCES categories(id) ON DELETE CASCADE,
     priority INTEGER DEFAULT 0,
     profile_id INTEGER DEFAULT 1 REFERENCES profiles(id) ON DELETE CASCADE,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 
 -- Imports tracking table
@@ -102,7 +110,10 @@ CREATE TABLE IF NOT EXISTS imports (
     status TEXT CHECK(status IN ('pending', 'completed', 'failed')) DEFAULT 'pending',
     skipped_rows JSON,
     duplicates_skipped INTEGER DEFAULT 0,
-    parse_errors INTEGER DEFAULT 0
+    parse_errors INTEGER DEFAULT 0,
+    profile_id INTEGER DEFAULT 1 REFERENCES profiles(id) ON DELETE CASCADE,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 
 

apps/api/src/routes/import.ts

@@ -218,9 +218,10 @@ function addToAddressBookIfNew(
   return result.changes > 0;
 }
 
-function getExistingImportHashes(): Set<string> {
+function getExistingImportHashes(profileId: number | string): Set<string> {
   const rows = query<{ import_hash: string }>(
-    "SELECT import_hash FROM transactions WHERE import_hash IS NOT NULL AND TRIM(import_hash) != ''"
+    "SELECT import_hash FROM transactions WHERE profile_id = ? AND import_hash IS NOT NULL AND TRIM(import_hash) != ''",
+    [profileId]
   );
   return new Set(rows.map((row) => row.import_hash));
 }
@@ -300,11 +301,11 @@ router.post('/csv', upload.single('file'), async (req, res) => {
       });
     }
 
-    // Get or create account based on IBAN
+    // Get or create account based on IBAN (scoped to profile)
     const iban = ingTransactions[0].rekening;
     let account = queryOne<{ id: number; profile_id: number }>(
-      'SELECT id, profile_id FROM accounts WHERE iban = ?',
-      [iban]
+      'SELECT id, profile_id FROM accounts WHERE iban = ? AND profile_id = ?',
+      [iban, profileId]
     );
 
     if (!account) {
@@ -319,8 +320,8 @@ router.post('/csv', upload.single('file'), async (req, res) => {
     // Convert to our transaction format
     const transactions = convertINGToTransactions(ingTransactions, account.id);
 
-    // Skip any entries that already exist (all months, including current month)
-    const existingHashes = getExistingImportHashes();
+    // Skip any entries that already exist (scoped to profile)
+    const existingHashes = getExistingImportHashes(profileId);
     const seenInThisFile = new Set<string>();
     const newTransactions = [] as typeof transactions;
     const skippedExisting = [] as typeof transactions;
@@ -444,14 +445,15 @@ router.post('/csv', upload.single('file'), async (req, res) => {
 
     // Create import record with skipped rows
     const importResult = run(
-      'INSERT INTO imports (filename, bank, transaction_count, status, duplicates_skipped, skipped_rows) VALUES (?, ?, ?, ?, ?, ?)',
+      'INSERT INTO imports (filename, bank, transaction_count, status, duplicates_skipped, skipped_rows, profile_id) VALUES (?, ?, ?, ?, ?, ?, ?)',
       [
         filename,
         bank,
         categorizedTransactions.length,
         'pending',
         skippedExisting.length + skippedInFile.length,
         JSON.stringify(skippedRowsData),
+        profileId,
       ]
     );
     const importId = Number(importResult.lastInsertRowid);
@@ -734,32 +736,26 @@ router.get('/history', (req, res) => {
       parse_errors: number | null;
     }>(
       `
-      SELECT DISTINCT i.id, i.filename, i.bank, i.imported_at, i.transaction_count, i.status,
-             i.skipped_rows, i.duplicates_skipped, i.parse_errors
-      FROM imports i
-      INNER JOIN transactions t ON t.profile_id = ?
-      WHERE i.imported_at >= (
-        SELECT MIN(t2.created_at) FROM transactions t2 WHERE t2.profile_id = ?
-      )
-      ORDER BY i.imported_at DESC
+      SELECT id, filename, bank, imported_at, transaction_count, status,
+             skipped_rows, duplicates_skipped, parse_errors
+      FROM imports
+      WHERE profile_id = ?
+      ORDER BY imported_at DESC
       LIMIT 10
     `,
-      [profileId, profileId]
+      [profileId]
     );
 
     // Clean up old imports (keep only 10 most recent per profile)
     run(
       `
       DELETE FROM imports
-      WHERE id NOT IN (
+      WHERE profile_id = ? 
+      AND id NOT IN (
         SELECT id FROM (
-          SELECT DISTINCT i.id
-          FROM imports i
-          INNER JOIN transactions t ON t.profile_id = ?
-          WHERE i.imported_at >= (
-            SELECT MIN(t2.created_at) FROM transactions t2 WHERE t2.profile_id = ?
-          )
-          ORDER BY i.imported_at DESC
+          SELECT id FROM imports 
+          WHERE profile_id = ?
+          ORDER BY imported_at DESC
           LIMIT 10
         )
       )
@@ -1002,12 +998,8 @@ router.post('/generic/import', upload.single('file'), async (req, res) => {
       transactions.push(...rowTx);
     }
 
-    // Get ALL existing hashes to check for duplicates (global check due to UNIQUE constraint)
-    const existingHashes = new Set(
-      query<{ import_hash: string }>(
-        'SELECT import_hash FROM transactions WHERE import_hash IS NOT NULL'
-      ).map((row) => row.import_hash)
-    );
+    // Get ALL existing hashes to check for duplicates (scoped to profile)
+    const existingHashes = getExistingImportHashes(profileId);
 
     // Also track hashes within this import to avoid duplicates in the CSV itself
     const seenInThisImport = new Set<string>();
@@ -1042,15 +1034,16 @@ router.post('/generic/import', upload.single('file'), async (req, res) => {
 
     // Create import record
     const importResult = run(
-      `INSERT INTO imports (filename, bank, transaction_count, status, skipped_rows, duplicates_skipped, parse_errors)
-       VALUES (?, ?, ?, 'pending', ?, ?, ?)`,
+      `INSERT INTO imports (filename, bank, transaction_count, status, skipped_rows, duplicates_skipped, parse_errors, profile_id)
+       VALUES (?, ?, ?, 'pending', ?, ?, ?, ?)`,
       [
         filename,
         req.body.bank || 'generic',
         newTransactions.length,
         JSON.stringify([...errors, ...duplicateErrors]),
         duplicateCount,
         errors.length,
+        profileId,
       ]
     );
     const importId = importResult.lastInsertRowid as number;

apps/web/src/components/settings/ProfileManager.tsx

@@ -172,12 +172,16 @@ export function ProfileManager() {
     }, 300);
   };
 
-  // Get avatar options for display, with selected gradient first if it's a gradient
+  // Get avatar options for display, making sure the current one is included if it's a gradient
   const getDisplayAvatars = () => {
     const selectedAvatar = formData.avatarUrl;
-    if (selectedAvatar && avatarOptions.includes(selectedAvatar)) {
-      const filtered = avatarOptions.filter((a) => a !== selectedAvatar);
-      return [selectedAvatar, ...filtered];
+    if (
+      selectedAvatar &&
+      typeof selectedAvatar === 'string' &&
+      selectedAvatar.startsWith('linear-gradient') &&
+      !avatarOptions.includes(selectedAvatar)
+    ) {
+      return [selectedAvatar, ...avatarOptions];
     }
     return avatarOptions;
   };
@@ -204,11 +208,20 @@ export function ProfileManager() {
       // Store the newly created profile ID and move to accounts step
       if (newProfile && typeof newProfile === 'object' && 'id' in newProfile) {
         setNewlyCreatedProfileId(newProfile.id as string);
+        setCreateStep('accounts');
+        setCreatedAccounts([]);
+      } else {
+        setToastMessage(
+          t.settings?.profileManager?.createError ||
+            'Er ging iets mis bij het aanmaken van het profiel.'
+        );
       }
-      setCreateStep('accounts');
-      setCreatedAccounts([]);
     } catch (error) {
       console.error('Failed to create profile', error);
+      setToastMessage(
+        t.settings?.profileManager?.createError ||
+          'Er ging iets mis bij het aanmaken van het profiel.'
+      );
     }
   };
 
@@ -340,7 +353,12 @@ export function ProfileManager() {
           <DialogTrigger asChild>
             <Button
               onClick={() => {
-                setFormData({ name: '', type: 'personal' });
+                // Default to first gradient if available
+                setFormData({
+                  name: '',
+                  type: 'personal',
+                  avatarUrl: avatarOptions[0] || null,
+                });
                 setCreateStep('profile');
               }}
             >