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

django_cfg/apps/accounts/admin/otp_admin.py

@@ -8,12 +8,12 @@ from django.contrib import admin
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
     DateTimeDisplayConfig,
-    StatusBadgeConfig,
+    DisplayMixin,
     Icons,
-    display
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    display,
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -24,7 +24,7 @@ from .filters import OTPStatusFilter
 @admin.register(OTPSecret)
 class OTPSecretAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Enhanced OTP admin using Django Admin Utilities."""
-    
+
     list_display = [
         'email_display',
         'secret_display',
@@ -53,7 +53,7 @@ class OTPSecretAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             },
         ),
     )
-    
+
     @display(description="Email")
     def email_display(self, obj):
         """Email display with email icon."""
@@ -63,7 +63,7 @@ class OTPSecretAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="info",
             config=config
         )
-    
+
     @display(description="Secret")
     def secret_display(self, obj):
         """Secret display with key icon."""
@@ -73,7 +73,7 @@ class OTPSecretAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="secondary",
             config=config
         )
-    
+
     @display(description="Status", label=True)
     def status_display(self, obj):
         """Enhanced OTP status with appropriate icons and colors."""
@@ -89,25 +89,25 @@ class OTPSecretAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             status = "Expired"
             icon = Icons.SCHEDULE
             variant = "warning"
-        
+
         config = StatusBadgeConfig(
             show_icons=True,
             icon=icon,
             custom_mappings={status: variant}
         )
-        
+
         return self.display_status_auto(
             type('obj', (), {'status': status})(),
             'status',
             config
         )
-    
+
     @display(description="Created")
     def created_display(self, obj):
         """Created time with relative display."""
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'created_at', config)
-    
+
     @display(description="Expires")
     def expires_display(self, obj):
         """Expires time with relative display."""

django_cfg/apps/accounts/admin/registration_admin.py

@@ -8,13 +8,13 @@ from django.contrib import admin
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    UserDisplayConfig,
     DateTimeDisplayConfig,
-    StatusBadgeConfig,
+    DisplayMixin,
     Icons,
-    display
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    UserDisplayConfig,
+    display,
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -24,7 +24,7 @@ from ..models import RegistrationSource, UserRegistrationSource
 @admin.register(RegistrationSource)
 class RegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Enhanced admin for RegistrationSource model using Django Admin Utilities."""
-    
+
     list_display = [
         'name_display',
         'description_display',
@@ -37,7 +37,7 @@ class RegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     search_fields = ['name', 'description']
     readonly_fields = ['created_at', 'updated_at']
     ordering = ['name']
-    
+
     fieldsets = (
         ('Source Details', {
             'fields': ('name', 'description', 'is_active')
@@ -47,7 +47,7 @@ class RegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'classes': ('collapse',)
         }),
     )
-    
+
     @display(description="Name")
     def name_display(self, obj):
         """Name display with source icon."""
@@ -57,58 +57,58 @@ class RegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="primary",
             config=config
         )
-    
+
     @display(description="Description")
     def description_display(self, obj):
         """Description display with info icon."""
         if not obj.description:
             return "—"
-        
+
         # Truncate long descriptions
         description = obj.description
         if len(description) > 50:
             description = f"{description[:47]}..."
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.INFO)
         return StatusBadge.create(
             text=description,
             variant="info",
             config=config
         )
-    
+
     @display(description="Status", label=True)
     def is_active_display(self, obj):
         """Active status display."""
         status = "Active" if obj.is_active else "Inactive"
         icon = Icons.CHECK_CIRCLE if obj.is_active else Icons.CANCEL
         variant = "success" if obj.is_active else "secondary"
-        
+
         config = StatusBadgeConfig(
             show_icons=True,
             icon=icon,
             custom_mappings={status: variant}
         )
-        
+
         return self.display_status_auto(
             type('obj', (), {'status': status})(),
             'status',
             config
         )
-    
+
     @display(description="Users")
     def users_count_display(self, obj):
         """Count of users from this source."""
         count = obj.user_registration_sources.count()
         if count == 0:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.PEOPLE)
         return StatusBadge.create(
             text=f"{count} user{'s' if count != 1 else ''}",
             variant="info",
             config=config
         )
-    
+
     @display(description="Created")
     def created_at_display(self, obj):
         """Created time with relative display."""
@@ -119,10 +119,10 @@ class RegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
 @admin.register(UserRegistrationSource)
 class UserRegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Enhanced admin for UserRegistrationSource model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['user', 'source']
