06/01 Review and optimize on UI/UX, security, and functionality

app/services/import_service.py

@@ -137,12 +137,17 @@ def import_rows(rows, skip_duplicates=True):
 
     for row in rows:
         if skip_duplicates:
-            existing = Transaction.query.filter_by(
+            q = Transaction.query.filter_by(
                 date=row['date'],
                 description=row['description'],
                 amount=row['amount'],
                 transaction_type=row['transaction_type'],
-            ).first()
+            )
+            # Scope to the same account when one is known, so identical
+            # transactions on different accounts are not incorrectly skipped.
+            if row.get('account_id'):
+                q = q.filter_by(account_id=row['account_id'])
+            existing = q.first()
             if existing:
                 skipped += 1
                 continue

app/services/recurring_service.py

@@ -53,8 +53,14 @@ def process_due_rules(dry_run=False):
                 db.session.commit()
             continue
 
-        # Create transaction for each missed occurrence up to today
+        # Create transaction for each missed occurrence up to today.
+        # Cap catchup at 90 days to prevent runaway loops on long-dormant rules.
+        catchup_floor = today - timedelta(days=90)
         run_date = rule.next_run or rule.start_date
+        if run_date < catchup_floor:
+            log.warning('[recurring] rule "%s" is >90 days overdue; starting catchup from %s',
+                        rule.description, catchup_floor)
+            run_date = catchup_floor
         affected_accounts = set()
 
         while run_date <= today: