Add
| {{ transaction.external_date|format_datetime('short') }} |
+ {{ transaction.merchant }} |
{{ transaction.description }} |
- {{ transaction.amount }} |
{{ transaction.categories.name }} |
+ {{ transaction.amount }} |
{{ transaction.account.name }} |
{{ transaction.account.institution.name }} |
@@ -162,10 +164,34 @@ Edit Transaction
+
+
+
+
+
+
+
+
+
diff --git a/scripts/add_merchant_column.py b/scripts/add_merchant_column.py
new file mode 100644
index 0000000..4889887
--- /dev/null
+++ b/scripts/add_merchant_column.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+"""
+Migration script to add merchant column to transaction table
+"""
+import os
+import sys
+
+# Change to project root directory (parent of scripts directory)
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+os.chdir(project_root)
+sys.path.insert(0, project_root)
+
+from app import create_app, db
+from sqlalchemy import text
+
+app = create_app()
+
+with app.app_context():
+ try:
+ # Add the merchant column if it doesn't exist
+ db.session.execute(text("""
+ ALTER TABLE transaction
+ ADD COLUMN IF NOT EXISTS merchant VARCHAR(255);
+ """))
+ db.session.commit()
+ print("✓ Successfully added merchant column to transaction table")
+ except Exception as e:
+ print(f"✗ Error adding merchant column: {e}")
+ db.session.rollback()
diff --git a/scripts/add_transaction_fields.py b/scripts/add_transaction_fields.py
new file mode 100644
index 0000000..b3b2f97
--- /dev/null
+++ b/scripts/add_transaction_fields.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+"""
+Migration script to add original_statement, notes, and tags columns to transaction table
+"""
+import os
+import sys
+
+# Change to project root directory (parent of scripts directory)
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+os.chdir(project_root)
+sys.path.insert(0, project_root)
+
+from app import create_app, db
+from sqlalchemy import text
+
+app = create_app()
+
+with app.app_context():
+ try:
+ # Add the new columns if they don't exist
+ db.session.execute(text("""
+ ALTER TABLE transaction
+ ADD COLUMN IF NOT EXISTS original_statement VARCHAR(255);
+ """))
+ db.session.execute(text("""
+ ALTER TABLE transaction
+ ADD COLUMN IF NOT EXISTS notes TEXT;
+ """))
+ db.session.execute(text("""
+ ALTER TABLE transaction
+ ADD COLUMN IF NOT EXISTS tags VARCHAR(255);
+ """))
+ db.session.commit()
+ print("✓ Successfully added original_statement, notes, and tags columns to transaction table")
+ except Exception as e:
+ print(f"✗ Error adding columns: {e}")
+ db.session.rollback()
diff --git a/scripts/clear_tables.py b/scripts/clear_tables.py
new file mode 100644
index 0000000..5131601
--- /dev/null
+++ b/scripts/clear_tables.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+"""
+Script to clear all tables except user table
+"""
+import os
+import sys
+
+# Change to project root directory (parent of scripts directory)
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+os.chdir(project_root)
+sys.path.insert(0, project_root)
+
+from app import create_app, db
+from sqlalchemy import text
+
+app = create_app()
+
+with app.app_context():
+ try:
+ # Clear tables in correct order (respecting foreign key constraints)
+ print("Clearing tables...")
+
+ # Delete transactions first (has foreign keys to categories and accounts)
+ result = db.session.execute(text("DELETE FROM transaction"))
+ print(f"✓ Cleared transaction table ({result.rowcount} rows)")
+
+ # Delete accounts (has foreign key to institution)
+ result = db.session.execute(text("DELETE FROM account"))
+ print(f"✓ Cleared account table ({result.rowcount} rows)")
+
+ # Delete institutions
+ result = db.session.execute(text("DELETE FROM institution"))
+ print(f"✓ Cleared institution table ({result.rowcount} rows)")
+
+ # Delete categories (has foreign keys to categories_group and categories_type)
+ result = db.session.execute(text("DELETE FROM categories"))
+ print(f"✓ Cleared categories table ({result.rowcount} rows)")
+
+ # Delete categories_group (has foreign key to categories_type)
+ result = db.session.execute(text("DELETE FROM categories_group"))
+ print(f"✓ Cleared categories_group table ({result.rowcount} rows)")
+
+ # Delete categories_type
+ result = db.session.execute(text("DELETE FROM categories_type"))
+ print(f"✓ Cleared categories_type table ({result.rowcount} rows)")
+
+ db.session.commit()
+ print("\n✓ Successfully cleared all tables (except user table)")
+ print("\nYou can now start fresh with importing categories and transactions!")
+
+ except Exception as e:
+ print(f"✗ Error clearing tables: {e}")
+ db.session.rollback()
diff --git a/scripts/clear_transactions.py b/scripts/clear_transactions.py
new file mode 100644
index 0000000..67b4a31
--- /dev/null
+++ b/scripts/clear_transactions.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+"""
+Script to clear only the transactions table
+"""
+import os
+import sys
+
+# Change to project root directory (parent of scripts directory)
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+os.chdir(project_root)
+sys.path.insert(0, project_root)
+
+from app import create_app, db
+from sqlalchemy import text
+
+app = create_app()
+
+with app.app_context():
+ try:
+ # Delete all transactions
+ result = db.session.execute(text("DELETE FROM transaction"))
+ db.session.commit()
+ print(f"✓ Cleared transaction table ({result.rowcount} rows)")
+ print("\nTransactions table is now empty. Ready for fresh import!")
+
+ except Exception as e:
+ print(f"✗ Error clearing transactions: {e}")
+ db.session.rollback()
diff --git a/scripts/convert_monarch_categories.py b/scripts/convert_monarch_categories.py
new file mode 100644
index 0000000..d0bc014
--- /dev/null
+++ b/scripts/convert_monarch_categories.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+"""
+Convert Monarch categories JSON to CSV format for OSPF import
+"""
+import json
+import csv
+import os
+import sys
+
+# Change to project root directory (parent of scripts directory)
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+os.chdir(project_root)
+
+# Read the JSON file
+with open('data/monarch-categories.json', 'r') as f:
+ data = json.load(f)
+
+# Extract categories
+categories = data['data']['categories']
+
+# Create a set to track unique combinations (to avoid duplicates)
+seen = set()
+rows = []
+
+for category in categories:
+ # Skip disabled categories
+ if category.get('isDisabled', False):
+ continue
+
+ category_name = category['name']
+ group_name = category['group']['name']
+ group_type = category['group']['type']
+
+ # Capitalize first letter of type for consistency with existing data
+ if group_type == 'income':
+ type_name = 'Income'
+ elif group_type == 'expense':
+ type_name = 'Expense'
+ elif group_type == 'transfer':
+ type_name = 'Transfer'
+ else:
+ type_name = group_type.capitalize()
+
+ # Create unique key
+ key = (category_name, group_name, type_name)
+
+ # Only add if not seen before
+ if key not in seen:
+ seen.add(key)
+ rows.append({
+ 'categories': category_name,
+ 'categories_group': group_name,
+ 'categories_type': type_name
+ })
+
+# Sort by type, then group, then category
+rows.sort(key=lambda x: (x['categories_type'], x['categories_group'], x['categories']))
+
+# Write to CSV
+with open('data/monarch-categories-data.csv', 'w', newline='', encoding='utf-8') as f:
+ writer = csv.DictWriter(f, fieldnames=['categories', 'categories_group', 'categories_type'])
+ writer.writeheader()
+ writer.writerows(rows)
+
+print(f"✓ Successfully created monarch-categories-data.csv with {len(rows)} categories")
+print(f"\nBreakdown:")
+print(f" - Income categories: {sum(1 for r in rows if r['categories_type'] == 'Income')}")
+print(f" - Expense categories: {sum(1 for r in rows if r['categories_type'] == 'Expense')}")
+print(f" - Transfer categories: {sum(1 for r in rows if r['categories_type'] == 'Transfer')}")
|