-    
+
     list_display = [
         'user_display',
         'source_display',
@@ -134,7 +134,7 @@ class UserRegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin)
     readonly_fields = ['registration_date']
     date_hierarchy = 'registration_date'
     ordering = ['-registration_date']
-    
+
     fieldsets = (
         ('Registration Details', {
             'fields': ('user', 'source', 'first_registration')
@@ -143,7 +143,7 @@ class UserRegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin)
             'fields': ('registration_date',)
         }),
     )
-    
+
     @display(description="User")
     def user_display(self, obj):
         """User display with avatar."""
@@ -153,19 +153,19 @@ class UserRegistrationSourceAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin)
             show_email=True
         )
         return self.display_user_simple(obj.user, config)
-    
+
     @display(description="Source")
     def source_display(self, obj):
         """Source display with source icon."""
         config = StatusBadgeConfig(show_icons=True, icon=Icons.SOURCE)
         variant = "success" if obj.source.is_active else "secondary"
-        
+
         return StatusBadge.create(
             text=obj.source.name,
             variant=variant,
             config=config
         )
-    
+
     @display(description="Registered")
     def registration_date_display(self, obj):
         """Registration date with relative display."""

django_cfg/apps/accounts/admin/resources.py

@@ -4,67 +4,68 @@ Import/Export resources for Accounts app.
 Enhanced resources with better data validation and export optimization.
 """
 
-from import_export import resources, fields
-from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget, ManyToManyWidget
+from datetime import timedelta
+
 from django.contrib.auth.models import Group
 from django.utils import timezone
-from datetime import timedelta
+from import_export import fields, resources
+from import_export.widgets import BooleanWidget, DateTimeWidget, ManyToManyWidget
 
-from ..models import CustomUser, UserActivity, RegistrationSource, TwilioResponse
+from ..models import CustomUser, RegistrationSource, TwilioResponse, UserActivity
 
 
 class CustomUserResource(resources.ModelResource):
     """Enhanced resource for importing/exporting users."""
-    
+
     # Custom fields for better export/import
     full_name = fields.Field(
         column_name='full_name',
         attribute='get_full_name',
         readonly=True
     )
-    
+
     groups = fields.Field(
         column_name='groups',
         attribute='groups',
         widget=ManyToManyWidget(Group, field='name', separator='|')
     )
-    
+
     last_login = fields.Field(
         column_name='last_login',
         attribute='last_login',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     date_joined = fields.Field(
         column_name='date_joined',
         attribute='date_joined',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     is_active = fields.Field(
         column_name='is_active',
         attribute='is_active',
         widget=BooleanWidget()
     )
-    
+
     is_staff = fields.Field(
         column_name='is_staff',
         attribute='is_staff',
         widget=BooleanWidget()
     )
-    
+
     phone_verified = fields.Field(
         column_name='phone_verified',
         attribute='phone_verified',
         widget=BooleanWidget()
     )
-    
+
     # Additional computed fields
     registration_sources = fields.Field(
         column_name='registration_sources',
         readonly=True
     )
-    
+
     activities_count = fields.Field(
         column_name='activities_count',
         readonly=True
@@ -75,7 +76,7 @@ class CustomUserResource(resources.ModelResource):
         fields = (
             'id',
             'email',
-            'first_name', 
+            'first_name',
             'last_name',
             'full_name',
             'company',
@@ -95,16 +96,16 @@ class CustomUserResource(resources.ModelResource):
         import_id_fields = ('email',)  # Use email as unique identifier
         skip_unchanged = True
         report_skipped = True
-        
+
     def dehydrate_registration_sources(self, user):
         """Get registration sources for export."""
         sources = user.user_registration_sources.select_related('source').all()
         return '|'.join([source.source.name for source in sources])
-    
+
     def dehydrate_activities_count(self, user):
         """Get activities count for export."""
         return user.activities.count()
-        
+
     def before_import_row(self, row, **kwargs):
         """Process row before import with enhanced validation."""
         # Ensure email is lowercase and valid
@@ -113,12 +114,12 @@ class CustomUserResource(resources.ModelResource):
             if '@' not in email:
                 raise ValueError(f"Invalid email format: {email}")
             row['email'] = email
-        
+
         # Clean phone number
         if 'phone' in row and row['phone']:
             phone = ''.join(filter(str.isdigit, str(row['phone'])))
             row['phone'] = phone if phone else None
-            
+
     def skip_row(self, instance, original, row, import_validation_errors=None):
         """Skip rows with validation errors."""
         if import_validation_errors:
@@ -128,31 +129,31 @@ class CustomUserResource(resources.ModelResource):
 
 class UserActivityResource(resources.ModelResource):
     """Enhanced resource for exporting user activity (export only)."""
-    
+
     user_email = fields.Field(
         column_name='user_email',
         attribute='user__email',
         readonly=True
     )
-    
+
     user_full_name = fields.Field(
         column_name='user_full_name',
         attribute='user__get_full_name',
         readonly=True
     )
-    
+
     activity_type_display = fields.Field(
         column_name='activity_type_display',
         attribute='get_activity_type_display',
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     # Additional context fields
     user_agent_browser = fields.Field(
         column_name='user_agent_browser',
@@ -177,12 +178,12 @@ class UserActivityResource(resources.ModelResource):
         )
         export_order = fields
         # No import - this is export only
-    
+
     def dehydrate_user_agent_browser(self, activity):
         """Extract browser info from user agent."""
         if not activity.user_agent:
             return "Unknown"
-        
+
         user_agent = activity.user_agent.lower()
         if 'chrome' in user_agent:
             return "Chrome"
@@ -194,7 +195,7 @@ class UserActivityResource(resources.ModelResource):
             return "Edge"
         else:
             return "Other"
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('user')
@@ -202,30 +203,30 @@ class UserActivityResource(resources.ModelResource):
 
 class RegistrationSourceResource(resources.ModelResource):
     """Enhanced resource for importing/exporting registration sources."""
-    
+
     is_active = fields.Field(
         column_name='is_active',
         attribute='is_active',
         widget=BooleanWidget()
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     updated_at = fields.Field(
         column_name='updated_at',
         attribute='updated_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     users_count = fields.Field(
         column_name='users_count',
         readonly=True
     )
-    
+
     recent_registrations = fields.Field(
         column_name='recent_registrations_7d',
         readonly=True
@@ -247,19 +248,19 @@ class RegistrationSourceResource(resources.ModelResource):
         import_id_fields = ('name',)  # Use name as unique identifier
         skip_unchanged = True
         report_skipped = True
-        
+
     def dehydrate_users_count(self, registration_source):
         """Calculate total users count for export."""
         return registration_source.user_registration_sources.count()
-    
+
     def dehydrate_recent_registrations(self, registration_source):
         """Calculate recent registrations count."""
-        
+
         week_ago = timezone.now() - timedelta(days=7)
         return registration_source.user_registration_sources.filter(
             created_at__gte=week_ago
         ).count()
-        
+
     def before_import_row(self, row, **kwargs):
         """Process row before import with validation."""
         # Clean and validate name
@@ -271,51 +272,51 @@ class RegistrationSourceResource(resources.ModelResource):
 
 class TwilioResponseResource(resources.ModelResource):
     """Enhanced resource for exporting Twilio responses (export only)."""
-    
+
     otp_recipient = fields.Field(
         column_name='otp_recipient',
         attribute='otp_secret__email',
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     updated_at = fields.Field(
         column_name='updated_at',
         attribute='updated_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     twilio_created_at = fields.Field(
         column_name='twilio_created_at',
         attribute='twilio_created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     has_error = fields.Field(
         column_name='has_error',
         attribute='has_error',
         widget=BooleanWidget(),
         readonly=True
     )
-    
+
     is_successful = fields.Field(
         column_name='is_successful',
         attribute='is_successful',
         widget=BooleanWidget(),
         readonly=True
     )
-    
+
     # Additional computed fields
     response_time_ms = fields.Field(
         column_name='response_time_ms',
         readonly=True
     )
-    
+
     masked_recipient = fields.Field(
         column_name='masked_recipient',
         readonly=True
@@ -347,19 +348,19 @@ class TwilioResponseResource(resources.ModelResource):
         )
         export_order = fields
         # No import - this is export only
-    
+
     def dehydrate_response_time_ms(self, twilio_response):
         """Calculate response time if available."""
         if twilio_response.twilio_created_at and twilio_response.created_at:
             delta = twilio_response.twilio_created_at - twilio_response.created_at
             return int(delta.total_seconds() * 1000)
         return None
-    
+
     def dehydrate_masked_recipient(self, twilio_response):
         """Mask recipient for privacy."""
         if not twilio_response.to_number:
             return "—"
-        
+
         recipient = twilio_response.to_number
         if '@' in recipient:
             # Email masking
@@ -369,7 +370,7 @@ class TwilioResponseResource(resources.ModelResource):
         else:
             # Phone masking
             return f"***{recipient[-4:]}" if len(recipient) > 4 else "***"
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('otp_secret')