django-cfg 1.4.116__py3-none-any.whl → 1.5.14__py3-none-any.whl

django_cfg/apps/integrations/rq/views/workers.py

@@ -0,0 +1,195 @@
+"""
+Django-RQ Worker Management ViewSet.
+
+Provides REST API endpoints for monitoring RQ workers.
+"""
+
+from django_cfg.mixins import AdminAPIMixin
+from django_cfg.modules.django_logging import get_logger
+from drf_spectacular.utils import extend_schema, OpenApiParameter
+from rest_framework import status, viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
+
+from ..serializers import WorkerSerializer, WorkerStatsSerializer
+from ..services import worker_to_model
+
+logger = get_logger("rq.workers")
+
+
+class WorkerViewSet(AdminAPIMixin, viewsets.ViewSet):
+    """
+    ViewSet for RQ worker monitoring.
+
+    Provides endpoints for:
+    - Listing all workers with statistics
+    - Getting worker aggregated stats
+    - Getting individual worker details
+
+    Requires admin authentication (JWT, Session, or Basic Auth).
+    """
+
+    @extend_schema(
+        tags=["RQ Workers"],
+        summary="List all workers",
+        description="Returns list of all RQ workers with their current state. Supports filtering by state and queue.",
+        parameters=[
+            OpenApiParameter(
+                name="state",
+                type=str,
+                location=OpenApiParameter.QUERY,
+                required=False,
+                description="Filter by worker state (idle, busy, suspended)",
+            ),
+            OpenApiParameter(
+                name="queue",
+                type=str,
+                location=OpenApiParameter.QUERY,
+                required=False,
+                description="Filter by queue name",
+            ),
+        ],
+        responses={
+            200: WorkerSerializer(many=True),
+        },
+    )
+    def list(self, request):
+        """List all workers with optional filtering."""
+        try:
+            import django_rq
+            from rq import Worker
+
+            # Get query params for filtering
+            state_filter = request.query_params.get('state')
+            queue_filter = request.query_params.get('queue')
+
+            # Get all workers using connection from default queue
+            # All queues share the same Redis connection, so we only need one
+            queue = django_rq.get_queue('default')
+            all_workers = Worker.all(connection=queue.connection)
+
+            workers_data = []
+            for worker in all_workers:
+                try:
+                    # Convert RQ Worker to Pydantic model
+                    worker_model = worker_to_model(worker)
+
+                    # Apply filters
+                    if state_filter and worker_model.state != state_filter:
+                        continue
+
+                    if queue_filter and queue_filter not in worker_model.get_queue_list():
+                        continue
+
+                    # Convert Pydantic model to dict for DRF serializer
+                    worker_dict = worker_model.model_dump()
+
+                    # DRF serializer expects 'queues' as list, not comma-separated string
+                    worker_dict['queues'] = worker_model.get_queue_list()
+
+                    # DRF serializer expects 'current_job' not 'current_job_id'
+                    worker_dict['current_job'] = worker_dict.pop('current_job_id')
+
+                    serializer = WorkerSerializer(data=worker_dict)
+                    serializer.is_valid(raise_exception=True)
+                    workers_data.append(serializer.data)
+
+                except Exception as e:
+                    logger.debug(f"Failed to get worker {worker.name}: {e}")
+                    continue
+
+            return Response(workers_data)
+
+        except Exception as e:
+            import traceback
+            logger.error(f"Worker list error: {e}", exc_info=True)
+            return Response(
+                {
+                    "error": str(e),
+                    "traceback": traceback.format_exc(),
+                },
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )
+
+    @extend_schema(
+        tags=["RQ Workers"],
+        summary="Get worker statistics",
+        description="Returns aggregated statistics for all workers.",
+        responses={
+            200: WorkerStatsSerializer,
+        },
+    )
+    @action(detail=False, methods=["get"], url_path="stats")
+    def stats(self, request):
+        """Get aggregated worker statistics."""
+        try:
+            import django_rq
+            from rq import Worker
+
+            # Get all workers using connection from default queue
+            # All queues share the same Redis connection, so we only need one
+            queue = django_rq.get_queue('default')
+            all_workers = Worker.all(connection=queue.connection)
+
+            # Count by state
+            busy_workers = 0
+            idle_workers = 0
+            suspended_workers = 0
+            total_successful = 0
+            total_failed = 0
+            total_working_time = 0.0
+
+            workers_list = []
+
+            for worker in all_workers:
+                try:
+                    # Convert RQ Worker to Pydantic model
+                    worker_model = worker_to_model(worker)
+
+                    # Count by state
+                    if worker_model.is_busy:
+                        busy_workers += 1
+                    elif worker_model.is_idle:
+                        idle_workers += 1
+                    elif worker_model.state == 'suspended':
+                        suspended_workers += 1
+
+                    total_successful += worker_model.successful_job_count
+                    total_failed += worker_model.failed_job_count
+                    total_working_time += worker_model.total_working_time
+
+                    # Convert to dict for serializer
+                    worker_dict = worker_model.model_dump()
+                    worker_dict['queues'] = worker_model.get_queue_list()
+                    worker_dict['current_job'] = worker_dict.pop('current_job_id')
+                    workers_list.append(worker_dict)
+
+                except Exception as e:
+                    logger.debug(f"Failed to process worker: {e}")
+                    continue
+
+            stats_data = {
+                "total_workers": len(all_workers),
+                "busy_workers": busy_workers,
+                "idle_workers": idle_workers,
+                "suspended_workers": suspended_workers,
+                "total_successful_jobs": total_successful,
+                "total_failed_jobs": total_failed,
+                "total_working_time": total_working_time,
+                "workers": workers_list,
+            }
+
+            serializer = WorkerStatsSerializer(data=stats_data)
+            serializer.is_valid(raise_exception=True)
+            return Response(serializer.data)
+
+        except Exception as e:
+            import traceback
+            logger.error(f"Worker stats error: {e}", exc_info=True)
+            return Response(
+                {
+                    "error": str(e),
+                    "traceback": traceback.format_exc(),
+                },
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            )

