django-cfg 1.4.21__py3-none-any.whl → 1.4.23__py3-none-any.whl

django_cfg/apps/leads/tests.py

@@ -2,12 +2,12 @@
 Lead Tests - Test cases for Lead model and API.
 """
 
+
+from django.contrib.auth import get_user_model
 from django.test import TestCase
 from django.urls import reverse
-from rest_framework.test import APITestCase
 from rest_framework import status
-from unittest.mock import patch
-from django.contrib.auth import get_user_model
+from rest_framework.test import APITestCase
 
 from .models import Lead
 
@@ -16,7 +16,7 @@ User = get_user_model()
 
 class LeadModelTest(TestCase):
     """Test cases for Lead model."""
-    
+
     def setUp(self):
         """Set up test data."""
         self.user = User.objects.create_user(
@@ -24,7 +24,7 @@ class LeadModelTest(TestCase):
             email='test@example.com',
             password='testpass123'
         )
-        
+
         self.lead_data = {
             'name': 'John Doe',
             'email': 'john@example.com',
@@ -41,11 +41,11 @@ class LeadModelTest(TestCase):
             'status': Lead.StatusChoices.NEW,
             'user': self.user
         }
-    
+
     def test_create_lead(self):
         """Test creating a lead."""
         lead = Lead.objects.create(**self.lead_data)
-        
+
         self.assertEqual(lead.name, 'John Doe')
         self.assertEqual(lead.email, 'john@example.com')
         self.assertEqual(lead.company, 'Test Company')
@@ -54,13 +54,13 @@ class LeadModelTest(TestCase):
         self.assertEqual(lead.user, self.user)
         self.assertIsNotNone(lead.created_at)
         self.assertIsNotNone(lead.updated_at)
-    
+
     def test_lead_str_representation(self):
         """Test string representation of lead."""
         lead = Lead.objects.create(**self.lead_data)
-        expected_str = f"John Doe - https://example.com/contact (new)"
+        expected_str = "John Doe - https://example.com/contact (new)"
         self.assertEqual(str(lead), expected_str)
-    
+
     def test_lead_choices(self):
         """Test lead choices."""
         # Test status choices
@@ -70,7 +70,7 @@ class LeadModelTest(TestCase):
         self.assertIn('qualified', status_choices)
         self.assertIn('converted', status_choices)
         self.assertIn('rejected', status_choices)
-        
+
         # Test contact type choices
         contact_choices = [choice[0] for choice in Lead.ContactTypeChoices.choices]
         self.assertIn('email', contact_choices)
@@ -78,15 +78,15 @@ class LeadModelTest(TestCase):
         self.assertIn('telegram', contact_choices)
         self.assertIn('phone', contact_choices)
         self.assertIn('other', contact_choices)
-    
+
     def test_lead_without_user(self):
         """Test creating lead without user."""
         lead_data = self.lead_data.copy()
         del lead_data['user']
-        
+
         lead = Lead.objects.create(**lead_data)
         self.assertIsNone(lead.user)
-    
+
     def test_lead_optional_fields(self):
         """Test creating lead with optional fields."""
         lead_data = {
@@ -96,7 +96,7 @@ class LeadModelTest(TestCase):
             'site_url': 'https://example.com/contact',
             'status': Lead.StatusChoices.NEW
         }
-        
+
         lead = Lead.objects.create(**lead_data)
         self.assertEqual(lead.name, 'Jane Doe')
         self.assertIsNone(lead.company)
@@ -109,7 +109,7 @@ class LeadModelTest(TestCase):
 
 class LeadAPITest(APITestCase):
     """Test cases for Lead API."""
-    
+
     def setUp(self):
         """Set up test data."""
         self.url = reverse('cfg_leads:lead-submit')
@@ -125,16 +125,16 @@ class LeadAPITest(APITestCase):
             'extra': {'source': 'contact_form'},
             'site_url': 'https://example.com/contact'
         }
-    
+
     def test_submit_lead_success(self):
         """Test successful lead submission."""
         response = self.client.post(self.url, self.valid_data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertTrue(response.data['success'])
         self.assertEqual(response.data['message'], 'Lead submitted successfully')
         self.assertIn('lead_id', response.data)
-        
+
         # Check if lead was created
         lead = Lead.objects.get(id=response.data['lead_id'])
         self.assertEqual(lead.name, 'John Doe')
@@ -142,46 +142,46 @@ class LeadAPITest(APITestCase):
         self.assertEqual(lead.status, Lead.StatusChoices.NEW)
         self.assertIsNotNone(lead.ip_address)
         self.assertIsNotNone(lead.user_agent)
-    
+
     def test_submit_lead_missing_required_fields(self):
         """Test lead submission with missing required fields."""
         # Test missing name
         data = self.valid_data.copy()
         del data['name']
         response = self.client.post(self.url, data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertFalse(response.data['success'])
         self.assertIn('name', response.data['details'])
-        
+
         # Test missing email
         data = self.valid_data.copy()
         del data['email']
         response = self.client.post(self.url, data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertFalse(response.data['success'])
         self.assertIn('email', response.data['details'])
-        
+
         # Test missing message
         data = self.valid_data.copy()
         del data['message']
         response = self.client.post(self.url, data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertFalse(response.data['success'])
         self.assertIn('message', response.data['details'])
-    
+
     def test_submit_lead_invalid_email(self):
         """Test lead submission with invalid email."""
         data = self.valid_data.copy()
         data['email'] = 'invalid-email'
         response = self.client.post(self.url, data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertFalse(response.data['success'])
         self.assertIn('email', response.data['details'])
-    
+
     def test_submit_lead_minimal_data(self):
         """Test lead submission with minimal required data."""
         minimal_data = {
@@ -190,12 +190,12 @@ class LeadAPITest(APITestCase):
             'message': 'Test message',
             'site_url': 'https://example.com/contact'
         }
-        
+
         response = self.client.post(self.url, minimal_data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertTrue(response.data['success'])
-        
+
         # Check if lead was created with defaults
         lead = Lead.objects.get(id=response.data['lead_id'])
         self.assertEqual(lead.name, 'Jane Doe')
@@ -205,24 +205,24 @@ class LeadAPITest(APITestCase):
         self.assertIsNone(lead.company_site)
         self.assertIsNone(lead.subject)
         self.assertIsNone(lead.extra)
-    
+
     def test_submit_lead_different_contact_types(self):
         """Test lead submission with different contact types."""
         contact_types = ['email', 'whatsapp', 'telegram', 'phone', 'other']
-        
+
         for contact_type in contact_types:
             data = self.valid_data.copy()
             data['contact_type'] = contact_type
             data['contact_value'] = f'test_{contact_type}@example.com'
-            
+
             response = self.client.post(self.url, data, format='json')
-            
+
             self.assertEqual(response.status_code, status.HTTP_201_CREATED)
             self.assertTrue(response.data['success'])
-            
+
             lead = Lead.objects.get(id=response.data['lead_id'])
             self.assertEqual(lead.contact_type, contact_type)
-    
+
     def test_submit_lead_with_extra_data(self):
         """Test lead submission with extra JSON data."""
         data = self.valid_data.copy()
@@ -236,14 +236,14 @@ class LeadAPITest(APITestCase):
                 'version': '91.0'
             }
         }
-        
+
         response = self.client.post(self.url, data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        
+
         lead = Lead.objects.get(id=response.data['lead_id'])
         self.assertEqual(lead.extra, data['extra'])
-    
+
     def test_submit_lead_ip_and_user_agent(self):
         """Test that IP address and user agent are captured."""
         # Set custom headers
@@ -251,21 +251,21 @@ class LeadAPITest(APITestCase):
             'HTTP_X_FORWARDED_FOR': '192.168.1.100',
             'HTTP_USER_AGENT': 'Test Browser/1.0'
         }
-        
+
         response = self.client.post(self.url, self.valid_data, format='json', **headers)
-        
+
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        
+
         lead = Lead.objects.get(id=response.data['lead_id'])
         self.assertEqual(lead.ip_address, '192.168.1.100')
         self.assertEqual(lead.user_agent, 'Test Browser/1.0')
-    
+
     def test_submit_lead_without_forwarded_ip(self):
         """Test IP capture when X-Forwarded-For is not present."""
         response = self.client.post(self.url, self.valid_data, format='json')
-        
+
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        
+
         lead = Lead.objects.get(id=response.data['lead_id'])
         # Should capture some IP (could be 127.0.0.1 in tests)
         self.assertIsNotNone(lead.ip_address)

django_cfg/apps/leads/urls.py

@@ -2,7 +2,7 @@
 Lead URLs - API routing for the leads application.
 """
 
