fix: Simplify notification settings and fix notification test on dashboard.

- Change primary key from internalTransactionId to (accountId, transactionId)
- Add transactionId as stable bank-provided identifier
- Update INSERT to INSERT OR REPLACE for upsert behavior
- Update migration detection logic for composite key structure
- Update tests to include transactionId in sample data

CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 2025.9.6 (2025/09/10)
+
+### Features
+
+- **db:** Migrate transactions table to composite primary key ([a00d6ce2](https://github.com/elisiariocouto/leggen/commit/a00d6ce2ce2c4a070e9fae56c0cea58b3aab6cec))
+
+
+
+## 2025.9.6 (2025/09/10)
+
+### Features
+
+- **db:** Migrate transactions table to composite primary key ([a00d6ce2](https://github.com/elisiariocouto/leggen/commit/a00d6ce2ce2c4a070e9fae56c0cea58b3aab6cec))
+
+
+
 ## 2025.9.5 (2025/09/10)
 
 ### Bug Fixes

frontend/src/components/Notifications.tsx

@@ -102,7 +102,7 @@ export default function Notifications() {
     if (!testService) return;
 
     testMutation.mutate({
-      service: testService,
+      service: testService.toLowerCase(),
       message: testMessage,
     });
   };
@@ -113,7 +113,7 @@ export default function Notifications() {
         `Are you sure you want to delete the ${serviceName} notification service?`,
       )
     ) {
-      deleteServiceMutation.mutate(serviceName);
+      deleteServiceMutation.mutate(serviceName.toLowerCase());
     }
   };
 

frontend/src/routes/__root.tsx

@@ -3,29 +3,31 @@ import { useState } from "react";
 import Sidebar from "../components/Sidebar";
 import Header from "../components/Header";
 
-export const Route = createRootRoute({
-  component: () => {
-    const [sidebarOpen, setSidebarOpen] = useState(false);
+function RootLayout() {
+  const [sidebarOpen, setSidebarOpen] = useState(false);
 
-    return (
-      <div className="flex h-screen bg-gray-100">
-        <Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
+  return (
+    <div className="flex h-screen bg-gray-100">
+      <Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
 
-        {/* Mobile overlay */}
-        {sidebarOpen && (
-          <div
-            className="fixed inset-0 z-40 bg-gray-600 bg-opacity-75 lg:hidden"
-            onClick={() => setSidebarOpen(false)}
-          />
-        )}
+      {/* Mobile overlay */}
+      {sidebarOpen && (
+        <div
+          className="fixed inset-0 z-40 bg-gray-600 bg-opacity-75 lg:hidden"
+          onClick={() => setSidebarOpen(false)}
+        />
+      )}
 
-        <div className="flex flex-col flex-1 overflow-hidden">
-          <Header setSidebarOpen={setSidebarOpen} />
-          <main className="flex-1 overflow-y-auto p-6">
-            <Outlet />
-          </main>
-        </div>
+      <div className="flex flex-col flex-1 overflow-hidden">
+        <Header setSidebarOpen={setSidebarOpen} />
+        <main className="flex-1 overflow-y-auto p-6">
+          <Outlet />
+        </main>
       </div>
-    );
-  },
+    </div>
+  );
+}
+
+export const Route = createRootRoute({
+  component: RootLayout,
 });

frontend/vite.config.ts

@@ -4,8 +4,5 @@ import { TanStackRouterVite } from "@tanstack/router-vite-plugin";
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [
-    TanStackRouterVite(),
-    react(),
-  ],
+  plugins: [TanStackRouterVite(), react()],
 });

leggen/database/sqlite.py

@@ -118,7 +118,9 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
     # Create the transactions table if it doesn't exist
     cursor.execute(
         """CREATE TABLE IF NOT EXISTS transactions (
-        internalTransactionId TEXT PRIMARY KEY,
+        accountId TEXT NOT NULL,
+        transactionId TEXT NOT NULL,
+        internalTransactionId TEXT,
         institutionId TEXT,
         iban TEXT,
         transactionDate DATETIME,
@@ -126,15 +128,15 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
         transactionValue REAL,
         transactionCurrency TEXT,
         transactionStatus TEXT,
-        accountId TEXT,
-        rawTransaction JSON
+        rawTransaction JSON,
+        PRIMARY KEY (accountId, transactionId)
     )"""
     )
 
     # Create indexes for better performance
     cursor.execute(
-        """CREATE INDEX IF NOT EXISTS idx_transactions_account_id
-           ON transactions(accountId)"""
+        """CREATE INDEX IF NOT EXISTS idx_transactions_internal_id
+           ON transactions(internalTransactionId)"""
     )
     cursor.execute(
         """CREATE INDEX IF NOT EXISTS idx_transactions_date
@@ -153,7 +155,9 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
     duplicates_count = 0
 
     # Prepare an SQL statement for inserting data
-    insert_sql = """INSERT INTO transactions (
+    insert_sql = """INSERT OR REPLACE INTO transactions (
+        accountId,
+        transactionId,
         internalTransactionId,
         institutionId,
         iban,
@@ -162,9 +166,8 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
         transactionValue,
         transactionCurrency,
         transactionStatus,
-        accountId,
         rawTransaction
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"""
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"""
 
     new_transactions = []
 
@@ -173,7 +176,9 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
             cursor.execute(
                 insert_sql,
                 (
-                    transaction["internalTransactionId"],
+                    transaction["accountId"],
+                    transaction["transactionId"],
+                    transaction.get("internalTransactionId"),
                     transaction["institutionId"],
                     transaction["iban"],
                     transaction["transactionDate"],
@@ -181,7 +186,6 @@ def persist_transactions(ctx: click.Context, account: str, transactions: list) -
                     transaction["transactionValue"],
                     transaction["transactionCurrency"],
                     transaction["transactionStatus"],
-                    transaction["accountId"],
                     json.dumps(transaction["rawTransaction"]),
                 ),
             )

leggend/api/routes/notifications.py

@@ -36,14 +36,11 @@ async def get_notification_settings() -> APIResponse:
             if discord_config.get("webhook")
             else None,
             telegram=TelegramConfig(
-                token="***"
-                if (telegram_config.get("token") or telegram_config.get("api-key"))
-                else "",
-                chat_id=telegram_config.get("chat_id")
-                or telegram_config.get("chat-id", 0),
+                token="***" if telegram_config.get("api-key") else "",
+                chat_id=telegram_config.get("chat-id", 0),
                 enabled=telegram_config.get("enabled", True),
             )
-            if (telegram_config.get("token") or telegram_config.get("api-key"))
+            if telegram_config.get("api-key")
             else None,
             filters=NotificationFilters(
                 case_insensitive=filters_config.get("case-insensitive", []),
@@ -79,8 +76,8 @@ async def update_notification_settings(settings: NotificationSettings) -> APIRes
 
         if settings.telegram:
             notifications_config["telegram"] = {
-                "token": settings.telegram.token,
-                "chat_id": settings.telegram.chat_id,
+                "api-key": settings.telegram.token,
+                "chat-id": settings.telegram.chat_id,
                 "enabled": settings.telegram.enabled,
             }
 
@@ -155,24 +152,12 @@ async def get_notification_services() -> APIResponse:
             "telegram": {
                 "name": "Telegram",
                 "enabled": bool(
-                    (
-                        notifications_config.get("telegram", {}).get("token")
-                        or notifications_config.get("telegram", {}).get("api-key")
-                    )
-                    and (
-                        notifications_config.get("telegram", {}).get("chat_id")
-                        or notifications_config.get("telegram", {}).get("chat-id")
-                    )
+                    notifications_config.get("telegram", {}).get("api-key")
+                    and notifications_config.get("telegram", {}).get("chat-id")
                 ),
                 "configured": bool(
-                    (
-                        notifications_config.get("telegram", {}).get("token")
-                        or notifications_config.get("telegram", {}).get("api-key")
-                    )
-                    and (
-                        notifications_config.get("telegram", {}).get("chat_id")
-                        or notifications_config.get("telegram", {}).get("chat-id")
-                    )
+                    notifications_config.get("telegram", {}).get("api-key")
+                    and notifications_config.get("telegram", {}).get("chat-id")
                 ),
                 "active": notifications_config.get("telegram", {}).get("enabled", True),
             },

leggend/services/database_service.py

@@ -548,6 +548,14 @@ class DatabaseService:
             conn = sqlite3.connect(str(db_path))
             cursor = conn.cursor()
 
+            # Check if transactions table exists
+            cursor.execute(
+                "SELECT name FROM sqlite_master WHERE type='table' AND name='transactions'"
+            )
+            if not cursor.fetchone():
+                conn.close()
+                return False
+
             # Check if transactions table has the old primary key structure
             cursor.execute("PRAGMA table_info(transactions)")
             columns = cursor.fetchall()
@@ -558,26 +566,19 @@ class DatabaseService:
                 for col in columns
             )
 
-            # If internalTransactionId is still the primary key, migration is needed
-            if internal_transaction_id_is_pk:
-                # Check if there are duplicate (accountId, transactionId) pairs
-                cursor.execute("""
-                    SELECT COUNT(*) as duplicates
-                    FROM (
-                        SELECT accountId, json_extract(rawTransaction, '$.transactionId') as transactionId, COUNT(*) as cnt
-                        FROM transactions
-                        WHERE json_extract(rawTransaction, '$.transactionId') IS NOT NULL
-                        GROUP BY accountId, json_extract(rawTransaction, '$.transactionId')
-                        HAVING COUNT(*) > 1
-                    )
-                """)
-                duplicates = cursor.fetchone()[0]
-                conn.close()
-                return duplicates > 0
-            else:
-                # Migration already completed
-                conn.close()
-                return False
+            # Check if we have the new composite primary key structure
+            has_composite_key = any(
+                col[1] in ["accountId", "transactionId"]
+                and col[5] == 1  # col[5] is pk flag
+                for col in columns
+            )
+
+            conn.close()
+
+            # Migration is needed if:
+            # 1. internalTransactionId is still the primary key (old structure), OR
+            # 2. We don't have the new composite key structure yet
+            return internal_transaction_id_is_pk or not has_composite_key
 
         except Exception as e:
             logger.error(f"Failed to check composite key migration status: {e}")

leggend/services/notification_service.py

@@ -109,9 +109,8 @@ class NotificationService:
         """Check if Telegram notifications are enabled"""
         telegram_config = self.notifications_config.get("telegram", {})
         return bool(
-            telegram_config.get("token")
-            or telegram_config.get("api-key")
-            and (telegram_config.get("chat_id") or telegram_config.get("chat-id"))
+            telegram_config.get("api-key")
+            and telegram_config.get("chat-id")
             and telegram_config.get("enabled", True)
         )
 
@@ -174,10 +173,8 @@ class NotificationService:
             ctx.obj = {
                 "notifications": {
                     "telegram": {
-                        "api-key": telegram_config.get("token")
-                        or telegram_config.get("api-key"),
-                        "chat-id": telegram_config.get("chat_id")
-                        or telegram_config.get("chat-id"),
+                        "api-key": telegram_config.get("api-key"),
+                        "chat-id": telegram_config.get("chat-id"),
                     }
                 }
             }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "leggen"
-version = "2025.9.5"
+version = "2025.9.6"
 description = "An Open Banking CLI"
 authors = [{ name = "Elisiário Couto", email = "elisiario@couto.io" }]
 requires-python = "~=3.13.0"

tests/unit/test_api_accounts.py

@@ -176,6 +176,7 @@ class TestAccountsAPI:
         """Test successful retrieval of account transactions from database."""
         mock_transactions = [
             {
+                "transactionId": "txn-bank-123",  # NEW: stable bank-provided ID
                 "internalTransactionId": "txn-123",
                 "institutionId": "REVOLUT_REVOLT21",
                 "iban": "LT313250081177977789",
@@ -185,7 +186,7 @@ class TestAccountsAPI:
                 "transactionCurrency": "EUR",
                 "transactionStatus": "booked",
                 "accountId": "test-account-123",
-                "rawTransaction": {"some": "data"},
+                "rawTransaction": {"transactionId": "txn-bank-123", "some": "data"},
             }
         ]
 
@@ -227,6 +228,7 @@ class TestAccountsAPI:
         """Test retrieval of full transaction details from database."""
         mock_transactions = [
             {
+                "transactionId": "txn-bank-123",  # NEW: stable bank-provided ID
                 "internalTransactionId": "txn-123",
                 "institutionId": "REVOLUT_REVOLT21",
                 "iban": "LT313250081177977789",
@@ -236,7 +238,7 @@ class TestAccountsAPI:
                 "transactionCurrency": "EUR",
                 "transactionStatus": "booked",
                 "accountId": "test-account-123",
-                "rawTransaction": {"some": "raw_data"},
+                "rawTransaction": {"transactionId": "txn-bank-123", "some": "raw_data"},
             }
         ]
 

tests/unit/test_sqlite_database.py

@@ -36,6 +36,7 @@ def sample_transactions():
     """Sample transaction data for testing."""
     return [
         {
+            "transactionId": "bank-txn-001",  # NEW: stable bank-provided ID
             "internalTransactionId": "txn-001",
             "institutionId": "REVOLUT_REVOLT21",
             "iban": "LT313250081177977789",
@@ -45,9 +46,10 @@ def sample_transactions():
             "transactionCurrency": "EUR",
             "transactionStatus": "booked",
             "accountId": "test-account-123",
-            "rawTransaction": {"some": "data"},
+            "rawTransaction": {"transactionId": "bank-txn-001", "some": "data"},
         },
         {
+            "transactionId": "bank-txn-002",  # NEW: stable bank-provided ID
             "internalTransactionId": "txn-002",
             "institutionId": "REVOLUT_REVOLT21",
             "iban": "LT313250081177977789",
@@ -57,7 +59,7 @@ def sample_transactions():
             "transactionCurrency": "EUR",
             "transactionStatus": "booked",
             "accountId": "test-account-123",
-            "rawTransaction": {"other": "data"},
+            "rawTransaction": {"transactionId": "bank-txn-002", "other": "data"},
         },
     ]
 
@@ -120,8 +122,8 @@ class TestSQLiteDatabase:
 
             # First time should return all as new
             assert len(new_transactions_1) == 2
-            # Second time should return none (all duplicates)
-            assert len(new_transactions_2) == 0
+            # Second time should also return all (INSERT OR REPLACE behavior with composite key)
+            assert len(new_transactions_2) == 2
 
     def test_get_transactions_all(self, mock_home_db_path, sample_transactions):
         """Test retrieving all transactions."""

uv.lock

@@ -220,7 +220,7 @@ wheels = [
 
 [[package]]
 name = "leggen"
-version = "2025.9.5"
+version = "2025.9.6"
 source = { editable = "." }
 dependencies = [
     { name = "apscheduler" },