django-cfg 1.1.69__py3-none-any.whl → 1.1.71__py3-none-any.whl

django_cfg/__init__.py

@@ -38,7 +38,7 @@ default_app_config = "django_cfg.apps.DjangoCfgConfig"
 from typing import TYPE_CHECKING
 
 # Version information
-__version__ = "1.1.69"
+__version__ = "1.1.71"
 __author__ = "Unrealos Team"
 __email__ = "info@unrealos.com"
 __license__ = "MIT"

django_cfg/apps/accounts/admin/__init__.py

@@ -7,6 +7,7 @@ from .otp import OTPSecretAdmin
 from .registration_source import RegistrationSourceAdmin, UserRegistrationSourceAdmin
 from .activity import UserActivityAdmin
 from .group import GroupAdmin
+from .twilio_response import TwilioResponseAdmin
 
 __all__ = [
     'CustomUserAdmin',
@@ -15,4 +16,5 @@ __all__ = [
     'UserRegistrationSourceAdmin',
     'UserActivityAdmin',
     'GroupAdmin',
+    'TwilioResponseAdmin',
 ]

django_cfg/apps/accounts/admin/activity.py

@@ -6,14 +6,21 @@ from django.contrib import admin
 from django.utils.html import format_html
 from django.contrib.humanize.templatetags.humanize import naturaltime
 from unfold.admin import ModelAdmin
+from import_export.admin import ExportMixin
+from unfold.contrib.import_export.forms import ExportForm
 
 from ..models import UserActivity
 from .filters import ActivityTypeFilter
+from .resources import UserActivityResource
 
 
 @admin.register(UserActivity)
-class UserActivityAdmin(ModelAdmin):
-    """Enhanced admin for UserActivity model."""
+class UserActivityAdmin(ModelAdmin, ExportMixin):
+    """Enhanced admin for UserActivity model with export functionality."""
+    
+    # Export-only configuration
+    resource_class = UserActivityResource
+    export_form_class = ExportForm
     
     list_display = [
         'user_display', 

django_cfg/apps/accounts/admin/filters.py

@@ -4,6 +4,7 @@ Custom admin filters for Accounts app.
 
 from django.contrib import admin
 from django.utils import timezone
+from django.db import models
 from datetime import timedelta
 
 
@@ -96,3 +97,44 @@ class ActivityTypeFilter(admin.SimpleListFilter):
         elif self.value():
             return queryset.filter(activity_type=self.value())
         return queryset
+
+
+class TwilioResponseStatusFilter(admin.SimpleListFilter):
+    title = "Response Status"
+    parameter_name = "twilio_status"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("successful", "Successful"),
+            ("error", "Has Error"),
+            ("recent", "Recent (24h)"),
+        )
+
+    def queryset(self, request, queryset):
+        now = timezone.now()
+        if self.value() == "successful":
+            return queryset.filter(error_code__isnull=True, error_message__isnull=True)
+        elif self.value() == "error":
+            return queryset.filter(
+                models.Q(error_code__isnull=False) | models.Q(error_message__isnull=False)
+            )
+        elif self.value() == "recent":
+            return queryset.filter(created_at__gte=now - timedelta(hours=24))
+        return queryset
+
+
+class TwilioResponseTypeFilter(admin.SimpleListFilter):
+    title = "Response Type"
+    parameter_name = "twilio_response_type"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("sms", "SMS"),
+            ("verification", "Verification"),
+            ("call", "Call"),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(response_type=self.value())
+        return queryset

django_cfg/apps/accounts/admin/registration_source.py

@@ -5,14 +5,21 @@ Registration Source admin configuration.
 from django.contrib import admin
 from django.contrib.humanize.templatetags.humanize import naturaltime
 from unfold.admin import ModelAdmin
+from import_export.admin import ImportExportModelAdmin
+from unfold.contrib.import_export.forms import ImportForm, ExportForm
 
 from ..models import RegistrationSource, UserRegistrationSource
 from .filters import RegistrationSourceStatusFilter
 from .inlines import RegistrationSourceInline
+from .resources import RegistrationSourceResource
 
 
 @admin.register(RegistrationSource)
-class RegistrationSourceAdmin(ModelAdmin):
+class RegistrationSourceAdmin(ModelAdmin, ImportExportModelAdmin):
+    # Import/Export configuration
+    resource_class = RegistrationSourceResource
+    import_form_class = ImportForm
+    export_form_class = ExportForm
     list_display = ["name", "url", "status", "users_count", "created"]
     list_display_links = ["name", "url"]
     list_filter = [RegistrationSourceStatusFilter, "is_active", "created_at"]

django_cfg/apps/accounts/admin/resources.py

@@ -0,0 +1,271 @@
+"""
+Import/Export resources for Accounts app.
+"""
+
+from import_export import resources, fields
+from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget, ManyToManyWidget
+from django.contrib.auth.models import Group
+
+from ..models import CustomUser, UserActivity, RegistrationSource, TwilioResponse
+
+
+class CustomUserResource(resources.ModelResource):
+    """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()
+    )
+
+    class Meta:
+        model = CustomUser
+        fields = (
+            'id',
+            'email',
+            'first_name', 
+            'last_name',
+            'full_name',
+            'company',
+            'phone',
+            'phone_verified',
+            'position',
+            'is_active',
+            'is_staff',
+            'is_superuser',
+            'groups',
+            'last_login',
+            'date_joined',
+        )
+        export_order = fields
+        import_id_fields = ('email',)  # Use email as unique identifier
+        skip_unchanged = True
+        report_skipped = True
+        
+    def before_import_row(self, row, **kwargs):
+        """Process row before import."""
+        # Ensure email is lowercase
+        if 'email' in row:
+            row['email'] = row['email'].lower().strip()
+            
+    def skip_row(self, instance, original, row, import_validation_errors=None):
+        """Skip rows with validation errors."""
+        if import_validation_errors:
+            return True
+        return super().skip_row(instance, original, row, import_validation_errors)
+
+
+class UserActivityResource(resources.ModelResource):
+    """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')
+    )
+
+    class Meta:
+        model = UserActivity
+        fields = (
+            'id',
+            'user_email',
+            'user_full_name',
+            'activity_type',
+            'activity_type_display',
+            'description',
+            'ip_address',
+            'user_agent',
+            'object_id',
+            'object_type',
+            'created_at',
+        )
+        export_order = fields
+        # No import - this is export only
+        
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('user')
+
+
+class RegistrationSourceResource(resources.ModelResource):
+    """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
+    )
+
+    class Meta:
+        model = RegistrationSource
+        fields = (
+            'id',
+            'url',
+            'name',
+            'description',
+            'is_active',
+            'users_count',
+            'created_at',
+            'updated_at',
+        )
+        export_order = fields
+        import_id_fields = ('url',)  # Use URL as unique identifier
+        skip_unchanged = True
+        report_skipped = True
+        
+    def dehydrate_users_count(self, registration_source):
+        """Calculate users count for export."""
+        return registration_source.user_registration_sources.count()
+        
+    def before_import_row(self, row, **kwargs):
+        """Process row before import."""
+        # Ensure URL is properly formatted
+        if 'url' in row and row['url']:
+            url = row['url'].strip()
+            if not url.startswith(('http://', 'https://')):
+                row['url'] = f'https://{url}'
+            else:
+                row['url'] = url
+
+
+class TwilioResponseResource(resources.ModelResource):
+    """Resource for exporting Twilio responses (export only)."""
+    
+    otp_recipient = fields.Field(
+        column_name='otp_recipient',
+        attribute='otp_secret__recipient',
+        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
+    )
+
+    class Meta:
+        model = TwilioResponse
+        fields = (
+            'id',
+            'response_type',
+            'service_type',
+            'status',
+            'message_sid',
+            'verification_sid',
+            'to_number',
+            'from_number',
+            'otp_recipient',
+            'error_code',
+            'error_message',
+            'price',
+            'price_unit',
+            'has_error',
+            'is_successful',
+            'created_at',
+            'updated_at',
+            'twilio_created_at',
+        )
+        export_order = fields
+        # No import - this is export only
+        
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('otp_secret')

django_cfg/apps/accounts/admin/twilio_response.py

@@ -6,9 +6,12 @@ from django.contrib import admin
 from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.utils.html import format_html
 from unfold.admin import ModelAdmin
+from import_export.admin import ExportMixin
+from unfold.contrib.import_export.forms import ExportForm
 
 from ..models import TwilioResponse
 from .filters import TwilioResponseStatusFilter, TwilioResponseTypeFilter
+from .resources import TwilioResponseResource
 
 
 class TwilioResponseInline(admin.TabularInline):
@@ -23,7 +26,10 @@ class TwilioResponseInline(admin.TabularInline):
 
 
 @admin.register(TwilioResponse)
-class TwilioResponseAdmin(ModelAdmin):
+class TwilioResponseAdmin(ModelAdmin, ExportMixin):
+    # Export-only configuration
+    resource_class = TwilioResponseResource
+    export_form_class = ExportForm
     list_display = [
         'identifier', 
         'service_type', 

django_cfg/apps/accounts/admin/user.py

@@ -12,18 +12,26 @@ from unfold.admin import ModelAdmin
 from unfold.forms import AdminPasswordChangeForm, UserChangeForm, UserCreationForm
 from unfold.decorators import action
 from unfold.enums import ActionVariant
+from import_export.admin import ImportExportModelAdmin
+from unfold.contrib.import_export.forms import ImportForm, ExportForm
 
 from ..models import CustomUser
 from .filters import UserStatusFilter
 from .inlines import UserRegistrationSourceInline, UserActivityInline, UserEmailLogInline, UserSupportTicketsInline
+from .resources import CustomUserResource
 
 
 @admin.register(CustomUser)
-class CustomUserAdmin(BaseUserAdmin, ModelAdmin):
+class CustomUserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin):
     # Forms loaded from `unfold.forms`
     form = UserChangeForm
     add_form = UserCreationForm
     change_password_form = AdminPasswordChangeForm
+    
+    # Import/Export configuration
+    resource_class = CustomUserResource
+    import_form_class = ImportForm
+    export_form_class = ExportForm
 
     list_display = [
         "avatar",

django_cfg/apps/accounts/migrations/0005_twilioresponse.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.6 on 2025-09-17 19:28
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_cfg_accounts', '0004_delete_twilioresponse'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TwilioResponse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('response_type', models.CharField(choices=[('api_send', 'API Send Request'), ('api_verify', 'API Verify Request'), ('webhook_status', 'Webhook Status Update'), ('webhook_delivery', 'Webhook Delivery Report')], max_length=20)),
+                ('service_type', models.CharField(choices=[('whatsapp', 'WhatsApp'), ('sms', 'SMS'), ('voice', 'Voice'), ('email', 'Email'), ('verify', 'Verify API')], max_length=10)),
+                ('message_sid', models.CharField(blank=True, help_text='Twilio Message SID', max_length=34)),
+                ('verification_sid', models.CharField(blank=True, help_text='Twilio Verification SID', max_length=34)),
+                ('request_data', models.JSONField(default=dict, help_text='Original request parameters')),
+                ('response_data', models.JSONField(default=dict, help_text='Twilio API response')),
+                ('status', models.CharField(blank=True, help_text='Message/Verification status', max_length=20)),
+                ('error_code', models.CharField(blank=True, help_text='Twilio error code', max_length=10)),
+                ('error_message', models.TextField(blank=True, help_text='Error description')),
+                ('to_number', models.CharField(blank=True, help_text='Recipient phone/email', max_length=20)),
+                ('from_number', models.CharField(blank=True, help_text='Sender phone/email', max_length=20)),
+                ('price', models.DecimalField(blank=True, decimal_places=6, max_digits=10, null=True)),
+                ('price_unit', models.CharField(blank=True, help_text='Currency code', max_length=3)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('twilio_created_at', models.DateTimeField(blank=True, help_text='Timestamp from Twilio', null=True)),
+                ('otp_secret', models.ForeignKey(blank=True, help_text='Related OTP if applicable', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='twilio_responses', to='django_cfg_accounts.otpsecret')),
+            ],
+            options={
+                'verbose_name': 'Twilio Response',
+                'verbose_name_plural': 'Twilio Responses',
+                'ordering': ['-created_at'],
+                'indexes': [models.Index(fields=['message_sid'], name='django_cfg__message_c37dcd_idx'), models.Index(fields=['verification_sid'], name='django_cfg__verific_7de689_idx'), models.Index(fields=['status', 'created_at'], name='django_cfg__status_95d8c8_idx'), models.Index(fields=['response_type', 'service_type'], name='django_cfg__respons_20ca26_idx')],
+            },
+        ),
+    ]

django_cfg/apps/accounts/models.py

@@ -237,3 +237,86 @@ class UserActivity(models.Model):
     
     def __str__(self):
         return f"{self.user.username} - {self.get_activity_type_display()}"
+
+
+class TwilioResponse(models.Model):
+    """Model for storing Twilio API responses and webhook data."""
+    
+    class ResponseType(models.TextChoices):
+        API_SEND = 'api_send', 'API Send Request'
+        API_VERIFY = 'api_verify', 'API Verify Request'
+        WEBHOOK_STATUS = 'webhook_status', 'Webhook Status Update'
+        WEBHOOK_DELIVERY = 'webhook_delivery', 'Webhook Delivery Report'
+    
+    class ServiceType(models.TextChoices):
+        WHATSAPP = 'whatsapp', 'WhatsApp'
+        SMS = 'sms', 'SMS'
+        VOICE = 'voice', 'Voice'
+        EMAIL = 'email', 'Email'
+        VERIFY = 'verify', 'Verify API'
+    
+    # Response metadata
+    response_type = models.CharField(max_length=20, choices=ResponseType.choices)
+    service_type = models.CharField(max_length=10, choices=ServiceType.choices)
+    
+    # Twilio identifiers
+    message_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Message SID")
+    verification_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Verification SID")
+    
+    # Request/Response data
+    request_data = models.JSONField(default=dict, help_text="Original request parameters")
+    response_data = models.JSONField(default=dict, help_text="Twilio API response")
+    
+    # Status and error information
+    status = models.CharField(max_length=20, blank=True, help_text="Message/Verification status")
+    error_code = models.CharField(max_length=10, blank=True, help_text="Twilio error code")
+    error_message = models.TextField(blank=True, help_text="Error description")
+    
+    # Contact information
+    to_number = models.CharField(max_length=20, blank=True, help_text="Recipient phone/email")
+    from_number = models.CharField(max_length=20, blank=True, help_text="Sender phone/email")
+    
+    # Pricing information
+    price = models.DecimalField(max_digits=10, decimal_places=6, null=True, blank=True)
+    price_unit = models.CharField(max_length=3, blank=True, help_text="Currency code")
+    
+    # Timestamps
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    twilio_created_at = models.DateTimeField(null=True, blank=True, help_text="Timestamp from Twilio")
+    
+    # Relations
+    otp_secret = models.ForeignKey(
+        OTPSecret,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='twilio_responses',
+        help_text="Related OTP if applicable"
+    )
+    
+    class Meta:
+        app_label = 'django_cfg_accounts'
+        verbose_name = 'Twilio Response'
+        verbose_name_plural = 'Twilio Responses'
+        ordering = ['-created_at']
+        indexes = [
+            models.Index(fields=['message_sid']),
+            models.Index(fields=['verification_sid']),
+            models.Index(fields=['status', 'created_at']),
+            models.Index(fields=['response_type', 'service_type']),
+        ]
+    
+    def __str__(self):
+        identifier = self.message_sid or self.verification_sid or f"#{self.id}"
+        return f"{self.get_service_type_display()} {self.get_response_type_display()} - {identifier}"
+    
+    @property
+    def has_error(self):
+        """Check if response has error."""
+        return bool(self.error_code or self.error_message)
+    
+    @property
+    def is_successful(self):
+        """Check if response is successful."""
+        return not self.has_error and self.status in ['sent', 'delivered', 'approved']

django_cfg/apps/leads/admin/__init__.py

@@ -0,0 +1,9 @@
+"""
+Admin configuration for Leads app.
+"""
+
+from .leads_admin import LeadAdmin
+
+__all__ = [
+    'LeadAdmin',
+]

django_cfg/apps/leads/{admin.py → admin/leads_admin.py}

@@ -4,11 +4,19 @@ from django.utils.html import format_html
 from django.http import HttpResponseRedirect
 from unfold.admin import ModelAdmin
 from unfold.decorators import action
-from .models import Lead
+from import_export.admin import ImportExportModelAdmin
+from unfold.contrib.import_export.forms import ImportForm, ExportForm
+
+from ..models import Lead
+from .resources import LeadResource
 
 
 @admin.register(Lead)
-class LeadAdmin(ModelAdmin):
+class LeadAdmin(ModelAdmin, ImportExportModelAdmin):
+    # Import/Export configuration
+    resource_class = LeadResource
+    import_form_class = ImportForm
+    export_form_class = ExportForm
     list_display = [
         'name', 'email', 'company', 'contact_type', 'contact_value',
         'subject', 'status_display', 'created_at'