-from django.urls import path, include
+from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
 from .views import LeadViewSet
@@ -16,4 +16,4 @@ app_name = "cfg_leads"
 
 urlpatterns = [
     path("", include(router.urls)),
-]
+]

django_cfg/apps/leads/views.py

@@ -2,17 +2,17 @@
 Lead Views - API views for Lead model.
 """
 
-from rest_framework import viewsets, status
+from drf_spectacular.utils import OpenApiExample, extend_schema
+from rest_framework import status, viewsets
 from rest_framework.decorators import action
-from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
-from drf_spectacular.utils import extend_schema, OpenApiExample
+from rest_framework.response import Response
 
 from .models import Lead
 from .serializers import (
-    LeadSubmissionSerializer, 
-    LeadSubmissionResponseSerializer, 
-    LeadSubmissionErrorSerializer
+    LeadSubmissionErrorSerializer,
+    LeadSubmissionResponseSerializer,
+    LeadSubmissionSerializer,
 )
 
 
@@ -65,9 +65,9 @@ class LeadViewSet(viewsets.ModelViewSet):
                 ip_address = x_forwarded_for.split(',')[0]
             else:
                 ip_address = request.META.get('REMOTE_ADDR')
-            
+
             user_agent = request.META.get('HTTP_USER_AGENT', '')
-            
+
             # Create lead with metadata
             lead_data = serializer.validated_data
             lead_data.update({
@@ -75,15 +75,15 @@ class LeadViewSet(viewsets.ModelViewSet):
                 'user_agent': user_agent,
                 'status': Lead.StatusChoices.NEW
             })
-            
+
             lead = Lead.objects.create(**lead_data)
-            
+
             return Response({
                 'success': True,
                 'message': 'Lead submitted successfully',
                 'lead_id': lead.id
             }, status=status.HTTP_201_CREATED)
-        
+
         return Response({
             'success': False,
             'error': 'Invalid data',

django_cfg/apps/maintenance/__init__.py

@@ -21,7 +21,7 @@ _LAZY_IMPORTS = {
     'CloudflareSite': ('django_cfg.apps.maintenance.models', 'CloudflareSite'),
     'MaintenanceLog': ('django_cfg.apps.maintenance.models', 'MaintenanceLog'),
     'ScheduledMaintenance': ('django_cfg.apps.maintenance.models', 'ScheduledMaintenance'),
-    
+
     # Services
     'MaintenanceService': ('django_cfg.apps.maintenance.services', 'MaintenanceService'),
     'SiteSyncService': ('django_cfg.apps.maintenance.services', 'SiteSyncService'),
@@ -45,11 +45,11 @@ def __getattr__(name: str):
     """Lazy import mechanism to avoid Django initialization issues."""
     if name in _LAZY_IMPORTS:
         module_path, attr_name = _LAZY_IMPORTS[name]
-        
+
         import importlib
         module = importlib.import_module(module_path)
         return getattr(module, attr_name)
-    
+
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 

django_cfg/apps/maintenance/admin/__init__.py

@@ -5,9 +5,9 @@ Refactored admin interfaces with Material Icons and optimized queries.
 """
 
 from .api_key_admin import CloudflareApiKeyAdmin