django_cfg/apps/system/dashboard/TRANSACTION_FIX.md

@@ -0,0 +1,73 @@
+# PostgreSQL Transaction Error Fix
+
+## Problem
+
+Error: **"current transaction is aborted, commands ignored until end of transaction block"**
+
+### Root Causes:
+1. Using `.extra()` for raw SQL queries in PostgreSQL
+2. Calling `.count()` on models whose tables don't exist in the database
+
+## Solution
+
+### 1. Replaced `.extra()` with `TruncDate()` in `charts_service.py`
+
+**Before:**
+```python
+.extra({'date': "date(date_joined)"})  # ❌ Raw SQL
+```
+
+**After:**
+```python
+from django.db.models.functions import TruncDate
+.annotate(date=TruncDate('date_joined'))  # ✅ Django ORM
+```
+
+### 2. Added table existence check in `statistics_service.py`
+
+**Problem:** `model.objects.count()` was called on ALL models, including those without database tables (e.g., migrations not run).
+
+**Solution:** Check if table exists before querying:
+
+```python
+def _get_model_stats(self, model) -> Optional[Dict[str, Any]]:
+    try:
+        from django.db import connection, OperationalError, ProgrammingError
+
+        # Check if table exists before querying
+        table_name = model._meta.db_table
+        with connection.cursor() as cursor:
+            cursor.execute(f"SELECT COUNT(*) FROM {connection.ops.quote_name(table_name)} LIMIT 1")
+
+        # Now safe to call model.objects.count()
+        model_stats = {
+            "count": model.objects.count(),
+            ...
+        }
+        return model_stats
+
+    except (OperationalError, ProgrammingError):
+        # Table doesn't exist - skip this model
+        return None
+```
+
+## Modified Files
+
+- ✅ `services/charts_service.py` - replaced all `.extra()` with `TruncDate()`
+- ✅ `services/statistics_service.py` - added table existence check
+- ✅ `views/overview_views.py` - simplified, removed complex transaction logic
+
+## Key Lessons
+
+1. **Don't use `.extra()`** - always use Django ORM functions
+2. **Check table existence** before querying models
+3. **Don't overcomplicate** - let Django handle transactions
+4. **Catch specific exceptions** - `OperationalError`, `ProgrammingError` for DB issues
+
+## Conclusion
+
+Keep it simple! The issue was two simple bugs:
+- Using raw SQL (`.extra()`)
+- Querying non-existent tables
+
+Fixed by using proper Django ORM and checking table existence.

django_cfg/apps/{dashboard → system/dashboard}/__init__.py

