Fix Tende Pay export notification: handle AMOUNT key and improve user guidance

docs/devlogs/server/runtimeerror.txt

@@ -1,66 +1,56 @@
-===== Application Startup at 2025-12-10 13:22:15 =====
+===== Application Startup at 2025-12-10 13:47:47 =====
 
-INFO:     Started server process [7]
+INFO:     Started server process [6]
 INFO:     Waiting for application startup.
-INFO: 2025-12-10T13:22:32 - app.main: ============================================================
-INFO: 2025-12-10T13:22:32 - app.main: 🚀 SwiftOps API v1.0.0 | PRODUCTION
-INFO: 2025-12-10T13:22:32 - app.main: 📊 Dashboard: Enabled
-INFO: 2025-12-10T13:22:32 - app.main: ============================================================
-INFO: 2025-12-10T13:22:32 - app.main: 📦 Database:
-INFO: 2025-12-10T13:22:32 - app.main:    ✓ Connected | 47 tables | 6 users
-INFO: 2025-12-10T13:22:32 - app.main: 💾 Cache & Sessions:
-INFO: 2025-12-10T13:22:33 - app.services.otp_service: ✅ OTP Service initialized with Redis storage
-INFO: 2025-12-10T13:22:33 - app.main:    ✓ Redis: Connected
-INFO: 2025-12-10T13:22:33 - app.main: 🔌 External Services:
-INFO: 2025-12-10T13:22:34 - app.main:    ✓ Cloudinary: Connected
-INFO: 2025-12-10T13:22:34 - app.main:    ✓ Resend: Configured
-INFO: 2025-12-10T13:22:34 - app.main:    ○ WASender: Disconnected
-INFO: 2025-12-10T13:22:34 - app.main:    ✓ Supabase: Connected | 6 buckets
-INFO: 2025-12-10T13:22:34 - app.main: ⏰ Scheduler:
-INFO: 2025-12-10T13:22:34 - apscheduler.scheduler: Adding job tentatively -- it will be properly scheduled when the scheduler starts
-INFO: 2025-12-10T13:22:34 - apscheduler.scheduler: Added job "Daily Field Agent Reconciliation" to job store "default"
-INFO: 2025-12-10T13:22:34 - apscheduler.scheduler: Scheduler started
-INFO: 2025-12-10T13:22:34 - app.tasks.scheduler: Reconciliation scheduler started (runs at 10 PM Africa/Nairobi)
-INFO: 2025-12-10T13:22:34 - app.main:    ✓ Daily reconciliation scheduler started (runs at midnight)
-INFO: 2025-12-10T13:22:34 - app.main: ============================================================
-INFO: 2025-12-10T13:22:34 - app.main: ✅ Startup complete | Ready to serve requests
-INFO: 2025-12-10T13:22:34 - app.main: ============================================================
+INFO: 2025-12-10T13:48:14 - app.main: ============================================================
+INFO: 2025-12-10T13:48:14 - app.main: 🚀 SwiftOps API v1.0.0 | PRODUCTION
+INFO: 2025-12-10T13:48:14 - app.main: 📊 Dashboard: Enabled
+INFO: 2025-12-10T13:48:14 - app.main: ============================================================
+INFO: 2025-12-10T13:48:14 - app.main: 📦 Database:
+INFO: 2025-12-10T13:48:14 - app.main:    ✓ Connected | 47 tables | 6 users
+INFO: 2025-12-10T13:48:14 - app.main: 💾 Cache & Sessions:
+INFO: 2025-12-10T13:48:15 - app.services.otp_service: ✅ OTP Service initialized with Redis storage
+INFO: 2025-12-10T13:48:16 - app.main:    ✓ Redis: Connected
+INFO: 2025-12-10T13:48:16 - app.main: 🔌 External Services:
+INFO: 2025-12-10T13:48:16 - app.main:    ✓ Cloudinary: Connected
+INFO: 2025-12-10T13:48:16 - app.main:    ✓ Resend: Configured
+INFO: 2025-12-10T13:48:16 - app.main:    ○ WASender: Disconnected
+INFO: 2025-12-10T13:48:16 - app.main:    ✓ Supabase: Connected | 6 buckets
+INFO: 2025-12-10T13:48:16 - app.main: ⏰ Scheduler:
+INFO: 2025-12-10T13:48:16 - apscheduler.scheduler: Adding job tentatively -- it will be properly scheduled when the scheduler starts
+INFO: 2025-12-10T13:48:16 - apscheduler.scheduler: Added job "Daily Field Agent Reconciliation" to job store "default"
+INFO: 2025-12-10T13:48:16 - apscheduler.scheduler: Scheduler started
+INFO: 2025-12-10T13:48:16 - app.tasks.scheduler: Reconciliation scheduler started (runs at 10 PM Africa/Nairobi)
+INFO: 2025-12-10T13:48:16 - app.main:    ✓ Daily reconciliation scheduler started (runs at midnight)
+INFO: 2025-12-10T13:48:16 - app.main: ============================================================
+INFO: 2025-12-10T13:48:16 - app.main: ✅ Startup complete | Ready to serve requests
+INFO: 2025-12-10T13:48:16 - app.main: ============================================================
 INFO:     Application startup complete.
 INFO:     Uvicorn running on http://0.0.0.0:7860 (Press CTRL+C to quit)
