mirror of
https://github.com/elisiariocouto/leggen.git
synced 2025-12-13 23:12:16 +00:00
Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5eecc72219 | ||
|
|
b1b348badb | ||
|
|
d2bc179d59 | ||
|
|
9fee74e2a9 | ||
|
|
7c06a1d8b9 | ||
|
|
d78f481192 | ||
|
|
b32853e8fd | ||
|
|
0750c41b7b | ||
|
|
1cd63731a3 | ||
|
|
38fddeb281 | ||
|
|
0205e5be0d | ||
|
|
ca7968cc3c | ||
|
|
e6da6ee9ab | ||
|
|
8802d24789 | ||
|
|
d3954f079b | ||
|
|
0b68038739 | ||
|
|
d36568da54 | ||
|
|
473f126d3e | ||
|
|
222bb2ec64 | ||
|
|
22ec0e36b1 | ||
|
|
0122913052 | ||
|
|
7f2a4634c5 | ||
|
|
704c3d4cb7 | ||
|
|
ef7c026db9 | ||
|
|
dc3522220a | ||
|
|
1693b3a50d | ||
|
|
460c5af6ea | ||
|
|
5a8614e019 | ||
|
|
ae5d034d4b | ||
|
|
d4edf69f2c | ||
|
|
d3a1696d4d | ||
|
|
24792744f9 | ||
|
|
b9ca74e7e6 | ||
|
|
a8f704129b | ||
|
|
62cd55e48f | ||
|
|
e4e3f885ea | ||
|
|
36d698f7ce |
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@@ -2,9 +2,9 @@ name: CI
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "main", "dev" ]
|
branches: ["main", "dev"]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "main", "dev" ]
|
branches: ["main", "dev"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test-python:
|
test-python:
|
||||||
@@ -43,8 +43,8 @@ jobs:
|
|||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: "20"
|
||||||
cache: 'npm'
|
cache: "npm"
|
||||||
cache-dependency-path: frontend/package-lock.json
|
cache-dependency-path: frontend/package-lock.json
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -165,3 +165,4 @@ leggen.db
|
|||||||
*.db
|
*.db
|
||||||
config.toml
|
config.toml
|
||||||
.claude/
|
.claude/
|
||||||
|
.playwright-mcp/
|
||||||
|
|||||||
11
.mcp.json
11
.mcp.json
@@ -2,16 +2,11 @@
|
|||||||
"mcpServers": {
|
"mcpServers": {
|
||||||
"shadcn": {
|
"shadcn": {
|
||||||
"command": "npx",
|
"command": "npx",
|
||||||
"args": [
|
"args": ["shadcn@latest", "mcp"]
|
||||||
"shadcn@latest",
|
|
||||||
"mcp"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"browsermcp": {
|
"playwright": {
|
||||||
"command": "npx",
|
"command": "npx",
|
||||||
"args": [
|
"args": ["@playwright/mcp@latest"]
|
||||||
"@browsermcp/mcp@latest"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ repos:
|
|||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
exclude: ".*\\.md$"
|
exclude: ".*\\.md$"
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
- id: check-added-large-files
|
|
||||||
- repo: local
|
- repo: local
|
||||||
hooks:
|
hooks:
|
||||||
- id: mypy
|
- id: mypy
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ The command outputs instructions for setting the required environment variable t
|
|||||||
uv run leggen server
|
uv run leggen server
|
||||||
```
|
```
|
||||||
- For development mode with auto-reload: `uv run leggen server --reload`
|
- For development mode with auto-reload: `uv run leggen server --reload`
|
||||||
- API will be available at `http://localhost:8000` with docs at `http://localhost:8000/docs`
|
- API will be available at `http://localhost:8000` with docs at `http://localhost:8000/api/v1/docs`
|
||||||
|
|
||||||
### Start the Frontend
|
### Start the Frontend
|
||||||
1. Navigate to the frontend directory: `cd frontend`
|
1. Navigate to the frontend directory: `cd frontend`
|
||||||
@@ -138,3 +138,4 @@ This repository follows conventional changelog practices. Refer to `CONTRIBUTING
|
|||||||
- Commit message format and scoping
|
- Commit message format and scoping
|
||||||
- Release process using `scripts/release.sh`
|
- Release process using `scripts/release.sh`
|
||||||
- Pre-commit hooks setup with `pre-commit install`
|
- Pre-commit hooks setup with `pre-commit install`
|
||||||
|
- When the pre-commit fails, the commit is canceled
|
||||||
|
|||||||
158
CHANGELOG.md
158
CHANGELOG.md
@@ -1,4 +1,162 @@
|
|||||||
|
|
||||||
|
## 2025.11.0 (2025/11/22)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **frontend:** Apply iOS safe area insets to body element instead of individual components. ([d2bc179d](https://github.com/elisiariocouto/leggen/commit/d2bc179d5937172a01ebbfffd35e7617f0ac32af))
|
||||||
|
- Fallback to internal_transaction_id when bank transactions do not have transaction_id. ([b1b348ba](https://github.com/elisiariocouto/leggen/commit/b1b348badb5d1ea9c01ef9ecab1003252165468c))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.10.2 (2025/10/06)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **frontend:** Improve nginx config. ([d78f4811](https://github.com/elisiariocouto/leggen/commit/d78f4811922df7e637abe65b1d0b1157dd331c3c))
|
||||||
|
- **frontend:** Include default mime types. ([7c06a1d8](https://github.com/elisiariocouto/leggen/commit/7c06a1d8b9bca3da2c481d9e89e7564cfffe32a3))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.10.1 (2025/10/05)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **frontend:** Fix PWA caching system, remove prompts. ([1cd63731](https://github.com/elisiariocouto/leggen/commit/1cd63731a35a1c77a59d7ae1a898ad8f22e362e4))
|
||||||
|
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- Improve documentation, add gif showing web app. ([0750c41b](https://github.com/elisiariocouto/leggen/commit/0750c41b7b6634900ec19b1701d58b06346028e3))
|
||||||
|
|
||||||
|
|
||||||
|
### Refactor
|
||||||
|
|
||||||
|
- **frontend:** Standardize button styling using shadcn Button component. ([38fddeb2](https://github.com/elisiariocouto/leggen/commit/38fddeb281588de41d8ff6292c1dd48443a059a4))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.10.0 (2025/10/01)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **gocardless:** Increase timeout to 30 seconds, some requests take some time. ([ca7968cc](https://github.com/elisiariocouto/leggen/commit/ca7968cc3c625e243fe2d75590a9e56f3100072b))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.26 (2025/09/30)
|
||||||
|
|
||||||
|
### Debug
|
||||||
|
|
||||||
|
- Log different sets of GoCardless rate limits. ([8802d247](https://github.com/elisiariocouto/leggen/commit/8802d24789cbb8e854d857a0d7cc89a25a26f378))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.25 (2025/09/30)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **api:** Fix S3 backup path-style configuration and improve UX. ([22ec0e36](https://github.com/elisiariocouto/leggen/commit/22ec0e36b11e5b017075bee51de0423a53ec4648))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **api:** Add S3 backup functionality to backend ([7f2a4634](https://github.com/elisiariocouto/leggen/commit/7f2a4634c51814b6785433a25ce42d20aea0558c))
|
||||||
|
- **frontend:** Add S3 backup UI and complete backup functionality ([01229130](https://github.com/elisiariocouto/leggen/commit/0122913052793bcbf011cb557ef182be21c5de93))
|
||||||
|
- **frontend:** Add ability to list backups and create a backup on demand. ([473f126d](https://github.com/elisiariocouto/leggen/commit/473f126d3e699521172539f2ca0bff0579ccee51))
|
||||||
|
|
||||||
|
|
||||||
|
### Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Log more rate limit headers. ([d36568da](https://github.com/elisiariocouto/leggen/commit/d36568da540d4fb4ae1fa10b322a3fa77dcc5360))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.24 (2025/09/25)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **frontend:** Add comprehensive bank account management system. ([ef7c026d](https://github.com/elisiariocouto/leggen/commit/ef7c026db9911cc3be8d5f48e42a4d7beb4b9d0a))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.24 (2025/09/25)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **frontend:** Add comprehensive bank account management system. ([ef7c026d](https://github.com/elisiariocouto/leggen/commit/ef7c026db9911cc3be8d5f48e42a4d7beb4b9d0a))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.23 (2025/09/24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **cli:** Fix API URL handling for subpaths and improve client robustness. ([ae5d034d](https://github.com/elisiariocouto/leggen/commit/ae5d034d4b1da785e3dc240c1d60c2cae7de8010))
|
||||||
|
- Correct sync trigger types from manual to scheduled/retry. ([460c5af6](https://github.com/elisiariocouto/leggen/commit/460c5af6ea343ef5685b716413d01d7a30fa9acf))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **frontend:** Add version-based cache invalidation for PWA updates ([d4edf69f](https://github.com/elisiariocouto/leggen/commit/d4edf69f2cea2515a00435ee974116948057148d))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.23 (2025/09/24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **cli:** Fix API URL handling for subpaths and improve client robustness. ([ae5d034d](https://github.com/elisiariocouto/leggen/commit/ae5d034d4b1da785e3dc240c1d60c2cae7de8010))
|
||||||
|
- Correct sync trigger types from manual to scheduled/retry. ([460c5af6](https://github.com/elisiariocouto/leggen/commit/460c5af6ea343ef5685b716413d01d7a30fa9acf))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **frontend:** Add version-based cache invalidation for PWA updates ([d4edf69f](https://github.com/elisiariocouto/leggen/commit/d4edf69f2cea2515a00435ee974116948057148d))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.22 (2025/09/24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **api:** Add automatic token refresh on 401 errors in GoCardless service. ([36d698f7](https://github.com/elisiariocouto/leggen/commit/36d698f7ce05c7db0e4b07dd07979de2c70b053e))
|
||||||
|
- **api:** Fix banks API test fixtures to match GoCardless response format. ([24792744](https://github.com/elisiariocouto/leggen/commit/24792744f9660063e1a3abb9ed8e925fea9a5e60))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **api:** Add separate sync failure notifications. ([e4e3f885](https://github.com/elisiariocouto/leggen/commit/e4e3f885eab1d45b0e10465ca04eb3f74e9c5a4d))
|
||||||
|
- **api:** Add bank logo support and fix banks endpoint type errors. ([b9ca74e7](https://github.com/elisiariocouto/leggen/commit/b9ca74e7e67c3877728b749a42f15f0c0d906561))
|
||||||
|
- **frontend:** Improve System page and TransactionsTable UX. ([62cd55e4](https://github.com/elisiariocouto/leggen/commit/62cd55e48fff7c2f5db9dd8230a7bd500e8f6eed))
|
||||||
|
|
||||||
|
|
||||||
|
### Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Add pre-commit instructions to AGENTS.md. ([a8f70412](https://github.com/elisiariocouto/leggen/commit/a8f704129b2453e604cf2ab776791ba1e91e6fc7))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 2025.9.22 (2025/09/24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **api:** Add automatic token refresh on 401 errors in GoCardless service. ([36d698f7](https://github.com/elisiariocouto/leggen/commit/36d698f7ce05c7db0e4b07dd07979de2c70b053e))
|
||||||
|
- **api:** Fix banks API test fixtures to match GoCardless response format. ([24792744](https://github.com/elisiariocouto/leggen/commit/24792744f9660063e1a3abb9ed8e925fea9a5e60))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- **api:** Add separate sync failure notifications. ([e4e3f885](https://github.com/elisiariocouto/leggen/commit/e4e3f885eab1d45b0e10465ca04eb3f74e9c5a4d))
|
||||||
|
- **api:** Add bank logo support and fix banks endpoint type errors. ([b9ca74e7](https://github.com/elisiariocouto/leggen/commit/b9ca74e7e67c3877728b749a42f15f0c0d906561))
|
||||||
|
- **frontend:** Improve System page and TransactionsTable UX. ([62cd55e4](https://github.com/elisiariocouto/leggen/commit/62cd55e48fff7c2f5db9dd8230a7bd500e8f6eed))
|
||||||
|
|
||||||
|
|
||||||
|
### Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Add pre-commit instructions to AGENTS.md. ([a8f70412](https://github.com/elisiariocouto/leggen/commit/a8f704129b2453e604cf2ab776791ba1e91e6fc7))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 2025.9.21 (2025/09/22)
|
## 2025.9.21 (2025/09/22)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
280
README.md
280
README.md
@@ -1,13 +1,21 @@
|
|||||||
# 💲 leggen
|
# 💲 leggen
|
||||||
|
|
||||||
An Open Banking CLI and API service for managing bank connections and transactions.
|
|
||||||
|
|
||||||
This tool provides a **unified command-line interface** (`leggen`) with both CLI commands and an integrated **FastAPI backend service**, plus a **React Web Interface** to connect to banks using the GoCardless Open Banking API.
|
A self hosted Open Banking Dashboard, API and CLI for managing bank connections and transactions.
|
||||||
|
|
||||||
Having your bank data accessible through both CLI and REST API gives you the power to backup, analyze, create reports, and integrate with other applications.
|
Having your bank data accessible through both CLI and REST API gives you the power to backup, analyze, create reports, and integrate with other applications.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
## 🛠️ Technologies
|
## 🛠️ Technologies
|
||||||
|
|
||||||
|
### Frontend
|
||||||
|
- [React](https://reactjs.org/): Modern web interface with TypeScript
|
||||||
|
- [Vite](https://vitejs.dev/): Fast build tool and development server
|
||||||
|
- [Tailwind CSS](https://tailwindcss.com/): Utility-first CSS framework
|
||||||
|
- [shadcn/ui](https://ui.shadcn.com/): Modern component system built on Radix UI
|
||||||
|
- [TanStack Query](https://tanstack.com/query): Powerful data synchronization for React
|
||||||
|
|
||||||
### 🔌 API & Backend
|
### 🔌 API & Backend
|
||||||
- [FastAPI](https://fastapi.tiangolo.com/): High-performance async API backend (integrated into `leggen server`)
|
- [FastAPI](https://fastapi.tiangolo.com/): High-performance async API backend (integrated into `leggen server`)
|
||||||
- [GoCardless Open Banking API](https://developer.gocardless.com/bank-account-data/overview): for connecting to banks
|
- [GoCardless Open Banking API](https://developer.gocardless.com/bank-account-data/overview): for connecting to banks
|
||||||
@@ -16,12 +24,6 @@ Having your bank data accessible through both CLI and REST API gives you the pow
|
|||||||
### 📦 Storage
|
### 📦 Storage
|
||||||
- [SQLite](https://www.sqlite.org): for storing transactions, simple and easy to use
|
- [SQLite](https://www.sqlite.org): for storing transactions, simple and easy to use
|
||||||
|
|
||||||
### Frontend
|
|
||||||
- [React](https://reactjs.org/): Modern web interface with TypeScript
|
|
||||||
- [Vite](https://vitejs.dev/): Fast build tool and development server
|
|
||||||
- [Tailwind CSS](https://tailwindcss.com/): Utility-first CSS framework
|
|
||||||
- [shadcn/ui](https://ui.shadcn.com/): Modern component system built on Radix UI
|
|
||||||
- [TanStack Query](https://tanstack.com/query): Powerful data synchronization for React
|
|
||||||
|
|
||||||
## ✨ Features
|
## ✨ Features
|
||||||
|
|
||||||
@@ -54,10 +56,9 @@ Having your bank data accessible through both CLI and REST API gives you the pow
|
|||||||
1. Create a GoCardless account at [https://gocardless.com/bank-account-data/](https://gocardless.com/bank-account-data/)
|
1. Create a GoCardless account at [https://gocardless.com/bank-account-data/](https://gocardless.com/bank-account-data/)
|
||||||
2. Get your API credentials (key and secret)
|
2. Get your API credentials (key and secret)
|
||||||
|
|
||||||
### Installation Options
|
### Installation
|
||||||
|
|
||||||
#### Option 1: Docker Compose (Recommended)
|
#### Docker Compose (Recommended)
|
||||||
The easiest way to get started is with Docker Compose, which includes both the React frontend and FastAPI backend:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Clone the repository
|
# Clone the repository
|
||||||
@@ -68,50 +69,11 @@ cd leggen
|
|||||||
mkdir -p data && cp config.example.toml data/config.toml
|
mkdir -p data && cp config.example.toml data/config.toml
|
||||||
# Edit data/config.toml with your GoCardless credentials
|
# Edit data/config.toml with your GoCardless credentials
|
||||||
|
|
||||||
# Start all services (frontend + backend)
|
# Start all services
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
# Access the web interface at http://localhost:3000
|
# Access the web interface at http://localhost:3000
|
||||||
# API is available at http://localhost:8000
|
# API documentation at http://localhost:3000/api/v1/docs
|
||||||
```
|
|
||||||
|
|
||||||
#### Production Deployment
|
|
||||||
|
|
||||||
For production deployment using published Docker images:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Clone the repository
|
|
||||||
git clone https://github.com/elisiariocouto/leggen.git
|
|
||||||
cd leggen
|
|
||||||
|
|
||||||
# Create your configuration
|
|
||||||
mkdir -p data && cp config.example.toml data/config.toml
|
|
||||||
# Edit data/config.toml with your GoCardless credentials
|
|
||||||
|
|
||||||
# Start production services
|
|
||||||
docker compose up -d
|
|
||||||
|
|
||||||
# Access the web interface at http://localhost:3000
|
|
||||||
# API is available at http://localhost:8000
|
|
||||||
```
|
|
||||||
|
|
||||||
### Development vs Production
|
|
||||||
|
|
||||||
- **Development**: Use `docker compose -f compose.dev.yml up -d` (builds from source)
|
|
||||||
- **Production**: Use `docker compose up -d` (uses published images)
|
|
||||||
|
|
||||||
#### Option 2: Local Development
|
|
||||||
For development or local installation:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Install with uv (recommended) or pip
|
|
||||||
uv sync # or pip install -e .
|
|
||||||
|
|
||||||
# Start the API service
|
|
||||||
uv run leggen server --reload # Development mode with auto-reload
|
|
||||||
|
|
||||||
# Use the CLI (in another terminal)
|
|
||||||
uv run leggen --help
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
@@ -153,214 +115,22 @@ case_sensitive = ["SpecificStore"]
|
|||||||
|
|
||||||
## 📖 Usage
|
## 📖 Usage
|
||||||
|
|
||||||
### API Service (`leggen server`)
|
### Web Interface
|
||||||
|
Access the React web interface at `http://localhost:3000` after starting the services.
|
||||||
|
|
||||||
Start the FastAPI backend service:
|
### API Service
|
||||||
|
Visit `http://localhost:3000/api/v1/docs` for interactive API documentation.
|
||||||
|
|
||||||
|
### CLI Commands
|
||||||
```bash
|
```bash
|
||||||
# Production mode
|
leggen status # Check connection status
|
||||||
leggen server
|
leggen bank add # Connect to a new bank
|
||||||
|
leggen balances # View account balances
|
||||||
# Development mode with auto-reload
|
leggen transactions # List transactions
|
||||||
leggen server --reload
|
leggen sync # Trigger background sync
|
||||||
|
|
||||||
# Custom host and port
|
|
||||||
leggen server --host 127.0.0.1 --port 8080
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**API Documentation**: Visit `http://localhost:8000/docs` for interactive API documentation.
|
For more options, run `leggen --help` or `leggen <command> --help`.
|
||||||
|
|
||||||
### CLI Commands (`leggen`)
|
|
||||||
|
|
||||||
#### Basic Commands
|
|
||||||
```bash
|
|
||||||
# Check connection status
|
|
||||||
leggen status
|
|
||||||
|
|
||||||
# Connect to a new bank
|
|
||||||
leggen bank add
|
|
||||||
|
|
||||||
# View account balances
|
|
||||||
leggen balances
|
|
||||||
|
|
||||||
# List recent transactions
|
|
||||||
leggen transactions --limit 20
|
|
||||||
|
|
||||||
# View detailed transactions
|
|
||||||
leggen transactions --full
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Sync Operations
|
|
||||||
```bash
|
|
||||||
# Start background sync
|
|
||||||
leggen sync
|
|
||||||
|
|
||||||
# Synchronous sync (wait for completion)
|
|
||||||
leggen sync --wait
|
|
||||||
|
|
||||||
# Force sync (override running sync)
|
|
||||||
leggen sync --force --wait
|
|
||||||
```
|
|
||||||
|
|
||||||
#### API Integration
|
|
||||||
```bash
|
|
||||||
# Use custom API URL
|
|
||||||
leggen --api-url http://localhost:8080 status
|
|
||||||
|
|
||||||
# Set via environment variable
|
|
||||||
export LEGGEN_API_URL=http://localhost:8080
|
|
||||||
leggen status
|
|
||||||
```
|
|
||||||
|
|
||||||
### Docker Usage
|
|
||||||
|
|
||||||
#### Development (build from source)
|
|
||||||
```bash
|
|
||||||
# Start development services
|
|
||||||
docker compose -f compose.dev.yml up -d
|
|
||||||
|
|
||||||
# View service status
|
|
||||||
docker compose -f compose.dev.yml ps
|
|
||||||
|
|
||||||
# Check logs
|
|
||||||
docker compose -f compose.dev.yml logs frontend
|
|
||||||
docker compose -f compose.dev.yml logs leggen-server
|
|
||||||
|
|
||||||
# Stop development services
|
|
||||||
docker compose -f compose.dev.yml down
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Production (use published images)
|
|
||||||
```bash
|
|
||||||
# Start production services
|
|
||||||
docker compose up -d
|
|
||||||
|
|
||||||
# View service status
|
|
||||||
docker compose ps
|
|
||||||
|
|
||||||
# Check logs
|
|
||||||
docker compose logs frontend
|
|
||||||
docker compose logs leggen-server
|
|
||||||
|
|
||||||
# Access the web interface at http://localhost:3000
|
|
||||||
# API documentation at http://localhost:8000/docs
|
|
||||||
|
|
||||||
# Stop production services
|
|
||||||
docker compose down
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔌 API Endpoints
|
|
||||||
|
|
||||||
The FastAPI backend provides comprehensive REST endpoints:
|
|
||||||
|
|
||||||
### Banks & Connections
|
|
||||||
- `GET /api/v1/banks/institutions?country=PT` - List available banks
|
|
||||||
- `POST /api/v1/banks/connect` - Create bank connection
|
|
||||||
- `GET /api/v1/banks/status` - Connection status
|
|
||||||
- `GET /api/v1/banks/countries` - Supported countries
|
|
||||||
|
|
||||||
### Accounts & Balances
|
|
||||||
- `GET /api/v1/accounts` - List all accounts
|
|
||||||
- `GET /api/v1/accounts/{id}` - Account details
|
|
||||||
- `GET /api/v1/accounts/{id}/balances` - Account balances
|
|
||||||
- `GET /api/v1/accounts/{id}/transactions` - Account transactions
|
|
||||||
|
|
||||||
### Transactions
|
|
||||||
- `GET /api/v1/transactions` - All transactions with filtering
|
|
||||||
- `GET /api/v1/transactions/stats` - Transaction statistics
|
|
||||||
|
|
||||||
### Sync & Scheduling
|
|
||||||
- `POST /api/v1/sync` - Trigger background sync
|
|
||||||
- `POST /api/v1/sync/now` - Synchronous sync
|
|
||||||
- `GET /api/v1/sync/status` - Sync status
|
|
||||||
- `GET/PUT /api/v1/sync/scheduler` - Scheduler configuration
|
|
||||||
|
|
||||||
### Notifications
|
|
||||||
- `GET/PUT /api/v1/notifications/settings` - Manage notifications
|
|
||||||
- `POST /api/v1/notifications/test` - Test notifications
|
|
||||||
|
|
||||||
## 🛠️ Development
|
|
||||||
|
|
||||||
### Local Development Setup
|
|
||||||
```bash
|
|
||||||
# Clone and setup
|
|
||||||
git clone https://github.com/elisiariocouto/leggen.git
|
|
||||||
cd leggen
|
|
||||||
|
|
||||||
# Install dependencies
|
|
||||||
uv sync
|
|
||||||
|
|
||||||
# Start API service with auto-reload
|
|
||||||
uv run leggen server --reload
|
|
||||||
|
|
||||||
# Use CLI commands
|
|
||||||
uv run leggen status
|
|
||||||
```
|
|
||||||
|
|
||||||
### Testing
|
|
||||||
|
|
||||||
Run the comprehensive test suite with:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Run all tests
|
|
||||||
uv run pytest
|
|
||||||
|
|
||||||
# Run unit tests only
|
|
||||||
uv run pytest tests/unit/
|
|
||||||
|
|
||||||
# Run with verbose output
|
|
||||||
uv run pytest tests/unit/ -v
|
|
||||||
|
|
||||||
# Run specific test files
|
|
||||||
uv run pytest tests/unit/test_config.py -v
|
|
||||||
uv run pytest tests/unit/test_scheduler.py -v
|
|
||||||
uv run pytest tests/unit/test_api_banks.py -v
|
|
||||||
|
|
||||||
# Run tests by markers
|
|
||||||
uv run pytest -m unit # Unit tests
|
|
||||||
uv run pytest -m api # API endpoint tests
|
|
||||||
uv run pytest -m cli # CLI tests
|
|
||||||
```
|
|
||||||
|
|
||||||
The test suite includes:
|
|
||||||
- **Configuration management tests** - TOML config loading/saving
|
|
||||||
- **API endpoint tests** - FastAPI route testing with mocked dependencies
|
|
||||||
- **CLI API client tests** - HTTP client integration testing
|
|
||||||
- **Background scheduler tests** - APScheduler job management
|
|
||||||
- **Mock data and fixtures** - Realistic test data for banks, accounts, transactions
|
|
||||||
|
|
||||||
### Code Structure
|
|
||||||
```
|
|
||||||
leggen/ # CLI application
|
|
||||||
├── commands/ # CLI command implementations
|
|
||||||
├── utils/ # Shared utilities
|
|
||||||
├── api/ # FastAPI API routes and models
|
|
||||||
├── services/ # Business logic
|
|
||||||
├── background/ # Background job scheduler
|
|
||||||
└── api_client.py # API client for server communication
|
|
||||||
|
|
||||||
tests/ # Test suite
|
|
||||||
├── conftest.py # Shared test fixtures
|
|
||||||
└── unit/ # Unit tests
|
|
||||||
├── test_config.py # Configuration tests
|
|
||||||
├── test_scheduler.py # Background scheduler tests
|
|
||||||
├── test_api_banks.py # Banks API tests
|
|
||||||
├── test_api_accounts.py # Accounts API tests
|
|
||||||
└── test_api_client.py # CLI API client tests
|
|
||||||
```
|
|
||||||
|
|
||||||
### Contributing
|
|
||||||
1. Fork the repository
|
|
||||||
2. Create a feature branch
|
|
||||||
3. Make your changes with tests
|
|
||||||
4. Submit a pull request
|
|
||||||
|
|
||||||
The repository uses GitHub Actions for CI/CD:
|
|
||||||
- **CI**: Runs Python tests (`uv run pytest`) and frontend linting/build on every push
|
|
||||||
- **Release**: Creates GitHub releases with changelog when tags are pushed
|
|
||||||
|
|
||||||
## ⚠️ Notes
|
## ⚠️ Notes
|
||||||
- This project is in active development
|
- This project is in active development
|
||||||
- GoCardless API rate limits apply
|
|
||||||
- Some banks may require additional authorization steps
|
|
||||||
- Docker images are automatically built and published on releases
|
|
||||||
|
|||||||
@@ -28,3 +28,13 @@ enabled = true
|
|||||||
[filters]
|
[filters]
|
||||||
case_insensitive = ["salary", "utility"]
|
case_insensitive = ["salary", "utility"]
|
||||||
case_sensitive = ["SpecificStore"]
|
case_sensitive = ["SpecificStore"]
|
||||||
|
|
||||||
|
# Optional: S3 backup configuration
|
||||||
|
[backup.s3]
|
||||||
|
access_key_id = "your-s3-access-key"
|
||||||
|
secret_access_key = "your-s3-secret-key"
|
||||||
|
bucket_name = "your-bucket-name"
|
||||||
|
region = "us-east-1"
|
||||||
|
# endpoint_url = "https://custom-s3-endpoint.com" # Optional: for custom S3-compatible endpoints
|
||||||
|
path_style = false # Set to true for path-style addressing
|
||||||
|
enabled = true
|
||||||
|
|||||||
BIN
docs/leggen_demo.gif
Normal file
BIN
docs/leggen_demo.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 548 KiB |
@@ -1,33 +1,102 @@
|
|||||||
server {
|
server {
|
||||||
|
|
||||||
|
# MIME types for PWA
|
||||||
|
include mime.types;
|
||||||
|
types {
|
||||||
|
application/manifest+json webmanifest;
|
||||||
|
}
|
||||||
|
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
|
# Trust proxy headers from Caddy/upstream proxy
|
||||||
|
set_real_ip_from 0.0.0.0/0;
|
||||||
|
real_ip_header X-Forwarded-For;
|
||||||
|
real_ip_recursive on;
|
||||||
|
|
||||||
|
# Security headers
|
||||||
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||||
|
|
||||||
# Enable gzip compression
|
# Enable gzip compression
|
||||||
gzip on;
|
gzip on;
|
||||||
gzip_vary on;
|
gzip_vary on;
|
||||||
gzip_min_length 1024;
|
gzip_min_length 1024;
|
||||||
gzip_proxied expired no-cache no-store private auth;
|
gzip_proxied expired no-cache no-store private auth;
|
||||||
gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json;
|
gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json application/manifest+json image/svg+xml;
|
||||||
|
|
||||||
# Handle client-side routing
|
# Service worker - no cache, must revalidate
|
||||||
|
location ~ ^/(sw\.js|workbox-.*\.js)$ {
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate" always;
|
||||||
|
add_header Pragma "no-cache" always;
|
||||||
|
add_header Expires "0" always;
|
||||||
|
add_header Service-Worker-Allowed "/" always;
|
||||||
|
types {
|
||||||
|
application/javascript js;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# PWA manifest - short cache with revalidation
|
||||||
|
location ~ ^/manifest\.webmanifest$ {
|
||||||
|
add_header Cache-Control "public, max-age=3600, must-revalidate" always;
|
||||||
|
types {
|
||||||
|
application/manifest+json webmanifest;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Handle client-side routing (SPA)
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.html;
|
autoindex off;
|
||||||
|
expires off;
|
||||||
|
add_header Cache-Control "public, max-age=0, s-maxage=0, must-revalidate" always;
|
||||||
|
try_files $uri $uri/ /index.html =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
# API proxy to backend (configurable via API_BACKEND_URL env var)
|
# API proxy to backend (configurable via API_BACKEND_URL env var)
|
||||||
location /api/ {
|
location /api/ {
|
||||||
proxy_pass ${API_BACKEND_URL};
|
proxy_pass ${API_BACKEND_URL};
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
|
||||||
|
proxy_set_header X-Forwarded-Host $http_x_forwarded_host;
|
||||||
|
proxy_redirect off;
|
||||||
|
|
||||||
|
# Timeouts
|
||||||
|
proxy_connect_timeout 60s;
|
||||||
|
proxy_send_timeout 60s;
|
||||||
|
proxy_read_timeout 60s;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Cache static assets
|
# Cache static assets with immutable flag
|
||||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
|
location ~* \.(css|js)$ {
|
||||||
expires 1y;
|
expires 1y;
|
||||||
add_header Cache-Control "public, immutable";
|
add_header Cache-Control "public, immutable" always;
|
||||||
|
access_log off;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cache images and icons
|
||||||
|
location ~* \.(png|jpg|jpeg|gif|ico|svg|webp)$ {
|
||||||
|
expires 1y;
|
||||||
|
add_header Cache-Control "public, immutable" always;
|
||||||
|
access_log off;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cache fonts (if any are added later)
|
||||||
|
location ~* \.(woff|woff2|ttf|eot|otf)$ {
|
||||||
|
expires 1y;
|
||||||
|
add_header Cache-Control "public, immutable" always;
|
||||||
|
add_header Access-Control-Allow-Origin "*" always;
|
||||||
|
access_log off;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Other static files
|
||||||
|
location ~* \.(xml|txt)$ {
|
||||||
|
expires 1d;
|
||||||
|
add_header Cache-Control "public, must-revalidate" always;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ export default function AccountSettings() {
|
|||||||
|
|
||||||
const [editingAccountId, setEditingAccountId] = useState<string | null>(null);
|
const [editingAccountId, setEditingAccountId] = useState<string | null>(null);
|
||||||
const [editingName, setEditingName] = useState("");
|
const [editingName, setEditingName] = useState("");
|
||||||
|
const [failedImages, setFailedImages] = useState<Set<string>>(new Set());
|
||||||
|
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
@@ -194,8 +195,24 @@ export default function AccountSettings() {
|
|||||||
{/* Mobile layout - stack vertically */}
|
{/* Mobile layout - stack vertically */}
|
||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3 sm:gap-4">
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3 sm:gap-4">
|
||||||
<div className="flex items-start sm:items-center space-x-3 sm:space-x-4 min-w-0 flex-1">
|
<div className="flex items-start sm:items-center space-x-3 sm:space-x-4 min-w-0 flex-1">
|
||||||
<div className="flex-shrink-0 p-2 sm:p-3 bg-muted rounded-full">
|
<div className="flex-shrink-0 w-10 h-10 sm:w-12 sm:h-12 rounded-full overflow-hidden bg-muted flex items-center justify-center">
|
||||||
<Building2 className="h-5 w-5 sm:h-6 sm:w-6 text-muted-foreground" />
|
{account.logo && !failedImages.has(account.id) ? (
|
||||||
|
<img
|
||||||
|
src={account.logo}
|
||||||
|
alt={`${account.institution_id} logo`}
|
||||||
|
className="w-full h-full object-contain"
|
||||||
|
onError={() => {
|
||||||
|
console.warn(
|
||||||
|
`Failed to load bank logo for ${account.institution_id}: ${account.logo}`,
|
||||||
|
);
|
||||||
|
setFailedImages(
|
||||||
|
(prev) => new Set([...prev, account.id]),
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Building2 className="h-5 w-5 sm:h-6 sm:w-6 text-muted-foreground" />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
{editingAccountId === account.id ? (
|
{editingAccountId === account.id ? (
|
||||||
@@ -217,24 +234,28 @@ export default function AccountSettings() {
|
|||||||
}}
|
}}
|
||||||
autoFocus
|
autoFocus
|
||||||
/>
|
/>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditSave}
|
onClick={handleEditSave}
|
||||||
disabled={
|
disabled={
|
||||||
!editingName.trim() ||
|
!editingName.trim() ||
|
||||||
updateAccountMutation.isPending
|
updateAccountMutation.isPending
|
||||||
}
|
}
|
||||||
className="p-1 text-green-600 hover:text-green-700 disabled:opacity-50 disabled:cursor-not-allowed"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8 text-green-600 hover:text-green-700 hover:bg-green-100"
|
||||||
title="Save changes"
|
title="Save changes"
|
||||||
>
|
>
|
||||||
<Check className="h-4 w-4" />
|
<Check className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditCancel}
|
onClick={handleEditCancel}
|
||||||
className="p-1 text-gray-600 hover:text-gray-700"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8"
|
||||||
title="Cancel editing"
|
title="Cancel editing"
|
||||||
>
|
>
|
||||||
<X className="h-4 w-4" />
|
<X className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
@@ -248,13 +269,15 @@ export default function AccountSettings() {
|
|||||||
account.name ||
|
account.name ||
|
||||||
"Unnamed Account"}
|
"Unnamed Account"}
|
||||||
</h4>
|
</h4>
|
||||||
<button
|
<Button
|
||||||
onClick={() => handleEditStart(account)}
|
onClick={() => handleEditStart(account)}
|
||||||
className="flex-shrink-0 p-1 text-muted-foreground hover:text-foreground transition-colors"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-7 w-7 flex-shrink-0"
|
||||||
title="Edit account name"
|
title="Edit account name"
|
||||||
>
|
>
|
||||||
<Edit2 className="h-4 w-4" />
|
<Edit2 className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
|
|||||||
@@ -273,24 +273,28 @@ export default function AccountsOverview() {
|
|||||||
}}
|
}}
|
||||||
autoFocus
|
autoFocus
|
||||||
/>
|
/>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditSave}
|
onClick={handleEditSave}
|
||||||
disabled={
|
disabled={
|
||||||
!editingName.trim() ||
|
!editingName.trim() ||
|
||||||
updateAccountMutation.isPending
|
updateAccountMutation.isPending
|
||||||
}
|
}
|
||||||
className="p-1 text-green-600 hover:text-green-700 disabled:opacity-50 disabled:cursor-not-allowed"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8 text-green-600 hover:text-green-700 hover:bg-green-100"
|
||||||
title="Save changes"
|
title="Save changes"
|
||||||
>
|
>
|
||||||
<Check className="h-4 w-4" />
|
<Check className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditCancel}
|
onClick={handleEditCancel}
|
||||||
className="p-1 text-gray-600 hover:text-gray-700"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8"
|
||||||
title="Cancel editing"
|
title="Cancel editing"
|
||||||
>
|
>
|
||||||
<X className="h-4 w-4" />
|
<X className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
@@ -304,13 +308,15 @@ export default function AccountsOverview() {
|
|||||||
account.name ||
|
account.name ||
|
||||||
"Unnamed Account"}
|
"Unnamed Account"}
|
||||||
</h4>
|
</h4>
|
||||||
<button
|
<Button
|
||||||
onClick={() => handleEditStart(account)}
|
onClick={() => handleEditStart(account)}
|
||||||
className="flex-shrink-0 p-1 text-muted-foreground hover:text-foreground transition-colors"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-7 w-7 flex-shrink-0"
|
||||||
title="Edit account name"
|
title="Edit account name"
|
||||||
>
|
>
|
||||||
<Edit2 className="h-4 w-4" />
|
<Edit2 className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
|
|||||||
203
frontend/src/components/AddBankAccountDrawer.tsx
Normal file
203
frontend/src/components/AddBankAccountDrawer.tsx
Normal file
@@ -0,0 +1,203 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { useQuery, useMutation } from "@tanstack/react-query";
|
||||||
|
import { Plus, Building2, ExternalLink } from "lucide-react";
|
||||||
|
import { apiClient } from "../lib/api";
|
||||||
|
import { Button } from "./ui/button";
|
||||||
|
import { Label } from "./ui/label";
|
||||||
|
import {
|
||||||
|
Drawer,
|
||||||
|
DrawerClose,
|
||||||
|
DrawerContent,
|
||||||
|
DrawerDescription,
|
||||||
|
DrawerFooter,
|
||||||
|
DrawerHeader,
|
||||||
|
DrawerTitle,
|
||||||
|
DrawerTrigger,
|
||||||
|
} from "./ui/drawer";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "./ui/select";
|
||||||
|
import { Alert, AlertDescription } from "./ui/alert";
|
||||||
|
|
||||||
|
export default function AddBankAccountDrawer() {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [selectedCountry, setSelectedCountry] = useState<string>("");
|
||||||
|
const [selectedBank, setSelectedBank] = useState<string>("");
|
||||||
|
|
||||||
|
const { data: countries } = useQuery({
|
||||||
|
queryKey: ["supportedCountries"],
|
||||||
|
queryFn: apiClient.getSupportedCountries,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { data: banks, isLoading: banksLoading } = useQuery({
|
||||||
|
queryKey: ["bankInstitutions", selectedCountry],
|
||||||
|
queryFn: () => apiClient.getBankInstitutions(selectedCountry),
|
||||||
|
enabled: !!selectedCountry,
|
||||||
|
});
|
||||||
|
|
||||||
|
const connectBankMutation = useMutation({
|
||||||
|
mutationFn: (institutionId: string) =>
|
||||||
|
apiClient.createBankConnection(institutionId),
|
||||||
|
onSuccess: (data) => {
|
||||||
|
// Redirect to the bank's authorization link
|
||||||
|
if (data.link) {
|
||||||
|
window.open(data.link, "_blank");
|
||||||
|
setOpen(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onError: (error) => {
|
||||||
|
console.error("Failed to create bank connection:", error);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleCountryChange = (country: string) => {
|
||||||
|
setSelectedCountry(country);
|
||||||
|
setSelectedBank("");
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleConnect = () => {
|
||||||
|
if (selectedBank) {
|
||||||
|
connectBankMutation.mutate(selectedBank);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const resetForm = () => {
|
||||||
|
setSelectedCountry("");
|
||||||
|
setSelectedBank("");
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Drawer
|
||||||
|
open={open}
|
||||||
|
onOpenChange={(isOpen) => {
|
||||||
|
setOpen(isOpen);
|
||||||
|
if (!isOpen) {
|
||||||
|
resetForm();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<DrawerTrigger asChild>
|
||||||
|
<Button size="sm">
|
||||||
|
<Plus className="h-4 w-4 mr-2" />
|
||||||
|
Add New Account
|
||||||
|
</Button>
|
||||||
|
</DrawerTrigger>
|
||||||
|
<DrawerContent className="max-h-[80vh]">
|
||||||
|
<DrawerHeader>
|
||||||
|
<DrawerTitle>Connect Bank Account</DrawerTitle>
|
||||||
|
<DrawerDescription>
|
||||||
|
Select your country and bank to connect your account to Leggen
|
||||||
|
</DrawerDescription>
|
||||||
|
</DrawerHeader>
|
||||||
|
|
||||||
|
<div className="px-6 space-y-6 overflow-y-auto">
|
||||||
|
{/* Country Selection */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="country">Country</Label>
|
||||||
|
<Select value={selectedCountry} onValueChange={handleCountryChange}>
|
||||||
|
<SelectTrigger>
|
||||||
|
<SelectValue placeholder="Select your country" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{countries?.map((country) => (
|
||||||
|
<SelectItem key={country.code} value={country.code}>
|
||||||
|
{country.name}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Bank Selection */}
|
||||||
|
{selectedCountry && (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="bank">Bank</Label>
|
||||||
|
{banksLoading ? (
|
||||||
|
<div className="p-4 text-center text-muted-foreground">
|
||||||
|
Loading banks...
|
||||||
|
</div>
|
||||||
|
) : banks && banks.length > 0 ? (
|
||||||
|
<Select value={selectedBank} onValueChange={setSelectedBank}>
|
||||||
|
<SelectTrigger>
|
||||||
|
<SelectValue placeholder="Select your bank" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{banks.map((bank) => (
|
||||||
|
<SelectItem key={bank.id} value={bank.id}>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
{bank.logo ? (
|
||||||
|
<img
|
||||||
|
src={bank.logo}
|
||||||
|
alt={`${bank.name} logo`}
|
||||||
|
className="w-4 h-4 object-contain"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Building2 className="w-4 h-4" />
|
||||||
|
)}
|
||||||
|
<span>{bank.name}</span>
|
||||||
|
</div>
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
) : (
|
||||||
|
<Alert>
|
||||||
|
<AlertDescription>
|
||||||
|
No banks available for the selected country.
|
||||||
|
</AlertDescription>
|
||||||
|
</Alert>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Instructions */}
|
||||||
|
{selectedBank && (
|
||||||
|
<Alert>
|
||||||
|
<AlertDescription>
|
||||||
|
You'll be redirected to your bank's website to authorize the
|
||||||
|
connection. After approval, you'll return to Leggen and your
|
||||||
|
account will start syncing.
|
||||||
|
</AlertDescription>
|
||||||
|
</Alert>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Error Display */}
|
||||||
|
{connectBankMutation.isError && (
|
||||||
|
<Alert variant="destructive">
|
||||||
|
<AlertDescription>
|
||||||
|
Failed to create bank connection. Please try again.
|
||||||
|
</AlertDescription>
|
||||||
|
</Alert>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<DrawerFooter>
|
||||||
|
<div className="flex space-x-2">
|
||||||
|
<Button
|
||||||
|
onClick={handleConnect}
|
||||||
|
disabled={!selectedBank || connectBankMutation.isPending}
|
||||||
|
className="flex-1"
|
||||||
|
>
|
||||||
|
<ExternalLink className="h-4 w-4 mr-2" />
|
||||||
|
{connectBankMutation.isPending
|
||||||
|
? "Connecting..."
|
||||||
|
: "Open Bank Authorization"}
|
||||||
|
</Button>
|
||||||
|
<DrawerClose asChild>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
disabled={connectBankMutation.isPending}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
</DrawerClose>
|
||||||
|
</div>
|
||||||
|
</DrawerFooter>
|
||||||
|
</DrawerContent>
|
||||||
|
</Drawer>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -61,7 +61,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sidebar collapsible="icon" className="pt-safe-top pl-safe-left" {...props}>
|
<Sidebar collapsible="icon" {...props}>
|
||||||
<SidebarHeader>
|
<SidebarHeader>
|
||||||
<SidebarMenu>
|
<SidebarMenu>
|
||||||
<SidebarMenuItem>
|
<SidebarMenuItem>
|
||||||
|
|||||||
@@ -47,7 +47,10 @@ export default function DiscordConfigDrawer({
|
|||||||
apiClient.updateNotificationSettings({
|
apiClient.updateNotificationSettings({
|
||||||
...settings,
|
...settings,
|
||||||
discord: discordConfig,
|
discord: discordConfig,
|
||||||
filters: settings?.filters || { case_insensitive: [], case_sensitive: [] },
|
filters: settings?.filters || {
|
||||||
|
case_insensitive: [],
|
||||||
|
case_sensitive: [],
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
queryClient.invalidateQueries({ queryKey: ["notificationSettings"] });
|
queryClient.invalidateQueries({ queryKey: ["notificationSettings"] });
|
||||||
@@ -60,10 +63,12 @@ export default function DiscordConfigDrawer({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const testMutation = useMutation({
|
const testMutation = useMutation({
|
||||||
mutationFn: () => apiClient.testNotification({
|
mutationFn: () =>
|
||||||
service: "discord",
|
apiClient.testNotification({
|
||||||
message: "Test notification from Leggen - Discord configuration is working!"
|
service: "discord",
|
||||||
}),
|
message:
|
||||||
|
"Test notification from Leggen - Discord configuration is working!",
|
||||||
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
console.log("Test Discord notification sent successfully");
|
console.log("Test Discord notification sent successfully");
|
||||||
},
|
},
|
||||||
@@ -81,13 +86,13 @@ export default function DiscordConfigDrawer({
|
|||||||
testMutation.mutate();
|
testMutation.mutate();
|
||||||
};
|
};
|
||||||
|
|
||||||
const isConfigValid = config.webhook.trim().length > 0 && config.webhook.includes('discord.com/api/webhooks');
|
const isConfigValid =
|
||||||
|
config.webhook.trim().length > 0 &&
|
||||||
|
config.webhook.includes("discord.com/api/webhooks");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer open={open} onOpenChange={setOpen}>
|
<Drawer open={open} onOpenChange={setOpen}>
|
||||||
<DrawerTrigger asChild>
|
<DrawerTrigger asChild>{trigger || <EditButton />}</DrawerTrigger>
|
||||||
{trigger || <EditButton />}
|
|
||||||
</DrawerTrigger>
|
|
||||||
<DrawerContent>
|
<DrawerContent>
|
||||||
<div className="mx-auto w-full max-w-md">
|
<div className="mx-auto w-full max-w-md">
|
||||||
<DrawerHeader>
|
<DrawerHeader>
|
||||||
@@ -103,7 +108,9 @@ export default function DiscordConfigDrawer({
|
|||||||
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
||||||
{/* Enable/Disable Toggle */}
|
{/* Enable/Disable Toggle */}
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<Label className="text-base font-medium">Enable Discord Notifications</Label>
|
<Label className="text-base font-medium">
|
||||||
|
Enable Discord Notifications
|
||||||
|
</Label>
|
||||||
<Switch
|
<Switch
|
||||||
checked={config.enabled}
|
checked={config.enabled}
|
||||||
onCheckedChange={(enabled) => setConfig({ ...config, enabled })}
|
onCheckedChange={(enabled) => setConfig({ ...config, enabled })}
|
||||||
@@ -118,11 +125,14 @@ export default function DiscordConfigDrawer({
|
|||||||
type="url"
|
type="url"
|
||||||
placeholder="https://discord.com/api/webhooks/..."
|
placeholder="https://discord.com/api/webhooks/..."
|
||||||
value={config.webhook}
|
value={config.webhook}
|
||||||
onChange={(e) => setConfig({ ...config, webhook: e.target.value })}
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, webhook: e.target.value })
|
||||||
|
}
|
||||||
disabled={!config.enabled}
|
disabled={!config.enabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
Create a webhook in your Discord server settings under Integrations → Webhooks
|
Create a webhook in your Discord server settings under
|
||||||
|
Integrations → Webhooks
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -130,9 +140,13 @@ export default function DiscordConfigDrawer({
|
|||||||
{config.enabled && (
|
{config.enabled && (
|
||||||
<div className="p-3 bg-muted rounded-md">
|
<div className="p-3 bg-muted rounded-md">
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
<div className={`w-2 h-2 rounded-full ${isConfigValid ? 'bg-green-500' : 'bg-red-500'}`} />
|
<div
|
||||||
|
className={`w-2 h-2 rounded-full ${isConfigValid ? "bg-green-500" : "bg-red-500"}`}
|
||||||
|
/>
|
||||||
<span className="text-sm font-medium">
|
<span className="text-sm font-medium">
|
||||||
{isConfigValid ? 'Configuration Valid' : 'Invalid Webhook URL'}
|
{isConfigValid
|
||||||
|
? "Configuration Valid"
|
||||||
|
: "Invalid Webhook URL"}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{!isConfigValid && config.webhook.trim().length > 0 && (
|
{!isConfigValid && config.webhook.trim().length > 0 && (
|
||||||
@@ -145,8 +159,13 @@ export default function DiscordConfigDrawer({
|
|||||||
|
|
||||||
<DrawerFooter className="px-0">
|
<DrawerFooter className="px-0">
|
||||||
<div className="flex space-x-2">
|
<div className="flex space-x-2">
|
||||||
<Button type="submit" disabled={updateMutation.isPending || !config.enabled}>
|
<Button
|
||||||
{updateMutation.isPending ? "Saving..." : "Save Configuration"}
|
type="submit"
|
||||||
|
disabled={updateMutation.isPending || !config.enabled}
|
||||||
|
>
|
||||||
|
{updateMutation.isPending
|
||||||
|
? "Saving..."
|
||||||
|
: "Save Configuration"}
|
||||||
</Button>
|
</Button>
|
||||||
{config.enabled && isConfigValid && (
|
{config.enabled && isConfigValid && (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -67,20 +67,32 @@ export default function NotificationFiltersDrawer({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const addCaseInsensitiveFilter = () => {
|
const addCaseInsensitiveFilter = () => {
|
||||||
if (newCaseInsensitive.trim() && !filters.case_insensitive.includes(newCaseInsensitive.trim())) {
|
if (
|
||||||
|
newCaseInsensitive.trim() &&
|
||||||
|
!filters.case_insensitive.includes(newCaseInsensitive.trim())
|
||||||
|
) {
|
||||||
setFilters({
|
setFilters({
|
||||||
...filters,
|
...filters,
|
||||||
case_insensitive: [...filters.case_insensitive, newCaseInsensitive.trim()],
|
case_insensitive: [
|
||||||
|
...filters.case_insensitive,
|
||||||
|
newCaseInsensitive.trim(),
|
||||||
|
],
|
||||||
});
|
});
|
||||||
setNewCaseInsensitive("");
|
setNewCaseInsensitive("");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const addCaseSensitiveFilter = () => {
|
const addCaseSensitiveFilter = () => {
|
||||||
if (newCaseSensitive.trim() && !filters.case_sensitive?.includes(newCaseSensitive.trim())) {
|
if (
|
||||||
|
newCaseSensitive.trim() &&
|
||||||
|
!filters.case_sensitive?.includes(newCaseSensitive.trim())
|
||||||
|
) {
|
||||||
setFilters({
|
setFilters({
|
||||||
...filters,
|
...filters,
|
||||||
case_sensitive: [...(filters.case_sensitive || []), newCaseSensitive.trim()],
|
case_sensitive: [
|
||||||
|
...(filters.case_sensitive || []),
|
||||||
|
newCaseSensitive.trim(),
|
||||||
|
],
|
||||||
});
|
});
|
||||||
setNewCaseSensitive("");
|
setNewCaseSensitive("");
|
||||||
}
|
}
|
||||||
@@ -96,30 +108,33 @@ export default function NotificationFiltersDrawer({
|
|||||||
const removeCaseSensitiveFilter = (index: number) => {
|
const removeCaseSensitiveFilter = (index: number) => {
|
||||||
setFilters({
|
setFilters({
|
||||||
...filters,
|
...filters,
|
||||||
case_sensitive: filters.case_sensitive?.filter((_, i) => i !== index) || [],
|
case_sensitive:
|
||||||
|
filters.case_sensitive?.filter((_, i) => i !== index) || [],
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer open={open} onOpenChange={setOpen}>
|
<Drawer open={open} onOpenChange={setOpen}>
|
||||||
<DrawerTrigger asChild>
|
<DrawerTrigger asChild>{trigger || <EditButton />}</DrawerTrigger>
|
||||||
{trigger || <EditButton />}
|
|
||||||
</DrawerTrigger>
|
|
||||||
<DrawerContent>
|
<DrawerContent>
|
||||||
<div className="mx-auto w-full max-w-2xl">
|
<div className="mx-auto w-full max-w-2xl">
|
||||||
<DrawerHeader>
|
<DrawerHeader>
|
||||||
<DrawerTitle>Notification Filters</DrawerTitle>
|
<DrawerTitle>Notification Filters</DrawerTitle>
|
||||||
<DrawerDescription>
|
<DrawerDescription>
|
||||||
Configure which transaction descriptions should trigger notifications
|
Configure which transaction descriptions should trigger
|
||||||
|
notifications
|
||||||
</DrawerDescription>
|
</DrawerDescription>
|
||||||
</DrawerHeader>
|
</DrawerHeader>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
||||||
{/* Case Insensitive Filters */}
|
{/* Case Insensitive Filters */}
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<Label className="text-base font-medium">Case Insensitive Filters</Label>
|
<Label className="text-base font-medium">
|
||||||
|
Case Insensitive Filters
|
||||||
|
</Label>
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
Filters that match regardless of capitalization (e.g., "AMAZON" matches "amazon")
|
Filters that match regardless of capitalization (e.g., "AMAZON"
|
||||||
|
matches "amazon")
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div className="flex space-x-2">
|
<div className="flex space-x-2">
|
||||||
@@ -134,7 +149,11 @@ export default function NotificationFiltersDrawer({
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Button type="button" onClick={addCaseInsensitiveFilter} size="sm">
|
<Button
|
||||||
|
type="button"
|
||||||
|
onClick={addCaseInsensitiveFilter}
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
<Plus className="h-4 w-4" />
|
<Plus className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
@@ -147,26 +166,33 @@ export default function NotificationFiltersDrawer({
|
|||||||
className="flex items-center space-x-1 bg-secondary text-secondary-foreground px-2 py-1 rounded-md text-sm"
|
className="flex items-center space-x-1 bg-secondary text-secondary-foreground px-2 py-1 rounded-md text-sm"
|
||||||
>
|
>
|
||||||
<span>{filter}</span>
|
<span>{filter}</span>
|
||||||
<button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => removeCaseInsensitiveFilter(index)}
|
onClick={() => removeCaseInsensitiveFilter(index)}
|
||||||
className="text-secondary-foreground hover:text-foreground"
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-5 w-5 hover:bg-secondary-foreground/10"
|
||||||
>
|
>
|
||||||
<X className="h-3 w-3" />
|
<X className="h-3 w-3" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<span className="text-muted-foreground text-sm">No filters added</span>
|
<span className="text-muted-foreground text-sm">
|
||||||
|
No filters added
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Case Sensitive Filters */}
|
{/* Case Sensitive Filters */}
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<Label className="text-base font-medium">Case Sensitive Filters</Label>
|
<Label className="text-base font-medium">
|
||||||
|
Case Sensitive Filters
|
||||||
|
</Label>
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
Filters that match exactly as typed (e.g., "AMAZON" only matches "AMAZON")
|
Filters that match exactly as typed (e.g., "AMAZON" only matches
|
||||||
|
"AMAZON")
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div className="flex space-x-2">
|
<div className="flex space-x-2">
|
||||||
@@ -181,7 +207,11 @@ export default function NotificationFiltersDrawer({
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Button type="button" onClick={addCaseSensitiveFilter} size="sm">
|
<Button
|
||||||
|
type="button"
|
||||||
|
onClick={addCaseSensitiveFilter}
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
<Plus className="h-4 w-4" />
|
<Plus className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
@@ -194,17 +224,21 @@ export default function NotificationFiltersDrawer({
|
|||||||
className="flex items-center space-x-1 bg-secondary text-secondary-foreground px-2 py-1 rounded-md text-sm"
|
className="flex items-center space-x-1 bg-secondary text-secondary-foreground px-2 py-1 rounded-md text-sm"
|
||||||
>
|
>
|
||||||
<span>{filter}</span>
|
<span>{filter}</span>
|
||||||
<button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => removeCaseSensitiveFilter(index)}
|
onClick={() => removeCaseSensitiveFilter(index)}
|
||||||
className="text-secondary-foreground hover:text-foreground"
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-5 w-5 hover:bg-secondary-foreground/10"
|
||||||
>
|
>
|
||||||
<X className="h-3 w-3" />
|
<X className="h-3 w-3" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<span className="text-muted-foreground text-sm">No filters added</span>
|
<span className="text-muted-foreground text-sm">
|
||||||
|
No filters added
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,160 +0,0 @@
|
|||||||
import { useEffect, useState } from "react";
|
|
||||||
import { X, Download, RotateCcw } from "lucide-react";
|
|
||||||
|
|
||||||
interface BeforeInstallPromptEvent extends Event {
|
|
||||||
prompt(): Promise<void>;
|
|
||||||
userChoice: Promise<{ outcome: "accepted" | "dismissed" }>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PWAPromptProps {
|
|
||||||
onInstall?: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function PWAInstallPrompt({ onInstall }: PWAPromptProps) {
|
|
||||||
const [deferredPrompt, setDeferredPrompt] =
|
|
||||||
useState<BeforeInstallPromptEvent | null>(null);
|
|
||||||
const [showPrompt, setShowPrompt] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handler = (e: Event) => {
|
|
||||||
// Prevent the mini-infobar from appearing on mobile
|
|
||||||
e.preventDefault();
|
|
||||||
setDeferredPrompt(e as BeforeInstallPromptEvent);
|
|
||||||
setShowPrompt(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener("beforeinstallprompt", handler);
|
|
||||||
|
|
||||||
return () => window.removeEventListener("beforeinstallprompt", handler);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleInstall = async () => {
|
|
||||||
if (!deferredPrompt) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await deferredPrompt.prompt();
|
|
||||||
const { outcome } = await deferredPrompt.userChoice;
|
|
||||||
|
|
||||||
if (outcome === "accepted") {
|
|
||||||
onInstall?.();
|
|
||||||
}
|
|
||||||
|
|
||||||
setDeferredPrompt(null);
|
|
||||||
setShowPrompt(false);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error installing PWA:", error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDismiss = () => {
|
|
||||||
setShowPrompt(false);
|
|
||||||
setDeferredPrompt(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!showPrompt || !deferredPrompt) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="fixed bottom-4 left-4 right-4 md:left-auto md:right-4 md:max-w-sm bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg p-4 z-50">
|
|
||||||
<div className="flex items-start gap-3">
|
|
||||||
<div className="flex-shrink-0">
|
|
||||||
<Download className="h-5 w-5 text-blue-600 dark:text-blue-400" />
|
|
||||||
</div>
|
|
||||||
<div className="flex-1 min-w-0">
|
|
||||||
<p className="text-sm font-medium text-gray-900 dark:text-gray-100">
|
|
||||||
Install Leggen
|
|
||||||
</p>
|
|
||||||
<p className="text-sm text-gray-500 dark:text-gray-400">
|
|
||||||
Add to your home screen for quick access
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
onClick={handleDismiss}
|
|
||||||
className="flex-shrink-0 text-gray-400 hover:text-gray-500 dark:hover:text-gray-300"
|
|
||||||
>
|
|
||||||
<X className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="mt-3 flex gap-2">
|
|
||||||
<button
|
|
||||||
onClick={handleInstall}
|
|
||||||
className="flex-1 bg-blue-600 text-white text-sm font-medium px-3 py-2 rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
>
|
|
||||||
Install
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={handleDismiss}
|
|
||||||
className="px-3 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100"
|
|
||||||
>
|
|
||||||
Not now
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PWAUpdatePromptProps {
|
|
||||||
updateAvailable: boolean;
|
|
||||||
onUpdate: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function PWAUpdatePrompt({
|
|
||||||
updateAvailable,
|
|
||||||
onUpdate,
|
|
||||||
}: PWAUpdatePromptProps) {
|
|
||||||
const [showPrompt, setShowPrompt] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (updateAvailable) {
|
|
||||||
setShowPrompt(true);
|
|
||||||
}
|
|
||||||
}, [updateAvailable]);
|
|
||||||
|
|
||||||
const handleUpdate = () => {
|
|
||||||
onUpdate();
|
|
||||||
setShowPrompt(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDismiss = () => {
|
|
||||||
setShowPrompt(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!showPrompt || !updateAvailable) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="fixed top-4 left-4 right-4 md:left-auto md:right-4 md:max-w-sm bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg shadow-lg p-4 z-50">
|
|
||||||
<div className="flex items-start gap-3">
|
|
||||||
<div className="flex-shrink-0">
|
|
||||||
<RotateCcw className="h-5 w-5 text-green-600 dark:text-green-400" />
|
|
||||||
</div>
|
|
||||||
<div className="flex-1 min-w-0">
|
|
||||||
<p className="text-sm font-medium text-gray-900 dark:text-gray-100">
|
|
||||||
Update Available
|
|
||||||
</p>
|
|
||||||
<p className="text-sm text-gray-500 dark:text-gray-400">
|
|
||||||
A new version of Leggen is ready to install
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
onClick={handleDismiss}
|
|
||||||
className="flex-shrink-0 text-gray-400 hover:text-gray-500 dark:hover:text-gray-300"
|
|
||||||
>
|
|
||||||
<X className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="mt-3 flex gap-2">
|
|
||||||
<button
|
|
||||||
onClick={handleUpdate}
|
|
||||||
className="flex-1 bg-green-600 text-white text-sm font-medium px-3 py-2 rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500"
|
|
||||||
>
|
|
||||||
Update Now
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={handleDismiss}
|
|
||||||
className="px-3 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100"
|
|
||||||
>
|
|
||||||
Later
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
273
frontend/src/components/S3BackupConfigDrawer.tsx
Normal file
273
frontend/src/components/S3BackupConfigDrawer.tsx
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
import { useState, useEffect } from "react";
|
||||||
|
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||||
|
import { Cloud, TestTube } from "lucide-react";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { apiClient } from "../lib/api";
|
||||||
|
import { Button } from "./ui/button";
|
||||||
|
import { Input } from "./ui/input";
|
||||||
|
import { Label } from "./ui/label";
|
||||||
|
import { Switch } from "./ui/switch";
|
||||||
|
import { EditButton } from "./ui/edit-button";
|
||||||
|
import {
|
||||||
|
Drawer,
|
||||||
|
DrawerClose,
|
||||||
|
DrawerContent,
|
||||||
|
DrawerDescription,
|
||||||
|
DrawerFooter,
|
||||||
|
DrawerHeader,
|
||||||
|
DrawerTitle,
|
||||||
|
DrawerTrigger,
|
||||||
|
} from "./ui/drawer";
|
||||||
|
import type { BackupSettings, S3Config } from "../types/api";
|
||||||
|
|
||||||
|
interface S3BackupConfigDrawerProps {
|
||||||
|
settings?: BackupSettings;
|
||||||
|
trigger?: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function S3BackupConfigDrawer({
|
||||||
|
settings,
|
||||||
|
trigger,
|
||||||
|
}: S3BackupConfigDrawerProps) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [config, setConfig] = useState<S3Config>({
|
||||||
|
access_key_id: "",
|
||||||
|
secret_access_key: "",
|
||||||
|
bucket_name: "",
|
||||||
|
region: "us-east-1",
|
||||||
|
endpoint_url: "",
|
||||||
|
path_style: false,
|
||||||
|
enabled: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (settings?.s3) {
|
||||||
|
setConfig({ ...settings.s3 });
|
||||||
|
}
|
||||||
|
}, [settings]);
|
||||||
|
|
||||||
|
const updateMutation = useMutation({
|
||||||
|
mutationFn: (s3Config: S3Config) =>
|
||||||
|
apiClient.updateBackupSettings({
|
||||||
|
s3: s3Config,
|
||||||
|
}),
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["backupSettings"] });
|
||||||
|
setOpen(false);
|
||||||
|
toast.success("S3 backup configuration saved successfully");
|
||||||
|
},
|
||||||
|
onError: (error: Error & { response?: { data?: { detail?: string } } }) => {
|
||||||
|
console.error("Failed to update S3 backup configuration:", error);
|
||||||
|
const message =
|
||||||
|
error?.response?.data?.detail ||
|
||||||
|
"Failed to save S3 configuration. Please check your settings and try again.";
|
||||||
|
toast.error(message);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const testMutation = useMutation({
|
||||||
|
mutationFn: () =>
|
||||||
|
apiClient.testBackupConnection({
|
||||||
|
service: "s3",
|
||||||
|
config: config,
|
||||||
|
}),
|
||||||
|
onSuccess: (response) => {
|
||||||
|
if (response.success) {
|
||||||
|
console.log("S3 connection test successful");
|
||||||
|
toast.success(
|
||||||
|
"S3 connection test successful! Your configuration is working correctly.",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
console.error("S3 connection test failed:", response.message);
|
||||||
|
toast.error(response.message || "S3 connection test failed. Please verify your credentials and settings.");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onError: (error: Error & { response?: { data?: { detail?: string } } }) => {
|
||||||
|
console.error("Failed to test S3 connection:", error);
|
||||||
|
const message =
|
||||||
|
error?.response?.data?.detail ||
|
||||||
|
"S3 connection test failed. Please verify your credentials and settings.";
|
||||||
|
toast.error(message);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleSubmit = (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
updateMutation.mutate(config);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTest = () => {
|
||||||
|
testMutation.mutate();
|
||||||
|
};
|
||||||
|
|
||||||
|
const isConfigValid =
|
||||||
|
config.access_key_id.trim().length > 0 &&
|
||||||
|
config.secret_access_key.trim().length > 0 &&
|
||||||
|
config.bucket_name.trim().length > 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Drawer open={open} onOpenChange={setOpen}>
|
||||||
|
<DrawerTrigger asChild>{trigger || <EditButton />}</DrawerTrigger>
|
||||||
|
<DrawerContent>
|
||||||
|
<div className="mx-auto w-full max-w-sm">
|
||||||
|
<DrawerHeader>
|
||||||
|
<DrawerTitle className="flex items-center space-x-2">
|
||||||
|
<Cloud className="h-5 w-5 text-primary" />
|
||||||
|
<span>S3 Backup Configuration</span>
|
||||||
|
</DrawerTitle>
|
||||||
|
<DrawerDescription>
|
||||||
|
Configure S3 settings for automatic database backups
|
||||||
|
</DrawerDescription>
|
||||||
|
</DrawerHeader>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit} className="px-4 space-y-4">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<Switch
|
||||||
|
id="enabled"
|
||||||
|
checked={config.enabled}
|
||||||
|
onCheckedChange={(checked) =>
|
||||||
|
setConfig({ ...config, enabled: checked })
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Label htmlFor="enabled">Enable S3 backups</Label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{config.enabled && (
|
||||||
|
<>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="access_key_id">Access Key ID</Label>
|
||||||
|
<Input
|
||||||
|
id="access_key_id"
|
||||||
|
type="text"
|
||||||
|
value={config.access_key_id}
|
||||||
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, access_key_id: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder="Your AWS Access Key ID"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="secret_access_key">Secret Access Key</Label>
|
||||||
|
<Input
|
||||||
|
id="secret_access_key"
|
||||||
|
type="password"
|
||||||
|
value={config.secret_access_key}
|
||||||
|
onChange={(e) =>
|
||||||
|
setConfig({
|
||||||
|
...config,
|
||||||
|
secret_access_key: e.target.value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder="Your AWS Secret Access Key"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="bucket_name">Bucket Name</Label>
|
||||||
|
<Input
|
||||||
|
id="bucket_name"
|
||||||
|
type="text"
|
||||||
|
value={config.bucket_name}
|
||||||
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, bucket_name: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder="my-backup-bucket"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="region">Region</Label>
|
||||||
|
<Input
|
||||||
|
id="region"
|
||||||
|
type="text"
|
||||||
|
value={config.region}
|
||||||
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, region: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder="us-east-1"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="endpoint_url">
|
||||||
|
Custom Endpoint URL (Optional)
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="endpoint_url"
|
||||||
|
type="url"
|
||||||
|
value={config.endpoint_url || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, endpoint_url: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder="https://custom-s3-endpoint.com"
|
||||||
|
/>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
For S3-compatible services like MinIO or DigitalOcean Spaces
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<Switch
|
||||||
|
id="path_style"
|
||||||
|
checked={config.path_style}
|
||||||
|
onCheckedChange={(checked) =>
|
||||||
|
setConfig({ ...config, path_style: checked })
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Label htmlFor="path_style">Use path-style addressing</Label>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Enable for older S3 implementations or certain S3-compatible
|
||||||
|
services
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<DrawerFooter className="px-0">
|
||||||
|
<div className="flex space-x-2">
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
disabled={updateMutation.isPending || !config.enabled}
|
||||||
|
>
|
||||||
|
{updateMutation.isPending
|
||||||
|
? "Saving..."
|
||||||
|
: "Save Configuration"}
|
||||||
|
</Button>
|
||||||
|
{config.enabled && isConfigValid && (
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
onClick={handleTest}
|
||||||
|
disabled={testMutation.isPending}
|
||||||
|
>
|
||||||
|
{testMutation.isPending ? (
|
||||||
|
<>
|
||||||
|
<TestTube className="h-4 w-4 mr-2 animate-spin" />
|
||||||
|
Testing...
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<TestTube className="h-4 w-4 mr-2" />
|
||||||
|
Test
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<DrawerClose asChild>
|
||||||
|
<Button variant="ghost">Cancel</Button>
|
||||||
|
</DrawerClose>
|
||||||
|
</DrawerFooter>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</DrawerContent>
|
||||||
|
</Drawer>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -10,14 +10,17 @@ import {
|
|||||||
Edit2,
|
Edit2,
|
||||||
Check,
|
Check,
|
||||||
X,
|
X,
|
||||||
Plus,
|
|
||||||
Bell,
|
Bell,
|
||||||
MessageSquare,
|
MessageSquare,
|
||||||
Send,
|
Send,
|
||||||
Trash2,
|
Trash2,
|
||||||
User,
|
User,
|
||||||
Filter,
|
Filter,
|
||||||
|
Cloud,
|
||||||
|
Archive,
|
||||||
|
Eye,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
import { toast } from "sonner";
|
||||||
import { apiClient } from "../lib/api";
|
import { apiClient } from "../lib/api";
|
||||||
import { formatCurrency, formatDate } from "../lib/utils";
|
import { formatCurrency, formatDate } from "../lib/utils";
|
||||||
import {
|
import {
|
||||||
@@ -35,11 +38,15 @@ import AccountsSkeleton from "./AccountsSkeleton";
|
|||||||
import NotificationFiltersDrawer from "./NotificationFiltersDrawer";
|
import NotificationFiltersDrawer from "./NotificationFiltersDrawer";
|
||||||
import DiscordConfigDrawer from "./DiscordConfigDrawer";
|
import DiscordConfigDrawer from "./DiscordConfigDrawer";
|
||||||
import TelegramConfigDrawer from "./TelegramConfigDrawer";
|
import TelegramConfigDrawer from "./TelegramConfigDrawer";
|
||||||
|
import AddBankAccountDrawer from "./AddBankAccountDrawer";
|
||||||
|
import S3BackupConfigDrawer from "./S3BackupConfigDrawer";
|
||||||
import type {
|
import type {
|
||||||
Account,
|
Account,
|
||||||
Balance,
|
Balance,
|
||||||
NotificationSettings,
|
NotificationSettings,
|
||||||
NotificationService,
|
NotificationService,
|
||||||
|
BackupSettings,
|
||||||
|
BackupInfo,
|
||||||
} from "../types/api";
|
} from "../types/api";
|
||||||
|
|
||||||
// Helper function to get status indicator color and styles
|
// Helper function to get status indicator color and styles
|
||||||
@@ -79,6 +86,8 @@ const getStatusIndicator = (status: string) => {
|
|||||||
export default function Settings() {
|
export default function Settings() {
|
||||||
const [editingAccountId, setEditingAccountId] = useState<string | null>(null);
|
const [editingAccountId, setEditingAccountId] = useState<string | null>(null);
|
||||||
const [editingName, setEditingName] = useState("");
|
const [editingName, setEditingName] = useState("");
|
||||||
|
const [failedImages, setFailedImages] = useState<Set<string>>(new Set());
|
||||||
|
const [showBackups, setShowBackups] = useState(false);
|
||||||
|
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
@@ -119,6 +128,33 @@ export default function Settings() {
|
|||||||
queryFn: apiClient.getNotificationServices,
|
queryFn: apiClient.getNotificationServices,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const { data: bankConnections } = useQuery({
|
||||||
|
queryKey: ["bankConnections"],
|
||||||
|
queryFn: apiClient.getBankConnectionsStatus,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Backup queries
|
||||||
|
const {
|
||||||
|
data: backupSettings,
|
||||||
|
isLoading: backupLoading,
|
||||||
|
error: backupError,
|
||||||
|
refetch: refetchBackup,
|
||||||
|
} = useQuery<BackupSettings>({
|
||||||
|
queryKey: ["backupSettings"],
|
||||||
|
queryFn: apiClient.getBackupSettings,
|
||||||
|
});
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: backups,
|
||||||
|
isLoading: backupsLoading,
|
||||||
|
error: backupsError,
|
||||||
|
refetch: refetchBackups,
|
||||||
|
} = useQuery<BackupInfo[]>({
|
||||||
|
queryKey: ["backups"],
|
||||||
|
queryFn: apiClient.listBackups,
|
||||||
|
enabled: showBackups,
|
||||||
|
});
|
||||||
|
|
||||||
// Account mutations
|
// Account mutations
|
||||||
const updateAccountMutation = useMutation({
|
const updateAccountMutation = useMutation({
|
||||||
mutationFn: ({ id, display_name }: { id: string; display_name: string }) =>
|
mutationFn: ({ id, display_name }: { id: string; display_name: string }) =>
|
||||||
@@ -142,6 +178,36 @@ export default function Settings() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Bank connection mutations
|
||||||
|
const deleteBankConnectionMutation = useMutation({
|
||||||
|
mutationFn: apiClient.deleteBankConnection,
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["accounts"] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["bankConnections"] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["balances"] });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Backup mutations
|
||||||
|
const createBackupMutation = useMutation({
|
||||||
|
mutationFn: () => apiClient.performBackupOperation({ operation: "backup" }),
|
||||||
|
onSuccess: (response) => {
|
||||||
|
if (response.success) {
|
||||||
|
toast.success(response.message || "Backup created successfully!");
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["backups"] });
|
||||||
|
} else {
|
||||||
|
toast.error(response.message || "Failed to create backup.");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onError: (error: Error & { response?: { data?: { detail?: string } } }) => {
|
||||||
|
console.error("Failed to create backup:", error);
|
||||||
|
const message =
|
||||||
|
error?.response?.data?.detail ||
|
||||||
|
"Failed to create backup. Please check your S3 configuration.";
|
||||||
|
toast.error(message);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
// Account handlers
|
// Account handlers
|
||||||
const handleEditStart = (account: Account) => {
|
const handleEditStart = (account: Account) => {
|
||||||
setEditingAccountId(account.id);
|
setEditingAccountId(account.id);
|
||||||
@@ -173,8 +239,27 @@ export default function Settings() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const isLoading = accountsLoading || settingsLoading || servicesLoading;
|
// Backup handlers
|
||||||
const hasError = accountsError || settingsError || servicesError;
|
const handleCreateBackup = () => {
|
||||||
|
if (!backupSettings?.s3?.enabled) {
|
||||||
|
toast.error("S3 backup is not enabled. Please configure and enable S3 backup first.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
createBackupMutation.mutate();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleViewBackups = () => {
|
||||||
|
if (!backupSettings?.s3?.enabled) {
|
||||||
|
toast.error("S3 backup is not enabled. Please configure and enable S3 backup first.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setShowBackups(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isLoading =
|
||||||
|
accountsLoading || settingsLoading || servicesLoading || backupLoading;
|
||||||
|
const hasError =
|
||||||
|
accountsError || settingsError || servicesError || backupError;
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return <AccountsSkeleton />;
|
return <AccountsSkeleton />;
|
||||||
@@ -195,6 +280,7 @@ export default function Settings() {
|
|||||||
refetchAccounts();
|
refetchAccounts();
|
||||||
refetchSettings();
|
refetchSettings();
|
||||||
refetchServices();
|
refetchServices();
|
||||||
|
refetchBackup();
|
||||||
}}
|
}}
|
||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
@@ -210,7 +296,7 @@ export default function Settings() {
|
|||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
<Tabs defaultValue="accounts" className="space-y-6">
|
<Tabs defaultValue="accounts" className="space-y-6">
|
||||||
<TabsList className="grid w-full grid-cols-2">
|
<TabsList className="grid w-full grid-cols-3">
|
||||||
<TabsTrigger value="accounts" className="flex items-center space-x-2">
|
<TabsTrigger value="accounts" className="flex items-center space-x-2">
|
||||||
<User className="h-4 w-4" />
|
<User className="h-4 w-4" />
|
||||||
<span>Accounts</span>
|
<span>Accounts</span>
|
||||||
@@ -222,6 +308,10 @@ export default function Settings() {
|
|||||||
<Bell className="h-4 w-4" />
|
<Bell className="h-4 w-4" />
|
||||||
<span>Notifications</span>
|
<span>Notifications</span>
|
||||||
</TabsTrigger>
|
</TabsTrigger>
|
||||||
|
<TabsTrigger value="backup" className="flex items-center space-x-2">
|
||||||
|
<Cloud className="h-4 w-4" />
|
||||||
|
<span>Backup</span>
|
||||||
|
</TabsTrigger>
|
||||||
</TabsList>
|
</TabsList>
|
||||||
|
|
||||||
<TabsContent value="accounts" className="space-y-6">
|
<TabsContent value="accounts" className="space-y-6">
|
||||||
@@ -244,13 +334,6 @@ export default function Settings() {
|
|||||||
<p className="text-muted-foreground mb-4">
|
<p className="text-muted-foreground mb-4">
|
||||||
Connect your first bank account to get started with Leggen.
|
Connect your first bank account to get started with Leggen.
|
||||||
</p>
|
</p>
|
||||||
<Button disabled className="flex items-center space-x-2">
|
|
||||||
<Plus className="h-4 w-4" />
|
|
||||||
<span>Add Bank Account</span>
|
|
||||||
</Button>
|
|
||||||
<p className="text-xs text-muted-foreground mt-2">
|
|
||||||
Coming soon: Add new bank connections
|
|
||||||
</p>
|
|
||||||
</CardContent>
|
</CardContent>
|
||||||
) : (
|
) : (
|
||||||
<CardContent className="p-0">
|
<CardContent className="p-0">
|
||||||
@@ -280,8 +363,24 @@ export default function Settings() {
|
|||||||
{/* Mobile layout - stack vertically */}
|
{/* Mobile layout - stack vertically */}
|
||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3 sm:gap-4">
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3 sm:gap-4">
|
||||||
<div className="flex items-start sm:items-center space-x-3 sm:space-x-4 min-w-0 flex-1">
|
<div className="flex items-start sm:items-center space-x-3 sm:space-x-4 min-w-0 flex-1">
|
||||||
<div className="flex-shrink-0 p-2 sm:p-3 bg-muted rounded-full">
|
<div className="flex-shrink-0 w-10 h-10 sm:w-12 sm:h-12 rounded-full overflow-hidden bg-muted flex items-center justify-center">
|
||||||
<Building2 className="h-5 w-5 sm:h-6 sm:w-6 text-muted-foreground" />
|
{account.logo && !failedImages.has(account.id) ? (
|
||||||
|
<img
|
||||||
|
src={account.logo}
|
||||||
|
alt={`${account.institution_id} logo`}
|
||||||
|
className="w-6 h-6 sm:w-8 sm:h-8 object-contain"
|
||||||
|
onError={() => {
|
||||||
|
console.warn(
|
||||||
|
`Failed to load bank logo for ${account.institution_id}: ${account.logo}`,
|
||||||
|
);
|
||||||
|
setFailedImages(
|
||||||
|
(prev) => new Set([...prev, account.id]),
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Building2 className="h-5 w-5 sm:h-6 sm:w-6 text-muted-foreground" />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
{editingAccountId === account.id ? (
|
{editingAccountId === account.id ? (
|
||||||
@@ -304,24 +403,28 @@ export default function Settings() {
|
|||||||
}}
|
}}
|
||||||
autoFocus
|
autoFocus
|
||||||
/>
|
/>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditSave}
|
onClick={handleEditSave}
|
||||||
disabled={
|
disabled={
|
||||||
!editingName.trim() ||
|
!editingName.trim() ||
|
||||||
updateAccountMutation.isPending
|
updateAccountMutation.isPending
|
||||||
}
|
}
|
||||||
className="p-1 text-green-600 hover:text-green-700 disabled:opacity-50 disabled:cursor-not-allowed"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8 text-green-600 hover:text-green-700 hover:bg-green-100"
|
||||||
title="Save changes"
|
title="Save changes"
|
||||||
>
|
>
|
||||||
<Check className="h-4 w-4" />
|
<Check className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
<button
|
<Button
|
||||||
onClick={handleEditCancel}
|
onClick={handleEditCancel}
|
||||||
className="p-1 text-gray-600 hover:text-gray-700"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8"
|
||||||
title="Cancel editing"
|
title="Cancel editing"
|
||||||
>
|
>
|
||||||
<X className="h-4 w-4" />
|
<X className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
@@ -335,13 +438,15 @@ export default function Settings() {
|
|||||||
account.name ||
|
account.name ||
|
||||||
"Unnamed Account"}
|
"Unnamed Account"}
|
||||||
</h4>
|
</h4>
|
||||||
<button
|
<Button
|
||||||
onClick={() => handleEditStart(account)}
|
onClick={() => handleEditStart(account)}
|
||||||
className="flex-shrink-0 p-1 text-muted-foreground hover:text-foreground transition-colors"
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-7 w-7 flex-shrink-0"
|
||||||
title="Edit account name"
|
title="Edit account name"
|
||||||
>
|
>
|
||||||
<Edit2 className="h-4 w-4" />
|
<Edit2 className="h-4 w-4" />
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground truncate">
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
{account.institution_id}
|
{account.institution_id}
|
||||||
@@ -404,30 +509,112 @@ export default function Settings() {
|
|||||||
)}
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
{/* Add Bank Section (Future Feature) */}
|
{/* Bank Connections Status */}
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle>Add New Bank Account</CardTitle>
|
<div className="flex items-center justify-between">
|
||||||
<CardDescription>
|
<div>
|
||||||
Connect additional bank accounts to track all your finances in
|
<CardTitle>Bank Connections</CardTitle>
|
||||||
one place
|
<CardDescription>
|
||||||
</CardDescription>
|
Status of all bank connection requests and their
|
||||||
</CardHeader>
|
authorization state
|
||||||
<CardContent className="p-6">
|
</CardDescription>
|
||||||
<div className="text-center space-y-4">
|
|
||||||
<div className="p-4 bg-muted rounded-lg">
|
|
||||||
<Plus className="h-8 w-8 text-muted-foreground mx-auto mb-2" />
|
|
||||||
<p className="text-sm text-muted-foreground">
|
|
||||||
Bank connection functionality is coming soon. Stay tuned for
|
|
||||||
updates!
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
<Button disabled variant="outline">
|
<AddBankAccountDrawer />
|
||||||
<Plus className="h-4 w-4 mr-2" />
|
|
||||||
Connect Bank Account
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardHeader>
|
||||||
|
|
||||||
|
{!bankConnections || bankConnections.length === 0 ? (
|
||||||
|
<CardContent className="p-6 text-center">
|
||||||
|
<Building2 className="h-12 w-12 text-muted-foreground mx-auto mb-4" />
|
||||||
|
<h3 className="text-lg font-medium text-foreground mb-2">
|
||||||
|
No bank connections found
|
||||||
|
</h3>
|
||||||
|
<p className="text-muted-foreground">
|
||||||
|
Bank connection requests will appear here after you connect
|
||||||
|
accounts.
|
||||||
|
</p>
|
||||||
|
</CardContent>
|
||||||
|
) : (
|
||||||
|
<CardContent className="p-0">
|
||||||
|
<div className="divide-y divide-border">
|
||||||
|
{bankConnections.map((connection) => {
|
||||||
|
const statusColor =
|
||||||
|
connection.status.toLowerCase() === "ln"
|
||||||
|
? "bg-green-500"
|
||||||
|
: connection.status.toLowerCase() === "cr"
|
||||||
|
? "bg-amber-500"
|
||||||
|
: connection.status.toLowerCase() === "ex"
|
||||||
|
? "bg-red-500"
|
||||||
|
: "bg-muted-foreground";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={connection.requisition_id}
|
||||||
|
className="p-4 sm:p-6 hover:bg-accent transition-colors"
|
||||||
|
>
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="flex items-center space-x-4 min-w-0 flex-1">
|
||||||
|
<div className="flex-shrink-0 w-10 h-10 rounded-full bg-muted flex items-center justify-center">
|
||||||
|
<Building2 className="h-5 w-5 text-muted-foreground" />
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<h4 className="text-base font-medium text-foreground truncate">
|
||||||
|
{connection.bank_name}
|
||||||
|
</h4>
|
||||||
|
<div
|
||||||
|
className={`w-3 h-3 rounded-full ${statusColor}`}
|
||||||
|
title={connection.status_display}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
{connection.status_display} •{" "}
|
||||||
|
{connection.accounts_count} account
|
||||||
|
{connection.accounts_count !== 1 ? "s" : ""}
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-muted-foreground font-mono">
|
||||||
|
ID: {connection.requisition_id}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center space-x-2 flex-shrink-0">
|
||||||
|
<div className="text-right">
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Created {formatDate(connection.created_at)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
const isWorking =
|
||||||
|
connection.status.toLowerCase() === "ln";
|
||||||
|
const message = isWorking
|
||||||
|
? `Are you sure you want to disconnect "${connection.bank_name}"? This will stop syncing new transactions but keep your existing transaction history.`
|
||||||
|
: `Delete connection to ${connection.bank_name}?`;
|
||||||
|
|
||||||
|
if (confirm(message)) {
|
||||||
|
deleteBankConnectionMutation.mutate(
|
||||||
|
connection.requisition_id,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
disabled={deleteBankConnectionMutation.isPending}
|
||||||
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
className="h-8 w-8 text-muted-foreground hover:text-destructive"
|
||||||
|
title="Delete connection"
|
||||||
|
>
|
||||||
|
<Trash2 className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
@@ -482,19 +669,21 @@ export default function Settings() {
|
|||||||
{service.name}
|
{service.name}
|
||||||
</h4>
|
</h4>
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
<div className={`w-2 h-2 rounded-full ${
|
<div
|
||||||
service.enabled && service.configured
|
className={`w-2 h-2 rounded-full ${
|
||||||
? 'bg-green-500'
|
service.enabled && service.configured
|
||||||
: service.enabled
|
? "bg-green-500"
|
||||||
? 'bg-amber-500'
|
: service.enabled
|
||||||
: 'bg-muted-foreground'
|
? "bg-amber-500"
|
||||||
}`} />
|
: "bg-muted-foreground"
|
||||||
|
}`}
|
||||||
|
/>
|
||||||
<span className="text-sm text-muted-foreground">
|
<span className="text-sm text-muted-foreground">
|
||||||
{service.enabled && service.configured
|
{service.enabled && service.configured
|
||||||
? 'Active'
|
? "Active"
|
||||||
: service.enabled
|
: service.enabled
|
||||||
? 'Needs Configuration'
|
? "Needs Configuration"
|
||||||
: 'Disabled'}
|
: "Disabled"}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -503,9 +692,15 @@ export default function Settings() {
|
|||||||
|
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
{service.name.toLowerCase().includes("discord") ? (
|
{service.name.toLowerCase().includes("discord") ? (
|
||||||
<DiscordConfigDrawer settings={notificationSettings} />
|
<DiscordConfigDrawer
|
||||||
) : service.name.toLowerCase().includes("telegram") ? (
|
settings={notificationSettings}
|
||||||
<TelegramConfigDrawer settings={notificationSettings} />
|
/>
|
||||||
|
) : service.name
|
||||||
|
.toLowerCase()
|
||||||
|
.includes("telegram") ? (
|
||||||
|
<TelegramConfigDrawer
|
||||||
|
settings={notificationSettings}
|
||||||
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@@ -547,17 +742,22 @@ export default function Settings() {
|
|||||||
Case Insensitive Filters
|
Case Insensitive Filters
|
||||||
</Label>
|
</Label>
|
||||||
<div className="min-h-[2rem] flex flex-wrap gap-1">
|
<div className="min-h-[2rem] flex flex-wrap gap-1">
|
||||||
{notificationSettings.filters.case_insensitive.length > 0 ? (
|
{notificationSettings.filters.case_insensitive
|
||||||
notificationSettings.filters.case_insensitive.map((filter, index) => (
|
.length > 0 ? (
|
||||||
<span
|
notificationSettings.filters.case_insensitive.map(
|
||||||
key={index}
|
(filter, index) => (
|
||||||
className="inline-flex items-center px-2 py-1 bg-secondary text-secondary-foreground rounded text-xs"
|
<span
|
||||||
>
|
key={index}
|
||||||
{filter}
|
className="inline-flex items-center px-2 py-1 bg-secondary text-secondary-foreground rounded text-xs"
|
||||||
</span>
|
>
|
||||||
))
|
{filter}
|
||||||
|
</span>
|
||||||
|
),
|
||||||
|
)
|
||||||
) : (
|
) : (
|
||||||
<p className="text-sm text-muted-foreground">None</p>
|
<p className="text-sm text-muted-foreground">
|
||||||
|
None
|
||||||
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -567,25 +767,31 @@ export default function Settings() {
|
|||||||
</Label>
|
</Label>
|
||||||
<div className="min-h-[2rem] flex flex-wrap gap-1">
|
<div className="min-h-[2rem] flex flex-wrap gap-1">
|
||||||
{notificationSettings.filters.case_sensitive &&
|
{notificationSettings.filters.case_sensitive &&
|
||||||
notificationSettings.filters.case_sensitive.length > 0 ? (
|
notificationSettings.filters.case_sensitive.length >
|
||||||
notificationSettings.filters.case_sensitive.map((filter, index) => (
|
0 ? (
|
||||||
<span
|
notificationSettings.filters.case_sensitive.map(
|
||||||
key={index}
|
(filter, index) => (
|
||||||
className="inline-flex items-center px-2 py-1 bg-secondary text-secondary-foreground rounded text-xs"
|
<span
|
||||||
>
|
key={index}
|
||||||
{filter}
|
className="inline-flex items-center px-2 py-1 bg-secondary text-secondary-foreground rounded text-xs"
|
||||||
</span>
|
>
|
||||||
))
|
{filter}
|
||||||
|
</span>
|
||||||
|
),
|
||||||
|
)
|
||||||
) : (
|
) : (
|
||||||
<p className="text-sm text-muted-foreground">None</p>
|
<p className="text-sm text-muted-foreground">
|
||||||
|
None
|
||||||
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
Filters determine which transaction descriptions will trigger notifications.
|
Filters determine which transaction descriptions will
|
||||||
Add terms to exclude transactions containing those words.
|
trigger notifications. Add terms to exclude transactions
|
||||||
|
containing those words.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
@@ -595,7 +801,8 @@ export default function Settings() {
|
|||||||
No notification filters configured
|
No notification filters configured
|
||||||
</h3>
|
</h3>
|
||||||
<p className="text-muted-foreground mb-4">
|
<p className="text-muted-foreground mb-4">
|
||||||
Set up filters to control which transactions trigger notifications.
|
Set up filters to control which transactions trigger
|
||||||
|
notifications.
|
||||||
</p>
|
</p>
|
||||||
<NotificationFiltersDrawer settings={notificationSettings} />
|
<NotificationFiltersDrawer settings={notificationSettings} />
|
||||||
</div>
|
</div>
|
||||||
@@ -603,6 +810,174 @@ export default function Settings() {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
|
<TabsContent value="backup" className="space-y-6">
|
||||||
|
{/* S3 Backup Configuration */}
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<CardTitle className="flex items-center space-x-2">
|
||||||
|
<Cloud className="h-5 w-5 text-primary" />
|
||||||
|
<span>S3 Backup Configuration</span>
|
||||||
|
</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
Configure automatic database backups to Amazon S3 or
|
||||||
|
S3-compatible storage
|
||||||
|
</CardDescription>
|
||||||
|
</CardHeader>
|
||||||
|
|
||||||
|
<CardContent>
|
||||||
|
{!backupSettings?.s3 ? (
|
||||||
|
<div className="text-center py-8">
|
||||||
|
<Cloud className="h-12 w-12 text-muted-foreground mx-auto mb-4" />
|
||||||
|
<h3 className="text-lg font-medium text-foreground mb-2">
|
||||||
|
No S3 backup configured
|
||||||
|
</h3>
|
||||||
|
<p className="text-muted-foreground mb-4">
|
||||||
|
Set up S3 backup to automatically backup your database to
|
||||||
|
the cloud.
|
||||||
|
</p>
|
||||||
|
<S3BackupConfigDrawer settings={backupSettings} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="flex items-center justify-between p-4 border rounded-lg">
|
||||||
|
<div className="flex items-center space-x-4">
|
||||||
|
<div className="p-3 bg-muted rounded-full">
|
||||||
|
<Cloud className="h-6 w-6 text-muted-foreground" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center space-x-3">
|
||||||
|
<h4 className="text-lg font-medium text-foreground">
|
||||||
|
S3 Backup
|
||||||
|
</h4>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<div
|
||||||
|
className={`w-2 h-2 rounded-full ${
|
||||||
|
backupSettings.s3.enabled
|
||||||
|
? "bg-green-500"
|
||||||
|
: "bg-muted-foreground"
|
||||||
|
}`}
|
||||||
|
/>
|
||||||
|
<span className="text-sm text-muted-foreground">
|
||||||
|
{backupSettings.s3.enabled
|
||||||
|
? "Enabled"
|
||||||
|
: "Disabled"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2 space-y-1">
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
<span className="font-medium">Bucket:</span>{" "}
|
||||||
|
{backupSettings.s3.bucket_name}
|
||||||
|
</p>
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
<span className="font-medium">Region:</span>{" "}
|
||||||
|
{backupSettings.s3.region}
|
||||||
|
</p>
|
||||||
|
{backupSettings.s3.endpoint_url && (
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
<span className="font-medium">Endpoint:</span>{" "}
|
||||||
|
{backupSettings.s3.endpoint_url}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<S3BackupConfigDrawer settings={backupSettings} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="p-4 bg-muted rounded-lg">
|
||||||
|
<h5 className="font-medium mb-2">Backup Information</h5>
|
||||||
|
<p className="text-sm text-muted-foreground mb-3">
|
||||||
|
Database backups are stored in the "leggen_backups/"
|
||||||
|
folder in your S3 bucket. Backups include the complete
|
||||||
|
SQLite database file.
|
||||||
|
</p>
|
||||||
|
<div className="flex space-x-2">
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
onClick={handleCreateBackup}
|
||||||
|
disabled={createBackupMutation.isPending}
|
||||||
|
>
|
||||||
|
{createBackupMutation.isPending ? (
|
||||||
|
<>
|
||||||
|
<Archive className="h-4 w-4 mr-2 animate-spin" />
|
||||||
|
Creating...
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<Archive className="h-4 w-4 mr-2" />
|
||||||
|
Create Backup Now
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
onClick={handleViewBackups}
|
||||||
|
>
|
||||||
|
<Eye className="h-4 w-4 mr-2" />
|
||||||
|
View Backups
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Backup List Modal/View */}
|
||||||
|
{showBackups && (
|
||||||
|
<div className="mt-6 p-4 border rounded-lg bg-background">
|
||||||
|
<div className="flex items-center justify-between mb-4">
|
||||||
|
<h5 className="font-medium">Available Backups</h5>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="ghost"
|
||||||
|
onClick={() => setShowBackups(false)}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{backupsLoading ? (
|
||||||
|
<p className="text-sm text-muted-foreground">Loading backups...</p>
|
||||||
|
) : backupsError ? (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<p className="text-sm text-destructive">Failed to load backups</p>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
onClick={() => refetchBackups()}
|
||||||
|
>
|
||||||
|
<RefreshCw className="h-4 w-4 mr-2" />
|
||||||
|
Retry
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
) : !backups || backups.length === 0 ? (
|
||||||
|
<p className="text-sm text-muted-foreground">No backups found</p>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-2">
|
||||||
|
{backups.map((backup, index) => (
|
||||||
|
<div
|
||||||
|
key={backup.key || index}
|
||||||
|
className="flex items-center justify-between p-3 border rounded bg-muted/50"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<p className="text-sm font-medium">{backup.key}</p>
|
||||||
|
<div className="flex items-center space-x-4 text-xs text-muted-foreground mt-1">
|
||||||
|
<span>Modified: {formatDate(backup.last_modified)}</span>
|
||||||
|
<span>Size: {(backup.size / 1024 / 1024).toFixed(2)} MB</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -30,10 +30,8 @@ export function SiteHeader() {
|
|||||||
refetchInterval: 30000,
|
refetchInterval: 30000,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<header className="flex h-16 shrink-0 items-center gap-2 border-b transition-[width,height] ease-linear pt-safe-top">
|
<header className="flex h-16 shrink-0 items-center gap-2 border-b transition-[width,height] ease-linear">
|
||||||
<div className="flex w-full items-center gap-1 px-4 lg:gap-2 lg:px-6">
|
<div className="flex w-full items-center gap-1 px-4 lg:gap-2 lg:px-6">
|
||||||
<SidebarTrigger className="-ml-1" />
|
<SidebarTrigger className="-ml-1" />
|
||||||
<Separator
|
<Separator
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
Clock,
|
Clock,
|
||||||
TrendingUp,
|
TrendingUp,
|
||||||
User,
|
User,
|
||||||
|
FileText,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { apiClient } from "../lib/api";
|
import { apiClient } from "../lib/api";
|
||||||
import {
|
import {
|
||||||
@@ -19,7 +20,73 @@ import {
|
|||||||
import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
|
import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
|
||||||
import { Button } from "./ui/button";
|
import { Button } from "./ui/button";
|
||||||
import { Badge } from "./ui/badge";
|
import { Badge } from "./ui/badge";
|
||||||
import type { SyncOperationsResponse } from "../types/api";
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from "./ui/dialog";
|
||||||
|
import { ScrollArea } from "./ui/scroll-area";
|
||||||
|
import type { SyncOperationsResponse, SyncOperation } from "../types/api";
|
||||||
|
|
||||||
|
// Component for viewing sync operation logs
|
||||||
|
function LogsDialog({ operation }: { operation: SyncOperation }) {
|
||||||
|
return (
|
||||||
|
<Dialog>
|
||||||
|
<DialogTrigger asChild>
|
||||||
|
<Button variant="outline" size="sm" className="shrink-0">
|
||||||
|
<FileText className="h-3 w-3 mr-1" />
|
||||||
|
<span className="hidden sm:inline">View Logs</span>
|
||||||
|
<span className="sm:hidden">Logs</span>
|
||||||
|
</Button>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent className="max-w-4xl max-h-[80vh]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Sync Operation Logs</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
Operation #{operation.id} - Started at{" "}
|
||||||
|
{new Date(operation.started_at).toLocaleString()}
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<ScrollArea className="h-[60vh] w-full rounded border p-4">
|
||||||
|
<div className="space-y-2">
|
||||||
|
{operation.logs.length === 0 ? (
|
||||||
|
<p className="text-muted-foreground text-sm">No logs available</p>
|
||||||
|
) : (
|
||||||
|
operation.logs.map((log, index) => (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className="text-sm font-mono bg-muted/50 p-2 rounded text-wrap break-all"
|
||||||
|
>
|
||||||
|
{log}
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{operation.errors.length > 0 && (
|
||||||
|
<>
|
||||||
|
<div className="mt-4 mb-2 text-sm font-semibold text-destructive">
|
||||||
|
Errors:
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
{operation.errors.map((error, index) => (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className="text-sm font-mono bg-destructive/10 border border-destructive/20 p-2 rounded text-wrap break-all text-destructive"
|
||||||
|
>
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</ScrollArea>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function System() {
|
export default function System() {
|
||||||
const {
|
const {
|
||||||
@@ -111,68 +178,134 @@ export default function System() {
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={operation.id}
|
key={operation.id}
|
||||||
className="flex items-center justify-between p-4 border rounded-lg hover:bg-accent transition-colors"
|
className="border rounded-lg hover:bg-accent transition-colors"
|
||||||
>
|
>
|
||||||
<div className="flex items-center space-x-4">
|
{/* Desktop Layout */}
|
||||||
<div
|
<div className="hidden md:flex items-center justify-between p-4">
|
||||||
className={`p-2 rounded-full ${
|
<div className="flex items-center space-x-4">
|
||||||
isRunning
|
<div
|
||||||
? "bg-blue-100 text-blue-600"
|
className={`p-2 rounded-full ${
|
||||||
: operation.success
|
isRunning
|
||||||
? "bg-green-100 text-green-600"
|
? "bg-blue-100 text-blue-600"
|
||||||
: "bg-red-100 text-red-600"
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{isRunning ? (
|
|
||||||
<RefreshCw className="h-4 w-4 animate-spin" />
|
|
||||||
) : operation.success ? (
|
|
||||||
<CheckCircle className="h-4 w-4" />
|
|
||||||
) : (
|
|
||||||
<AlertCircle className="h-4 w-4" />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div className="flex items-center space-x-2">
|
|
||||||
<h4 className="text-sm font-medium text-foreground">
|
|
||||||
{isRunning
|
|
||||||
? "Sync Running"
|
|
||||||
: operation.success
|
: operation.success
|
||||||
? "Sync Completed"
|
? "bg-green-100 text-green-600"
|
||||||
: "Sync Failed"}
|
: "bg-red-100 text-red-600"
|
||||||
</h4>
|
}`}
|
||||||
<Badge variant="outline" className="text-xs">
|
>
|
||||||
{operation.trigger_type}
|
{isRunning ? (
|
||||||
</Badge>
|
<RefreshCw className="h-4 w-4 animate-spin" />
|
||||||
|
) : operation.success ? (
|
||||||
|
<CheckCircle className="h-4 w-4" />
|
||||||
|
) : (
|
||||||
|
<AlertCircle className="h-4 w-4" />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center space-x-4 mt-1 text-xs text-muted-foreground">
|
<div>
|
||||||
<span className="flex items-center space-x-1">
|
<div className="flex items-center space-x-2">
|
||||||
<Clock className="h-3 w-3" />
|
<h4 className="text-sm font-medium text-foreground">
|
||||||
<span>
|
{isRunning
|
||||||
{startedAt.toLocaleDateString()}{" "}
|
? "Sync Running"
|
||||||
{startedAt.toLocaleTimeString()}
|
: operation.success
|
||||||
|
? "Sync Completed"
|
||||||
|
: "Sync Failed"}
|
||||||
|
</h4>
|
||||||
|
<Badge variant="outline" className="text-xs">
|
||||||
|
{operation.trigger_type.charAt(0).toUpperCase() +
|
||||||
|
operation.trigger_type.slice(1)}
|
||||||
|
</Badge>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-4 mt-1 text-xs text-muted-foreground">
|
||||||
|
<span className="flex items-center space-x-1">
|
||||||
|
<Clock className="h-3 w-3" />
|
||||||
|
<span>
|
||||||
|
{startedAt.toLocaleDateString()}{" "}
|
||||||
|
{startedAt.toLocaleTimeString()}
|
||||||
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
{duration && <span>Duration: {duration}</span>}
|
||||||
{duration && <span>Duration: {duration}</span>}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="flex items-center space-x-4">
|
||||||
|
<div className="text-right text-sm text-muted-foreground">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<User className="h-3 w-3" />
|
||||||
|
<span>{operation.accounts_processed} accounts</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2 mt-1">
|
||||||
|
<TrendingUp className="h-3 w-3" />
|
||||||
|
<span>
|
||||||
|
{operation.transactions_added} new transactions
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<LogsDialog operation={operation} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-right text-sm text-muted-foreground">
|
|
||||||
<div className="flex items-center space-x-2">
|
{/* Mobile Layout */}
|
||||||
<User className="h-3 w-3" />
|
<div className="md:hidden p-4 space-y-3">
|
||||||
<span>{operation.accounts_processed} accounts</span>
|
<div className="flex items-start justify-between">
|
||||||
</div>
|
<div className="flex items-center space-x-3">
|
||||||
<div className="flex items-center space-x-2 mt-1">
|
<div
|
||||||
<TrendingUp className="h-3 w-3" />
|
className={`p-2 rounded-full ${
|
||||||
<span>
|
isRunning
|
||||||
{operation.transactions_added} new transactions
|
? "bg-blue-100 text-blue-600"
|
||||||
</span>
|
: operation.success
|
||||||
</div>
|
? "bg-green-100 text-green-600"
|
||||||
{operation.errors.length > 0 && (
|
: "bg-red-100 text-red-600"
|
||||||
<div className="flex items-center space-x-2 mt-1 text-red-600">
|
}`}
|
||||||
<AlertCircle className="h-3 w-3" />
|
>
|
||||||
<span>{operation.errors.length} errors</span>
|
{isRunning ? (
|
||||||
|
<RefreshCw className="h-4 w-4 animate-spin" />
|
||||||
|
) : operation.success ? (
|
||||||
|
<CheckCircle className="h-4 w-4" />
|
||||||
|
) : (
|
||||||
|
<AlertCircle className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h4 className="text-sm font-medium text-foreground">
|
||||||
|
{isRunning
|
||||||
|
? "Sync Running"
|
||||||
|
: operation.success
|
||||||
|
? "Sync Completed"
|
||||||
|
: "Sync Failed"}
|
||||||
|
</h4>
|
||||||
|
<Badge variant="outline" className="text-xs mt-1">
|
||||||
|
{operation.trigger_type.charAt(0).toUpperCase() +
|
||||||
|
operation.trigger_type.slice(1)}
|
||||||
|
</Badge>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
<LogsDialog operation={operation} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="text-xs text-muted-foreground space-y-2">
|
||||||
|
<div className="flex items-center space-x-1">
|
||||||
|
<Clock className="h-3 w-3" />
|
||||||
|
<span>
|
||||||
|
{startedAt.toLocaleDateString()}{" "}
|
||||||
|
{startedAt.toLocaleTimeString()}
|
||||||
|
</span>
|
||||||
|
{duration && (
|
||||||
|
<span className="ml-2">• {duration}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-2 gap-2 text-xs">
|
||||||
|
<div className="flex items-center space-x-1">
|
||||||
|
<User className="h-3 w-3" />
|
||||||
|
<span>{operation.accounts_processed} accounts</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-1">
|
||||||
|
<TrendingUp className="h-3 w-3" />
|
||||||
|
<span>
|
||||||
|
{operation.transactions_added} new transactions
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -48,7 +48,10 @@ export default function TelegramConfigDrawer({
|
|||||||
apiClient.updateNotificationSettings({
|
apiClient.updateNotificationSettings({
|
||||||
...settings,
|
...settings,
|
||||||
telegram: telegramConfig,
|
telegram: telegramConfig,
|
||||||
filters: settings?.filters || { case_insensitive: [], case_sensitive: [] },
|
filters: settings?.filters || {
|
||||||
|
case_insensitive: [],
|
||||||
|
case_sensitive: [],
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
queryClient.invalidateQueries({ queryKey: ["notificationSettings"] });
|
queryClient.invalidateQueries({ queryKey: ["notificationSettings"] });
|
||||||
@@ -61,10 +64,12 @@ export default function TelegramConfigDrawer({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const testMutation = useMutation({
|
const testMutation = useMutation({
|
||||||
mutationFn: () => apiClient.testNotification({
|
mutationFn: () =>
|
||||||
service: "telegram",
|
apiClient.testNotification({
|
||||||
message: "Test notification from Leggen - Telegram configuration is working!"
|
service: "telegram",
|
||||||
}),
|
message:
|
||||||
|
"Test notification from Leggen - Telegram configuration is working!",
|
||||||
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
console.log("Test Telegram notification sent successfully");
|
console.log("Test Telegram notification sent successfully");
|
||||||
},
|
},
|
||||||
@@ -86,9 +91,7 @@ export default function TelegramConfigDrawer({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer open={open} onOpenChange={setOpen}>
|
<Drawer open={open} onOpenChange={setOpen}>
|
||||||
<DrawerTrigger asChild>
|
<DrawerTrigger asChild>{trigger || <EditButton />}</DrawerTrigger>
|
||||||
{trigger || <EditButton />}
|
|
||||||
</DrawerTrigger>
|
|
||||||
<DrawerContent>
|
<DrawerContent>
|
||||||
<div className="mx-auto w-full max-w-md">
|
<div className="mx-auto w-full max-w-md">
|
||||||
<DrawerHeader>
|
<DrawerHeader>
|
||||||
@@ -104,7 +107,9 @@ export default function TelegramConfigDrawer({
|
|||||||
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
<form onSubmit={handleSubmit} className="p-4 space-y-6">
|
||||||
{/* Enable/Disable Toggle */}
|
{/* Enable/Disable Toggle */}
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<Label className="text-base font-medium">Enable Telegram Notifications</Label>
|
<Label className="text-base font-medium">
|
||||||
|
Enable Telegram Notifications
|
||||||
|
</Label>
|
||||||
<Switch
|
<Switch
|
||||||
checked={config.enabled}
|
checked={config.enabled}
|
||||||
onCheckedChange={(enabled) => setConfig({ ...config, enabled })}
|
onCheckedChange={(enabled) => setConfig({ ...config, enabled })}
|
||||||
@@ -119,7 +124,9 @@ export default function TelegramConfigDrawer({
|
|||||||
type="password"
|
type="password"
|
||||||
placeholder="123456789:ABCdefGHIjklMNOpqrsTUVwxyz"
|
placeholder="123456789:ABCdefGHIjklMNOpqrsTUVwxyz"
|
||||||
value={config.token}
|
value={config.token}
|
||||||
onChange={(e) => setConfig({ ...config, token: e.target.value })}
|
onChange={(e) =>
|
||||||
|
setConfig({ ...config, token: e.target.value })
|
||||||
|
}
|
||||||
disabled={!config.enabled}
|
disabled={!config.enabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -135,11 +142,18 @@ export default function TelegramConfigDrawer({
|
|||||||
type="number"
|
type="number"
|
||||||
placeholder="123456789"
|
placeholder="123456789"
|
||||||
value={config.chat_id || ""}
|
value={config.chat_id || ""}
|
||||||
onChange={(e) => setConfig({ ...config, chat_id: parseInt(e.target.value) || 0 })}
|
onChange={(e) =>
|
||||||
|
setConfig({
|
||||||
|
...config,
|
||||||
|
chat_id: parseInt(e.target.value) || 0,
|
||||||
|
})
|
||||||
|
}
|
||||||
disabled={!config.enabled}
|
disabled={!config.enabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
Send a message to your bot and visit https://api.telegram.org/bot<token>/getUpdates to find your chat ID
|
Send a message to your bot and visit
|
||||||
|
https://api.telegram.org/bot<token>/getUpdates to find
|
||||||
|
your chat ID
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -147,23 +161,33 @@ export default function TelegramConfigDrawer({
|
|||||||
{config.enabled && (
|
{config.enabled && (
|
||||||
<div className="p-3 bg-muted rounded-md">
|
<div className="p-3 bg-muted rounded-md">
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
<div className={`w-2 h-2 rounded-full ${isConfigValid ? 'bg-green-500' : 'bg-red-500'}`} />
|
<div
|
||||||
|
className={`w-2 h-2 rounded-full ${isConfigValid ? "bg-green-500" : "bg-red-500"}`}
|
||||||
|
/>
|
||||||
<span className="text-sm font-medium">
|
<span className="text-sm font-medium">
|
||||||
{isConfigValid ? 'Configuration Valid' : 'Missing Token or Chat ID'}
|
{isConfigValid
|
||||||
|
? "Configuration Valid"
|
||||||
|
: "Missing Token or Chat ID"}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{!isConfigValid && (config.token.trim().length > 0 || config.chat_id !== 0) && (
|
{!isConfigValid &&
|
||||||
<p className="text-xs text-muted-foreground mt-1">
|
(config.token.trim().length > 0 || config.chat_id !== 0) && (
|
||||||
Both bot token and chat ID are required
|
<p className="text-xs text-muted-foreground mt-1">
|
||||||
</p>
|
Both bot token and chat ID are required
|
||||||
)}
|
</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<DrawerFooter className="px-0">
|
<DrawerFooter className="px-0">
|
||||||
<div className="flex space-x-2">
|
<div className="flex space-x-2">
|
||||||
<Button type="submit" disabled={updateMutation.isPending || !config.enabled}>
|
<Button
|
||||||
{updateMutation.isPending ? "Saving..." : "Save Configuration"}
|
type="submit"
|
||||||
|
disabled={updateMutation.isPending || !config.enabled}
|
||||||
|
>
|
||||||
|
{updateMutation.isPending
|
||||||
|
? "Saving..."
|
||||||
|
: "Save Configuration"}
|
||||||
</Button>
|
</Button>
|
||||||
{config.enabled && isConfigValid && (
|
{config.enabled && isConfigValid && (
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -190,8 +190,7 @@ export default function TransactionsTable() {
|
|||||||
<div className="text-xs text-muted-foreground space-y-1">
|
<div className="text-xs text-muted-foreground space-y-1">
|
||||||
{account && (
|
{account && (
|
||||||
<p className="truncate">
|
<p className="truncate">
|
||||||
{account.name || "Unnamed Account"} •{" "}
|
{account.display_name || "Unnamed Account"}
|
||||||
{account.institution_id}
|
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
{(transaction.creditor_name || transaction.debtor_name) && (
|
{(transaction.creditor_name || transaction.debtor_name) && (
|
||||||
@@ -260,14 +259,15 @@ export default function TransactionsTable() {
|
|||||||
cell: ({ row }) => {
|
cell: ({ row }) => {
|
||||||
const transaction = row.original;
|
const transaction = row.original;
|
||||||
return (
|
return (
|
||||||
<button
|
<Button
|
||||||
onClick={() => handleViewRaw(transaction)}
|
onClick={() => handleViewRaw(transaction)}
|
||||||
className="inline-flex items-center px-2 py-1 text-xs bg-muted text-muted-foreground rounded hover:bg-accent transition-colors"
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
title="View raw transaction data"
|
title="View raw transaction data"
|
||||||
>
|
>
|
||||||
<Eye className="h-3 w-3 mr-1" />
|
<Eye className="h-3 w-3 mr-1" />
|
||||||
Raw
|
Raw
|
||||||
</button>
|
</Button>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -486,8 +486,7 @@ export default function TransactionsTable() {
|
|||||||
<div className="text-xs text-muted-foreground space-y-1 mt-1">
|
<div className="text-xs text-muted-foreground space-y-1 mt-1">
|
||||||
{account && (
|
{account && (
|
||||||
<p className="break-words">
|
<p className="break-words">
|
||||||
{account.name || "Unnamed Account"} •{" "}
|
{account.display_name || "Unnamed Account"}
|
||||||
{account.institution_id}
|
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
{(transaction.creditor_name ||
|
{(transaction.creditor_name ||
|
||||||
@@ -532,14 +531,15 @@ export default function TransactionsTable() {
|
|||||||
transaction.transaction_currency,
|
transaction.transaction_currency,
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
<button
|
<Button
|
||||||
onClick={() => handleViewRaw(transaction)}
|
onClick={() => handleViewRaw(transaction)}
|
||||||
className="inline-flex items-center px-2 py-1 text-xs bg-muted text-muted-foreground rounded hover:bg-accent transition-colors"
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
title="View raw transaction data"
|
title="View raw transaction data"
|
||||||
>
|
>
|
||||||
<Eye className="h-3 w-3 mr-1" />
|
<Eye className="h-3 w-3 mr-1" />
|
||||||
Raw
|
Raw
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ export default function TimePeriodFilter({
|
|||||||
className = "",
|
className = "",
|
||||||
}: TimePeriodFilterProps) {
|
}: TimePeriodFilterProps) {
|
||||||
return (
|
return (
|
||||||
<div className={`flex flex-col sm:flex-row sm:items-center gap-4 ${className}`}>
|
<div
|
||||||
|
className={`flex flex-col sm:flex-row sm:items-center gap-4 ${className}`}
|
||||||
|
>
|
||||||
<div className="flex items-center gap-2 text-foreground">
|
<div className="flex items-center gap-2 text-foreground">
|
||||||
<Calendar size={20} />
|
<Calendar size={20} />
|
||||||
<span className="font-medium">Time Period:</span>
|
<span className="font-medium">Time Period:</span>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as React from "react"
|
import * as React from "react";
|
||||||
import { Drawer as DrawerPrimitive } from "vaul"
|
import { Drawer as DrawerPrimitive } from "vaul";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
const Drawer = ({
|
const Drawer = ({
|
||||||
shouldScaleBackground = true,
|
shouldScaleBackground = true,
|
||||||
@@ -11,14 +11,14 @@ const Drawer = ({
|
|||||||
shouldScaleBackground={shouldScaleBackground}
|
shouldScaleBackground={shouldScaleBackground}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
)
|
);
|
||||||
Drawer.displayName = "Drawer"
|
Drawer.displayName = "Drawer";
|
||||||
|
|
||||||
const DrawerTrigger = DrawerPrimitive.Trigger
|
const DrawerTrigger = DrawerPrimitive.Trigger;
|
||||||
|
|
||||||
const DrawerPortal = DrawerPrimitive.Portal
|
const DrawerPortal = DrawerPrimitive.Portal;
|
||||||
|
|
||||||
const DrawerClose = DrawerPrimitive.Close
|
const DrawerClose = DrawerPrimitive.Close;
|
||||||
|
|
||||||
const DrawerOverlay = React.forwardRef<
|
const DrawerOverlay = React.forwardRef<
|
||||||
React.ElementRef<typeof DrawerPrimitive.Overlay>,
|
React.ElementRef<typeof DrawerPrimitive.Overlay>,
|
||||||
@@ -29,8 +29,8 @@ const DrawerOverlay = React.forwardRef<
|
|||||||
className={cn("fixed inset-0 z-50 bg-black/80", className)}
|
className={cn("fixed inset-0 z-50 bg-black/80", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
))
|
));
|
||||||
DrawerOverlay.displayName = DrawerPrimitive.Overlay.displayName
|
DrawerOverlay.displayName = DrawerPrimitive.Overlay.displayName;
|
||||||
|
|
||||||
const DrawerContent = React.forwardRef<
|
const DrawerContent = React.forwardRef<
|
||||||
React.ElementRef<typeof DrawerPrimitive.Content>,
|
React.ElementRef<typeof DrawerPrimitive.Content>,
|
||||||
@@ -42,7 +42,7 @@ const DrawerContent = React.forwardRef<
|
|||||||
ref={ref}
|
ref={ref}
|
||||||
className={cn(
|
className={cn(
|
||||||
"fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border bg-background",
|
"fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border bg-background",
|
||||||
className
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
@@ -50,8 +50,8 @@ const DrawerContent = React.forwardRef<
|
|||||||
{children}
|
{children}
|
||||||
</DrawerPrimitive.Content>
|
</DrawerPrimitive.Content>
|
||||||
</DrawerPortal>
|
</DrawerPortal>
|
||||||
))
|
));
|
||||||
DrawerContent.displayName = "DrawerContent"
|
DrawerContent.displayName = "DrawerContent";
|
||||||
|
|
||||||
const DrawerHeader = ({
|
const DrawerHeader = ({
|
||||||
className,
|
className,
|
||||||
@@ -61,8 +61,8 @@ const DrawerHeader = ({
|
|||||||
className={cn("grid gap-1.5 p-4 text-center sm:text-left", className)}
|
className={cn("grid gap-1.5 p-4 text-center sm:text-left", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
)
|
);
|
||||||
DrawerHeader.displayName = "DrawerHeader"
|
DrawerHeader.displayName = "DrawerHeader";
|
||||||
|
|
||||||
const DrawerFooter = ({
|
const DrawerFooter = ({
|
||||||
className,
|
className,
|
||||||
@@ -72,8 +72,8 @@ const DrawerFooter = ({
|
|||||||
className={cn("mt-auto flex flex-col gap-2 p-4", className)}
|
className={cn("mt-auto flex flex-col gap-2 p-4", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
)
|
);
|
||||||
DrawerFooter.displayName = "DrawerFooter"
|
DrawerFooter.displayName = "DrawerFooter";
|
||||||
|
|
||||||
const DrawerTitle = React.forwardRef<
|
const DrawerTitle = React.forwardRef<
|
||||||
React.ElementRef<typeof DrawerPrimitive.Title>,
|
React.ElementRef<typeof DrawerPrimitive.Title>,
|
||||||
@@ -83,12 +83,12 @@ const DrawerTitle = React.forwardRef<
|
|||||||
ref={ref}
|
ref={ref}
|
||||||
className={cn(
|
className={cn(
|
||||||
"text-lg font-semibold leading-none tracking-tight",
|
"text-lg font-semibold leading-none tracking-tight",
|
||||||
className
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
))
|
));
|
||||||
DrawerTitle.displayName = DrawerPrimitive.Title.displayName
|
DrawerTitle.displayName = DrawerPrimitive.Title.displayName;
|
||||||
|
|
||||||
const DrawerDescription = React.forwardRef<
|
const DrawerDescription = React.forwardRef<
|
||||||
React.ElementRef<typeof DrawerPrimitive.Description>,
|
React.ElementRef<typeof DrawerPrimitive.Description>,
|
||||||
@@ -99,8 +99,8 @@ const DrawerDescription = React.forwardRef<
|
|||||||
className={cn("text-sm text-muted-foreground", className)}
|
className={cn("text-sm text-muted-foreground", className)}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
))
|
));
|
||||||
DrawerDescription.displayName = DrawerPrimitive.Description.displayName
|
DrawerDescription.displayName = DrawerPrimitive.Description.displayName;
|
||||||
|
|
||||||
export {
|
export {
|
||||||
Drawer,
|
Drawer,
|
||||||
@@ -113,4 +113,4 @@ export {
|
|||||||
DrawerFooter,
|
DrawerFooter,
|
||||||
DrawerTitle,
|
DrawerTitle,
|
||||||
DrawerDescription,
|
DrawerDescription,
|
||||||
}
|
};
|
||||||
|
|||||||
@@ -7,7 +7,13 @@ interface EditButtonProps {
|
|||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
className?: string;
|
className?: string;
|
||||||
size?: "default" | "sm" | "lg" | "icon";
|
size?: "default" | "sm" | "lg" | "icon";
|
||||||
variant?: "default" | "destructive" | "outline" | "secondary" | "ghost" | "link";
|
variant?:
|
||||||
|
| "default"
|
||||||
|
| "destructive"
|
||||||
|
| "outline"
|
||||||
|
| "secondary"
|
||||||
|
| "ghost"
|
||||||
|
| "link";
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +34,7 @@ export function EditButton({
|
|||||||
variant={variant}
|
variant={variant}
|
||||||
className={cn(
|
className={cn(
|
||||||
"h-8 px-3 text-muted-foreground hover:text-foreground transition-colors",
|
"h-8 px-3 text-muted-foreground hover:text-foreground transition-colors",
|
||||||
className
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
|
|||||||
21
frontend/src/components/ui/scroll-area.tsx
Normal file
21
frontend/src/components/ui/scroll-area.tsx
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import * as React from "react";
|
||||||
|
import { cn } from "../../lib/utils";
|
||||||
|
|
||||||
|
const ScrollArea = React.forwardRef<
|
||||||
|
HTMLDivElement,
|
||||||
|
React.HTMLAttributes<HTMLDivElement>
|
||||||
|
>(({ className, children, ...props }, ref) => (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={cn(
|
||||||
|
"relative overflow-auto scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-gray-100",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
));
|
||||||
|
ScrollArea.displayName = "ScrollArea";
|
||||||
|
|
||||||
|
export { ScrollArea };
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as React from "react"
|
import * as React from "react";
|
||||||
import * as SwitchPrimitives from "@radix-ui/react-switch"
|
import * as SwitchPrimitives from "@radix-ui/react-switch";
|
||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
const Switch = React.forwardRef<
|
const Switch = React.forwardRef<
|
||||||
React.ElementRef<typeof SwitchPrimitives.Root>,
|
React.ElementRef<typeof SwitchPrimitives.Root>,
|
||||||
@@ -10,18 +10,18 @@ const Switch = React.forwardRef<
|
|||||||
<SwitchPrimitives.Root
|
<SwitchPrimitives.Root
|
||||||
className={cn(
|
className={cn(
|
||||||
"peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
|
"peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
|
||||||
className
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
>
|
>
|
||||||
<SwitchPrimitives.Thumb
|
<SwitchPrimitives.Thumb
|
||||||
className={cn(
|
className={cn(
|
||||||
"pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0"
|
"pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0",
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</SwitchPrimitives.Root>
|
</SwitchPrimitives.Root>
|
||||||
))
|
));
|
||||||
Switch.displayName = SwitchPrimitives.Root.displayName
|
Switch.displayName = SwitchPrimitives.Root.displayName;
|
||||||
|
|
||||||
export { Switch }
|
export { Switch };
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
import { useEffect, useState } from "react";
|
|
||||||
|
|
||||||
interface PWAUpdate {
|
|
||||||
updateAvailable: boolean;
|
|
||||||
updateSW: () => Promise<void>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function usePWA(): PWAUpdate {
|
|
||||||
const [updateAvailable, setUpdateAvailable] = useState(false);
|
|
||||||
const [updateSW, setUpdateSW] = useState<() => Promise<void>>(
|
|
||||||
() => async () => {},
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// Check if SW registration is available
|
|
||||||
if ("serviceWorker" in navigator) {
|
|
||||||
// Import the registerSW function
|
|
||||||
import("virtual:pwa-register")
|
|
||||||
.then(({ registerSW }) => {
|
|
||||||
const updateSWFunction = registerSW({
|
|
||||||
onNeedRefresh() {
|
|
||||||
setUpdateAvailable(true);
|
|
||||||
setUpdateSW(() => updateSWFunction);
|
|
||||||
},
|
|
||||||
onOfflineReady() {
|
|
||||||
console.log("App ready to work offline");
|
|
||||||
},
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
// PWA not available in development mode or when disabled
|
|
||||||
console.log("PWA registration not available");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return {
|
|
||||||
updateAvailable,
|
|
||||||
updateSW,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -86,5 +86,9 @@
|
|||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground;
|
@apply bg-background text-foreground;
|
||||||
|
padding-top: var(--safe-area-inset-top);
|
||||||
|
padding-bottom: var(--safe-area-inset-bottom);
|
||||||
|
padding-left: var(--safe-area-inset-left);
|
||||||
|
padding-right: var(--safe-area-inset-right);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,14 @@ import type {
|
|||||||
AccountUpdate,
|
AccountUpdate,
|
||||||
TransactionStats,
|
TransactionStats,
|
||||||
SyncOperationsResponse,
|
SyncOperationsResponse,
|
||||||
|
BankInstitution,
|
||||||
|
BankConnectionStatus,
|
||||||
|
BankRequisition,
|
||||||
|
Country,
|
||||||
|
BackupSettings,
|
||||||
|
BackupTest,
|
||||||
|
BackupInfo,
|
||||||
|
BackupOperation,
|
||||||
} from "../types/api";
|
} from "../types/api";
|
||||||
|
|
||||||
// Use VITE_API_URL for development, relative URLs for production
|
// Use VITE_API_URL for development, relative URLs for production
|
||||||
@@ -168,8 +176,6 @@ export const apiClient = {
|
|||||||
return response.data.data;
|
return response.data.data;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Analytics endpoints
|
// Analytics endpoints
|
||||||
getTransactionStats: async (days?: number): Promise<TransactionStats> => {
|
getTransactionStats: async (days?: number): Promise<TransactionStats> => {
|
||||||
const queryParams = new URLSearchParams();
|
const queryParams = new URLSearchParams();
|
||||||
@@ -231,6 +237,79 @@ export const apiClient = {
|
|||||||
);
|
);
|
||||||
return response.data.data;
|
return response.data.data;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// Bank management endpoints
|
||||||
|
getBankInstitutions: async (country: string): Promise<BankInstitution[]> => {
|
||||||
|
const response = await api.get<ApiResponse<BankInstitution[]>>(
|
||||||
|
`/banks/institutions?country=${country}`,
|
||||||
|
);
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
getBankConnectionsStatus: async (): Promise<BankConnectionStatus[]> => {
|
||||||
|
const response =
|
||||||
|
await api.get<ApiResponse<BankConnectionStatus[]>>("/banks/status");
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
createBankConnection: async (
|
||||||
|
institutionId: string,
|
||||||
|
redirectUrl?: string,
|
||||||
|
): Promise<BankRequisition> => {
|
||||||
|
// If no redirect URL provided, construct it from current location
|
||||||
|
const finalRedirectUrl =
|
||||||
|
redirectUrl || `${window.location.origin}/bank-connected`;
|
||||||
|
|
||||||
|
const response = await api.post<ApiResponse<BankRequisition>>(
|
||||||
|
"/banks/connect",
|
||||||
|
{
|
||||||
|
institution_id: institutionId,
|
||||||
|
redirect_url: finalRedirectUrl,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
deleteBankConnection: async (requisitionId: string): Promise<void> => {
|
||||||
|
await api.delete(`/banks/connections/${requisitionId}`);
|
||||||
|
},
|
||||||
|
|
||||||
|
getSupportedCountries: async (): Promise<Country[]> => {
|
||||||
|
const response = await api.get<ApiResponse<Country[]>>("/banks/countries");
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
// Backup endpoints
|
||||||
|
getBackupSettings: async (): Promise<BackupSettings> => {
|
||||||
|
const response =
|
||||||
|
await api.get<ApiResponse<BackupSettings>>("/backup/settings");
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
updateBackupSettings: async (
|
||||||
|
settings: BackupSettings,
|
||||||
|
): Promise<BackupSettings> => {
|
||||||
|
const response = await api.put<ApiResponse<BackupSettings>>(
|
||||||
|
"/backup/settings",
|
||||||
|
settings,
|
||||||
|
);
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
testBackupConnection: async (test: BackupTest): Promise<ApiResponse<{ connected?: boolean }>> => {
|
||||||
|
const response = await api.post<ApiResponse<{ connected?: boolean }>>("/backup/test", test);
|
||||||
|
return response.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
listBackups: async (): Promise<BackupInfo[]> => {
|
||||||
|
const response = await api.get<ApiResponse<BackupInfo[]>>("/backup/list");
|
||||||
|
return response.data.data;
|
||||||
|
},
|
||||||
|
|
||||||
|
performBackupOperation: async (operation: BackupOperation): Promise<ApiResponse<{ operation: string; completed: boolean }>> => {
|
||||||
|
const response = await api.post<ApiResponse<{ operation: string; completed: boolean }>>("/backup/operation", operation);
|
||||||
|
return response.data;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default apiClient;
|
export default apiClient;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|||||||
import { ThemeProvider } from "./contexts/ThemeContext";
|
import { ThemeProvider } from "./contexts/ThemeContext";
|
||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { routeTree } from "./routeTree.gen";
|
import { routeTree } from "./routeTree.gen";
|
||||||
|
import { registerSW } from "virtual:pwa-register";
|
||||||
|
|
||||||
const router = createRouter({ routeTree });
|
const router = createRouter({ routeTree });
|
||||||
|
|
||||||
@@ -17,6 +18,57 @@ const queryClient = new QueryClient({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const intervalMS = 60 * 60 * 1000;
|
||||||
|
|
||||||
|
registerSW({
|
||||||
|
onRegisteredSW(swUrl, r) {
|
||||||
|
console.log("[PWA] Service worker registered successfully");
|
||||||
|
|
||||||
|
if (r) {
|
||||||
|
setInterval(async () => {
|
||||||
|
console.log("[PWA] Checking for updates...");
|
||||||
|
|
||||||
|
if (r.installing) {
|
||||||
|
console.log("[PWA] Update already installing, skipping check");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!navigator) {
|
||||||
|
console.log("[PWA] Navigator not available, skipping check");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("connection" in navigator && !navigator.onLine) {
|
||||||
|
console.log("[PWA] Device is offline, skipping check");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const resp = await fetch(swUrl, {
|
||||||
|
cache: "no-store",
|
||||||
|
headers: {
|
||||||
|
cache: "no-store",
|
||||||
|
"cache-control": "no-cache",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (resp?.status === 200) {
|
||||||
|
console.log("[PWA] Update check successful, triggering update");
|
||||||
|
await r.update();
|
||||||
|
} else {
|
||||||
|
console.log(`[PWA] Update check returned status: ${resp?.status}`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("[PWA] Error checking for updates:", error);
|
||||||
|
}
|
||||||
|
}, intervalMS);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onOfflineReady() {
|
||||||
|
console.log("[PWA] App ready to work offline");
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
createRoot(document.getElementById("root")!).render(
|
createRoot(document.getElementById("root")!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { Route as TransactionsRouteImport } from './routes/transactions'
|
|||||||
import { Route as SystemRouteImport } from './routes/system'
|
import { Route as SystemRouteImport } from './routes/system'
|
||||||
import { Route as SettingsRouteImport } from './routes/settings'
|
import { Route as SettingsRouteImport } from './routes/settings'
|
||||||
import { Route as NotificationsRouteImport } from './routes/notifications'
|
import { Route as NotificationsRouteImport } from './routes/notifications'
|
||||||
|
import { Route as BankConnectedRouteImport } from './routes/bank-connected'
|
||||||
import { Route as AnalyticsRouteImport } from './routes/analytics'
|
import { Route as AnalyticsRouteImport } from './routes/analytics'
|
||||||
import { Route as IndexRouteImport } from './routes/index'
|
import { Route as IndexRouteImport } from './routes/index'
|
||||||
|
|
||||||
@@ -36,6 +37,11 @@ const NotificationsRoute = NotificationsRouteImport.update({
|
|||||||
path: '/notifications',
|
path: '/notifications',
|
||||||
getParentRoute: () => rootRouteImport,
|
getParentRoute: () => rootRouteImport,
|
||||||
} as any)
|
} as any)
|
||||||
|
const BankConnectedRoute = BankConnectedRouteImport.update({
|
||||||
|
id: '/bank-connected',
|
||||||
|
path: '/bank-connected',
|
||||||
|
getParentRoute: () => rootRouteImport,
|
||||||
|
} as any)
|
||||||
const AnalyticsRoute = AnalyticsRouteImport.update({
|
const AnalyticsRoute = AnalyticsRouteImport.update({
|
||||||
id: '/analytics',
|
id: '/analytics',
|
||||||
path: '/analytics',
|
path: '/analytics',
|
||||||
@@ -50,6 +56,7 @@ const IndexRoute = IndexRouteImport.update({
|
|||||||
export interface FileRoutesByFullPath {
|
export interface FileRoutesByFullPath {
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/analytics': typeof AnalyticsRoute
|
'/analytics': typeof AnalyticsRoute
|
||||||
|
'/bank-connected': typeof BankConnectedRoute
|
||||||
'/notifications': typeof NotificationsRoute
|
'/notifications': typeof NotificationsRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
'/system': typeof SystemRoute
|
'/system': typeof SystemRoute
|
||||||
@@ -58,6 +65,7 @@ export interface FileRoutesByFullPath {
|
|||||||
export interface FileRoutesByTo {
|
export interface FileRoutesByTo {
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/analytics': typeof AnalyticsRoute
|
'/analytics': typeof AnalyticsRoute
|
||||||
|
'/bank-connected': typeof BankConnectedRoute
|
||||||
'/notifications': typeof NotificationsRoute
|
'/notifications': typeof NotificationsRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
'/system': typeof SystemRoute
|
'/system': typeof SystemRoute
|
||||||
@@ -67,6 +75,7 @@ export interface FileRoutesById {
|
|||||||
__root__: typeof rootRouteImport
|
__root__: typeof rootRouteImport
|
||||||
'/': typeof IndexRoute
|
'/': typeof IndexRoute
|
||||||
'/analytics': typeof AnalyticsRoute
|
'/analytics': typeof AnalyticsRoute
|
||||||
|
'/bank-connected': typeof BankConnectedRoute
|
||||||
'/notifications': typeof NotificationsRoute
|
'/notifications': typeof NotificationsRoute
|
||||||
'/settings': typeof SettingsRoute
|
'/settings': typeof SettingsRoute
|
||||||
'/system': typeof SystemRoute
|
'/system': typeof SystemRoute
|
||||||
@@ -77,6 +86,7 @@ export interface FileRouteTypes {
|
|||||||
fullPaths:
|
fullPaths:
|
||||||
| '/'
|
| '/'
|
||||||
| '/analytics'
|
| '/analytics'
|
||||||
|
| '/bank-connected'
|
||||||
| '/notifications'
|
| '/notifications'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
| '/system'
|
| '/system'
|
||||||
@@ -85,6 +95,7 @@ export interface FileRouteTypes {
|
|||||||
to:
|
to:
|
||||||
| '/'
|
| '/'
|
||||||
| '/analytics'
|
| '/analytics'
|
||||||
|
| '/bank-connected'
|
||||||
| '/notifications'
|
| '/notifications'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
| '/system'
|
| '/system'
|
||||||
@@ -93,6 +104,7 @@ export interface FileRouteTypes {
|
|||||||
| '__root__'
|
| '__root__'
|
||||||
| '/'
|
| '/'
|
||||||
| '/analytics'
|
| '/analytics'
|
||||||
|
| '/bank-connected'
|
||||||
| '/notifications'
|
| '/notifications'
|
||||||
| '/settings'
|
| '/settings'
|
||||||
| '/system'
|
| '/system'
|
||||||
@@ -102,6 +114,7 @@ export interface FileRouteTypes {
|
|||||||
export interface RootRouteChildren {
|
export interface RootRouteChildren {
|
||||||
IndexRoute: typeof IndexRoute
|
IndexRoute: typeof IndexRoute
|
||||||
AnalyticsRoute: typeof AnalyticsRoute
|
AnalyticsRoute: typeof AnalyticsRoute
|
||||||
|
BankConnectedRoute: typeof BankConnectedRoute
|
||||||
NotificationsRoute: typeof NotificationsRoute
|
NotificationsRoute: typeof NotificationsRoute
|
||||||
SettingsRoute: typeof SettingsRoute
|
SettingsRoute: typeof SettingsRoute
|
||||||
SystemRoute: typeof SystemRoute
|
SystemRoute: typeof SystemRoute
|
||||||
@@ -138,6 +151,13 @@ declare module '@tanstack/react-router' {
|
|||||||
preLoaderRoute: typeof NotificationsRouteImport
|
preLoaderRoute: typeof NotificationsRouteImport
|
||||||
parentRoute: typeof rootRouteImport
|
parentRoute: typeof rootRouteImport
|
||||||
}
|
}
|
||||||
|
'/bank-connected': {
|
||||||
|
id: '/bank-connected'
|
||||||
|
path: '/bank-connected'
|
||||||
|
fullPath: '/bank-connected'
|
||||||
|
preLoaderRoute: typeof BankConnectedRouteImport
|
||||||
|
parentRoute: typeof rootRouteImport
|
||||||
|
}
|
||||||
'/analytics': {
|
'/analytics': {
|
||||||
id: '/analytics'
|
id: '/analytics'
|
||||||
path: '/analytics'
|
path: '/analytics'
|
||||||
@@ -158,6 +178,7 @@ declare module '@tanstack/react-router' {
|
|||||||
const rootRouteChildren: RootRouteChildren = {
|
const rootRouteChildren: RootRouteChildren = {
|
||||||
IndexRoute: IndexRoute,
|
IndexRoute: IndexRoute,
|
||||||
AnalyticsRoute: AnalyticsRoute,
|
AnalyticsRoute: AnalyticsRoute,
|
||||||
|
BankConnectedRoute: BankConnectedRoute,
|
||||||
NotificationsRoute: NotificationsRoute,
|
NotificationsRoute: NotificationsRoute,
|
||||||
SettingsRoute: SettingsRoute,
|
SettingsRoute: SettingsRoute,
|
||||||
SystemRoute: SystemRoute,
|
SystemRoute: SystemRoute,
|
||||||
|
|||||||
@@ -1,26 +1,10 @@
|
|||||||
import { createRootRoute, Outlet } from "@tanstack/react-router";
|
import { createRootRoute, Outlet } from "@tanstack/react-router";
|
||||||
import { AppSidebar } from "../components/AppSidebar";
|
import { AppSidebar } from "../components/AppSidebar";
|
||||||
import { SiteHeader } from "../components/SiteHeader";
|
import { SiteHeader } from "../components/SiteHeader";
|
||||||
import { PWAInstallPrompt, PWAUpdatePrompt } from "../components/PWAPrompts";
|
|
||||||
import { usePWA } from "../hooks/usePWA";
|
|
||||||
import { SidebarInset, SidebarProvider } from "../components/ui/sidebar";
|
import { SidebarInset, SidebarProvider } from "../components/ui/sidebar";
|
||||||
|
import { Toaster } from "../components/ui/sonner";
|
||||||
|
|
||||||
function RootLayout() {
|
function RootLayout() {
|
||||||
const { updateAvailable, updateSW } = usePWA();
|
|
||||||
|
|
||||||
const handlePWAInstall = () => {
|
|
||||||
console.log("PWA installed successfully");
|
|
||||||
};
|
|
||||||
|
|
||||||
const handlePWAUpdate = async () => {
|
|
||||||
try {
|
|
||||||
await updateSW();
|
|
||||||
console.log("PWA updated successfully");
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error updating PWA:", error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SidebarProvider
|
<SidebarProvider
|
||||||
style={
|
style={
|
||||||
@@ -38,12 +22,8 @@ function RootLayout() {
|
|||||||
</main>
|
</main>
|
||||||
</SidebarInset>
|
</SidebarInset>
|
||||||
|
|
||||||
{/* PWA Prompts */}
|
{/* Toast Notifications */}
|
||||||
<PWAInstallPrompt onInstall={handlePWAInstall} />
|
<Toaster />
|
||||||
<PWAUpdatePrompt
|
|
||||||
updateAvailable={updateAvailable}
|
|
||||||
onUpdate={handlePWAUpdate}
|
|
||||||
/>
|
|
||||||
</SidebarProvider>
|
</SidebarProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
57
frontend/src/routes/bank-connected.tsx
Normal file
57
frontend/src/routes/bank-connected.tsx
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
import { createFileRoute, useSearch } from "@tanstack/react-router";
|
||||||
|
import { CheckCircle, ArrowLeft } from "lucide-react";
|
||||||
|
import { Button } from "../components/ui/button";
|
||||||
|
import {
|
||||||
|
Card,
|
||||||
|
CardContent,
|
||||||
|
CardHeader,
|
||||||
|
CardTitle,
|
||||||
|
} from "../components/ui/card";
|
||||||
|
|
||||||
|
function BankConnected() {
|
||||||
|
const search = useSearch({ from: "/bank-connected" });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-background p-4">
|
||||||
|
<Card className="w-full max-w-md">
|
||||||
|
<CardHeader className="text-center pb-2">
|
||||||
|
<div className="mx-auto mb-4">
|
||||||
|
<CheckCircle className="h-16 w-16 text-green-500" />
|
||||||
|
</div>
|
||||||
|
<CardTitle className="text-2xl">Account Connected!</CardTitle>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="text-center space-y-4">
|
||||||
|
<p className="text-muted-foreground">
|
||||||
|
Your bank account has been successfully connected to Leggen. We'll
|
||||||
|
start syncing your transactions shortly.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{search?.bank && (
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
Connected to: <strong>{search.bank}</strong>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="pt-4">
|
||||||
|
<Button
|
||||||
|
onClick={() => (window.location.href = "/settings")}
|
||||||
|
className="w-full"
|
||||||
|
>
|
||||||
|
<ArrowLeft className="h-4 w-4 mr-2" />
|
||||||
|
Go to Settings
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Route = createFileRoute("/bank-connected")({
|
||||||
|
component: BankConnected,
|
||||||
|
validateSearch: (search: Record<string, unknown>) => {
|
||||||
|
return {
|
||||||
|
bank: (search.bank as string) || undefined,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -13,6 +13,7 @@ export interface Account {
|
|||||||
name?: string;
|
name?: string;
|
||||||
display_name?: string;
|
display_name?: string;
|
||||||
currency?: string;
|
currency?: string;
|
||||||
|
logo?: string;
|
||||||
created: string;
|
created: string;
|
||||||
last_accessed?: string;
|
last_accessed?: string;
|
||||||
balances: AccountBalance[];
|
balances: AccountBalance[];
|
||||||
@@ -241,3 +242,69 @@ export interface SyncOperationsResponse {
|
|||||||
operations: SyncOperation[];
|
operations: SyncOperation[];
|
||||||
count: number;
|
count: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Bank-related types
|
||||||
|
export interface BankInstitution {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
bic?: string;
|
||||||
|
transaction_total_days: number;
|
||||||
|
countries: string[];
|
||||||
|
logo?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BankRequisition {
|
||||||
|
id: string;
|
||||||
|
institution_id: string;
|
||||||
|
status: string;
|
||||||
|
status_display?: string;
|
||||||
|
created: string;
|
||||||
|
link: string;
|
||||||
|
accounts: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BankConnectionStatus {
|
||||||
|
bank_id: string;
|
||||||
|
bank_name: string;
|
||||||
|
status: string;
|
||||||
|
status_display: string;
|
||||||
|
created_at: string;
|
||||||
|
requisition_id: string;
|
||||||
|
accounts_count: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Country {
|
||||||
|
code: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Backup types
|
||||||
|
export interface S3Config {
|
||||||
|
access_key_id: string;
|
||||||
|
secret_access_key: string;
|
||||||
|
bucket_name: string;
|
||||||
|
region: string;
|
||||||
|
endpoint_url?: string;
|
||||||
|
path_style: boolean;
|
||||||
|
enabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackupSettings {
|
||||||
|
s3?: S3Config;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackupTest {
|
||||||
|
service: string;
|
||||||
|
config: S3Config;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackupInfo {
|
||||||
|
key: string;
|
||||||
|
last_modified: string;
|
||||||
|
size: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackupOperation {
|
||||||
|
operation: string;
|
||||||
|
backup_key?: string;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,20 +1,17 @@
|
|||||||
import { defineConfig } from "vite";
|
import { defineConfig } from "vite";
|
||||||
import react from "@vitejs/plugin-react";
|
import react from "@vitejs/plugin-react";
|
||||||
import { TanStackRouterVite } from "@tanstack/router-vite-plugin";
|
import { tanstackRouter } from "@tanstack/router-vite-plugin";
|
||||||
import { VitePWA } from "vite-plugin-pwa";
|
import { VitePWA } from "vite-plugin-pwa";
|
||||||
|
|
||||||
// https://vite.dev/config/
|
// https://vite.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [
|
||||||
TanStackRouterVite(),
|
tanstackRouter(),
|
||||||
react(),
|
react(),
|
||||||
VitePWA({
|
VitePWA({
|
||||||
registerType: "autoUpdate",
|
registerType: "autoUpdate",
|
||||||
includeAssets: [
|
includeAssets: [
|
||||||
"favicon.ico",
|
"robots.txt"
|
||||||
"apple-touch-icon-180x180.png",
|
|
||||||
"maskable-icon-512x512.png",
|
|
||||||
"robots.txt",
|
|
||||||
],
|
],
|
||||||
manifest: {
|
manifest: {
|
||||||
name: "Leggen",
|
name: "Leggen",
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ class AccountDetails(BaseModel):
|
|||||||
name: Optional[str] = None
|
name: Optional[str] = None
|
||||||
display_name: Optional[str] = None
|
display_name: Optional[str] = None
|
||||||
currency: Optional[str] = None
|
currency: Optional[str] = None
|
||||||
|
logo: Optional[str] = None
|
||||||
created: datetime
|
created: datetime
|
||||||
last_accessed: Optional[datetime] = None
|
last_accessed: Optional[datetime] = None
|
||||||
balances: List[AccountBalance] = []
|
balances: List[AccountBalance] = []
|
||||||
|
|||||||
49
leggen/api/models/backup.py
Normal file
49
leggen/api/models/backup.py
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
"""API models for backup endpoints."""
|
||||||
|
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
|
class S3Config(BaseModel):
|
||||||
|
"""S3 backup configuration model for API."""
|
||||||
|
|
||||||
|
access_key_id: str = Field(..., description="AWS S3 access key ID")
|
||||||
|
secret_access_key: str = Field(..., description="AWS S3 secret access key")
|
||||||
|
bucket_name: str = Field(..., description="S3 bucket name")
|
||||||
|
region: str = Field(default="us-east-1", description="AWS S3 region")
|
||||||
|
endpoint_url: Optional[str] = Field(
|
||||||
|
default=None, description="Custom S3 endpoint URL"
|
||||||
|
)
|
||||||
|
path_style: bool = Field(default=False, description="Use path-style addressing")
|
||||||
|
enabled: bool = Field(default=True, description="Enable S3 backups")
|
||||||
|
|
||||||
|
|
||||||
|
class BackupSettings(BaseModel):
|
||||||
|
"""Backup settings model for API."""
|
||||||
|
|
||||||
|
s3: Optional[S3Config] = None
|
||||||
|
|
||||||
|
|
||||||
|
class BackupTest(BaseModel):
|
||||||
|
"""Backup connection test request model."""
|
||||||
|
|
||||||
|
service: str = Field(..., description="Backup service type (s3)")
|
||||||
|
config: S3Config = Field(..., description="S3 configuration to test")
|
||||||
|
|
||||||
|
|
||||||
|
class BackupInfo(BaseModel):
|
||||||
|
"""Backup file information model."""
|
||||||
|
|
||||||
|
key: str = Field(..., description="S3 object key")
|
||||||
|
last_modified: str = Field(..., description="Last modified timestamp (ISO format)")
|
||||||
|
size: int = Field(..., description="File size in bytes")
|
||||||
|
|
||||||
|
|
||||||
|
class BackupOperation(BaseModel):
|
||||||
|
"""Backup operation request model."""
|
||||||
|
|
||||||
|
operation: str = Field(..., description="Operation type (backup, restore)")
|
||||||
|
backup_key: Optional[str] = Field(
|
||||||
|
default=None, description="Backup key for restore operations"
|
||||||
|
)
|
||||||
@@ -18,7 +18,7 @@ class SyncOperation(BaseModel):
|
|||||||
duration_seconds: Optional[float] = None
|
duration_seconds: Optional[float] = None
|
||||||
errors: list[str] = []
|
errors: list[str] = []
|
||||||
logs: list[str] = []
|
logs: list[str] = []
|
||||||
trigger_type: str = "manual" # manual, scheduled, api
|
trigger_type: str = "manual" # manual, scheduled, retry, api
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
json_encoders = {datetime: lambda v: v.isoformat() if v else None}
|
json_encoders = {datetime: lambda v: v.isoformat() if v else None}
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ async def get_all_accounts() -> APIResponse:
|
|||||||
name=db_account.get("name"),
|
name=db_account.get("name"),
|
||||||
display_name=db_account.get("display_name"),
|
display_name=db_account.get("display_name"),
|
||||||
currency=db_account.get("currency"),
|
currency=db_account.get("currency"),
|
||||||
|
logo=db_account.get("logo"),
|
||||||
created=db_account["created"],
|
created=db_account["created"],
|
||||||
last_accessed=db_account.get("last_accessed"),
|
last_accessed=db_account.get("last_accessed"),
|
||||||
balances=balances,
|
balances=balances,
|
||||||
@@ -115,6 +116,7 @@ async def get_account_details(account_id: str) -> APIResponse:
|
|||||||
name=db_account.get("name"),
|
name=db_account.get("name"),
|
||||||
display_name=db_account.get("display_name"),
|
display_name=db_account.get("display_name"),
|
||||||
currency=db_account.get("currency"),
|
currency=db_account.get("currency"),
|
||||||
|
logo=db_account.get("logo"),
|
||||||
created=db_account["created"],
|
created=db_account["created"],
|
||||||
last_accessed=db_account.get("last_accessed"),
|
last_accessed=db_account.get("last_accessed"),
|
||||||
balances=balances,
|
balances=balances,
|
||||||
|
|||||||
264
leggen/api/routes/backup.py
Normal file
264
leggen/api/routes/backup.py
Normal file
@@ -0,0 +1,264 @@
|
|||||||
|
"""API routes for backup management."""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
|
from leggen.api.models.backup import (
|
||||||
|
BackupOperation,
|
||||||
|
BackupSettings,
|
||||||
|
BackupTest,
|
||||||
|
S3Config,
|
||||||
|
)
|
||||||
|
from leggen.api.models.common import APIResponse
|
||||||
|
from leggen.models.config import S3BackupConfig
|
||||||
|
from leggen.services.backup_service import BackupService
|
||||||
|
from leggen.utils.config import config
|
||||||
|
from leggen.utils.paths import path_manager
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/backup/settings", response_model=APIResponse)
|
||||||
|
async def get_backup_settings() -> APIResponse:
|
||||||
|
"""Get current backup settings."""
|
||||||
|
try:
|
||||||
|
backup_config = config.backup_config
|
||||||
|
|
||||||
|
# Build response safely without exposing secrets
|
||||||
|
s3_config = backup_config.get("s3", {})
|
||||||
|
|
||||||
|
settings = BackupSettings(
|
||||||
|
s3=S3Config(
|
||||||
|
access_key_id="***" if s3_config.get("access_key_id") else "",
|
||||||
|
secret_access_key="***" if s3_config.get("secret_access_key") else "",
|
||||||
|
bucket_name=s3_config.get("bucket_name", ""),
|
||||||
|
region=s3_config.get("region", "us-east-1"),
|
||||||
|
endpoint_url=s3_config.get("endpoint_url"),
|
||||||
|
path_style=s3_config.get("path_style", False),
|
||||||
|
enabled=s3_config.get("enabled", True),
|
||||||
|
)
|
||||||
|
if s3_config.get("bucket_name")
|
||||||
|
else None,
|
||||||
|
)
|
||||||
|
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data=settings,
|
||||||
|
message="Backup settings retrieved successfully",
|
||||||
|
)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to get backup settings: {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500, detail=f"Failed to get backup settings: {str(e)}"
|
||||||
|
) from e
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/backup/settings", response_model=APIResponse)
|
||||||
|
async def update_backup_settings(settings: BackupSettings) -> APIResponse:
|
||||||
|
"""Update backup settings."""
|
||||||
|
try:
|
||||||
|
# First test the connection if S3 config is provided
|
||||||
|
if settings.s3:
|
||||||
|
# Convert API model to config model
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id=settings.s3.access_key_id,
|
||||||
|
secret_access_key=settings.s3.secret_access_key,
|
||||||
|
bucket_name=settings.s3.bucket_name,
|
||||||
|
region=settings.s3.region,
|
||||||
|
endpoint_url=settings.s3.endpoint_url,
|
||||||
|
path_style=settings.s3.path_style,
|
||||||
|
enabled=settings.s3.enabled,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test connection
|
||||||
|
backup_service = BackupService()
|
||||||
|
connection_success = await backup_service.test_connection(s3_config)
|
||||||
|
|
||||||
|
if not connection_success:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="S3 connection test failed. Please check your configuration.",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Update backup config
|
||||||
|
backup_config = {}
|
||||||
|
|
||||||
|
if settings.s3:
|
||||||
|
backup_config["s3"] = {
|
||||||
|
"access_key_id": settings.s3.access_key_id,
|
||||||
|
"secret_access_key": settings.s3.secret_access_key,
|
||||||
|
"bucket_name": settings.s3.bucket_name,
|
||||||
|
"region": settings.s3.region,
|
||||||
|
"endpoint_url": settings.s3.endpoint_url,
|
||||||
|
"path_style": settings.s3.path_style,
|
||||||
|
"enabled": settings.s3.enabled,
|
||||||
|
}
|
||||||
|
|
||||||
|
# Save to config
|
||||||
|
if backup_config:
|
||||||
|
config.update_section("backup", backup_config)
|
||||||
|
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data={"updated": True},
|
||||||
|
message="Backup settings updated successfully",
|
||||||
|
)
|
||||||
|
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to update backup settings: {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500, detail=f"Failed to update backup settings: {str(e)}"
|
||||||
|
) from e
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/backup/test", response_model=APIResponse)
|
||||||
|
async def test_backup_connection(test_request: BackupTest) -> APIResponse:
|
||||||
|
"""Test backup connection."""
|
||||||
|
try:
|
||||||
|
if test_request.service != "s3":
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400, detail="Only 's3' service is supported"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Convert API model to config model
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id=test_request.config.access_key_id,
|
||||||
|
secret_access_key=test_request.config.secret_access_key,
|
||||||
|
bucket_name=test_request.config.bucket_name,
|
||||||
|
region=test_request.config.region,
|
||||||
|
endpoint_url=test_request.config.endpoint_url,
|
||||||
|
path_style=test_request.config.path_style,
|
||||||
|
enabled=test_request.config.enabled,
|
||||||
|
)
|
||||||
|
|
||||||
|
backup_service = BackupService()
|
||||||
|
success = await backup_service.test_connection(s3_config)
|
||||||
|
|
||||||
|
if success:
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data={"connected": True},
|
||||||
|
message="S3 connection test successful",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return APIResponse(
|
||||||
|
success=False,
|
||||||
|
message="S3 connection test failed",
|
||||||
|
)
|
||||||
|
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to test backup connection: {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500, detail=f"Failed to test backup connection: {str(e)}"
|
||||||
|
) from e
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/backup/list", response_model=APIResponse)
|
||||||
|
async def list_backups() -> APIResponse:
|
||||||
|
"""List available backups."""
|
||||||
|
try:
|
||||||
|
backup_config = config.backup_config.get("s3", {})
|
||||||
|
|
||||||
|
if not backup_config.get("bucket_name"):
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data=[],
|
||||||
|
message="No S3 backup configuration found",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Convert config to model
|
||||||
|
s3_config = S3BackupConfig(**backup_config)
|
||||||
|
backup_service = BackupService(s3_config)
|
||||||
|
|
||||||
|
backups = await backup_service.list_backups()
|
||||||
|
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data=backups,
|
||||||
|
message=f"Found {len(backups)} backups",
|
||||||
|
)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to list backups: {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500, detail=f"Failed to list backups: {str(e)}"
|
||||||
|
) from e
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/backup/operation", response_model=APIResponse)
|
||||||
|
async def backup_operation(operation_request: BackupOperation) -> APIResponse:
|
||||||
|
"""Perform backup operation (backup or restore)."""
|
||||||
|
try:
|
||||||
|
backup_config = config.backup_config.get("s3", {})
|
||||||
|
|
||||||
|
if not backup_config.get("bucket_name"):
|
||||||
|
raise HTTPException(status_code=400, detail="S3 backup is not configured")
|
||||||
|
|
||||||
|
# Convert config to model with validation
|
||||||
|
try:
|
||||||
|
s3_config = S3BackupConfig(**backup_config)
|
||||||
|
except Exception as e:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400, detail=f"Invalid S3 configuration: {str(e)}"
|
||||||
|
) from e
|
||||||
|
|
||||||
|
backup_service = BackupService(s3_config)
|
||||||
|
|
||||||
|
if operation_request.operation == "backup":
|
||||||
|
# Backup database
|
||||||
|
database_path = path_manager.get_database_path()
|
||||||
|
success = await backup_service.backup_database(database_path)
|
||||||
|
|
||||||
|
if success:
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data={"operation": "backup", "completed": True},
|
||||||
|
message="Database backup completed successfully",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return APIResponse(
|
||||||
|
success=False,
|
||||||
|
message="Database backup failed",
|
||||||
|
)
|
||||||
|
|
||||||
|
elif operation_request.operation == "restore":
|
||||||
|
if not operation_request.backup_key:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail="backup_key is required for restore operation",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Restore database
|
||||||
|
database_path = path_manager.get_database_path()
|
||||||
|
success = await backup_service.restore_database(
|
||||||
|
operation_request.backup_key, database_path
|
||||||
|
)
|
||||||
|
|
||||||
|
if success:
|
||||||
|
return APIResponse(
|
||||||
|
success=True,
|
||||||
|
data={"operation": "restore", "completed": True},
|
||||||
|
message="Database restore completed successfully",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return APIResponse(
|
||||||
|
success=False,
|
||||||
|
message="Database restore failed",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400, detail="Invalid operation. Use 'backup' or 'restore'"
|
||||||
|
)
|
||||||
|
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to perform backup operation: {e}")
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=500, detail=f"Failed to perform backup operation: {str(e)}"
|
||||||
|
) from e
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import httpx
|
||||||
from fastapi import APIRouter, HTTPException, Query
|
from fastapi import APIRouter, HTTPException, Query
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
|
|
||||||
@@ -21,14 +22,19 @@ async def get_bank_institutions(
|
|||||||
) -> APIResponse:
|
) -> APIResponse:
|
||||||
"""Get available bank institutions for a country"""
|
"""Get available bank institutions for a country"""
|
||||||
try:
|
try:
|
||||||
institutions_data = await gocardless_service.get_institutions(country)
|
institutions_response = await gocardless_service.get_institutions(country)
|
||||||
|
# Handle both list and dict responses
|
||||||
|
if isinstance(institutions_response, list):
|
||||||
|
institutions_data = institutions_response
|
||||||
|
else:
|
||||||
|
institutions_data = institutions_response.get("results", [])
|
||||||
|
|
||||||
institutions = [
|
institutions = [
|
||||||
BankInstitution(
|
BankInstitution(
|
||||||
id=inst["id"],
|
id=inst["id"],
|
||||||
name=inst["name"],
|
name=inst["name"],
|
||||||
bic=inst.get("bic"),
|
bic=inst.get("bic"),
|
||||||
transaction_total_days=inst["transaction_total_days"],
|
transaction_total_days=int(inst["transaction_total_days"]),
|
||||||
countries=inst["countries"],
|
countries=inst["countries"],
|
||||||
logo=inst.get("logo"),
|
logo=inst.get("logo"),
|
||||||
)
|
)
|
||||||
@@ -121,13 +127,36 @@ async def get_bank_connections_status() -> APIResponse:
|
|||||||
async def delete_bank_connection(requisition_id: str) -> APIResponse:
|
async def delete_bank_connection(requisition_id: str) -> APIResponse:
|
||||||
"""Delete a bank connection"""
|
"""Delete a bank connection"""
|
||||||
try:
|
try:
|
||||||
# This would need to be implemented in GoCardlessService
|
# Delete the requisition from GoCardless
|
||||||
# For now, return success
|
result = await gocardless_service.delete_requisition(requisition_id)
|
||||||
|
|
||||||
|
# GoCardless returns different responses for successful deletes
|
||||||
|
# We should check if the operation was actually successful
|
||||||
|
logger.info(f"GoCardless delete response for {requisition_id}: {result}")
|
||||||
|
|
||||||
return APIResponse(
|
return APIResponse(
|
||||||
success=True,
|
success=True,
|
||||||
message=f"Bank connection {requisition_id} deleted successfully",
|
message=f"Bank connection {requisition_id} deleted successfully",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
except httpx.HTTPStatusError as http_err:
|
||||||
|
logger.error(
|
||||||
|
f"HTTP error deleting bank connection {requisition_id}: {http_err}"
|
||||||
|
)
|
||||||
|
if http_err.response.status_code == 404:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=404, detail=f"Bank connection {requisition_id} not found"
|
||||||
|
) from http_err
|
||||||
|
elif http_err.response.status_code == 400:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=400,
|
||||||
|
detail=f"Invalid request to delete connection {requisition_id}",
|
||||||
|
) from http_err
|
||||||
|
else:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=http_err.response.status_code,
|
||||||
|
detail=f"GoCardless API error: {http_err}",
|
||||||
|
) from http_err
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to delete bank connection {requisition_id}: {e}")
|
logger.error(f"Failed to delete bank connection {requisition_id}: {e}")
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
from typing import Any, Dict, List, Optional, Union
|
from typing import Any, Dict, List, Optional, Union
|
||||||
from urllib.parse import urljoin
|
from urllib.parse import urljoin, urlparse
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
@@ -13,11 +13,22 @@ class LeggenAPIClient:
|
|||||||
base_url: str
|
base_url: str
|
||||||
|
|
||||||
def __init__(self, base_url: Optional[str] = None):
|
def __init__(self, base_url: Optional[str] = None):
|
||||||
self.base_url = (
|
raw_url = (
|
||||||
base_url
|
base_url
|
||||||
or os.environ.get("LEGGEN_API_URL", "http://localhost:8000")
|
or os.environ.get("LEGGEN_API_URL", "http://localhost:8000")
|
||||||
or "http://localhost:8000"
|
or "http://localhost:8000"
|
||||||
)
|
)
|
||||||
|
# Ensure base_url includes /api/v1 path if not already present
|
||||||
|
parsed = urlparse(raw_url)
|
||||||
|
if not parsed.path or parsed.path == "/":
|
||||||
|
# No path or just root, add /api/v1
|
||||||
|
self.base_url = f"{raw_url.rstrip('/')}/api/v1"
|
||||||
|
elif not parsed.path.startswith("/api/v1"):
|
||||||
|
# Has a path but not /api/v1, add it
|
||||||
|
self.base_url = f"{raw_url.rstrip('/')}/api/v1"
|
||||||
|
else:
|
||||||
|
# Already has /api/v1 path
|
||||||
|
self.base_url = raw_url.rstrip("/")
|
||||||
self.session = requests.Session()
|
self.session = requests.Session()
|
||||||
self.session.headers.update(
|
self.session.headers.update(
|
||||||
{"Content-Type": "application/json", "Accept": "application/json"}
|
{"Content-Type": "application/json", "Accept": "application/json"}
|
||||||
@@ -25,7 +36,14 @@ class LeggenAPIClient:
|
|||||||
|
|
||||||
def _make_request(self, method: str, endpoint: str, **kwargs) -> Dict[str, Any]:
|
def _make_request(self, method: str, endpoint: str, **kwargs) -> Dict[str, Any]:
|
||||||
"""Make HTTP request to the API"""
|
"""Make HTTP request to the API"""
|
||||||
url = urljoin(self.base_url, endpoint)
|
# Construct URL by joining base_url with endpoint
|
||||||
|
# Handle both relative endpoints (starting with /) and paths
|
||||||
|
if endpoint.startswith("/"):
|
||||||
|
# Absolute endpoint path - append to base_url
|
||||||
|
url = f"{self.base_url}{endpoint}"
|
||||||
|
else:
|
||||||
|
# Relative endpoint, use urljoin
|
||||||
|
url = urljoin(f"{self.base_url}/", endpoint)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = self.session.request(method, url, **kwargs)
|
response = self.session.request(method, url, **kwargs)
|
||||||
@@ -52,7 +70,9 @@ class LeggenAPIClient:
|
|||||||
"""Check if the leggen server is healthy"""
|
"""Check if the leggen server is healthy"""
|
||||||
try:
|
try:
|
||||||
response = self._make_request("GET", "/health")
|
response = self._make_request("GET", "/health")
|
||||||
return response.get("status") == "healthy"
|
# The API now returns nested data structure
|
||||||
|
data = response.get("data", {})
|
||||||
|
return data.get("status") == "healthy"
|
||||||
except Exception:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -60,7 +80,7 @@ class LeggenAPIClient:
|
|||||||
def get_institutions(self, country: str = "PT") -> List[Dict[str, Any]]:
|
def get_institutions(self, country: str = "PT") -> List[Dict[str, Any]]:
|
||||||
"""Get bank institutions for a country"""
|
"""Get bank institutions for a country"""
|
||||||
response = self._make_request(
|
response = self._make_request(
|
||||||
"GET", "/api/v1/banks/institutions", params={"country": country}
|
"GET", "/banks/institutions", params={"country": country}
|
||||||
)
|
)
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
@@ -70,35 +90,35 @@ class LeggenAPIClient:
|
|||||||
"""Connect to a bank"""
|
"""Connect to a bank"""
|
||||||
response = self._make_request(
|
response = self._make_request(
|
||||||
"POST",
|
"POST",
|
||||||
"/api/v1/banks/connect",
|
"/banks/connect",
|
||||||
json={"institution_id": institution_id, "redirect_url": redirect_url},
|
json={"institution_id": institution_id, "redirect_url": redirect_url},
|
||||||
)
|
)
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def get_bank_status(self) -> List[Dict[str, Any]]:
|
def get_bank_status(self) -> List[Dict[str, Any]]:
|
||||||
"""Get bank connection status"""
|
"""Get bank connection status"""
|
||||||
response = self._make_request("GET", "/api/v1/banks/status")
|
response = self._make_request("GET", "/banks/status")
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
def get_supported_countries(self) -> List[Dict[str, Any]]:
|
def get_supported_countries(self) -> List[Dict[str, Any]]:
|
||||||
"""Get supported countries"""
|
"""Get supported countries"""
|
||||||
response = self._make_request("GET", "/api/v1/banks/countries")
|
response = self._make_request("GET", "/banks/countries")
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
# Account endpoints
|
# Account endpoints
|
||||||
def get_accounts(self) -> List[Dict[str, Any]]:
|
def get_accounts(self) -> List[Dict[str, Any]]:
|
||||||
"""Get all accounts"""
|
"""Get all accounts"""
|
||||||
response = self._make_request("GET", "/api/v1/accounts")
|
response = self._make_request("GET", "/accounts")
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
def get_account_details(self, account_id: str) -> Dict[str, Any]:
|
def get_account_details(self, account_id: str) -> Dict[str, Any]:
|
||||||
"""Get account details"""
|
"""Get account details"""
|
||||||
response = self._make_request("GET", f"/api/v1/accounts/{account_id}")
|
response = self._make_request("GET", f"/accounts/{account_id}")
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def get_account_balances(self, account_id: str) -> List[Dict[str, Any]]:
|
def get_account_balances(self, account_id: str) -> List[Dict[str, Any]]:
|
||||||
"""Get account balances"""
|
"""Get account balances"""
|
||||||
response = self._make_request("GET", f"/api/v1/accounts/{account_id}/balances")
|
response = self._make_request("GET", f"/accounts/{account_id}/balances")
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
def get_account_transactions(
|
def get_account_transactions(
|
||||||
@@ -107,7 +127,7 @@ class LeggenAPIClient:
|
|||||||
"""Get account transactions"""
|
"""Get account transactions"""
|
||||||
response = self._make_request(
|
response = self._make_request(
|
||||||
"GET",
|
"GET",
|
||||||
f"/api/v1/accounts/{account_id}/transactions",
|
f"/accounts/{account_id}/transactions",
|
||||||
params={"limit": limit, "summary_only": summary_only},
|
params={"limit": limit, "summary_only": summary_only},
|
||||||
)
|
)
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
@@ -120,7 +140,7 @@ class LeggenAPIClient:
|
|||||||
params = {"limit": limit, "summary_only": summary_only}
|
params = {"limit": limit, "summary_only": summary_only}
|
||||||
params.update(filters)
|
params.update(filters)
|
||||||
|
|
||||||
response = self._make_request("GET", "/api/v1/transactions", params=params)
|
response = self._make_request("GET", "/transactions", params=params)
|
||||||
return response.get("data", [])
|
return response.get("data", [])
|
||||||
|
|
||||||
def get_transaction_stats(
|
def get_transaction_stats(
|
||||||
@@ -131,15 +151,13 @@ class LeggenAPIClient:
|
|||||||
if account_id:
|
if account_id:
|
||||||
params["account_id"] = account_id
|
params["account_id"] = account_id
|
||||||
|
|
||||||
response = self._make_request(
|
response = self._make_request("GET", "/transactions/stats", params=params)
|
||||||
"GET", "/api/v1/transactions/stats", params=params
|
|
||||||
)
|
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
# Sync endpoints
|
# Sync endpoints
|
||||||
def get_sync_status(self) -> Dict[str, Any]:
|
def get_sync_status(self) -> Dict[str, Any]:
|
||||||
"""Get sync status"""
|
"""Get sync status"""
|
||||||
response = self._make_request("GET", "/api/v1/sync/status")
|
response = self._make_request("GET", "/sync/status")
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def trigger_sync(
|
def trigger_sync(
|
||||||
@@ -150,7 +168,7 @@ class LeggenAPIClient:
|
|||||||
if account_ids:
|
if account_ids:
|
||||||
data["account_ids"] = account_ids
|
data["account_ids"] = account_ids
|
||||||
|
|
||||||
response = self._make_request("POST", "/api/v1/sync", json=data)
|
response = self._make_request("POST", "/sync", json=data)
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def sync_now(
|
def sync_now(
|
||||||
@@ -161,12 +179,12 @@ class LeggenAPIClient:
|
|||||||
if account_ids:
|
if account_ids:
|
||||||
data["account_ids"] = account_ids
|
data["account_ids"] = account_ids
|
||||||
|
|
||||||
response = self._make_request("POST", "/api/v1/sync/now", json=data)
|
response = self._make_request("POST", "/sync/now", json=data)
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def get_scheduler_config(self) -> Dict[str, Any]:
|
def get_scheduler_config(self) -> Dict[str, Any]:
|
||||||
"""Get scheduler configuration"""
|
"""Get scheduler configuration"""
|
||||||
response = self._make_request("GET", "/api/v1/sync/scheduler")
|
response = self._make_request("GET", "/sync/scheduler")
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|
||||||
def update_scheduler_config(
|
def update_scheduler_config(
|
||||||
@@ -185,5 +203,5 @@ class LeggenAPIClient:
|
|||||||
if cron:
|
if cron:
|
||||||
data["cron"] = cron
|
data["cron"] = cron
|
||||||
|
|
||||||
response = self._make_request("PUT", "/api/v1/sync/scheduler", json=data)
|
response = self._make_request("PUT", "/sync/scheduler", json=data)
|
||||||
return response.get("data", {})
|
return response.get("data", {})
|
||||||
|
|||||||
@@ -102,17 +102,19 @@ class BackgroundScheduler:
|
|||||||
async def _run_sync(self, retry_count: int = 0):
|
async def _run_sync(self, retry_count: int = 0):
|
||||||
"""Run sync with enhanced error handling and retry logic"""
|
"""Run sync with enhanced error handling and retry logic"""
|
||||||
try:
|
try:
|
||||||
logger.info("Starting scheduled sync job")
|
trigger_type = "retry" if retry_count > 0 else "scheduled"
|
||||||
await self.sync_service.sync_all_accounts()
|
logger.info(f"Starting {trigger_type} sync job")
|
||||||
logger.info("Scheduled sync job completed successfully")
|
await self.sync_service.sync_all_accounts(trigger_type=trigger_type)
|
||||||
|
logger.info(f"{trigger_type.capitalize()} sync job completed successfully")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
trigger_type = "retry" if retry_count > 0 else "scheduled"
|
||||||
logger.error(
|
logger.error(
|
||||||
f"Scheduled sync job failed (attempt {retry_count + 1}/{self.max_retries}): {e}"
|
f"{trigger_type.capitalize()} sync job failed (attempt {retry_count + 1}/{self.max_retries}): {e}"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Send notification about the failure
|
# Send notification about the failure
|
||||||
try:
|
try:
|
||||||
await self.notification_service.send_expiry_notification(
|
await self.notification_service.send_sync_failure_notification(
|
||||||
{
|
{
|
||||||
"type": "sync_failure",
|
"type": "sync_failure",
|
||||||
"error": str(e),
|
"error": str(e),
|
||||||
@@ -145,7 +147,7 @@ class BackgroundScheduler:
|
|||||||
logger.error("Maximum retries exceeded for sync job")
|
logger.error("Maximum retries exceeded for sync job")
|
||||||
# Send final failure notification
|
# Send final failure notification
|
||||||
try:
|
try:
|
||||||
await self.notification_service.send_expiry_notification(
|
await self.notification_service.send_sync_failure_notification(
|
||||||
{
|
{
|
||||||
"type": "sync_final_failure",
|
"type": "sync_final_failure",
|
||||||
"error": str(e),
|
"error": str(e),
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import click
|
import click
|
||||||
|
|
||||||
|
from leggen.api_client import LeggenAPIClient
|
||||||
from leggen.main import cli
|
from leggen.main import cli
|
||||||
from leggen.utils.text import info, success
|
from leggen.utils.text import info, success
|
||||||
|
|
||||||
@@ -15,12 +16,11 @@ def delete(ctx, requisition_id: str):
|
|||||||
|
|
||||||
Check `leggen status` to get the REQUISITION_ID
|
Check `leggen status` to get the REQUISITION_ID
|
||||||
"""
|
"""
|
||||||
import requests
|
api_client = LeggenAPIClient(ctx.obj.get("api_url"))
|
||||||
|
|
||||||
info(f"Deleting Bank Requisition: {requisition_id}")
|
info(f"Deleting Bank Requisition: {requisition_id}")
|
||||||
|
|
||||||
api_url = ctx.obj.get("api_url", "http://localhost:8000")
|
# Use API client to make the delete request
|
||||||
res = requests.delete(f"{api_url}/requisitions/{requisition_id}")
|
api_client._make_request("DELETE", f"/requisitions/{requisition_id}")
|
||||||
res.raise_for_status()
|
|
||||||
|
|
||||||
success(f"Bank Requisition {requisition_id} deleted")
|
success(f"Bank Requisition {requisition_id} deleted")
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from fastapi import FastAPI
|
|||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
|
|
||||||
from leggen.api.routes import accounts, banks, notifications, sync, transactions
|
from leggen.api.routes import accounts, backup, banks, notifications, sync, transactions
|
||||||
from leggen.background.scheduler import scheduler
|
from leggen.background.scheduler import scheduler
|
||||||
from leggen.utils.config import config
|
from leggen.utils.config import config
|
||||||
from leggen.utils.paths import path_manager
|
from leggen.utils.paths import path_manager
|
||||||
@@ -60,6 +60,8 @@ def create_app() -> FastAPI:
|
|||||||
description="Open Banking API for Leggen",
|
description="Open Banking API for Leggen",
|
||||||
version=version,
|
version=version,
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
|
docs_url="/api/v1/docs",
|
||||||
|
openapi_url="/api/v1/openapi.json",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add CORS middleware
|
# Add CORS middleware
|
||||||
@@ -81,6 +83,7 @@ def create_app() -> FastAPI:
|
|||||||
app.include_router(transactions.router, prefix="/api/v1", tags=["transactions"])
|
app.include_router(transactions.router, prefix="/api/v1", tags=["transactions"])
|
||||||
app.include_router(sync.router, prefix="/api/v1", tags=["sync"])
|
app.include_router(sync.router, prefix="/api/v1", tags=["sync"])
|
||||||
app.include_router(notifications.router, prefix="/api/v1", tags=["notifications"])
|
app.include_router(notifications.router, prefix="/api/v1", tags=["notifications"])
|
||||||
|
app.include_router(backup.router, prefix="/api/v1", tags=["backup"])
|
||||||
|
|
||||||
@app.get("/api/v1/health")
|
@app.get("/api/v1/health")
|
||||||
async def health():
|
async def health():
|
||||||
|
|||||||
@@ -32,6 +32,22 @@ class NotificationConfig(BaseModel):
|
|||||||
telegram: Optional[TelegramNotificationConfig] = None
|
telegram: Optional[TelegramNotificationConfig] = None
|
||||||
|
|
||||||
|
|
||||||
|
class S3BackupConfig(BaseModel):
|
||||||
|
access_key_id: str = Field(..., description="AWS S3 access key ID")
|
||||||
|
secret_access_key: str = Field(..., description="AWS S3 secret access key")
|
||||||
|
bucket_name: str = Field(..., description="S3 bucket name")
|
||||||
|
region: str = Field(default="us-east-1", description="AWS S3 region")
|
||||||
|
endpoint_url: Optional[str] = Field(
|
||||||
|
default=None, description="Custom S3 endpoint URL"
|
||||||
|
)
|
||||||
|
path_style: bool = Field(default=False, description="Use path-style addressing")
|
||||||
|
enabled: bool = Field(default=True, description="Enable S3 backups")
|
||||||
|
|
||||||
|
|
||||||
|
class BackupConfig(BaseModel):
|
||||||
|
s3: Optional[S3BackupConfig] = None
|
||||||
|
|
||||||
|
|
||||||
class FilterConfig(BaseModel):
|
class FilterConfig(BaseModel):
|
||||||
case_insensitive: Optional[List[str]] = Field(default_factory=list)
|
case_insensitive: Optional[List[str]] = Field(default_factory=list)
|
||||||
case_sensitive: Optional[List[str]] = Field(default_factory=list)
|
case_sensitive: Optional[List[str]] = Field(default_factory=list)
|
||||||
@@ -56,3 +72,4 @@ class Config(BaseModel):
|
|||||||
notifications: Optional[NotificationConfig] = None
|
notifications: Optional[NotificationConfig] = None
|
||||||
filters: Optional[FilterConfig] = None
|
filters: Optional[FilterConfig] = None
|
||||||
scheduler: SchedulerConfig = Field(default_factory=SchedulerConfig)
|
scheduler: SchedulerConfig = Field(default_factory=SchedulerConfig)
|
||||||
|
backup: Optional[BackupConfig] = None
|
||||||
|
|||||||
@@ -55,3 +55,44 @@ def send_transactions_message(ctx: click.Context, transactions: list):
|
|||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise Exception(f"Discord notification failed: {e}\n{response.text}") from e
|
raise Exception(f"Discord notification failed: {e}\n{response.text}") from e
|
||||||
|
|
||||||
|
|
||||||
|
def send_sync_failure_notification(ctx: click.Context, notification: dict):
|
||||||
|
info("Sending sync failure notification to Discord")
|
||||||
|
webhook = DiscordWebhook(url=ctx.obj["notifications"]["discord"]["webhook"])
|
||||||
|
|
||||||
|
# Determine color and title based on failure type
|
||||||
|
if notification.get("type") == "sync_final_failure":
|
||||||
|
color = "ff0000" # Red for final failure
|
||||||
|
title = "🚨 Sync Final Failure"
|
||||||
|
description = (
|
||||||
|
f"Sync failed permanently after {notification['retry_count']} attempts"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
color = "ffaa00" # Orange for retry
|
||||||
|
title = "⚠️ Sync Failure"
|
||||||
|
description = f"Sync failed (attempt {notification['retry_count']}/{notification['max_retries']}). Will retry automatically..."
|
||||||
|
|
||||||
|
embed = DiscordEmbed(
|
||||||
|
title=title,
|
||||||
|
description=description,
|
||||||
|
color=color,
|
||||||
|
)
|
||||||
|
embed.set_author(
|
||||||
|
name="Leggen",
|
||||||
|
url="https://github.com/elisiariocouto/leggen",
|
||||||
|
)
|
||||||
|
embed.add_embed_field(
|
||||||
|
name="Error",
|
||||||
|
value=notification["error"][:1024], # Discord has field value limits
|
||||||
|
inline=False,
|
||||||
|
)
|
||||||
|
embed.set_footer(text="Sync failure notification")
|
||||||
|
embed.set_timestamp()
|
||||||
|
|
||||||
|
webhook.add_embed(embed)
|
||||||
|
response = webhook.execute()
|
||||||
|
try:
|
||||||
|
response.raise_for_status()
|
||||||
|
except Exception as e:
|
||||||
|
raise Exception(f"Discord notification failed: {e}\n{response.text}") from e
|
||||||
|
|||||||
@@ -79,3 +79,38 @@ def send_transaction_message(ctx: click.Context, transactions: list):
|
|||||||
res.raise_for_status()
|
res.raise_for_status()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise Exception(f"Telegram notification failed: {e}\n{res.text}") from e
|
raise Exception(f"Telegram notification failed: {e}\n{res.text}") from e
|
||||||
|
|
||||||
|
|
||||||
|
def send_sync_failure_notification(ctx: click.Context, notification: dict):
|
||||||
|
token = ctx.obj["notifications"]["telegram"]["token"]
|
||||||
|
chat_id = ctx.obj["notifications"]["telegram"]["chat_id"]
|
||||||
|
bot_url = f"https://api.telegram.org/bot{token}/sendMessage"
|
||||||
|
info("Sending sync failure notification to Telegram")
|
||||||
|
|
||||||
|
message = "*🚨 [Leggen](https://github.com/elisiariocouto/leggen)*\n"
|
||||||
|
message += "*Sync Failed*\n\n"
|
||||||
|
message += escape_markdown(f"Error: {notification['error']}\n")
|
||||||
|
|
||||||
|
if notification.get("type") == "sync_final_failure":
|
||||||
|
message += escape_markdown(
|
||||||
|
f"❌ Final failure after {notification['retry_count']} attempts\n"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
message += escape_markdown(
|
||||||
|
f"🔄 Attempt {notification['retry_count']}/{notification['max_retries']}\n"
|
||||||
|
)
|
||||||
|
message += escape_markdown("Will retry automatically...\n")
|
||||||
|
|
||||||
|
res = requests.post(
|
||||||
|
bot_url,
|
||||||
|
json={
|
||||||
|
"chat_id": chat_id,
|
||||||
|
"text": message,
|
||||||
|
"parse_mode": "MarkdownV2",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
res.raise_for_status()
|
||||||
|
except Exception as e:
|
||||||
|
raise Exception(f"Telegram notification failed: {e}\n{res.text}") from e
|
||||||
|
|||||||
192
leggen/services/backup_service.py
Normal file
192
leggen/services/backup_service.py
Normal file
@@ -0,0 +1,192 @@
|
|||||||
|
"""Backup service for S3 storage."""
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
import boto3
|
||||||
|
from botocore.exceptions import ClientError, NoCredentialsError
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
|
from leggen.models.config import S3BackupConfig
|
||||||
|
|
||||||
|
|
||||||
|
class BackupService:
|
||||||
|
"""Service for managing S3 backups."""
|
||||||
|
|
||||||
|
def __init__(self, s3_config: Optional[S3BackupConfig] = None):
|
||||||
|
"""Initialize backup service with S3 configuration."""
|
||||||
|
self.s3_config = s3_config
|
||||||
|
self._s3_client = None
|
||||||
|
|
||||||
|
def _get_s3_client(self, config: Optional[S3BackupConfig] = None):
|
||||||
|
"""Get or create S3 client with current configuration."""
|
||||||
|
current_config = config or self.s3_config
|
||||||
|
if not current_config:
|
||||||
|
raise ValueError("S3 configuration is required")
|
||||||
|
|
||||||
|
# Create S3 client with configuration
|
||||||
|
session = boto3.Session(
|
||||||
|
aws_access_key_id=current_config.access_key_id,
|
||||||
|
aws_secret_access_key=current_config.secret_access_key,
|
||||||
|
region_name=current_config.region,
|
||||||
|
)
|
||||||
|
|
||||||
|
s3_kwargs = {}
|
||||||
|
if current_config.endpoint_url:
|
||||||
|
s3_kwargs["endpoint_url"] = current_config.endpoint_url
|
||||||
|
|
||||||
|
if current_config.path_style:
|
||||||
|
from botocore.config import Config
|
||||||
|
|
||||||
|
s3_kwargs["config"] = Config(s3={"addressing_style": "path"})
|
||||||
|
|
||||||
|
return session.client("s3", **s3_kwargs)
|
||||||
|
|
||||||
|
async def test_connection(self, config: S3BackupConfig) -> bool:
|
||||||
|
"""Test S3 connection with provided configuration.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config: S3 configuration to test
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if connection successful, False otherwise
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
s3_client = self._get_s3_client(config)
|
||||||
|
|
||||||
|
# Try to list objects in the bucket (limited to 1 to minimize cost)
|
||||||
|
s3_client.list_objects_v2(Bucket=config.bucket_name, MaxKeys=1)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"S3 connection test successful for bucket: {config.bucket_name}"
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
|
||||||
|
except NoCredentialsError:
|
||||||
|
logger.error("S3 credentials not found or invalid")
|
||||||
|
return False
|
||||||
|
except ClientError as e:
|
||||||
|
error_code = e.response["Error"]["Code"]
|
||||||
|
logger.error(
|
||||||
|
f"S3 connection test failed: {error_code} - {e.response['Error']['Message']}"
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error during S3 connection test: {str(e)}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def backup_database(self, database_path: Path) -> bool:
|
||||||
|
"""Backup database file to S3.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
database_path: Path to the SQLite database file
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if backup successful, False otherwise
|
||||||
|
"""
|
||||||
|
if not self.s3_config or not self.s3_config.enabled:
|
||||||
|
logger.warning("S3 backup is not configured or disabled")
|
||||||
|
return False
|
||||||
|
|
||||||
|
if not database_path.exists():
|
||||||
|
logger.error(f"Database file not found: {database_path}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
s3_client = self._get_s3_client()
|
||||||
|
|
||||||
|
# Generate backup filename with timestamp
|
||||||
|
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
|
||||||
|
backup_key = f"leggen_backups/database_backup_{timestamp}.db"
|
||||||
|
|
||||||
|
# Upload database file
|
||||||
|
logger.info(f"Starting database backup to S3: {backup_key}")
|
||||||
|
s3_client.upload_file(
|
||||||
|
str(database_path), self.s3_config.bucket_name, backup_key
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(f"Database backup completed successfully: {backup_key}")
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Database backup failed: {str(e)}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def list_backups(self) -> list[dict]:
|
||||||
|
"""List available backups in S3.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of backup metadata dictionaries
|
||||||
|
"""
|
||||||
|
if not self.s3_config or not self.s3_config.enabled:
|
||||||
|
logger.warning("S3 backup is not configured or disabled")
|
||||||
|
return []
|
||||||
|
|
||||||
|
try:
|
||||||
|
s3_client = self._get_s3_client()
|
||||||
|
|
||||||
|
# List objects with backup prefix
|
||||||
|
response = s3_client.list_objects_v2(
|
||||||
|
Bucket=self.s3_config.bucket_name, Prefix="leggen_backups/"
|
||||||
|
)
|
||||||
|
|
||||||
|
backups = []
|
||||||
|
for obj in response.get("Contents", []):
|
||||||
|
backups.append(
|
||||||
|
{
|
||||||
|
"key": obj["Key"],
|
||||||
|
"last_modified": obj["LastModified"].isoformat(),
|
||||||
|
"size": obj["Size"],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Sort by last modified (newest first)
|
||||||
|
backups.sort(key=lambda x: x["last_modified"], reverse=True)
|
||||||
|
|
||||||
|
return backups
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to list backups: {str(e)}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
async def restore_database(self, backup_key: str, restore_path: Path) -> bool:
|
||||||
|
"""Restore database from S3 backup.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
backup_key: S3 key of the backup to restore
|
||||||
|
restore_path: Path where to restore the database
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if restore successful, False otherwise
|
||||||
|
"""
|
||||||
|
if not self.s3_config or not self.s3_config.enabled:
|
||||||
|
logger.warning("S3 backup is not configured or disabled")
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
s3_client = self._get_s3_client()
|
||||||
|
|
||||||
|
# Download backup file
|
||||||
|
logger.info(f"Starting database restore from S3: {backup_key}")
|
||||||
|
|
||||||
|
# Create parent directory if it doesn't exist
|
||||||
|
restore_path.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
# Download to temporary file first, then move to final location
|
||||||
|
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
|
||||||
|
s3_client.download_file(
|
||||||
|
self.s3_config.bucket_name, backup_key, temp_file.name
|
||||||
|
)
|
||||||
|
|
||||||
|
# Move temp file to final location
|
||||||
|
temp_path = Path(temp_file.name)
|
||||||
|
temp_path.replace(restore_path)
|
||||||
|
|
||||||
|
logger.info(f"Database restore completed successfully: {restore_path}")
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Database restore failed: {str(e)}")
|
||||||
|
return False
|
||||||
@@ -217,6 +217,7 @@ class DatabaseService:
|
|||||||
await self._migrate_to_composite_key_if_needed()
|
await self._migrate_to_composite_key_if_needed()
|
||||||
await self._migrate_add_display_name_if_needed()
|
await self._migrate_add_display_name_if_needed()
|
||||||
await self._migrate_add_sync_operations_if_needed()
|
await self._migrate_add_sync_operations_if_needed()
|
||||||
|
await self._migrate_add_logo_if_needed()
|
||||||
|
|
||||||
async def _migrate_balance_timestamps_if_needed(self):
|
async def _migrate_balance_timestamps_if_needed(self):
|
||||||
"""Check and migrate balance timestamps if needed"""
|
"""Check and migrate balance timestamps if needed"""
|
||||||
@@ -1133,7 +1134,8 @@ class DatabaseService:
|
|||||||
created DATETIME,
|
created DATETIME,
|
||||||
last_accessed DATETIME,
|
last_accessed DATETIME,
|
||||||
last_updated DATETIME,
|
last_updated DATETIME,
|
||||||
display_name TEXT
|
display_name TEXT,
|
||||||
|
logo TEXT
|
||||||
)"""
|
)"""
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1170,8 +1172,9 @@ class DatabaseService:
|
|||||||
created,
|
created,
|
||||||
last_accessed,
|
last_accessed,
|
||||||
last_updated,
|
last_updated,
|
||||||
display_name
|
display_name,
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
|
logo
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
|
||||||
(
|
(
|
||||||
account_data["id"],
|
account_data["id"],
|
||||||
account_data["institution_id"],
|
account_data["institution_id"],
|
||||||
@@ -1183,6 +1186,7 @@ class DatabaseService:
|
|||||||
account_data.get("last_accessed"),
|
account_data.get("last_accessed"),
|
||||||
account_data.get("last_updated", account_data["created"]),
|
account_data.get("last_updated", account_data["created"]),
|
||||||
display_name,
|
display_name,
|
||||||
|
account_data.get("logo"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
@@ -1516,6 +1520,79 @@ class DatabaseService:
|
|||||||
logger.error(f"Sync operations table migration failed: {e}")
|
logger.error(f"Sync operations table migration failed: {e}")
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
async def _migrate_add_logo_if_needed(self):
|
||||||
|
"""Check and add logo column to accounts table if needed"""
|
||||||
|
try:
|
||||||
|
if await self._check_logo_migration_needed():
|
||||||
|
logger.info("Logo column migration needed, starting...")
|
||||||
|
await self._migrate_add_logo()
|
||||||
|
logger.info("Logo column migration completed")
|
||||||
|
else:
|
||||||
|
logger.info("Logo column already exists")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Logo column migration failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
async def _check_logo_migration_needed(self) -> bool:
|
||||||
|
"""Check if logo column needs to be added to accounts table"""
|
||||||
|
db_path = path_manager.get_database_path()
|
||||||
|
if not db_path.exists():
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(str(db_path))
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
# Check if accounts table exists
|
||||||
|
cursor.execute(
|
||||||
|
"SELECT name FROM sqlite_master WHERE type='table' AND name='accounts'"
|
||||||
|
)
|
||||||
|
if not cursor.fetchone():
|
||||||
|
conn.close()
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Check if logo column exists
|
||||||
|
cursor.execute("PRAGMA table_info(accounts)")
|
||||||
|
columns = cursor.fetchall()
|
||||||
|
|
||||||
|
# Check if logo column exists
|
||||||
|
has_logo = any(col[1] == "logo" for col in columns)
|
||||||
|
|
||||||
|
conn.close()
|
||||||
|
return not has_logo
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to check logo migration status: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def _migrate_add_logo(self):
|
||||||
|
"""Add logo column to accounts table"""
|
||||||
|
db_path = path_manager.get_database_path()
|
||||||
|
if not db_path.exists():
|
||||||
|
logger.warning("Database file not found, skipping migration")
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
conn = sqlite3.connect(str(db_path))
|
||||||
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
logger.info("Adding logo column to accounts table...")
|
||||||
|
|
||||||
|
# Add the logo column
|
||||||
|
cursor.execute("""
|
||||||
|
ALTER TABLE accounts
|
||||||
|
ADD COLUMN logo TEXT
|
||||||
|
""")
|
||||||
|
|
||||||
|
conn.commit()
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
logger.info("Logo column migration completed successfully")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Logo column migration failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
async def persist_sync_operation(self, sync_operation: Dict[str, Any]) -> int:
|
async def persist_sync_operation(self, sync_operation: Dict[str, Any]) -> int:
|
||||||
"""Persist sync operation to database and return the ID"""
|
"""Persist sync operation to database and return the ID"""
|
||||||
if not self.sqlite_enabled:
|
if not self.sqlite_enabled:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import json
|
import json
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict, List
|
from typing import Any, Dict
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
@@ -9,17 +9,21 @@ from leggen.utils.config import config
|
|||||||
from leggen.utils.paths import path_manager
|
from leggen.utils.paths import path_manager
|
||||||
|
|
||||||
|
|
||||||
def _log_rate_limits(response):
|
def _log_rate_limits(response, method, url):
|
||||||
"""Log GoCardless API rate limit headers"""
|
"""Log GoCardless API rate limit headers"""
|
||||||
limit = response.headers.get("X-RateLimit-Limit")
|
limit = response.headers.get("http_x_ratelimit_limit")
|
||||||
remaining = response.headers.get("X-RateLimit-Remaining")
|
remaining = response.headers.get("http_x_ratelimit_remaining")
|
||||||
reset = response.headers.get("X-RateLimit-Reset")
|
reset = response.headers.get("http_x_ratelimit_reset")
|
||||||
account_success_reset = response.headers.get("X-RateLimit-Account-Success-Reset")
|
|
||||||
|
|
||||||
if limit or remaining or reset or account_success_reset:
|
account_limit = response.headers.get("http_x_ratelimit_account_success_limit")
|
||||||
logger.info(
|
account_remaining = response.headers.get(
|
||||||
f"GoCardless rate limits - Limit: {limit}, Remaining: {remaining}, Reset: {reset}s, Account Success Reset: {account_success_reset}"
|
"http_x_ratelimit_account_success_remaining"
|
||||||
)
|
)
|
||||||
|
account_reset = response.headers.get("http_x_ratelimit_account_success_reset")
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
f"{method} {url} Limit/Remaining/Reset (Global: {limit}/{remaining}/{reset}s) (Account: {account_limit}/{account_remaining}/{account_reset}s)"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class GoCardlessService:
|
class GoCardlessService:
|
||||||
@@ -30,6 +34,31 @@ class GoCardlessService:
|
|||||||
)
|
)
|
||||||
self._token = None
|
self._token = None
|
||||||
|
|
||||||
|
async def _make_authenticated_request(
|
||||||
|
self, method: str, url: str, **kwargs
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Make authenticated request with automatic token refresh on 401"""
|
||||||
|
headers = await self._get_auth_headers()
|
||||||
|
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.request(
|
||||||
|
method, url, headers=headers, timeout=30, **kwargs
|
||||||
|
)
|
||||||
|
_log_rate_limits(response, method, url)
|
||||||
|
|
||||||
|
# If we get 401, clear token cache and retry once
|
||||||
|
if response.status_code == 401:
|
||||||
|
logger.warning("Got 401, clearing token cache and retrying")
|
||||||
|
self._token = None
|
||||||
|
headers = await self._get_auth_headers()
|
||||||
|
response = await client.request(
|
||||||
|
method, url, headers=headers, timeout=30, **kwargs
|
||||||
|
)
|
||||||
|
_log_rate_limits(response, method, url)
|
||||||
|
|
||||||
|
response.raise_for_status()
|
||||||
|
return response.json()
|
||||||
|
|
||||||
async def _get_auth_headers(self) -> Dict[str, str]:
|
async def _get_auth_headers(self) -> Dict[str, str]:
|
||||||
"""Get authentication headers for GoCardless API"""
|
"""Get authentication headers for GoCardless API"""
|
||||||
token = await self._get_token()
|
token = await self._get_token()
|
||||||
@@ -56,7 +85,9 @@ class GoCardlessService:
|
|||||||
f"{self.base_url}/token/refresh/",
|
f"{self.base_url}/token/refresh/",
|
||||||
json={"refresh": auth["refresh"]},
|
json={"refresh": auth["refresh"]},
|
||||||
)
|
)
|
||||||
_log_rate_limits(response)
|
_log_rate_limits(
|
||||||
|
response, "POST", f"{self.base_url}/token/refresh/"
|
||||||
|
)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
auth.update(response.json())
|
auth.update(response.json())
|
||||||
self._save_auth(auth)
|
self._save_auth(auth)
|
||||||
@@ -84,7 +115,7 @@ class GoCardlessService:
|
|||||||
"secret_key": self.config["secret"],
|
"secret_key": self.config["secret"],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
_log_rate_limits(response)
|
_log_rate_limits(response, "POST", f"{self.base_url}/token/new/")
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
auth = response.json()
|
auth = response.json()
|
||||||
self._save_auth(auth)
|
self._save_auth(auth)
|
||||||
@@ -102,74 +133,54 @@ class GoCardlessService:
|
|||||||
with open(auth_file, "w") as f:
|
with open(auth_file, "w") as f:
|
||||||
json.dump(auth_data, f)
|
json.dump(auth_data, f)
|
||||||
|
|
||||||
async def get_institutions(self, country: str = "PT") -> List[Dict[str, Any]]:
|
async def get_institutions(self, country: str = "PT") -> Dict[str, Any]:
|
||||||
"""Get available bank institutions for a country"""
|
"""Get available bank institutions for a country"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"GET", f"{self.base_url}/institutions/", params={"country": country}
|
||||||
response = await client.get(
|
)
|
||||||
f"{self.base_url}/institutions/",
|
|
||||||
headers=headers,
|
|
||||||
params={"country": country},
|
|
||||||
)
|
|
||||||
_log_rate_limits(response)
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.json()
|
|
||||||
|
|
||||||
async def create_requisition(
|
async def create_requisition(
|
||||||
self, institution_id: str, redirect_url: str
|
self, institution_id: str, redirect_url: str
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""Create a bank connection requisition"""
|
"""Create a bank connection requisition"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"POST",
|
||||||
response = await client.post(
|
f"{self.base_url}/requisitions/",
|
||||||
f"{self.base_url}/requisitions/",
|
json={"institution_id": institution_id, "redirect": redirect_url},
|
||||||
headers=headers,
|
)
|
||||||
json={"institution_id": institution_id, "redirect": redirect_url},
|
|
||||||
)
|
|
||||||
_log_rate_limits(response)
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.json()
|
|
||||||
|
|
||||||
async def get_requisitions(self) -> Dict[str, Any]:
|
async def get_requisitions(self) -> Dict[str, Any]:
|
||||||
"""Get all requisitions"""
|
"""Get all requisitions"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"GET", f"{self.base_url}/requisitions/"
|
||||||
response = await client.get(
|
)
|
||||||
f"{self.base_url}/requisitions/", headers=headers
|
|
||||||
)
|
async def delete_requisition(self, requisition_id: str) -> Dict[str, Any]:
|
||||||
_log_rate_limits(response)
|
"""Delete a requisition"""
|
||||||
response.raise_for_status()
|
return await self._make_authenticated_request(
|
||||||
return response.json()
|
"DELETE", f"{self.base_url}/requisitions/{requisition_id}/"
|
||||||
|
)
|
||||||
|
|
||||||
async def get_account_details(self, account_id: str) -> Dict[str, Any]:
|
async def get_account_details(self, account_id: str) -> Dict[str, Any]:
|
||||||
"""Get account details"""
|
"""Get account details"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"GET", f"{self.base_url}/accounts/{account_id}/"
|
||||||
response = await client.get(
|
)
|
||||||
f"{self.base_url}/accounts/{account_id}/", headers=headers
|
|
||||||
)
|
|
||||||
_log_rate_limits(response)
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.json()
|
|
||||||
|
|
||||||
async def get_account_balances(self, account_id: str) -> Dict[str, Any]:
|
async def get_account_balances(self, account_id: str) -> Dict[str, Any]:
|
||||||
"""Get account balances"""
|
"""Get account balances"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"GET", f"{self.base_url}/accounts/{account_id}/balances/"
|
||||||
response = await client.get(
|
)
|
||||||
f"{self.base_url}/accounts/{account_id}/balances/", headers=headers
|
|
||||||
)
|
|
||||||
_log_rate_limits(response)
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.json()
|
|
||||||
|
|
||||||
async def get_account_transactions(self, account_id: str) -> Dict[str, Any]:
|
async def get_account_transactions(self, account_id: str) -> Dict[str, Any]:
|
||||||
"""Get account transactions"""
|
"""Get account transactions"""
|
||||||
headers = await self._get_auth_headers()
|
return await self._make_authenticated_request(
|
||||||
async with httpx.AsyncClient() as client:
|
"GET", f"{self.base_url}/accounts/{account_id}/transactions/"
|
||||||
response = await client.get(
|
)
|
||||||
f"{self.base_url}/accounts/{account_id}/transactions/", headers=headers
|
|
||||||
)
|
async def get_institution_details(self, institution_id: str) -> Dict[str, Any]:
|
||||||
_log_rate_limits(response)
|
"""Get institution details by ID"""
|
||||||
response.raise_for_status()
|
return await self._make_authenticated_request(
|
||||||
return response.json()
|
"GET", f"{self.base_url}/institutions/{institution_id}/"
|
||||||
|
)
|
||||||
|
|||||||
@@ -289,3 +289,69 @@ class NotificationService:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to send Telegram expiry notification: {e}")
|
logger.error(f"Failed to send Telegram expiry notification: {e}")
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
async def send_sync_failure_notification(
|
||||||
|
self, notification_data: Dict[str, Any]
|
||||||
|
) -> None:
|
||||||
|
"""Send notification about sync failure"""
|
||||||
|
if self._is_discord_enabled():
|
||||||
|
await self._send_discord_sync_failure(notification_data)
|
||||||
|
|
||||||
|
if self._is_telegram_enabled():
|
||||||
|
await self._send_telegram_sync_failure(notification_data)
|
||||||
|
|
||||||
|
async def _send_discord_sync_failure(
|
||||||
|
self, notification_data: Dict[str, Any]
|
||||||
|
) -> None:
|
||||||
|
"""Send Discord sync failure notification"""
|
||||||
|
try:
|
||||||
|
import click
|
||||||
|
|
||||||
|
from leggen.notifications.discord import send_sync_failure_notification
|
||||||
|
|
||||||
|
# Create a mock context with the webhook
|
||||||
|
ctx = click.Context(click.Command("sync_failure"))
|
||||||
|
ctx.obj = {
|
||||||
|
"notifications": {
|
||||||
|
"discord": {
|
||||||
|
"webhook": self.notifications_config.get("discord", {}).get(
|
||||||
|
"webhook"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Send sync failure notification using the actual implementation
|
||||||
|
send_sync_failure_notification(ctx, notification_data)
|
||||||
|
logger.info(f"Sent Discord sync failure notification: {notification_data}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to send Discord sync failure notification: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
async def _send_telegram_sync_failure(
|
||||||
|
self, notification_data: Dict[str, Any]
|
||||||
|
) -> None:
|
||||||
|
"""Send Telegram sync failure notification"""
|
||||||
|
try:
|
||||||
|
import click
|
||||||
|
|
||||||
|
from leggen.notifications.telegram import send_sync_failure_notification
|
||||||
|
|
||||||
|
# Create a mock context with the telegram config
|
||||||
|
ctx = click.Context(click.Command("sync_failure"))
|
||||||
|
telegram_config = self.notifications_config.get("telegram", {})
|
||||||
|
ctx.obj = {
|
||||||
|
"notifications": {
|
||||||
|
"telegram": {
|
||||||
|
"token": telegram_config.get("token"),
|
||||||
|
"chat_id": telegram_config.get("chat_id"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Send sync failure notification using the actual implementation
|
||||||
|
send_sync_failure_notification(ctx, notification_data)
|
||||||
|
logger.info(f"Sent Telegram sync failure notification: {notification_data}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to send Telegram sync failure notification: {e}")
|
||||||
|
raise
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class SyncService:
|
|||||||
self.database = DatabaseService()
|
self.database = DatabaseService()
|
||||||
self.notifications = NotificationService()
|
self.notifications = NotificationService()
|
||||||
self._sync_status = SyncStatus(is_running=False)
|
self._sync_status = SyncStatus(is_running=False)
|
||||||
|
self._institution_logos = {} # Cache for institution logos
|
||||||
|
|
||||||
async def get_sync_status(self) -> SyncStatus:
|
async def get_sync_status(self) -> SyncStatus:
|
||||||
"""Get current sync status"""
|
"""Get current sync status"""
|
||||||
@@ -77,7 +78,7 @@ class SyncService:
|
|||||||
# Get balances to extract currency information
|
# Get balances to extract currency information
|
||||||
balances = await self.gocardless.get_account_balances(account_id)
|
balances = await self.gocardless.get_account_balances(account_id)
|
||||||
|
|
||||||
# Enrich account details with currency and persist
|
# Enrich account details with currency and institution logo
|
||||||
if account_details and balances:
|
if account_details and balances:
|
||||||
enriched_account_details = account_details.copy()
|
enriched_account_details = account_details.copy()
|
||||||
|
|
||||||
@@ -90,6 +91,26 @@ class SyncService:
|
|||||||
if currency:
|
if currency:
|
||||||
enriched_account_details["currency"] = currency
|
enriched_account_details["currency"] = currency
|
||||||
|
|
||||||
|
# Get institution details to fetch logo
|
||||||
|
institution_id = enriched_account_details.get("institution_id")
|
||||||
|
if institution_id:
|
||||||
|
try:
|
||||||
|
institution_details = (
|
||||||
|
await self.gocardless.get_institution_details(
|
||||||
|
institution_id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
enriched_account_details["logo"] = (
|
||||||
|
institution_details.get("logo", "")
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
f"Fetched logo for institution {institution_id}: {enriched_account_details.get('logo', 'No logo')}"
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(
|
||||||
|
f"Failed to fetch institution details for {institution_id}: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
# Persist enriched account details to database
|
# Persist enriched account details to database
|
||||||
await self.database.persist_account_details(
|
await self.database.persist_account_details(
|
||||||
enriched_account_details
|
enriched_account_details
|
||||||
|
|||||||
@@ -70,7 +70,10 @@ class TransactionProcessor:
|
|||||||
internal_transaction_id = transaction.get("internalTransactionId")
|
internal_transaction_id = transaction.get("internalTransactionId")
|
||||||
|
|
||||||
if not transaction_id:
|
if not transaction_id:
|
||||||
raise ValueError("Transaction missing required transactionId field")
|
if internal_transaction_id:
|
||||||
|
transaction_id = internal_transaction_id
|
||||||
|
else:
|
||||||
|
raise ValueError("Transaction missing required transactionId field")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"accountId": account_id,
|
"accountId": account_id,
|
||||||
|
|||||||
@@ -39,13 +39,11 @@ class Config:
|
|||||||
try:
|
try:
|
||||||
with open(config_path, "rb") as f:
|
with open(config_path, "rb") as f:
|
||||||
raw_config = tomllib.load(f)
|
raw_config = tomllib.load(f)
|
||||||
logger.info(f"Configuration loaded from {config_path}")
|
|
||||||
|
|
||||||
# Validate configuration using Pydantic
|
# Validate configuration using Pydantic
|
||||||
try:
|
try:
|
||||||
self._config_model = ConfigModel(**raw_config)
|
self._config_model = ConfigModel(**raw_config)
|
||||||
self._config = self._config_model.dict(by_alias=True, exclude_none=True)
|
self._config = self._config_model.dict(by_alias=True, exclude_none=True)
|
||||||
logger.info("Configuration validation successful")
|
|
||||||
except ValidationError as e:
|
except ValidationError as e:
|
||||||
logger.error(f"Configuration validation failed: {e}")
|
logger.error(f"Configuration validation failed: {e}")
|
||||||
raise ValueError(f"Invalid configuration: {e}") from e
|
raise ValueError(f"Invalid configuration: {e}") from e
|
||||||
@@ -164,6 +162,11 @@ class Config:
|
|||||||
}
|
}
|
||||||
return self.config.get("scheduler", default_schedule)
|
return self.config.get("scheduler", default_schedule)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def backup_config(self) -> Dict[str, Any]:
|
||||||
|
"""Get backup configuration"""
|
||||||
|
return self.config.get("backup", {})
|
||||||
|
|
||||||
|
|
||||||
def load_config(ctx: click.Context, _, filename):
|
def load_config(ctx: click.Context, _, filename):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "leggen"
|
name = "leggen"
|
||||||
version = "2025.9.21"
|
version = "2025.11.0"
|
||||||
description = "An Open Banking CLI"
|
description = "An Open Banking CLI"
|
||||||
authors = [{ name = "Elisiário Couto", email = "elisiario@couto.io" }]
|
authors = [{ name = "Elisiário Couto", email = "elisiario@couto.io" }]
|
||||||
requires-python = "~=3.13.0"
|
requires-python = "~=3.13.0"
|
||||||
@@ -35,6 +35,7 @@ dependencies = [
|
|||||||
"tomli-w>=1.0.0,<2",
|
"tomli-w>=1.0.0,<2",
|
||||||
"httpx>=0.28.1",
|
"httpx>=0.28.1",
|
||||||
"pydantic>=2.0.0,<3",
|
"pydantic>=2.0.0,<3",
|
||||||
|
"boto3>=1.35.0,<2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
@@ -88,5 +89,5 @@ markers = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[tool.mypy.overrides]]
|
[[tool.mypy.overrides]]
|
||||||
module = ["apscheduler.*", "discord_webhook.*"]
|
module = ["apscheduler.*", "discord_webhook.*", "botocore.*", "boto3.*"]
|
||||||
ignore_missing_imports = true
|
ignore_missing_imports = true
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ echo " > Version bumped to $NEXT_VERSION"
|
|||||||
echo "Updating CHANGELOG.md"
|
echo "Updating CHANGELOG.md"
|
||||||
git-cliff --unreleased --tag "$NEXT_VERSION" --prepend CHANGELOG.md > /dev/null
|
git-cliff --unreleased --tag "$NEXT_VERSION" --prepend CHANGELOG.md > /dev/null
|
||||||
|
|
||||||
|
echo "Locking dependencies"
|
||||||
|
uv lock
|
||||||
|
|
||||||
echo " > Commiting changes and adding git tag"
|
echo " > Commiting changes and adding git tag"
|
||||||
git add pyproject.toml CHANGELOG.md uv.lock
|
git add pyproject.toml CHANGELOG.md uv.lock
|
||||||
git commit -m "chore(ci): Bump version to $NEXT_VERSION"
|
git commit -m "chore(ci): Bump version to $NEXT_VERSION"
|
||||||
|
|||||||
@@ -103,22 +103,24 @@ def mock_db_path(temp_db_path):
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def sample_bank_data():
|
def sample_bank_data():
|
||||||
"""Sample bank/institution data for testing."""
|
"""Sample bank/institution data for testing."""
|
||||||
return [
|
return {
|
||||||
{
|
"results": [
|
||||||
"id": "REVOLUT_REVOLT21",
|
{
|
||||||
"name": "Revolut",
|
"id": "REVOLUT_REVOLT21",
|
||||||
"bic": "REVOLT21",
|
"name": "Revolut",
|
||||||
"transaction_total_days": 90,
|
"bic": "REVOLT21",
|
||||||
"countries": ["GB", "LT"],
|
"transaction_total_days": 90,
|
||||||
},
|
"countries": ["GB", "LT"],
|
||||||
{
|
},
|
||||||
"id": "BANCOBPI_BBPIPTPL",
|
{
|
||||||
"name": "Banco BPI",
|
"id": "BANCOBPI_BBPIPTPL",
|
||||||
"bic": "BBPIPTPL",
|
"name": "Banco BPI",
|
||||||
"transaction_total_days": 90,
|
"bic": "BBPIPTPL",
|
||||||
"countries": ["PT"],
|
"transaction_total_days": 90,
|
||||||
},
|
"countries": ["PT"],
|
||||||
]
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|||||||
303
tests/unit/test_api_backup.py
Normal file
303
tests/unit/test_api_backup.py
Normal file
@@ -0,0 +1,303 @@
|
|||||||
|
"""Tests for backup API endpoints."""
|
||||||
|
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.api
|
||||||
|
class TestBackupAPI:
|
||||||
|
"""Test backup-related API endpoints."""
|
||||||
|
|
||||||
|
def test_get_backup_settings_no_config(self, api_client, mock_config):
|
||||||
|
"""Test getting backup settings with no configuration."""
|
||||||
|
# Mock empty backup config by updating the config dict
|
||||||
|
mock_config._config["backup"] = {}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.get("/api/v1/backup/settings")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"]["s3"] is None
|
||||||
|
|
||||||
|
def test_get_backup_settings_with_s3_config(self, api_client, mock_config):
|
||||||
|
"""Test getting backup settings with S3 configuration."""
|
||||||
|
# Mock S3 backup config (with masked credentials)
|
||||||
|
mock_config._config["backup"] = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.get("/api/v1/backup/settings")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"]["s3"] is not None
|
||||||
|
|
||||||
|
s3_config = data["data"]["s3"]
|
||||||
|
assert s3_config["access_key_id"] == "***" # Masked
|
||||||
|
assert s3_config["secret_access_key"] == "***" # Masked
|
||||||
|
assert s3_config["bucket_name"] == "test-bucket"
|
||||||
|
assert s3_config["region"] == "us-east-1"
|
||||||
|
assert s3_config["enabled"] is True
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.test_connection")
|
||||||
|
def test_update_backup_settings_success(
|
||||||
|
self, mock_test_connection, api_client, mock_config
|
||||||
|
):
|
||||||
|
"""Test successful backup settings update."""
|
||||||
|
mock_test_connection.return_value = True
|
||||||
|
mock_config._config["backup"] = {}
|
||||||
|
|
||||||
|
request_data = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.put("/api/v1/backup/settings", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"]["updated"] is True
|
||||||
|
|
||||||
|
# Verify connection test was called
|
||||||
|
mock_test_connection.assert_called_once()
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.test_connection")
|
||||||
|
def test_update_backup_settings_connection_failure(
|
||||||
|
self, mock_test_connection, api_client, mock_config
|
||||||
|
):
|
||||||
|
"""Test backup settings update with connection test failure."""
|
||||||
|
mock_test_connection.return_value = False
|
||||||
|
mock_config._config["backup"] = {}
|
||||||
|
|
||||||
|
request_data = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "invalid-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.put("/api/v1/backup/settings", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 400
|
||||||
|
data = response.json()
|
||||||
|
assert "S3 connection test failed" in data["detail"]
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.test_connection")
|
||||||
|
def test_test_backup_connection_success(self, mock_test_connection, api_client):
|
||||||
|
"""Test successful backup connection test."""
|
||||||
|
mock_test_connection.return_value = True
|
||||||
|
|
||||||
|
request_data = {
|
||||||
|
"service": "s3",
|
||||||
|
"config": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
response = api_client.post("/api/v1/backup/test", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"]["connected"] is True
|
||||||
|
|
||||||
|
# Verify connection test was called
|
||||||
|
mock_test_connection.assert_called_once()
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.test_connection")
|
||||||
|
def test_test_backup_connection_failure(self, mock_test_connection, api_client):
|
||||||
|
"""Test failed backup connection test."""
|
||||||
|
mock_test_connection.return_value = False
|
||||||
|
|
||||||
|
request_data = {
|
||||||
|
"service": "s3",
|
||||||
|
"config": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "invalid-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
response = api_client.post("/api/v1/backup/test", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is False
|
||||||
|
|
||||||
|
def test_test_backup_connection_invalid_service(self, api_client):
|
||||||
|
"""Test backup connection test with invalid service."""
|
||||||
|
request_data = {
|
||||||
|
"service": "invalid",
|
||||||
|
"config": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"endpoint_url": None,
|
||||||
|
"path_style": False,
|
||||||
|
"enabled": True,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
response = api_client.post("/api/v1/backup/test", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 400
|
||||||
|
data = response.json()
|
||||||
|
assert "Only 's3' service is supported" in data["detail"]
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.list_backups")
|
||||||
|
def test_list_backups_success(self, mock_list_backups, api_client, mock_config):
|
||||||
|
"""Test successful backup listing."""
|
||||||
|
mock_list_backups.return_value = [
|
||||||
|
{
|
||||||
|
"key": "leggen_backups/database_backup_20250101_120000.db",
|
||||||
|
"last_modified": "2025-01-01T12:00:00",
|
||||||
|
"size": 1024,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "leggen_backups/database_backup_20250101_110000.db",
|
||||||
|
"last_modified": "2025-01-01T11:00:00",
|
||||||
|
"size": 512,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
mock_config._config["backup"] = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.get("/api/v1/backup/list")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert len(data["data"]) == 2
|
||||||
|
assert (
|
||||||
|
data["data"][0]["key"]
|
||||||
|
== "leggen_backups/database_backup_20250101_120000.db"
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_list_backups_no_config(self, api_client, mock_config):
|
||||||
|
"""Test backup listing with no configuration."""
|
||||||
|
mock_config._config["backup"] = {}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.get("/api/v1/backup/list")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"] == []
|
||||||
|
|
||||||
|
@patch("leggen.services.backup_service.BackupService.backup_database")
|
||||||
|
@patch("leggen.utils.paths.path_manager.get_database_path")
|
||||||
|
def test_backup_operation_success(
|
||||||
|
self, mock_get_db_path, mock_backup_db, api_client, mock_config
|
||||||
|
):
|
||||||
|
"""Test successful backup operation."""
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
mock_get_db_path.return_value = Path("/test/database.db")
|
||||||
|
mock_backup_db.return_value = True
|
||||||
|
|
||||||
|
mock_config._config["backup"] = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
request_data = {"operation": "backup"}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.post("/api/v1/backup/operation", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["success"] is True
|
||||||
|
assert data["data"]["operation"] == "backup"
|
||||||
|
assert data["data"]["completed"] is True
|
||||||
|
|
||||||
|
# Verify backup was called
|
||||||
|
mock_backup_db.assert_called_once()
|
||||||
|
|
||||||
|
def test_backup_operation_no_config(self, api_client, mock_config):
|
||||||
|
"""Test backup operation with no configuration."""
|
||||||
|
mock_config._config["backup"] = {}
|
||||||
|
|
||||||
|
request_data = {"operation": "backup"}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.post("/api/v1/backup/operation", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 400
|
||||||
|
data = response.json()
|
||||||
|
assert "S3 backup is not configured" in data["detail"]
|
||||||
|
|
||||||
|
def test_backup_operation_invalid_operation(self, api_client, mock_config):
|
||||||
|
"""Test backup operation with invalid operation type."""
|
||||||
|
mock_config._config["backup"] = {
|
||||||
|
"s3": {
|
||||||
|
"access_key_id": "AKIATEST123",
|
||||||
|
"secret_access_key": "secret123",
|
||||||
|
"bucket_name": "test-bucket",
|
||||||
|
"region": "us-east-1",
|
||||||
|
"enabled": True,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
request_data = {"operation": "invalid"}
|
||||||
|
|
||||||
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
response = api_client.post("/api/v1/backup/operation", json=request_data)
|
||||||
|
|
||||||
|
assert response.status_code == 400
|
||||||
|
data = response.json()
|
||||||
|
assert "Invalid operation" in data["detail"]
|
||||||
@@ -50,7 +50,7 @@ class TestBanksAPI:
|
|||||||
|
|
||||||
# Mock empty institutions response for invalid country
|
# Mock empty institutions response for invalid country
|
||||||
respx.get("https://bankaccountdata.gocardless.com/api/v2/institutions/").mock(
|
respx.get("https://bankaccountdata.gocardless.com/api/v2/institutions/").mock(
|
||||||
return_value=httpx.Response(200, json=[])
|
return_value=httpx.Response(200, json={"results": []})
|
||||||
)
|
)
|
||||||
|
|
||||||
with patch("leggen.utils.config.config", mock_config):
|
with patch("leggen.utils.config.config", mock_config):
|
||||||
|
|||||||
@@ -18,7 +18,10 @@ class TestLeggenAPIClient:
|
|||||||
client = LeggenAPIClient("http://localhost:8000")
|
client = LeggenAPIClient("http://localhost:8000")
|
||||||
|
|
||||||
with requests_mock.Mocker() as m:
|
with requests_mock.Mocker() as m:
|
||||||
m.get("http://localhost:8000/health", json={"status": "healthy"})
|
m.get(
|
||||||
|
"http://localhost:8000/api/v1/health",
|
||||||
|
json={"data": {"status": "healthy"}},
|
||||||
|
)
|
||||||
|
|
||||||
result = client.health_check()
|
result = client.health_check()
|
||||||
assert result is True
|
assert result is True
|
||||||
@@ -37,9 +40,12 @@ class TestLeggenAPIClient:
|
|||||||
"""Test getting institutions via API client."""
|
"""Test getting institutions via API client."""
|
||||||
client = LeggenAPIClient("http://localhost:8000")
|
client = LeggenAPIClient("http://localhost:8000")
|
||||||
|
|
||||||
|
# The API returns processed institutions, not raw GoCardless data
|
||||||
|
processed_institutions = sample_bank_data["results"]
|
||||||
|
|
||||||
api_response = {
|
api_response = {
|
||||||
"success": True,
|
"success": True,
|
||||||
"data": sample_bank_data,
|
"data": processed_institutions,
|
||||||
"message": "Found 2 institutions for PT",
|
"message": "Found 2 institutions for PT",
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,13 +115,13 @@ class TestLeggenAPIClient:
|
|||||||
custom_url = "http://custom-host:9000"
|
custom_url = "http://custom-host:9000"
|
||||||
client = LeggenAPIClient(custom_url)
|
client = LeggenAPIClient(custom_url)
|
||||||
|
|
||||||
assert client.base_url == custom_url
|
assert client.base_url == f"{custom_url}/api/v1"
|
||||||
|
|
||||||
def test_environment_variable_url(self):
|
def test_environment_variable_url(self):
|
||||||
"""Test using environment variable for API URL."""
|
"""Test using environment variable for API URL."""
|
||||||
with patch.dict("os.environ", {"LEGGEN_API_URL": "http://env-host:7000"}):
|
with patch.dict("os.environ", {"LEGGEN_API_URL": "http://env-host:7000"}):
|
||||||
client = LeggenAPIClient()
|
client = LeggenAPIClient()
|
||||||
assert client.base_url == "http://env-host:7000"
|
assert client.base_url == "http://env-host:7000/api/v1"
|
||||||
|
|
||||||
def test_sync_with_options(self):
|
def test_sync_with_options(self):
|
||||||
"""Test sync with various options."""
|
"""Test sync with various options."""
|
||||||
|
|||||||
226
tests/unit/test_backup_service.py
Normal file
226
tests/unit/test_backup_service.py
Normal file
@@ -0,0 +1,226 @@
|
|||||||
|
"""Tests for backup service functionality."""
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from botocore.exceptions import ClientError, NoCredentialsError
|
||||||
|
|
||||||
|
from leggen.models.config import S3BackupConfig
|
||||||
|
from leggen.services.backup_service import BackupService
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.unit
|
||||||
|
class TestBackupService:
|
||||||
|
"""Test backup service functionality."""
|
||||||
|
|
||||||
|
def test_backup_service_initialization(self):
|
||||||
|
"""Test backup service can be initialized."""
|
||||||
|
service = BackupService()
|
||||||
|
assert service.s3_config is None
|
||||||
|
assert service._s3_client is None
|
||||||
|
|
||||||
|
def test_backup_service_with_config(self):
|
||||||
|
"""Test backup service initialization with config."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
service = BackupService(s3_config)
|
||||||
|
assert service.s3_config == s3_config
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_test_connection_success(self):
|
||||||
|
"""Test successful S3 connection test."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
|
||||||
|
service = BackupService()
|
||||||
|
|
||||||
|
# Mock S3 client
|
||||||
|
with patch("boto3.Session") as mock_session:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_session.return_value.client.return_value = mock_client
|
||||||
|
|
||||||
|
# Mock successful list_objects_v2 call
|
||||||
|
mock_client.list_objects_v2.return_value = {"Contents": []}
|
||||||
|
|
||||||
|
result = await service.test_connection(s3_config)
|
||||||
|
assert result is True
|
||||||
|
|
||||||
|
# Verify the client was called correctly
|
||||||
|
mock_client.list_objects_v2.assert_called_once_with(
|
||||||
|
Bucket="test-bucket", MaxKeys=1
|
||||||
|
)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_test_connection_no_credentials(self):
|
||||||
|
"""Test S3 connection test with no credentials."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
|
||||||
|
service = BackupService()
|
||||||
|
|
||||||
|
# Mock S3 client to raise NoCredentialsError
|
||||||
|
with patch("boto3.Session") as mock_session:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_session.return_value.client.return_value = mock_client
|
||||||
|
mock_client.list_objects_v2.side_effect = NoCredentialsError()
|
||||||
|
|
||||||
|
result = await service.test_connection(s3_config)
|
||||||
|
assert result is False
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_test_connection_client_error(self):
|
||||||
|
"""Test S3 connection test with client error."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
|
||||||
|
service = BackupService()
|
||||||
|
|
||||||
|
# Mock S3 client to raise ClientError
|
||||||
|
with patch("boto3.Session") as mock_session:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_session.return_value.client.return_value = mock_client
|
||||||
|
error_response = {
|
||||||
|
"Error": {"Code": "NoSuchBucket", "Message": "Bucket not found"}
|
||||||
|
}
|
||||||
|
mock_client.list_objects_v2.side_effect = ClientError(
|
||||||
|
error_response, "ListObjectsV2"
|
||||||
|
)
|
||||||
|
|
||||||
|
result = await service.test_connection(s3_config)
|
||||||
|
assert result is False
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_backup_database_no_config(self):
|
||||||
|
"""Test backup database with no configuration."""
|
||||||
|
service = BackupService()
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
db_path = Path(tmpdir) / "test.db"
|
||||||
|
db_path.write_text("test database content")
|
||||||
|
|
||||||
|
result = await service.backup_database(db_path)
|
||||||
|
assert result is False
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_backup_database_disabled(self):
|
||||||
|
"""Test backup database with disabled configuration."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
enabled=False,
|
||||||
|
)
|
||||||
|
service = BackupService(s3_config)
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
db_path = Path(tmpdir) / "test.db"
|
||||||
|
db_path.write_text("test database content")
|
||||||
|
|
||||||
|
result = await service.backup_database(db_path)
|
||||||
|
assert result is False
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_backup_database_file_not_found(self):
|
||||||
|
"""Test backup database with non-existent file."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
service = BackupService(s3_config)
|
||||||
|
|
||||||
|
non_existent_path = Path("/non/existent/path.db")
|
||||||
|
result = await service.backup_database(non_existent_path)
|
||||||
|
assert result is False
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_backup_database_success(self):
|
||||||
|
"""Test successful database backup."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
service = BackupService(s3_config)
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
db_path = Path(tmpdir) / "test.db"
|
||||||
|
db_path.write_text("test database content")
|
||||||
|
|
||||||
|
# Mock S3 client
|
||||||
|
with patch("boto3.Session") as mock_session:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_session.return_value.client.return_value = mock_client
|
||||||
|
|
||||||
|
result = await service.backup_database(db_path)
|
||||||
|
assert result is True
|
||||||
|
|
||||||
|
# Verify upload_file was called
|
||||||
|
mock_client.upload_file.assert_called_once()
|
||||||
|
args = mock_client.upload_file.call_args[0]
|
||||||
|
assert args[0] == str(db_path) # source file
|
||||||
|
assert args[1] == "test-bucket" # bucket name
|
||||||
|
assert args[2].startswith("leggen_backups/database_backup_") # key
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_list_backups_success(self):
|
||||||
|
"""Test successful backup listing."""
|
||||||
|
s3_config = S3BackupConfig(
|
||||||
|
access_key_id="test-key",
|
||||||
|
secret_access_key="test-secret",
|
||||||
|
bucket_name="test-bucket",
|
||||||
|
region="us-east-1",
|
||||||
|
)
|
||||||
|
service = BackupService(s3_config)
|
||||||
|
|
||||||
|
# Mock S3 client response
|
||||||
|
with patch("boto3.Session") as mock_session:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_session.return_value.client.return_value = mock_client
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
mock_response = {
|
||||||
|
"Contents": [
|
||||||
|
{
|
||||||
|
"Key": "leggen_backups/database_backup_20250101_120000.db",
|
||||||
|
"LastModified": datetime(2025, 1, 1, 12, 0, 0),
|
||||||
|
"Size": 1024,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Key": "leggen_backups/database_backup_20250101_130000.db",
|
||||||
|
"LastModified": datetime(2025, 1, 1, 13, 0, 0),
|
||||||
|
"Size": 2048,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
mock_client.list_objects_v2.return_value = mock_response
|
||||||
|
|
||||||
|
backups = await service.list_backups()
|
||||||
|
assert len(backups) == 2
|
||||||
|
|
||||||
|
# Check that backups are sorted by last modified (newest first)
|
||||||
|
assert backups[0]["last_modified"] > backups[1]["last_modified"]
|
||||||
|
assert backups[0]["size"] == 2048
|
||||||
|
assert backups[1]["size"] == 1024
|
||||||
74
uv.lock
generated
74
uv.lock
generated
@@ -36,6 +36,34 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/d0/ae/9a053dd9229c0fde6b1f1f33f609ccff1ee79ddda364c756a924c6d8563b/APScheduler-3.11.0-py3-none-any.whl", hash = "sha256:fc134ca32e50f5eadcc4938e3a4545ab19131435e851abb40b34d63d5141c6da", size = 64004, upload-time = "2024-11-24T19:39:24.442Z" },
|
{ url = "https://files.pythonhosted.org/packages/d0/ae/9a053dd9229c0fde6b1f1f33f609ccff1ee79ddda364c756a924c6d8563b/APScheduler-3.11.0-py3-none-any.whl", hash = "sha256:fc134ca32e50f5eadcc4938e3a4545ab19131435e851abb40b34d63d5141c6da", size = 64004, upload-time = "2024-11-24T19:39:24.442Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "boto3"
|
||||||
|
version = "1.40.36"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "botocore" },
|
||||||
|
{ name = "jmespath" },
|
||||||
|
{ name = "s3transfer" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/8d/21/7bc857b155e8264c92b6fa8e0860a67dc01a19cbe6ba4342500299f2ae5b/boto3-1.40.36.tar.gz", hash = "sha256:bfc1f3d5c4f5d12b8458406b8972f8794ac57e2da1ee441469e143bc0440a5c3", size = 111552, upload-time = "2025-09-22T19:26:17.357Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/70/4c/428b728d5cf9003f83f735d10dd522945ab20c7d67e6c987909f29be12a0/boto3-1.40.36-py3-none-any.whl", hash = "sha256:d7c1fe033f491f560cd26022a9dcf28baf877ae854f33bc64fffd0df3b9c98be", size = 139345, upload-time = "2025-09-22T19:26:15.194Z" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "botocore"
|
||||||
|
version = "1.40.36"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "jmespath" },
|
||||||
|
{ name = "python-dateutil" },
|
||||||
|
{ name = "urllib3" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/4b/30/75fdc75933d3bc1c8dd7fbaee771438328b518936906b411075b1eacac93/botocore-1.40.36.tar.gz", hash = "sha256:93386a8dc54173267ddfc6cd8636c9171e021f7c032aa1df3af7de816e3df616", size = 14349583, upload-time = "2025-09-22T19:26:05.957Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/d8/51/95c0324ac20b5bbafad4c89dd610c8e0dd6cbadbb2c8ca66dc95ccde98b8/botocore-1.40.36-py3-none-any.whl", hash = "sha256:d6edf75875e4013cb7078875a1d6c289afb4cc6675d99d80700c692d8d8e0b72", size = 14020478, upload-time = "2025-09-22T19:26:02.054Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "certifi"
|
name = "certifi"
|
||||||
version = "2025.8.3"
|
version = "2025.8.3"
|
||||||
@@ -218,12 +246,22 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050, upload-time = "2025-03-19T20:10:01.071Z" },
|
{ url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050, upload-time = "2025-03-19T20:10:01.071Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "jmespath"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/00/2a/e867e8531cf3e36b41201936b7fa7ba7b5702dbef42922193f05c8976cd6/jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe", size = 25843, upload-time = "2022-06-17T18:00:12.224Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/31/b4/b9b800c45527aadd64d5b442f9b932b00648617eb5d63d2c7a6587b7cafc/jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980", size = 20256, upload-time = "2022-06-17T18:00:10.251Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "leggen"
|
name = "leggen"
|
||||||
version = "2025.9.21"
|
version = "2025.11.0"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "apscheduler" },
|
{ name = "apscheduler" },
|
||||||
|
{ name = "boto3" },
|
||||||
{ name = "click" },
|
{ name = "click" },
|
||||||
{ name = "discord-webhook" },
|
{ name = "discord-webhook" },
|
||||||
{ name = "fastapi" },
|
{ name = "fastapi" },
|
||||||
@@ -253,6 +291,7 @@ dev = [
|
|||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
{ name = "apscheduler", specifier = ">=3.10.0,<4" },
|
{ name = "apscheduler", specifier = ">=3.10.0,<4" },
|
||||||
|
{ name = "boto3", specifier = ">=1.35.0,<2" },
|
||||||
{ name = "click", specifier = ">=8.1.7,<9" },
|
{ name = "click", specifier = ">=8.1.7,<9" },
|
||||||
{ name = "discord-webhook", specifier = ">=1.3.1,<2" },
|
{ name = "discord-webhook", specifier = ">=1.3.1,<2" },
|
||||||
{ name = "fastapi", specifier = ">=0.104.0,<1" },
|
{ name = "fastapi", specifier = ">=0.104.0,<1" },
|
||||||
@@ -474,6 +513,18 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/2b/b3/7fefc43fb706380144bcd293cc6e446e6f637ddfa8b83f48d1734156b529/pytest_mock-3.15.0-py3-none-any.whl", hash = "sha256:ef2219485fb1bd256b00e7ad7466ce26729b30eadfc7cbcdb4fa9a92ca68db6f", size = 10050, upload-time = "2025-09-04T20:57:47.274Z" },
|
{ url = "https://files.pythonhosted.org/packages/2b/b3/7fefc43fb706380144bcd293cc6e446e6f637ddfa8b83f48d1734156b529/pytest_mock-3.15.0-py3-none-any.whl", hash = "sha256:ef2219485fb1bd256b00e7ad7466ce26729b30eadfc7cbcdb4fa9a92ca68db6f", size = 10050, upload-time = "2025-09-04T20:57:47.274Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "python-dateutil"
|
||||||
|
version = "2.9.0.post0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "six" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "python-dotenv"
|
name = "python-dotenv"
|
||||||
version = "1.1.1"
|
version = "1.1.1"
|
||||||
@@ -565,6 +616,27 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/e1/a3/03216a6a86c706df54422612981fb0f9041dbb452c3401501d4a22b942c9/ruff-0.13.0-py3-none-win_arm64.whl", hash = "sha256:ab80525317b1e1d38614addec8ac954f1b3e662de9d59114ecbf771d00cf613e", size = 12312357, upload-time = "2025-09-10T16:25:35.595Z" },
|
{ url = "https://files.pythonhosted.org/packages/e1/a3/03216a6a86c706df54422612981fb0f9041dbb452c3401501d4a22b942c9/ruff-0.13.0-py3-none-win_arm64.whl", hash = "sha256:ab80525317b1e1d38614addec8ac954f1b3e662de9d59114ecbf771d00cf613e", size = 12312357, upload-time = "2025-09-10T16:25:35.595Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "s3transfer"
|
||||||
|
version = "0.14.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "botocore" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/62/74/8d69dcb7a9efe8baa2046891735e5dfe433ad558ae23d9e3c14c633d1d58/s3transfer-0.14.0.tar.gz", hash = "sha256:eff12264e7c8b4985074ccce27a3b38a485bb7f7422cc8046fee9be4983e4125", size = 151547, upload-time = "2025-09-09T19:23:31.089Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/48/f0/ae7ca09223a81a1d890b2557186ea015f6e0502e9b8cb8e1813f1d8cfa4e/s3transfer-0.14.0-py3-none-any.whl", hash = "sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456", size = 85712, upload-time = "2025-09-09T19:23:30.041Z" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "six"
|
||||||
|
version = "1.17.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sniffio"
|
name = "sniffio"
|
||||||
version = "1.3.1"
|
version = "1.3.1"
|
||||||
|
|||||||
Reference in New Issue
Block a user