@@ -5,4 +5,4 @@ Provides RESTful API endpoints for dashboard statistics and metrics.
 Designed to work with Next.js frontend without ORM dependencies.
 """
 
-default_app_config = 'django_cfg.apps.dashboard.apps.DashboardConfig'
+default_app_config = 'django_cfg.apps.system.dashboard.apps.DashboardConfig'

django_cfg/apps/{dashboard → system/dashboard}/apps.py

@@ -9,7 +9,7 @@ class DashboardConfig(AppConfig):
     """Configuration for Dashboard application."""
 
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'django_cfg.apps.dashboard'
+    name = 'django_cfg.apps.system.dashboard'
     label = 'dashboard'
     verbose_name = 'Dashboard'
 

django_cfg/apps/{dashboard → system/dashboard}/serializers/__init__.py

@@ -22,12 +22,7 @@ from .commands import (
     CommandHelpResponseSerializer,
 )
 from .apizones import APIZoneSerializer, APIZonesSummarySerializer
-from .django_q2 import (
-    DjangoQ2ScheduleSerializer,
-    DjangoQ2TaskSerializer,
-    DjangoQ2StatusSerializer,
-    DjangoQ2SummarySerializer,
-)
+from .config import DjangoConfigSerializer, ConfigDataSerializer
 
 __all__ = [
     # Base
@@ -66,9 +61,7 @@ __all__ = [
     'APIZoneSerializer',
     'APIZonesSummarySerializer',
 
-    # Django-Q2
-    'DjangoQ2ScheduleSerializer',
-    'DjangoQ2TaskSerializer',
-    'DjangoQ2StatusSerializer',
-    'DjangoQ2SummarySerializer',
+    # Config
+    'DjangoConfigSerializer',
+    'ConfigDataSerializer',
 ]

django_cfg/apps/{dashboard → system/dashboard}/serializers/activity.py

@@ -19,7 +19,7 @@ class QuickActionSerializer(serializers.Serializer):
     icon = serializers.CharField(help_text="Material icon name")
     link = serializers.CharField(help_text="Action URL")
     color = serializers.ChoiceField(
-        choices=['primary', 'success', 'warning', 'danger', 'secondary'],
+        choices=['primary', 'success', 'warning', 'danger', 'secondary', 'info', 'default'],
         default='primary',
         help_text="Button color theme"
     )

django_cfg/apps/{dashboard → system/dashboard}/serializers/commands.py

@@ -8,7 +8,14 @@ from rest_framework import serializers
 
 
 class CommandSerializer(serializers.Serializer):
-    """Django management command serializer."""
+    """
+    Django management command serializer.
+
+    Includes security metadata from base classes (SafeCommand, InteractiveCommand, etc.):
+    - web_executable: Can be executed via web interface
+    - requires_input: Requires interactive user input
+    - is_destructive: Modifies or deletes data
+    """
     name = serializers.CharField()
     app = serializers.CharField()
     help = serializers.CharField()
@@ -17,6 +24,23 @@ class CommandSerializer(serializers.Serializer):
     is_allowed = serializers.BooleanField(required=False)
     risk_level = serializers.CharField(required=False)
 
+    # Security metadata from command base classes
+    web_executable = serializers.BooleanField(
+        required=False,
+        allow_null=True,
+        help_text="Can be executed via web interface"
+    )
+    requires_input = serializers.BooleanField(
+        required=False,
+        allow_null=True,
+        help_text="Requires interactive user input"
+    )
+    is_destructive = serializers.BooleanField(
+        required=False,
+        allow_null=True,
+        help_text="Modifies or deletes data"
+    )
+
 
 class CommandsSummarySerializer(serializers.Serializer):
     """Commands summary serializer."""

django_cfg/apps/system/dashboard/serializers/config.py

@@ -0,0 +1,245 @@
+"""
+Django Config Serializers
+
+Serializers for displaying user's DjangoConfig settings.
+"""
+
+from rest_framework import serializers
+
+
+# Nested serializers for complex structures
+
+class DatabaseConfigSerializer(serializers.Serializer):
+    """Database configuration."""
+    engine = serializers.CharField()
+    name = serializers.CharField()
+    user = serializers.CharField(required=False, allow_null=True)
+    password = serializers.CharField(required=False, allow_null=True)
+    host = serializers.CharField(required=False, allow_null=True)
+    port = serializers.IntegerField(required=False, allow_null=True)
+    connect_timeout = serializers.IntegerField(required=False, allow_null=True)
+    sslmode = serializers.CharField(required=False, allow_null=True)
+    options = serializers.DictField(required=False, allow_null=True)
+    apps = serializers.ListField(required=False, allow_null=True)
+    operations = serializers.ListField(required=False, allow_null=True)
+    migrate_to = serializers.CharField(required=False, allow_null=True)
+    routing_description = serializers.CharField(required=False, allow_null=True)
+
+
+class EmailConfigSerializer(serializers.Serializer):
+    """Email configuration."""
+    backend = serializers.CharField(required=False, allow_null=True)
+    host = serializers.CharField(required=False, allow_null=True)
+    port = serializers.IntegerField(required=False, allow_null=True)
+    username = serializers.CharField(required=False, allow_null=True)
+    password = serializers.CharField(required=False, allow_null=True)
+    use_tls = serializers.BooleanField(required=False, allow_null=True)
+    use_ssl = serializers.BooleanField(required=False, allow_null=True)
+    ssl_verify = serializers.BooleanField(required=False, allow_null=True)
+    timeout = serializers.IntegerField(required=False, allow_null=True)
+    default_from = serializers.CharField(required=False, allow_null=True)
+
+
+class PaymentsNowPaymentsSerializer(serializers.Serializer):
+    """NowPayments configuration."""
+    api_key = serializers.CharField(required=False, allow_null=True)
+    ipn_secret = serializers.CharField(required=False, allow_null=True)
+    sandbox = serializers.BooleanField(required=False, allow_null=True)
+    enabled = serializers.BooleanField(required=False, allow_null=True)
+
+
+class PaymentsConfigSerializer(serializers.Serializer):
+    """Payments configuration."""
+    enabled = serializers.BooleanField(required=False, allow_null=True)
+    nowpayments = PaymentsNowPaymentsSerializer(required=False, allow_null=True)
+
+
+class GRPCConfigDashboardSerializer(serializers.Serializer):
+    """gRPC configuration for dashboard."""
+    enabled = serializers.BooleanField(required=False, allow_null=True)
+    host = serializers.CharField(required=False, allow_null=True)
+    port = serializers.IntegerField(required=False, allow_null=True)
+    max_workers = serializers.IntegerField(required=False, allow_null=True)
+    reflection = serializers.BooleanField(required=False, allow_null=True)
+    health_check = serializers.BooleanField(required=False, allow_null=True)
+    interceptors = serializers.ListField(required=False, allow_null=True)
+
+
+class CentrifugoConfigSerializer(serializers.Serializer):
+    """Centrifugo configuration."""
+    enabled = serializers.BooleanField(required=False, allow_null=True)
+    api_url = serializers.CharField(required=False, allow_null=True)
+    api_key = serializers.CharField(required=False, allow_null=True)
+    token_hmac_secret_key = serializers.CharField(required=False, allow_null=True)
+    timeout = serializers.IntegerField(required=False, allow_null=True)
+
+
+class RedisQueueConfigSerializer(serializers.Serializer):
+    """Redis Queue configuration."""
+    url = serializers.CharField(required=False, allow_null=True)
+    host = serializers.CharField(required=False, allow_null=True)
+    port = serializers.IntegerField(required=False, allow_null=True)
+    db = serializers.IntegerField(required=False, allow_null=True)
+    username = serializers.CharField(required=False, allow_null=True)
+    password = serializers.CharField(required=False, allow_null=True)
+    default_timeout = serializers.IntegerField(required=False, allow_null=True)
+    default_result_ttl = serializers.IntegerField(required=False, allow_null=True)
+    sentinels = serializers.ListField(required=False, allow_null=True)
+    master_name = serializers.CharField(required=False, allow_null=True)
+    socket_timeout = serializers.IntegerField(required=False, allow_null=True)
+
+
+class DjangoRQConfigSerializer(serializers.Serializer):
+    """Django-RQ configuration."""
+    enabled = serializers.BooleanField(required=False, allow_null=True)
+    queues = serializers.ListField(child=RedisQueueConfigSerializer(), required=False, allow_null=True)
+    show_admin_link = serializers.BooleanField(required=False, allow_null=True)
+    exception_handlers = serializers.ListField(required=False, allow_null=True)
+    api_token = serializers.CharField(required=False, allow_null=True)
+    prometheus_enabled = serializers.BooleanField(required=False, allow_null=True)
+    schedules = serializers.ListField(child=serializers.DictField(), required=False, allow_null=True)
+
+
+class DRFConfigSerializer(serializers.Serializer):
+    """Django REST Framework configuration."""
+    default_pagination_class = serializers.CharField(required=False, allow_null=True)
+    page_size = serializers.IntegerField(required=False, allow_null=True)
+
+
+class SpectacularConfigSerializer(serializers.Serializer):
+    """DRF Spectacular configuration."""
+    title = serializers.CharField(required=False, allow_null=True)
+    description = serializers.CharField(required=False, allow_null=True)
+    version = serializers.CharField(required=False, allow_null=True)
+
+
+class JWTConfigSerializer(serializers.Serializer):
+    """JWT configuration."""
+    access_token_lifetime = serializers.IntegerField(required=False, allow_null=True)
+    refresh_token_lifetime = serializers.IntegerField(required=False, allow_null=True)
+    algorithm = serializers.CharField(required=False, allow_null=True)
+
+
+class ConfigMetaSerializer(serializers.Serializer):
+    """Config metadata."""
+    config_class = serializers.CharField()
+    secret_key_configured = serializers.BooleanField()
+
+
+class DjangoConfigSerializer(serializers.Serializer):
+    """
+    Typed serializer for user's DjangoConfig settings.
+
+    Reflects the actual structure of DjangoConfig model.
+    All passwords and sensitive data are sanitized before reaching this serializer.
+    """
+
+    # Project info
+    env_mode = serializers.CharField(required=False, allow_null=True)
+    project_name = serializers.CharField(required=False, allow_null=True)
+    project_logo = serializers.CharField(required=False, allow_null=True)
+    project_version = serializers.CharField(required=False, allow_null=True)
+    project_description = serializers.CharField(required=False, allow_null=True)
+    startup_info_mode = serializers.CharField(required=False, allow_null=True)
+
+    # Feature flags
+    enable_support = serializers.BooleanField(required=False, allow_null=True)
+    enable_accounts = serializers.BooleanField(required=False, allow_null=True)
+    enable_newsletter = serializers.BooleanField(required=False, allow_null=True)
+    enable_leads = serializers.BooleanField(required=False, allow_null=True)
+    enable_knowbase = serializers.BooleanField(required=False, allow_null=True)
+    enable_agents = serializers.BooleanField(required=False, allow_null=True)
+    enable_maintenance = serializers.BooleanField(required=False, allow_null=True)
+    enable_frontend = serializers.BooleanField(required=False, allow_null=True)
+    enable_drf_tailwind = serializers.BooleanField(required=False, allow_null=True)
+
+    # URLs
+    site_url = serializers.CharField(required=False, allow_null=True)
+    api_url = serializers.CharField(required=False, allow_null=True)
+
+    # Debug settings
+    debug = serializers.BooleanField(required=False, allow_null=True)
+    debug_warnings = serializers.BooleanField(required=False, allow_null=True)
+
+    # Django settings
+    root_urlconf = serializers.CharField(required=False, allow_null=True)
+    wsgi_application = serializers.CharField(required=False, allow_null=True)
+    auth_user_model = serializers.CharField(required=False, allow_null=True)
+    project_apps = serializers.ListField(required=False, allow_null=True)
+
+    # Infrastructure
+    databases = serializers.DictField(child=DatabaseConfigSerializer(), required=False, allow_null=True)
+    redis_url = serializers.CharField(required=False, allow_null=True)
+    cache_default = serializers.CharField(required=False, allow_null=True)
+    cache_sessions = serializers.CharField(required=False, allow_null=True)
+
+    # Security
+    security_domains = serializers.ListField(required=False, allow_null=True)
+    ssl_redirect = serializers.BooleanField(required=False, allow_null=True)
+    cors_allow_headers = serializers.ListField(required=False, allow_null=True)
+
+    # Integrations
+    email = EmailConfigSerializer(required=False, allow_null=True)
+    payments = PaymentsConfigSerializer(required=False, allow_null=True)
+    grpc = GRPCConfigDashboardSerializer(required=False, allow_null=True)
+    centrifugo = CentrifugoConfigSerializer(required=False, allow_null=True)
+    django_rq = DjangoRQConfigSerializer(required=False, allow_null=True)
+    drf = DRFConfigSerializer(required=False, allow_null=True)
+    spectacular = SpectacularConfigSerializer(required=False, allow_null=True)
+    jwt = JWTConfigSerializer(required=False, allow_null=True)
+
+    # Other configs (pass-through for flexibility)
+    telegram = serializers.DictField(required=False, allow_null=True)
+    ngrok = serializers.DictField(required=False, allow_null=True)
+    axes = serializers.DictField(required=False, allow_null=True)
+    crypto_fields = serializers.DictField(required=False, allow_null=True)
+    unfold = serializers.CharField(required=False, allow_null=True)  # String representation of Unfold config
+    tailwind_app_name = serializers.CharField(required=False, allow_null=True)
+    tailwind_version = serializers.IntegerField(required=False, allow_null=True)  # Integer version number
+    limits = serializers.DictField(required=False, allow_null=True)
+    api_keys = serializers.DictField(required=False, allow_null=True)
+    custom_middleware = serializers.ListField(required=False, allow_null=True)
+    nextjs_admin = serializers.DictField(required=False, allow_null=True)
+    admin_emails = serializers.ListField(required=False, allow_null=True)
+    constance = serializers.DictField(required=False, allow_null=True)
+    openapi_client = serializers.DictField(required=False, allow_null=True)
+
+    # Metadata
+    _meta = ConfigMetaSerializer(required=False, allow_null=True)
+
+
+class ConfigValidationSerializer(serializers.Serializer):
+    """Validation result for config serializer."""
+    status = serializers.CharField(help_text="Validation status: 'valid', 'warning', or 'error'")
+    missing_in_serializer = serializers.ListField(
+        child=serializers.CharField(),
+        help_text="Fields present in config but missing in serializer"
+    )
+    extra_in_serializer = serializers.ListField(
+        child=serializers.CharField(),
+        help_text="Fields present in serializer but not in config"
+    )
+    type_mismatches = serializers.ListField(
+        child=serializers.DictField(),
+        help_text="Fields with type mismatches"
+    )
+    total_config_fields = serializers.IntegerField(help_text="Total fields in config")
+    total_serializer_fields = serializers.IntegerField(help_text="Total fields in serializer")
+
+
+class ConfigDataSerializer(serializers.Serializer):
+    """
+    Serializer for complete config data endpoint.
+
+    Returns both DjangoConfig and Django settings with validation info.
+    """
+
+    django_config = DjangoConfigSerializer(
+        help_text="User's DjangoConfig settings"
+    )
+    django_settings = serializers.DictField(
+        help_text="Complete Django settings (sanitized)"
+    )
+    _validation = ConfigValidationSerializer(
+        help_text="Validation result comparing serializer with actual config"
+    )

django_cfg/apps/{dashboard → system/dashboard}/services/__init__.py

@@ -11,7 +11,7 @@ from .charts_service import ChartsService
 from .commands_service import CommandsService
 from .apizones_service import APIZonesService
 from .overview_service import OverviewService
-from .django_q2_service import DjangoQ2Service
+from .config_service import ConfigService
 
 __all__ = [
     'StatisticsService',
@@ -20,5 +20,5 @@ __all__ = [
     'CommandsService',
     'APIZonesService',
     'OverviewService',
-    'DjangoQ2Service',
+    'ConfigService',
 ]

django_cfg/apps/{dashboard → system/dashboard}/services/charts_service.py

@@ -11,6 +11,7 @@ from typing import Any, Dict, List
 
 from django.contrib.auth import get_user_model
 from django.db.models import Count
+from django.db.models.functions import TruncDate
 from django.utils import timezone
 
 logger = logging.getLogger(__name__)
@@ -78,7 +79,7 @@ class ChartsService:
             # Get registration counts by date
             registration_data = (
                 User.objects.filter(date_joined__date__gte=start_date)
-                .extra({'date': "date(date_joined)"})
+                .annotate(date=TruncDate('date_joined'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')
@@ -138,7 +139,7 @@ class ChartsService:
             # Get login activity (users who logged in each day)
             activity_data = (
                 User.objects.filter(last_login__date__gte=start_date, last_login__isnull=False)
-                .extra({'date': "date(last_login)"})
+                .annotate(date=TruncDate('last_login'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')
@@ -192,7 +193,7 @@ class ChartsService:
             # Get activity data by date
             activity_data = (
                 User.objects.filter(last_login__date__gte=start_date, last_login__isnull=False)
-                .extra({'date': "date(last_login)"})
+                .annotate(date=TruncDate('last_login'))
                 .values('date')
                 .annotate(count=Count('id'))
                 .order_by('date')