-INFO:     10.16.13.79:2541 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:14743 - "GET /api/v1/ticket-expenses/stats/summary?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&page=1&page_size=20&status=pending HTTP/1.1" 200 OK
-INFO:     10.16.13.79:19111 - "GET /api/v1/ticket-expenses?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&page=1&page_size=20&is_approved=false HTTP/1.1" 200 OK
-INFO:     10.16.13.79:1467 - "GET /api/v1/ticket-expenses?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&is_paid=false&page=1&page_size=100&is_approved=true HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:23:41 - app.api.v1.ticket_expenses: Bulk export requested by user c5cf92be-4172-4fe2-af5c-f05d83b3a938 for 2 expenses
-WARNING: 2025-12-10T13:23:41 - app.services.tende_pay_formatter: Invalid phone number format: +2547994597823 -> 2547994597823
-INFO: 2025-12-10T13:23:41 - app.api.v1.ticket_expenses: Bulk exported 2 expenses by user c5cf92be-4172-4fe2-af5c-f05d83b3a938. Generated 0 payment rows. Reference: CSV_EXPORT_20251210_132341_c5cf92be-4172-4fe2-af5c-f05d83b3a938
-INFO:     10.16.37.13:38179 - "POST /api/v1/ticket-expenses/bulk-export?expense_ids=35db9201-3c05-4853-be91-5eb6f30782d1&expense_ids=d73cb843-e4fb-4200-aa3e-243887714422 HTTP/1.1" 200 OK
-INFO:     10.16.13.79:62181 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:6569 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:21572 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:18784 - "GET /api/v1/notifications/stats HTTP/1.1" 200 OK
-INFO:     10.16.13.79:29931 - "GET /api/v1/notifications/stats HTTP/1.1" 200 OK
-INFO:     10.16.37.13:8632 - "GET /api/v1/notifications?page=1&page_size=50 HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:00 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:00 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO:     10.16.13.79:20577 - "GET /api/v1/profile/me HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:01 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:01 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO:     10.16.13.79:20577 - "GET /api/v1/financial-accounts/me HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:01 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:01 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO:     10.16.37.13:65405 - "GET /api/v1/asset-assignments/me HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:01 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:01 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO:     10.16.37.13:4263 - "GET /api/v1/documents/users/me HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:26 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:26 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO: 2025-12-10T13:26:26 - app.services.audit_service: Audit log created: update on financial_account by viyisa8151@feralrex.com
-INFO:     10.16.13.79:29992 - "PUT /api/v1/financial-accounts/me/c6d350c7-1b90-4e48-b7e5-ce80d1bac22a HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:26 - app.api.deps: Checking active user: 43b778b0-2062-4724-abbb-916a4835a9b0, is_active: True, type: <class 'bool'>
-INFO: 2025-12-10T13:26:26 - app.api.deps: User 43b778b0-2062-4724-abbb-916a4835a9b0 is active - proceeding
-INFO:     10.16.13.79:29992 - "GET /api/v1/financial-accounts/me HTTP/1.1" 200 OK
-INFO:     10.16.13.79:13377 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-10T13:26:37 - app.api.v1.ticket_expenses: Bulk export requested by user c5cf92be-4172-4fe2-af5c-f05d83b3a938 for 2 expenses
-INFO:     10.16.13.79:31385 - "POST /api/v1/ticket-expenses/bulk-export?expense_ids=35db9201-3c05-4853-be91-5eb6f30782d1&expense_ids=d73cb843-e4fb-4200-aa3e-243887714422 HTTP/1.1" 400 Bad Request
-INFO:     10.16.13.79:28716 - "GET /health HTTP/1.1" 200 OK
+INFO:     10.16.37.13:48475 - "GET /?logs=container HTTP/1.1" 200 OK
+INFO:     10.16.37.13:48781 - "GET /health HTTP/1.1" 200 OK
+INFO:     10.16.37.13:63708 - "GET /health HTTP/1.1" 200 OK
+INFO: 2025-12-10T13:48:36 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
+INFO: 2025-12-10T13:48:36 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
+INFO:     10.16.13.79:2766 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
+INFO: 2025-12-10T13:48:37 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
+INFO: 2025-12-10T13:48:37 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
+INFO:     10.16.13.79:2766 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
+INFO: 2025-12-10T13:48:37 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
+INFO: 2025-12-10T13:48:37 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
+INFO:     10.16.37.13:63708 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
+INFO:     10.16.13.79:2766 - "GET /api/v1/ticket-expenses?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&is_paid=false&page=1&page_size=100&is_approved=true HTTP/1.1" 200 OK
+INFO:     10.16.37.13:38981 - "GET /health HTTP/1.1" 200 OK
+INFO: 2025-12-10T13:48:43 - app.api.v1.ticket_expenses: Bulk export requested by user c5cf92be-4172-4fe2-af5c-f05d83b3a938 for 2 expenses
+INFO: 2025-12-10T13:48:43 - app.api.v1.ticket_expenses: Bulk exported 2 of 2 expenses by user c5cf92be-4172-4fe2-af5c-f05d83b3a938. Generated 1 payment rows. Skipped: 0. Reference: CSV_EXPORT_20251210_134843_c5cf92be-4172-4fe2-af5c-f05d83b3a938
+ERROR: 2025-12-10T13:48:43 - app.api.v1.ticket_expenses: Failed to queue export completion notification: 'total_amount'
+INFO:     10.16.37.13:38981 - "POST /api/v1/ticket-expenses/bulk-export?expense_ids=b8a0bac2-69c0-4218-a565-e1e2b6ce0d4d&expense_ids=7b697e88-c4c1-4366-b05e-c0689a90451c HTTP/1.1" 200 OK
+INFO:     10.16.37.13:36720 - "GET /api/v1/ticket-expenses/stats/summary?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&page=1&page_size=20&status=pending HTTP/1.1" 200 OK
+INFO:     10.16.13.79:45984 - "GET /api/v1/ticket-expenses?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&page=1&page_size=20&is_approved=false HTTP/1.1" 200 OK
+INFO:     10.16.13.79:17081 - "GET /health HTTP/1.1" 200 OK
+INFO:     10.16.13.79:5119 - "GET /api/v1/notifications/stats HTTP/1.1" 200 OK
+INFO:     10.16.37.13:13915 - "GET /api/v1/notifications?page=1&page_size=50&project_id=0ade6bd1-e492-4e25-b681-59f42058d29a HTTP/1.1" 200 OK
+INFO: 2025-12-10T13:49:23 - app.services.notification_service: Marked notification c7196978-05d9-42ba-b07d-130048cec958 as read for user c5cf92be-4172-4fe2-af5c-f05d83b3a938
+INFO:     10.16.13.79:5119 - "PUT /api/v1/notifications/c7196978-05d9-42ba-b07d-130048cec958/read HTTP/1.1" 200 OK
+INFO:     10.16.13.79:5119 - "GET /api/v1/notifications/stats HTTP/1.1" 200 OK
+INFO:     10.16.37.13:13915 - "GET /api/v1/notifications?page=1&page_size=50&project_id=0ade6bd1-e492-4e25-b681-59f42058d29a HTTP/1.1" 200 OK