-from .site_admin import CloudflareSiteAdmin
 from .log_admin import MaintenanceLogAdmin
 from .scheduled_admin import ScheduledMaintenanceAdmin
+from .site_admin import CloudflareSiteAdmin
 
 __all__ = [
     'CloudflareApiKeyAdmin',

django_cfg/apps/maintenance/admin/api_key_admin.py

@@ -4,22 +4,22 @@ CloudflareApiKey admin using Django Admin Utilities.
 Enhanced API key management with Material Icons and optimized queries.
 """
 
+
 from django.contrib import admin, messages
-from django.http import HttpRequest
 from django.db import models
 from django.db.models import Count
-from typing import Any
+from django.http import HttpRequest
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    StatusBadgeConfig,
+    ActionVariant,
     DateTimeDisplayConfig,
+    DisplayMixin,
     Icons,
-    ActionVariant,
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    action,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -29,7 +29,7 @@ from ..models import CloudflareApiKey
 @admin.register(CloudflareApiKey)
 class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Admin interface for CloudflareApiKey model using Django Admin Utilities."""
-    
+
     list_display = [
         'status_display',
         'name_display',
@@ -55,7 +55,7 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'last_used_at',
         'sites_using_key'
     ]
-    
+
     fieldsets = [
         ('🔑 Basic Information', {
             'fields': ['name', 'description'],
@@ -78,13 +78,13 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'classes': ('tab', 'collapse')
         })
     ]
-    
+
     actions = [
         'make_default_action',
         'activate_keys_action',
         'deactivate_keys_action'
     ]
-    
+
     @display(description="Status")
     def status_display(self, obj: CloudflareApiKey) -> str:
         """Display status with badge."""
@@ -110,7 +110,7 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
                 variant="danger",
                 config=config
             )
