Fix runtime error: remove await from sync function, update AuditService calls to new API

docs/devlogs/server/runtimeerror.txt

@@ -1,398 +1,57 @@
-===== Application Startup at 2025-12-10 21:53:44 =====
+===== Application Startup at 2025-12-12 11:59:51 =====
 
-INFO:     Started server process [7]
-INFO:     Waiting for application startup.
-INFO: 2025-12-10T21:54:05 - app.main: ============================================================
-INFO: 2025-12-10T21:54:05 - app.main: 🚀 SwiftOps API v1.0.0 | PRODUCTION
-INFO: 2025-12-10T21:54:05 - app.main: 📊 Dashboard: Enabled
-INFO: 2025-12-10T21:54:05 - app.main: ============================================================
-INFO: 2025-12-10T21:54:05 - app.main: 📦 Database:
-INFO: 2025-12-10T21:54:05 - app.main:    ✓ Connected | 47 tables | 6 users
-INFO: 2025-12-10T21:54:05 - app.main: 💾 Cache & Sessions:
-INFO: 2025-12-10T21:54:06 - app.services.otp_service: ✅ OTP Service initialized with Redis storage
-INFO: 2025-12-10T21:54:07 - app.main:    ✓ Redis: Connected
-INFO: 2025-12-10T21:54:07 - app.main: 🔌 External Services:
-INFO: 2025-12-10T21:54:07 - app.main:    ✓ Cloudinary: Connected
-INFO: 2025-12-10T21:54:07 - app.main:    ✓ Resend: Configured
-INFO: 2025-12-10T21:54:07 - app.main:    ○ WASender: Disconnected
-INFO: 2025-12-10T21:54:07 - app.main:    ✓ Supabase: Connected | 6 buckets
-INFO: 2025-12-10T21:54:07 - app.main: ⏰ Scheduler:
-INFO: 2025-12-10T21:54:07 - apscheduler.scheduler: Adding job tentatively -- it will be properly scheduled when the scheduler starts
-INFO: 2025-12-10T21:54:07 - apscheduler.scheduler: Added job "Daily Field Agent Reconciliation" to job store "default"
-INFO: 2025-12-10T21:54:07 - apscheduler.scheduler: Scheduler started
-INFO: 2025-12-10T21:54:07 - app.tasks.scheduler: Reconciliation scheduler started (runs at 10 PM Africa/Nairobi)
-INFO: 2025-12-10T21:54:07 - app.main:    ✓ Daily reconciliation scheduler started (runs at midnight)
-INFO: 2025-12-10T21:54:07 - app.main: ============================================================
-INFO: 2025-12-10T21:54:07 - app.main: ✅ Startup complete | Ready to serve requests
-INFO: 2025-12-10T21:54:07 - app.main: ============================================================
-INFO:     Application startup complete.
-INFO:     Uvicorn running on http://0.0.0.0:7860 (Press CTRL+C to quit)
-INFO: 2025-12-10T22:00:00 - apscheduler.executors.default: Running job "Daily Field Agent Reconciliation (trigger: cron[hour='22', minute='0'], next run at: 2025-12-10 22:00:00 UTC)" (scheduled at 2025-12-10 22:00:00+00:00)
-INFO: 2025-12-10T22:00:00 - app.tasks.scheduler: Starting scheduled validation for 2025-12-10
-INFO: 2025-12-10T22:00:00 - app.tasks.scheduler: Validating 1 projects for 2025-12-10
-INFO: 2025-12-10T22:00:00 - app.services.reconciliation.reconciliation_service: Starting reconciliation: project=0ade6bd1-e492-4e25-b681-59f42058d29a, date=2025-12-10, type=scheduled
-INFO: 2025-12-10T22:00:00 - app.services.reconciliation.reconciliation_service: Aggregated 1 agents in 71ms
-INFO: 2025-12-10T22:00:00 - app.services.reconciliation.anomaly_detector: Detected 0 anomalies across 1 agents
-ERROR: 2025-12-10T22:00:00 - app.services.reconciliation.reconciliation_service: Reconciliation failed: (psycopg2.ProgrammingError) can't adapt type 'dict'
-[SQL: 
-            UPDATE reconciliation_runs
-            SET 
-                status = 'completed',
-                completed_at = NOW(),
-                agents_processed = %(agents_processed)s,
-                timesheets_created = %(timesheets_created)s,
-                timesheets_updated = %(timesheets_updated)s,
-                assignments_processed = %(assignments_processed)s,
-                expenses_processed = %(expenses_processed)s,
-                summary_stats = %(summary_stats)s,
-                anomalies_detected = %(anomalies)s,
-                execution_time_ms = %(execution_time_ms)s,
-                query_time_ms = %(query_time_ms)s,
-                updated_at = NOW()
-            WHERE id = %(run_id)s
-        ]
-[parameters: {'agents_processed': 1, 'timesheets_created': 0, 'timesheets_updated': 1, 'assignments_processed': 1, 'expenses_processed': 3, 'summary_stats': {'total_agents': 1, 'total_tickets_assigned': 1, 'total_tickets_completed': 2, 'total_tickets_rejected': 0, 'total_tickets_cancelled': 0, 'total_expen ... (37 characters truncated) ... es': 2370.0, 'total_pending_expenses': 7650.0, 'total_expense_claims': 3, 'avg_tickets_per_agent': 2.0, 'avg_expenses_per_agent': Decimal('10020.00')}, 'anomalies': [], 'execution_time_ms': 288, 'query_time_ms': 71, 'run_id': 'ade18d69-39da-40da-92bf-5ff92beaf9ea'}]
-(Background on this error at: https://sqlalche.me/e/20/f405)
 Traceback (most recent call last):
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1969, in _exec_single_context
-    self.dialect.do_execute(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/default.py", line 922, in do_execute
-    cursor.execute(statement, parameters)
-psycopg2.ProgrammingError: can't adapt type 'dict'
-
-The above exception was the direct cause of the following exception:
-
-Traceback (most recent call last):
-  File "/app/src/app/services/reconciliation/reconciliation_service.py", line 117, in reconcile_project_day
-    self._complete_run(
-  File "/app/src/app/services/reconciliation/reconciliation_service.py", line 482, in _complete_run
-    self.db.execute(query, {
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/orm/session.py", line 2308, in execute
-    return self._execute_internal(
-           ^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/orm/session.py", line 2199, in _execute_internal
-    result = conn.execute(
-             ^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1416, in execute
-    return meth(
-           ^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/sql/elements.py", line 516, in _execute_on_connection
-    return connection._execute_clauseelement(
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1639, in _execute_clauseelement
-    ret = self._execute_context(
-          ^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1848, in _execute_context
-    return self._exec_single_context(
+  File "/usr/local/bin/uvicorn", line 8, in <module>
+    sys.exit(main())
+             ^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/click/core.py", line 1485, in __call__
+    return self.main(*args, **kwargs)
            ^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1988, in _exec_single_context
-    self._handle_dbapi_exception(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 2343, in _handle_dbapi_exception
-    raise sqlalchemy_exception.with_traceback(exc_info[2]) from e
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1969, in _exec_single_context
-    self.dialect.do_execute(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/default.py", line 922, in do_execute
-    cursor.execute(statement, parameters)
-sqlalchemy.exc.ProgrammingError: (psycopg2.ProgrammingError) can't adapt type 'dict'
-[SQL: 
-            UPDATE reconciliation_runs
-            SET 
-                status = 'completed',
-                completed_at = NOW(),
-                agents_processed = %(agents_processed)s,
-                timesheets_created = %(timesheets_created)s,
-                timesheets_updated = %(timesheets_updated)s,
-                assignments_processed = %(assignments_processed)s,
-                expenses_processed = %(expenses_processed)s,
-                summary_stats = %(summary_stats)s,
-                anomalies_detected = %(anomalies)s,
-                execution_time_ms = %(execution_time_ms)s,
-                query_time_ms = %(query_time_ms)s,
-                updated_at = NOW()
-            WHERE id = %(run_id)s
-        ]
-[parameters: {'agents_processed': 1, 'timesheets_created': 0, 'timesheets_updated': 1, 'assignments_processed': 1, 'expenses_processed': 3, 'summary_stats': {'total_agents': 1, 'total_tickets_assigned': 1, 'total_tickets_completed': 2, 'total_tickets_rejected': 0, 'total_tickets_cancelled': 0, 'total_expen ... (37 characters truncated) ... es': 2370.0, 'total_pending_expenses': 7650.0, 'total_expense_claims': 3, 'avg_tickets_per_agent': 2.0, 'avg_expenses_per_agent': Decimal('10020.00')}, 'anomalies': [], 'execution_time_ms': 288, 'query_time_ms': 71, 'run_id': 'ade18d69-39da-40da-92bf-5ff92beaf9ea'}]
-(Background on this error at: https://sqlalche.me/e/20/f405)
-ERROR: 2025-12-10T22:00:00 - app.tasks.scheduler: Failed to validate project 0ade6bd1-e492-4e25-b681-59f42058d29a (Atomio Fttx): Reconciliation failed: (psycopg2.ProgrammingError) can't adapt type 'dict'
-[SQL: 
-            UPDATE reconciliation_runs
-            SET 
-                status = 'completed',
-                completed_at = NOW(),
-                agents_processed = %(agents_processed)s,
-                timesheets_created = %(timesheets_created)s,
-                timesheets_updated = %(timesheets_updated)s,
-                assignments_processed = %(assignments_processed)s,
-                expenses_processed = %(expenses_processed)s,
-                summary_stats = %(summary_stats)s,
-                anomalies_detected = %(anomalies)s,
-                execution_time_ms = %(execution_time_ms)s,
-                query_time_ms = %(query_time_ms)s,
-                updated_at = NOW()
-            WHERE id = %(run_id)s
-        ]
-[parameters: {'agents_processed': 1, 'timesheets_created': 0, 'timesheets_updated': 1, 'assignments_processed': 1, 'expenses_processed': 3, 'summary_stats': {'total_agents': 1, 'total_tickets_assigned': 1, 'total_tickets_completed': 2, 'total_tickets_rejected': 0, 'total_tickets_cancelled': 0, 'total_expen ... (37 characters truncated) ... es': 2370.0, 'total_pending_expenses': 7650.0, 'total_expense_claims': 3, 'avg_tickets_per_agent': 2.0, 'avg_expenses_per_agent': Decimal('10020.00')}, 'anomalies': [], 'execution_time_ms': 288, 'query_time_ms': 71, 'run_id': 'ade18d69-39da-40da-92bf-5ff92beaf9ea'}]
-(Background on this error at: https://sqlalche.me/e/20/f405)
-Traceback (most recent call last):
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1969, in _exec_single_context
-    self.dialect.do_execute(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/default.py", line 922, in do_execute
-    cursor.execute(statement, parameters)
-psycopg2.ProgrammingError: can't adapt type 'dict'
-
-The above exception was the direct cause of the following exception:
-
-Traceback (most recent call last):
-  File "/app/src/app/services/reconciliation/reconciliation_service.py", line 117, in reconcile_project_day
-    self._complete_run(
-  File "/app/src/app/services/reconciliation/reconciliation_service.py", line 482, in _complete_run
-    self.db.execute(query, {
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/orm/session.py", line 2308, in execute
-    return self._execute_internal(
-           ^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/orm/session.py", line 2199, in _execute_internal
-    result = conn.execute(
-             ^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1416, in execute
-    return meth(
-           ^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/sql/elements.py", line 516, in _execute_on_connection
-    return connection._execute_clauseelement(
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1639, in _execute_clauseelement
-    ret = self._execute_context(
-          ^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1848, in _execute_context
-    return self._exec_single_context(
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1988, in _exec_single_context
-    self._handle_dbapi_exception(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 2343, in _handle_dbapi_exception
-    raise sqlalchemy_exception.with_traceback(exc_info[2]) from e
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/base.py", line 1969, in _exec_single_context
-    self.dialect.do_execute(
-  File "/usr/local/lib/python3.11/site-packages/sqlalchemy/engine/default.py", line 922, in do_execute
-    cursor.execute(statement, parameters)
-sqlalchemy.exc.ProgrammingError: (psycopg2.ProgrammingError) can't adapt type 'dict'
-[SQL: 
-            UPDATE reconciliation_runs
-            SET 
-                status = 'completed',
-                completed_at = NOW(),
-                agents_processed = %(agents_processed)s,
-                timesheets_created = %(timesheets_created)s,
-                timesheets_updated = %(timesheets_updated)s,
-                assignments_processed = %(assignments_processed)s,
-                expenses_processed = %(expenses_processed)s,
-                summary_stats = %(summary_stats)s,
-                anomalies_detected = %(anomalies)s,
-                execution_time_ms = %(execution_time_ms)s,
-                query_time_ms = %(query_time_ms)s,
-                updated_at = NOW()
-            WHERE id = %(run_id)s
-        ]
-[parameters: {'agents_processed': 1, 'timesheets_created': 0, 'timesheets_updated': 1, 'assignments_processed': 1, 'expenses_processed': 3, 'summary_stats': {'total_agents': 1, 'total_tickets_assigned': 1, 'total_tickets_completed': 2, 'total_tickets_rejected': 0, 'total_tickets_cancelled': 0, 'total_expen ... (37 characters truncated) ... es': 2370.0, 'total_pending_expenses': 7650.0, 'total_expense_claims': 3, 'avg_tickets_per_agent': 2.0, 'avg_expenses_per_agent': Decimal('10020.00')}, 'anomalies': [], 'execution_time_ms': 288, 'query_time_ms': 71, 'run_id': 'ade18d69-39da-40da-92bf-5ff92beaf9ea'}]
-(Background on this error at: https://sqlalche.me/e/20/f405)
-
-The above exception was the direct cause of the following exception:
-
-Traceback (most recent call last):
-  File "/app/src/app/tasks/scheduler.py", line 132, in validate_all_projects
-    run_id = service.reconcile_project_day(
-             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/app/src/app/services/reconciliation/reconciliation_service.py", line 149, in reconcile_project_day
-    raise ReconciliationError(f"Reconciliation failed: {str(e)}") from e
-app.services.reconciliation.reconciliation_service.ReconciliationError: Reconciliation failed: (psycopg2.ProgrammingError) can't adapt type 'dict'
-[SQL: 
-            UPDATE reconciliation_runs
-            SET 
-                status = 'completed',
-                completed_at = NOW(),
-                agents_processed = %(agents_processed)s,
-                timesheets_created = %(timesheets_created)s,
-                timesheets_updated = %(timesheets_updated)s,
-                assignments_processed = %(assignments_processed)s,
-                expenses_processed = %(expenses_processed)s,
-                summary_stats = %(summary_stats)s,
-                anomalies_detected = %(anomalies)s,
-                execution_time_ms = %(execution_time_ms)s,
-                query_time_ms = %(query_time_ms)s,
-                updated_at = NOW()
-            WHERE id = %(run_id)s
-        ]
-[parameters: {'agents_processed': 1, 'timesheets_created': 0, 'timesheets_updated': 1, 'assignments_processed': 1, 'expenses_processed': 3, 'summary_stats': {'total_agents': 1, 'total_tickets_assigned': 1, 'total_tickets_completed': 2, 'total_tickets_rejected': 0, 'total_tickets_cancelled': 0, 'total_expen ... (37 characters truncated) ... es': 2370.0, 'total_pending_expenses': 7650.0, 'total_expense_claims': 3, 'avg_tickets_per_agent': 2.0, 'avg_expenses_per_agent': Decimal('10020.00')}, 'anomalies': [], 'execution_time_ms': 288, 'query_time_ms': 71, 'run_id': 'ade18d69-39da-40da-92bf-5ff92beaf9ea'}]
-(Background on this error at: https://sqlalche.me/e/20/f405)
-INFO: 2025-12-10T22:00:00 - app.tasks.scheduler: Validation summary: 0/1 projects succeeded
-WARNING: 2025-12-10T22:00:00 - app.tasks.scheduler: Failed projects: ['Atomio Fttx']
-INFO: 2025-12-10T22:00:00 - app.tasks.scheduler: Scheduled validation completed for 2025-12-10
-INFO: 2025-12-10T22:00:00 - apscheduler.executors.default: Job "Daily Field Agent Reconciliation (trigger: cron[hour='22', minute='0'], next run at: 2025-12-11 22:00:00 UTC)" executed successfully
-INFO: 2025-12-10T22:00:00 - app.tasks.scheduler: Job daily_validation completed successfully
-INFO:     10.16.13.79:30150 - "GET / HTTP/1.1" 200 OK
-INFO:     10.16.13.79:44122 - "GET / HTTP/1.1" 200 OK
-INFO:     10.16.13.79:55137 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:25 - app.core.supabase_auth: Session refreshed successfully
-INFO: 2025-12-11T06:07:29 - app.api.v1.auth: ✅ Token refreshed successfully for: nadina73@nembors.com
-INFO:     10.16.37.13:60071 - "POST /api/v1/auth/refresh-token HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:30 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:07:30 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:32694 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:30 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:07:30 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:60071 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:30 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:07:30 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:32694 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:31 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:07:31 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:60071 - "GET /api/v1/analytics/user/overview HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:07:32 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:07:32 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO: 2025-12-11T06:07:32 - app.services.project_service: Listed 1 projects (total: 1) for user c5cf92be-4172-4fe2-af5c-f05d83b3a938
-INFO:     10.16.13.79:32694 - "GET /api/v1/projects?page=1&per_page=100 HTTP/1.1" 200 OK
-INFO:     10.16.13.79:50368 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:63963 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:14550 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:47705 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:31 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:31 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:29766 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:32 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:32 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:29766 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:32 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:32 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:47705 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:32 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:32 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:47705 - "GET /api/v1/analytics/user/overview HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:33 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:33 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO: 2025-12-11T06:19:33 - app.services.project_service: Listed 1 projects (total: 1) for user c5cf92be-4172-4fe2-af5c-f05d83b3a938
-INFO:     10.16.37.13:47705 - "GET /api/v1/projects?page=1&per_page=100 HTTP/1.1" 200 OK
-INFO:     10.16.37.13:10471 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:46 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:46 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO: 2025-12-11T06:19:46 - app.services.audit_service: Audit log created: update on user_preferences by nadina73@nembors.com
-INFO: 2025-12-11T06:19:46 - app.api.v1.auth: Preferences updated for user: nadina73@nembors.com
-INFO:     10.16.13.79:25924 - "PUT /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:47 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:47 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:10471 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:19:47 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:19:47 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO: 2025-12-11T06:19:47 - app.services.dashboard_service: Dashboard cache MISS for project 0ade6bd1-e492-4e25-b681-59f42058d29a, user c5cf92be-4172-4fe2-af5c-f05d83b3a938 - building fresh data
-INFO: 2025-12-11T06:19:47 - app.services.dashboard_service: Built and cached dashboard for project 0ade6bd1-e492-4e25-b681-59f42058d29a
-INFO:     10.16.13.79:25924 - "GET /api/v1/projects/0ade6bd1-e492-4e25-b681-59f42058d29a/dashboard HTTP/1.1" 200 OK
-INFO:     10.16.13.79:25924 - "GET /api/v1/notifications?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a&page_size=50&is_read=false HTTP/1.1" 200 OK
-INFO:     10.16.37.13:10471 - "GET /api/v1/tickets/stats?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a HTTP/1.1" 200 OK
-INFO:     10.16.13.79:39294 - "GET /api/v1/contractor-invoices?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a HTTP/1.1" 200 OK
-INFO:     10.16.37.13:56789 - "GET /api/v1/contractor-invoices/stats?project_id=0ade6bd1-e492-4e25-b681-59f42058d29a HTTP/1.1" 200 OK
-INFO:     10.16.13.79:54124 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.13.79:54124 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.37.13:5569 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:15098 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:36865 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:32070 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:16706 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:08 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:08 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:5103 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:09 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:09 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:5103 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:09 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:09 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:16706 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.37.13:18227 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.13.79:5103 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:16 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:16 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:17230 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO:     10.16.13.79:33301 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:16 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:16 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:17230 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:23:16 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:23:16 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:33301 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO:     10.16.37.13:17230 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.13.79:33301 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.37.13:30569 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:50 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:50 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:29711 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO:     10.16.37.13:39487 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:51 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:51 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:39487 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:51 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:51 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:29711 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.37.13:53350 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:59 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:59 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:52474 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO:     10.16.13.79:62628 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:59 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:59 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:52474 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:25:59 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:25:59 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:62628 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.37.13:23782 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.37.13:16935 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:26:23 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:26:23 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:7127 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:26:23 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:26:23 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:7127 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:26:23 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:26:23 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:16935 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.13.79:63911 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.37.13:62825 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:62825 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.13.79:59155 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:27183 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:27:46 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:27:46 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:51476 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:27:46 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:27:46 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:51476 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:27:46 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:27:46 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:27183 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.37.13:64873 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.13.79:33275 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.13.79:33275 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.37.13:23023 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:31 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:31 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:31206 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:31 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:31 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:31206 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:31 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:31 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:23023 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO:     10.16.13.79:49321 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.37.13:23023 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:22536 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.37.13:22536 - "GET /health HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:37 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:37 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:20306 - "GET /api/v1/auth/me HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:37 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:37 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.13.79:20306 - "GET /api/v1/auth/me/preferences/available-apps HTTP/1.1" 200 OK
-INFO: 2025-12-11T06:28:38 - app.api.deps: Checking active user: c5cf92be-4172-4fe2-af5c-f05d83b3a938, is_active: True, type: <class 'bool'>
-INFO: 2025-12-11T06:28:38 - app.api.deps: User c5cf92be-4172-4fe2-af5c-f05d83b3a938 is active - proceeding
-INFO:     10.16.37.13:22536 - "GET /api/v1/auth/me/preferences HTTP/1.1" 200 OK
-INFO:     10.16.13.79:35880 - "GET /api/v1/contractor-invoices/81c96213-485f-4170-92a0-23c08332923b HTTP/1.1" 200 OK
-INFO:     10.16.13.79:35880 - "GET /api/v1/tickets/2de41ce7-dff1-4151-9710-87958d18b5c4/detail HTTP/1.1" 200 OK
-INFO:     10.16.37.13:4657 - "GET /api/v1/projects/0ade6bd1-e492-4e25-b681-59f42058d29a/regions/4cd27765-5720-4cc0-872e-bf0da3cd1898 HTTP/1.1" 405 Method Not Allowed
-INFO:     10.16.13.79:11727 - "GET /health HTTP/1.1" 200 OK
-INFO:     10.16.37.13:10176 - "GET /api/v1/projects/0ade6bd1-e492-4e25-b681-59f42058d29a/regions/4cd27765-5720-4cc0-872e-bf0da3cd1898 HTTP/1.1" 405 Method Not Allowed
-INFO:     10.16.37.13:19693 - "GET /health HTTP/1.1" 200 OK
+  File "/usr/local/lib/python3.11/site-packages/click/core.py", line 1406, in main
+    rv = self.invoke(ctx)
+         ^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/click/core.py", line 1269, in invoke
+    return ctx.invoke(self.callback, **ctx.params)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/click/core.py", line 824, in invoke
+    return callback(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/main.py", line 416, in main
+    run(
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/main.py", line 587, in run
+    server.run()
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/server.py", line 61, in run
+    return asyncio.run(self.serve(sockets=sockets))
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/asyncio/runners.py", line 190, in run
+    return runner.run(main)
+           ^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/asyncio/runners.py", line 118, in run
+    return self._loop.run_until_complete(task)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "uvloop/loop.pyx", line 1518, in uvloop.loop.Loop.run_until_complete
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/server.py", line 68, in serve
+    config.load()
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/config.py", line 467, in load
+    self.loaded_app = import_from_string(self.app)
+                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/site-packages/uvicorn/importer.py", line 21, in import_from_string
+    module = importlib.import_module(module_str)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/usr/local/lib/python3.11/importlib/__init__.py", line 126, in import_module
+    return _bootstrap._gcd_import(name[level:], package, level)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "<frozen importlib._bootstrap>", line 1204, in _gcd_import
+  File "<frozen importlib._bootstrap>", line 1176, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 1147, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 690, in _load_unlocked
+  File "<frozen importlib._bootstrap_external>", line 940, in exec_module
+  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
+  File "/app/src/app/main.py", line 151, in <module>
+    from app.api.v1.router import api_router
+  File "/app/src/app/api/v1/router.py", line 5, in <module>
+    from app.api.v1 import (
+  File "/app/src/app/api/v1/payroll.py", line 599
+    await AuditService.log_action(
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+SyntaxError: 'await' outside async function

src/app/api/v1/customers.py

@@ -97,18 +97,19 @@ async def create_customer(
         customer = CustomerService.create_customer(db, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="create_customer",
-            resource_type="customer",
-            resource_id=customer.id,
-            details={
+            entity_type="customer",
+            description=f"Created customer: {customer.customer_name}",
+            user=current_user,
+            entity_id=str(customer.id),
+            request=request,
+            additional_metadata={
                 "customer_name": customer.customer_name,
                 "phone": customer.phone_primary,
                 "client_id": str(customer.client_id)
-            },
-            request=request
+            }
         )
         
         # Build response with nested data
@@ -319,17 +320,18 @@ async def update_customer(
         customer = CustomerService.update_customer(db, customer_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="update_customer",
-            resource_type="customer",
-            resource_id=customer.id,
-            details={
-                "old_state": old_state,
-                "changes": data.model_dump(exclude_unset=True)
-            },
-            request=request
+            entity_type="customer",
+            description=f"Updated customer {customer.id}",
+            user=current_user,
+            entity_id=str(customer.id),
+            request=request,
+            changes={
+                "old": old_state,
+                "new": data.model_dump(exclude_unset=True)
+            }
         )
         
         # Build response with nested data
@@ -381,17 +383,18 @@ async def delete_customer(
         CustomerService.delete_customer(db, customer_id, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="delete_customer",
-            resource_type="customer",
-            resource_id=customer_id,
-            details={
+            entity_type="customer",
+            description=f"Deleted customer: {customer.customer_name}",
+            user=current_user,
+            entity_id=str(customer_id),
+            request=request,
+            additional_metadata={
                 "customer_name": customer.customer_name,
                 "phone": customer.phone_primary
-            },
-            request=request
+            }
         )
         
     except HTTPException:

src/app/api/v1/payroll.py

@@ -93,20 +93,21 @@ async def generate_payroll(
         
         if result.payroll:
             # Log audit trail
-            await AuditService.log_action(
+            AuditService.log_action(
                 db=db,
-                user_id=current_user.id,
                 action="generate_payroll",
-                resource_type="payroll",
-                resource_id=result.payroll.id,
-                details={
+                entity_type="payroll",
+                description=f"Generated payroll for user {data.user_id} project {data.project_id} period {data.period_start_date} to {data.period_end_date}",
+                user=current_user,
+                entity_id=str(result.payroll.id),
+                request=request,
+                additional_metadata={
                     "user_id": str(data.user_id),
                     "project_id": str(data.project_id),
                     "period": f"{data.period_start_date} to {data.period_end_date}",
                     "success": result.success,
                     "skipped_reason": result.skipped_reason
-                },
-                ip_address=request.client.host if request.client else None
+                }
             )
         
         return result
@@ -169,13 +170,15 @@ async def generate_payroll_batch(
         )
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="generate_batch_payroll",
-            resource_type="payroll",
-            resource_id=None,
-            details={
+            entity_type="payroll",
+            description=f"Generated batch payroll for target date {data.target_date} project {data.project_id if data.project_id else 'all'}",
+            user=current_user,
+            entity_id=None,
+            request=request,
+            additional_metadata={
                 "target_date": str(data.target_date),
                 "project_id": str(data.project_id) if data.project_id else None,
                 "total_processed": result.total_processed,
@@ -375,17 +378,18 @@ async def recalculate_payroll(
         result = PayrollService.recalculate_payroll(db, payroll_id, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="recalculate_payroll",
-            resource_type="payroll",
-            resource_id=payroll_id,
-            details={
+            entity_type="payroll",
+            description=f"Recalculated payroll {payroll_id}",
+            user=current_user,
+            entity_id=str(payroll_id),
+            request=request,
+            additional_metadata={
                 "payroll_id": str(payroll_id),
                 "success": result.success
-            },
-            ip_address=request.client.host if request.client else None
+            }
         )
         
         return result
@@ -447,19 +451,20 @@ async def mark_payroll_as_paid(
         )
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="mark_payroll_paid",
-            resource_type="payroll",
-            resource_id=payroll_id,
-            details={
+            entity_type="payroll",
+            description=f"Marked payroll {payroll_id} as paid via {data.payment_method}",
+            user=current_user,
+            entity_id=str(payroll_id),
+            request=request,
+            additional_metadata={
                 "payroll_id": str(payroll_id),
                 "payment_method": data.payment_method,
                 "payment_reference": data.payment_reference,
                 "total_amount": str(payroll.total_amount)
-            },
-            ip_address=request.client.host if request.client else None
+            }
         )
         
         return payroll
@@ -480,7 +485,7 @@ async def mark_payroll_as_paid(
 
 @router.post("/export", status_code=status.HTTP_200_OK)
 @require_permission("manage_payroll")
-def export_payroll_for_payment(
+async def export_payroll_for_payment(
     background_tasks: BackgroundTasks,
     from_date: date = Query(..., description="Period start date (inclusive)"),
     to_date: date = Query(..., description="Period end date (inclusive)"),
@@ -595,22 +600,23 @@ def export_payroll_for_payment(
         output.seek(0)
         filename = f"tende_pay_payroll_{from_date.isoformat()}_{to_date.isoformat()}_{datetime.utcnow().strftime('%Y%m%d_%H%M%S')}.csv"
 
-        # Log audit trail (keep async for now - separate concern)
-        await AuditService.log_action(
+        # Log audit trail
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="export_payroll_for_payment",
-            resource_type="payroll",
-            resource_id=None,
-            details={
+            entity_type="payroll",
+            description=f"Exported {len(csv_rows)} payroll records for payment (period: {from_date} to {to_date})",
+            user=current_user,
+            entity_id=None,
+            request=request,
+            additional_metadata={
                 "from_date": from_date.isoformat(),
                 "to_date": to_date.isoformat(),
                 "project_id": str(project_id) if project_id else None,
                 "user_id": str(user_id) if user_id else None,
                 "exported_count": len(csv_rows),
                 "warning_count": len(warnings)
-            },
-            ip_address=request.client.host if request and request.client else None
+            }
         )
 
         logger.info(

src/app/api/v1/tasks.py

@@ -131,19 +131,20 @@ async def create_task(
         task = TaskService.create_task(db, data, current_user, background_tasks)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="create_task",
-            resource_type="task",
-            resource_id=task.id,
-            details={
+            entity_type="task",
+            description=f"Created task: {task.task_title}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            additional_metadata={
                 "task_title": task.task_title,
                 "project_id": str(task.project_id),
                 "task_type": task.task_type,
                 "status": task.status.value
-            },
-            request=request
+            }
         )
         
         # Build response with nested data
@@ -495,17 +496,18 @@ async def update_task(
         task = TaskService.update_task(db, task_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="update_task",
-            resource_type="task",
-            resource_id=task.id,
-            details={
-                "old_state": old_state,
-                "changes": data.model_dump(exclude_unset=True)
-            },
-            request=request
+            entity_type="task",
+            description=f"Updated task {task.id}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            changes={
+                "old": old_state,
+                "new": data.model_dump(exclude_unset=True)
+            }
         )
         
         # Build response with nested data
@@ -562,18 +564,18 @@ async def update_task_status(
         task = TaskService.update_task_status(db, task_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="update_task_status",
-            resource_type="task",
-            resource_id=task.id,
-            details={
-                "old_status": old_status.value,
-                "new_status": task.status.value,
-                "reason": data.reason
-            },
-            request=request
+            entity_type="task",
+            description=f"Updated task status from {old_status.value} to {task.status.value}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            changes={
+                "old": {"status": old_status.value},
+                "new": {"status": task.status.value, "reason": data.reason}
+            }
         )
         
         # Build response
@@ -617,14 +619,15 @@ async def start_task(
         task = TaskService.start_task(db, task_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="start_task",
-            resource_type="task",
-            resource_id=task.id,
-            details={"started_at": str(task.started_at)},
-            request=request
+            entity_type="task",
+            description=f"Started task {task.id}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            additional_metadata={"started_at": str(task.started_at)}
         )
         
         # Build response
@@ -670,17 +673,18 @@ async def complete_task(
         task = TaskService.complete_task(db, task_id, data, current_user, background_tasks)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="complete_task",
-            resource_type="task",
-            resource_id=task.id,
-            details={
+            entity_type="task",
+            description=f"Completed task {task.id}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            additional_metadata={
                 "completed_at": str(task.completed_at),
                 "notes": data.completion_notes
-            },
-            request=request
+            }
         )
         
         # Build response
@@ -726,14 +730,15 @@ async def cancel_task(
         task = TaskService.cancel_task(db, task_id, data, current_user, background_tasks)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="cancel_task",
-            resource_type="task",
-            resource_id=task.id,
-            details={"reason": data.cancellation_reason},
-            request=request
+            entity_type="task",
+            description=f"Cancelled task {task.id}",
+            user=current_user,
+            entity_id=str(task.id),
+            request=request,
+            additional_metadata={"reason": data.cancellation_reason}
         )
         
         # Build response
@@ -786,17 +791,18 @@ async def delete_task(
         TaskService.delete_task(db, task_id, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="delete_task",
-            resource_type="task",
-            resource_id=task_id,
-            details={
+            entity_type="task",
+            description=f"Deleted task: {task.task_title}",
+            user=current_user,
+            entity_id=str(task_id),
+            request=request,
+            additional_metadata={
                 "task_title": task.task_title,
                 "project_id": str(task.project_id)
-            },
-            request=request
+            }
         )
         
     except HTTPException:

src/app/api/v1/timesheets.py

@@ -69,18 +69,19 @@ async def create_timesheet(
         timesheet = TimesheetService.create_timesheet(db, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="create_timesheet",
-            resource_type="timesheet",
-            resource_id=timesheet.id,
-            details={
+            entity_type="timesheet",
+            description=f"Created timesheet for user {timesheet.user_id} on {timesheet.work_date}",
+            user=current_user,
+            entity_id=str(timesheet.id),
+            request=request,
+            additional_metadata={
                 "user_id": str(timesheet.user_id),
                 "work_date": str(timesheet.work_date),
                 "status": timesheet.status.value
-            },
-            request=request
+            }
         )
         
         # Build response with nested data
@@ -186,18 +187,19 @@ async def apply_for_leave(
         timesheet = TimesheetService.create_timesheet(db, timesheet_data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="apply_for_leave",
-            resource_type="timesheet",
-            resource_id=timesheet.id,
-            details={
+            entity_type="timesheet",
+            description=f"Applied for leave on {data.work_date}: {data.status}",
+            user=current_user,
+            entity_id=str(timesheet.id),
+            request=request,
+            additional_metadata={
                 "work_date": str(data.work_date),
-                "status": data.status,  # Already a string
+                "status": data.status,
                 "leave_reason": data.leave_reason
-            },
-            request=request
+            }
         )
         
         # Build response
@@ -253,19 +255,20 @@ async def bulk_create_timesheets(
         timesheets = TimesheetService.bulk_create_timesheets(db, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="bulk_create_timesheets",
-            resource_type="timesheet",
-            resource_id=None,
-            details={
+            entity_type="timesheet",
+            description=f"Bulk created {len(timesheets)} timesheets for project {data.project_id} on {data.work_date}",
+            user=current_user,
+            entity_id=None,
+            request=request,
+            additional_metadata={
                 "project_id": str(data.project_id),
                 "work_date": str(data.work_date),
                 "user_count": len(timesheets),
                 "status": data.status.value
-            },
-            request=request
+            }
         )
         
         # Build response array
@@ -750,17 +753,18 @@ async def update_timesheet(
         timesheet = TimesheetService.update_timesheet(db, timesheet_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="update_timesheet",
-            resource_type="timesheet",
-            resource_id=timesheet.id,
-            details={
-                "old_state": old_state,
-                "changes": data.model_dump(exclude_unset=True)
-            },
-            request=request
+            entity_type="timesheet",
+            description=f"Updated timesheet {timesheet.id}",
+            user=current_user,
+            entity_id=str(timesheet.id),
+            request=request,
+            changes={
+                "old": old_state,
+                "new": data.model_dump(exclude_unset=True)
+            }
         )
         
         # Build response with nested data
@@ -809,18 +813,19 @@ async def approve_leave(
         timesheet = TimesheetService.approve_leave(db, timesheet_id, data, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="approve_leave",
-            resource_type="timesheet",
-            resource_id=timesheet.id,
-            details={
+            entity_type="timesheet",
+            description=f"Approved leave for user {timesheet.user_id} on {timesheet.work_date}",
+            user=current_user,
+            entity_id=str(timesheet.id),
+            request=request,
+            additional_metadata={
                 "user_id": str(timesheet.user_id),
                 "work_date": str(timesheet.work_date),
                 "status": timesheet.status.value
-            },
-            request=request
+            }
         )
         
         # Build response with nested data
@@ -871,18 +876,19 @@ async def delete_timesheet(
         TimesheetService.delete_timesheet(db, timesheet_id, current_user)
         
         # Log audit trail
-        await AuditService.log_action(
+        AuditService.log_action(
             db=db,
-            user_id=current_user.id,
             action="delete_timesheet",
-            resource_type="timesheet",
-            resource_id=timesheet_id,
-            details={
+            entity_type="timesheet",
+            description=f"Deleted timesheet for user {timesheet.user_id} on {timesheet.work_date}",
+            user=current_user,
+            entity_id=str(timesheet_id),
+            request=request,
+            additional_metadata={
                 "user_id": str(timesheet.user_id),
                 "work_date": str(timesheet.work_date),
                 "status": timesheet.status.value
-            },
-            request=request
+            }
         )
         
     except HTTPException:
@@ -967,14 +973,15 @@ async def generate_timesheets(
                 'method': 'single_user'
             }
             
-            await AuditService.log_action(
+            AuditService.log_action(
                 db=db,
-                user_id=current_user.id,
                 action="generate_timesheet_single",
-                resource_type="timesheet",
-                resource_id=timesheet.id if timesheet else None,
-                details=stats,
-                request=request
+                entity_type="timesheet",
+                description=f"Generated timesheet for user {user_id} on {target_date}",
+                user=current_user,
+                entity_id=str(timesheet.id) if timesheet else None,
+                request=request,
+                additional_metadata=stats
             )
             
             return stats
@@ -988,13 +995,15 @@ async def generate_timesheets(
                 regenerate=regenerate
             )
             
-            await AuditService.log_action(
+            AuditService.log_action(
                 db=db,
-                user_id=current_user.id,
                 action="generate_timesheets_bulk",
-                resource_type="timesheet",
-                resource_id=None,
-                details=stats,
+                entity_type="timesheet",
+                description=f"Generated timesheets in bulk for {target_date}",
+                user=current_user,
+                entity_id=None,
+                request=request,
+                additional_metadata=stats
                 request=request
             )