src/app/api/v1/ticket_expenses.py

@@ -1328,17 +1328,22 @@ def bulk_export_expenses(
             ticket = db.query(Ticket).filter(Ticket.id == first_expense.ticket_id).first()
             project_id = ticket.project_id if ticket else None
             
-            total_amount = sum(row["total_amount"] for row in csv_rows)
+            # Calculate total from Tende Pay CSV format (key is "AMOUNT" not "total_amount")
+            total_amount = sum(row["AMOUNT"] for row in csv_rows)
+            
+            # Calculate total from actually exported expenses (more accurate)
+            exported_expenses = [e for e in expenses if e.id in exported_expense_ids]
+            total_amount_from_expenses = sum(e.total_cost for e in exported_expenses)
             
             background_tasks.add_task(
                 NotificationHelper.notify_expense_export_complete,
                 db=db,
                 user_id=current_user.id,
-                total_expenses=len(expenses),
-                total_amount=total_amount,
+                total_expenses=len(exported_expenses),  # Only count exported ones
+                total_amount=float(total_amount_from_expenses),
                 payment_groups=len(csv_rows),
                 project_id=project_id,
-                expense_ids=[e.id for e in expenses]
+                expense_ids=[e.id for e in exported_expenses]
             )
         except Exception as e:
             logger.error(f"Failed to queue export completion notification: {str(e)}")

src/app/services/notification_helper.py

@@ -628,8 +628,8 @@ class NotificationHelper:
         """
         service = NotificationService()
         
-        title = f"Expense Payment Export Complete"
-        message = f"Exported {total_expenses} expenses (${total_amount:.2f}) in {payment_groups} payment groups. All marked as paid."
+        title = f"Tende Pay Export Complete"
+        message = f"Exported {total_expenses} expenses (KES {total_amount:,.2f}) in {payment_groups} payment groups. CSV ready for Tende Pay upload. All expenses marked as paid."
         
         metadata = {
             'project_id': str(project_id) if project_id else None,

tests/fixtures/payment_export_2025-12-10.csv

@@ -0,0 +1,2 @@
+NAME,ID NUMBER,PHONE NUMBER,AMOUNT,PAYMENT MODE,BANK (Optional),BANK ACCOUNT NO (Optional),PAYBILL BUSINESS NO (Optional),PAYBILL ACCOUNT NO (Optional),BUY GOODS TILL NO (Optional),BILL PAYMENT BILLER CODE (Optional),BILL PAYMENT ACCOUNT NO (Optional),NARRATION (OPTIONAL)
+Viyisa Sasa,12437583,254799459782,310.0,MPESA,,,,,,,,"Expenses 2025-12-10: Ticket #Nnacy Wanjiru (Transport 210.0) | Ticket #Elizabeth Muthoni (Transport 100.0) - 2 items, 310.0 KES"