-    
+
     @display(description="Name", ordering="name")
     def name_display(self, obj: CloudflareApiKey) -> str:
         """Display API key name."""
@@ -120,19 +120,19 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="primary",
             config=config
         )
-    
+
     @display(description="Description")
     def description_preview(self, obj: CloudflareApiKey) -> str:
         """Show description preview."""
         if not obj.description:
             return "—"
-        
+
         preview = obj.description[:50]
         if len(obj.description) > 50:
             preview += "..."
-        
+
         return preview
-    
+
     @display(description="Active")
     def active_display(self, obj: CloudflareApiKey) -> str:
         """Display active status badge."""
@@ -142,7 +142,7 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         else:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.CANCEL)
             return StatusBadge.create(text="Inactive", variant="secondary", config=config)
-    
+
     @display(description="Default")
     def default_display(self, obj: CloudflareApiKey) -> str:
         """Display default status badge."""
@@ -151,7 +151,7 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             return StatusBadge.create(text="Default", variant="primary", config=config)
         else:
             return "—"
-    
+
     @display(description="Sites")
     def sites_count(self, obj: CloudflareApiKey) -> str:
         """Display count of sites using this key."""
@@ -159,7 +159,7 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         if count > 0:
             return f"{count} sites"
         return "No sites"
-    
+
     @display(description="Last Used")
     def last_used_display(self, obj: CloudflareApiKey) -> str:
         """Display last used time."""
@@ -167,81 +167,81 @@ class CloudflareApiKeyAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             return "Never"
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'last_used_at', config)
-    
+
     @display(description="Created")
     def created_at_display(self, obj: CloudflareApiKey) -> str:
         """Created time with relative display."""
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'created_at', config)
-    
+
     def sites_using_key(self, obj: CloudflareApiKey) -> str:
         """Show sites using this API key."""
         sites = obj.cloudflaresite_set.all()[:10]
-        
+
         if not sites:
             return "No sites using this key"
-        
+
         site_list = []
         for site in sites:
             status_emoji = "🔧" if site.maintenance_active else "🟢"
             site_list.append(f"{status_emoji} {site.name} ({site.domain})")
-        
+
         result = "\n".join(site_list)
-        
+
         total_count = obj.cloudflaresite_set.count()
         if total_count > 10:
             result += f"\n... and {total_count - 10} more sites"
-        
+
         return result
-    
+
     @action(description="Make default API key", variant=ActionVariant.PRIMARY)
     def make_default_action(self, request: HttpRequest, queryset) -> None:
         """Make selected key the default."""
         if queryset.count() > 1:
             messages.error(request, "Please select only one API key to make default.")
             return
-        
+
         key = queryset.first()
         if key:
             key.is_default = True
             key.save()
             messages.success(request, f"'{key.name}' is now the default API key.")
-    
+
     @action(description="Activate API keys", variant=ActionVariant.SUCCESS)
     def activate_keys_action(self, request: HttpRequest, queryset) -> None:
         """Activate selected API keys."""
         count = queryset.update(is_active=True)
         messages.success(request, f"Successfully activated {count} API keys.")
-    
+
     @action(description="Deactivate API keys", variant=ActionVariant.DANGER)
     def deactivate_keys_action(self, request: HttpRequest, queryset) -> None:
         """Deactivate selected API keys."""
         default_keys = queryset.filter(is_default=True)
         if default_keys.exists():
             messages.error(
-                request, 
+                request,
                 "Cannot deactivate default API key. Please set another key as default first."
             )
             return
-        
+
         count = queryset.update(is_active=False)
         messages.warning(request, f"Successfully deactivated {count} API keys.")
-    
+
     def changelist_view(self, request, extra_context=None):
         """Add API key statistics to changelist."""
         extra_context = extra_context or {}
-        
+
         queryset = self.get_queryset(request)
         stats = queryset.aggregate(
             total_keys=Count('id'),
             active_keys=Count('id', filter=models.Q(is_active=True)),
             default_keys=Count('id', filter=models.Q(is_default=True))
         )
-        
+
         extra_context['api_key_stats'] = {
             'total_keys': stats['total_keys'] or 0,
             'active_keys': stats['active_keys'] or 0,
             'default_keys': stats['default_keys'] or 0
         }
-        
+
         return super().changelist_view(request, extra_context)