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

django_cfg/apps/newsletter/admin/resources.py

@@ -2,42 +2,42 @@
 Import/Export resources for Newsletter app.
 """
 
-from import_export import resources, fields
-from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget
 from django.contrib.auth import get_user_model
+from import_export import fields, resources
+from import_export.widgets import BooleanWidget, DateTimeWidget, ForeignKeyWidget
 
-from ..models import Newsletter, NewsletterSubscription, EmailLog
+from ..models import EmailLog, Newsletter, NewsletterSubscription
 
 User = get_user_model()
 
 
 class NewsletterResource(resources.ModelResource):
     """Resource for importing/exporting newsletters."""
-    
+
     subscribers_count = fields.Field(
         column_name='subscribers_count',
         attribute='subscribers_count',
         readonly=True
     )
-    
+
     is_active = fields.Field(
         column_name='is_active',
         attribute='is_active',
         widget=BooleanWidget()
     )
-    
+
     auto_subscribe = fields.Field(
         column_name='auto_subscribe',
         attribute='auto_subscribe',
         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',
@@ -60,7 +60,7 @@ class NewsletterResource(resources.ModelResource):
         import_id_fields = ('title',)  # Use title as unique identifier
         skip_unchanged = True
         report_skipped = True
-        
+
     def before_import_row(self, row, **kwargs):
         """Process row before import."""
         # Ensure title is not empty
@@ -72,33 +72,33 @@ class NewsletterResource(resources.ModelResource):
 
 class NewsletterSubscriptionResource(resources.ModelResource):
     """Resource for importing/exporting newsletter subscriptions."""
-    
+
     newsletter_title = fields.Field(
         column_name='newsletter_title',
         attribute='newsletter__title',
         widget=ForeignKeyWidget(Newsletter, field='title'),
         readonly=False
     )
-    
+
     user_email = fields.Field(
         column_name='user_email',
         attribute='user__email',
         widget=ForeignKeyWidget(User, field='email'),
         readonly=False
     )
-    
+
     is_active = fields.Field(
         column_name='is_active',
         attribute='is_active',
         widget=BooleanWidget()
     )
-    
+
     subscribed_at = fields.Field(
         column_name='subscribed_at',
         attribute='subscribed_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     unsubscribed_at = fields.Field(
         column_name='unsubscribed_at',
         attribute='unsubscribed_at',
@@ -120,13 +120,13 @@ class NewsletterSubscriptionResource(resources.ModelResource):
         import_id_fields = ('newsletter_title', 'email')  # Composite 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()
-            
+
         # Handle newsletter assignment by title
         if 'newsletter_title' in row and row['newsletter_title']:
             try:
@@ -134,7 +134,7 @@ class NewsletterSubscriptionResource(resources.ModelResource):
                 row['newsletter'] = newsletter.pk
             except Newsletter.DoesNotExist:
                 raise ValueError(f"Newsletter '{row['newsletter_title']}' not found")
-                
+
         # Handle user assignment by email (optional)
         if 'user_email' in row and row['user_email']:
             try:
@@ -143,7 +143,7 @@ class NewsletterSubscriptionResource(resources.ModelResource):
             except User.DoesNotExist:
                 # Clear user field if email not found
                 row['user'] = None
-                
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('newsletter', 'user')
@@ -151,63 +151,63 @@ class NewsletterSubscriptionResource(resources.ModelResource):
 
 class EmailLogResource(resources.ModelResource):
     """Resource for exporting email logs (export only)."""
-    
+
     user_email = fields.Field(
         column_name='user_email',
         attribute='user__email',
         readonly=True
     )
-    
+
     newsletter_title = fields.Field(
         column_name='newsletter_title',
         attribute='newsletter__title',
         readonly=True
     )
-    
+
     campaign_subject = fields.Field(
         column_name='campaign_subject',
         attribute='campaign__subject',
         readonly=True
     )
-    
+
     status_display = fields.Field(
         column_name='status_display',
         attribute='get_status_display',
         readonly=True
     )
-    
+
     is_opened = fields.Field(
         column_name='is_opened',
         attribute='is_opened',
         widget=BooleanWidget(),
         readonly=True
     )
-    
+
     is_clicked = fields.Field(
         column_name='is_clicked',
         attribute='is_clicked',
         widget=BooleanWidget(),
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     sent_at = fields.Field(
         column_name='sent_at',
         attribute='sent_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     opened_at = fields.Field(
         column_name='opened_at',
         attribute='opened_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     clicked_at = fields.Field(
         column_name='clicked_at',
         attribute='clicked_at',
@@ -235,7 +235,7 @@ class EmailLogResource(resources.ModelResource):
         )
         export_order = fields
         # No import - this is export only
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('user', 'newsletter', 'campaign')

django_cfg/apps/newsletter/admin.py

@@ -1,14 +1,21 @@
 from django import forms
 from django.contrib import admin, messages
+from django.http import HttpResponseRedirect
 from django.urls import reverse
 from django.utils.html import format_html
-from django.http import HttpResponseRedirect
 from unfold.admin import ModelAdmin
-from unfold.decorators import action
 from unfold.contrib.forms.widgets import WysiwygWidget
+from unfold.decorators import action
 from unfold.enums import ActionVariant
-from .models import EmailLog, Newsletter, NewsletterSubscription, NewsletterCampaign
-from .admin_filters import UserEmailFilter, UserNameFilter, HasUserFilter, EmailOpenedFilter, EmailClickedFilter
+
+from .admin_filters import (
+    EmailClickedFilter,
+    EmailOpenedFilter,
+    HasUserFilter,
+    UserEmailFilter,
+    UserNameFilter,
+)
+from .models import EmailLog, Newsletter, NewsletterCampaign, NewsletterSubscription
 
 
 @admin.register(EmailLog)
@@ -34,15 +41,15 @@ class EmailLogAdmin(ModelAdmin):
             return format_html('<a href="{}">{}</a>', link, obj.newsletter.title)
         return "-"
     newsletter_link.short_description = 'Newsletter'
-    
+
     def tracking_status(self, obj):
         """Show clean tracking status."""
         opened_status = "Opened" if obj.is_opened else "Not opened"
         clicked_status = "Clicked" if obj.is_clicked else "Not clicked"
-        
+
         opened_color = "#28a745" if obj.is_opened else "#dc3545"
         clicked_color = "#007bff" if obj.is_clicked else "#6c757d"
-        
+
         return format_html(
             '<div style="display: flex; gap: 8px;">'
             '<span style="background: {}; color: white; padding: 2px 6px; border-radius: 3px; font-size: 11px;">{}</span>'
@@ -119,10 +126,10 @@ class NewsletterCampaignAdmin(ModelAdmin):
     readonly_fields = ('status', 'created_at', 'sent_at', 'recipient_count')
     search_fields = ('subject', 'email_title', 'main_text')
     autocomplete_fields = ('newsletter',)
-    
+
     # Django admin actions
     actions = ["send_selected_campaigns"]
-    
+
     # Unfold actions configuration
     actions_list = []  # Changelist actions (removed send_selected_campaigns)
     actions_detail = ["send_campaign"]  # Detail page actions
@@ -141,29 +148,29 @@ class NewsletterCampaignAdmin(ModelAdmin):
             if not campaign:
                 self.message_user(request, "Campaign not found.", messages.ERROR)
                 return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
-                
+
             if campaign.status != NewsletterCampaign.CampaignStatus.DRAFT:
                 self.message_user(
-                    request, 
-                    f"Campaign '{campaign.subject}' is not in draft status.", 
+                    request,
+                    f"Campaign '{campaign.subject}' is not in draft status.",
                     messages.WARNING
                 )
                 return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
-            
+
             success = campaign.send_campaign()
             if success:
                 self.message_user(
-                    request, 
-                    f"Campaign '{campaign.subject}' sent successfully.", 
+                    request,
+                    f"Campaign '{campaign.subject}' sent successfully.",
                     messages.SUCCESS
                 )
             else:
                 self.message_user(
-                    request, 
-                    f"Campaign '{campaign.subject}' failed to send.", 
+                    request,
+                    f"Campaign '{campaign.subject}' failed to send.",
                     messages.ERROR
                 )
-                
+
         except Exception as e:
             self.message_user(request, f"An error occurred: {e}", messages.ERROR)
 
@@ -173,7 +180,7 @@ class NewsletterCampaignAdmin(ModelAdmin):
         """Send multiple campaigns (standard Django admin action)."""
         sent_count = 0
         skipped_count = 0
-        
+
         for campaign in queryset:
             if campaign.status == NewsletterCampaign.CampaignStatus.DRAFT:
                 success = campaign.send_campaign()
@@ -184,24 +191,24 @@ class NewsletterCampaignAdmin(ModelAdmin):
             else:
                 skipped_count += 1
                 messages.warning(
-                    request, 
+                    request,
                     f"Campaign '{campaign.subject}' skipped (not in Draft status)."
                 )
 
         if sent_count > 0:
             self.message_user(
-                request, 
-                f"Successfully sent {sent_count} campaigns.", 
+                request,
+                f"Successfully sent {sent_count} campaigns.",
                 messages.SUCCESS
             )
-        
+
         if skipped_count > 0:
             self.message_user(
-                request, 
-                f"{skipped_count} campaigns were skipped.", 
+                request,
+                f"{skipped_count} campaigns were skipped.",
                 messages.WARNING
             )
-    
+
     send_selected_campaigns.short_description = "Send selected campaigns"
 
     @action(
@@ -216,19 +223,19 @@ class NewsletterCampaignAdmin(ModelAdmin):
             success = obj.send_campaign()
             if success:
                 self.message_user(
-                    request, 
-                    f"Campaign '{obj.subject}' sent successfully.", 
+                    request,
+                    f"Campaign '{obj.subject}' sent successfully.",
                     messages.SUCCESS
                 )
             else:
                 self.message_user(
-                    request, 
-                    f"Campaign '{obj.subject}' failed to send.", 
+                    request,
+                    f"Campaign '{obj.subject}' failed to send.",
                     messages.ERROR
                 )
         else:
             self.message_user(
-                request, 
-                f"Campaign '{obj.subject}' is not in draft status.", 
+                request,
+                f"Campaign '{obj.subject}' is not in draft status.",
                 messages.WARNING
             )

django_cfg/apps/newsletter/management/commands/test_newsletter.py

@@ -2,10 +2,10 @@
 Management command to test newsletter sending functionality.
 """
 
-from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth import get_user_model
+from django.core.management.base import BaseCommand, CommandError
 
-from django_cfg.apps.newsletter.models import Newsletter, NewsletterSubscription, NewsletterCampaign
+from django_cfg.apps.newsletter.models import Newsletter, NewsletterCampaign, NewsletterSubscription
 from django_cfg.apps.newsletter.services.email_service import NewsletterEmailService
 
 User = get_user_model()
@@ -107,7 +107,7 @@ class Command(BaseCommand):
 
             # Send test email
             self.stdout.write("Sending test newsletter...")
-            
+
             email_service = NewsletterEmailService()
             result = email_service.send_newsletter_email(
                 newsletter=newsletter,

django_cfg/apps/newsletter/managers/__init__.py

@@ -1 +1 @@
-# Managers package 
+# Managers package

django_cfg/apps/newsletter/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # Generated by Django 5.2.5 on 2025-09-09 05:19
 
-import django.db.models.deletion
 import uuid
+
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
 

django_cfg/apps/newsletter/models.py

@@ -1,16 +1,17 @@
 import uuid
-from django.db import models
+
 from django.conf import settings
+from django.db import models
 from django.utils import timezone
 
 
 class NewsletterManager(models.Manager):
     """Custom manager for Newsletter model."""
-    
+
     def active(self):
         """Get active newsletters."""
         return self.filter(is_active=True)
-    
+
     def with_auto_subscribe(self):
         """Get newsletters with auto-subscribe enabled."""
         return self.filter(is_active=True, auto_subscribe=True)
@@ -18,29 +19,29 @@ class NewsletterManager(models.Manager):
 
 class Newsletter(models.Model):
     """Newsletter model for managing email campaigns."""
-    
+
     title = models.CharField(max_length=255, verbose_name="Newsletter Title")
     description = models.TextField(blank=True, verbose_name="Description")
     is_active = models.BooleanField(default=True, verbose_name="Active")
     auto_subscribe = models.BooleanField(
-        default=False, 
+        default=False,
         verbose_name="Auto Subscribe New Users",
         help_text="Automatically subscribe new users to this newsletter"
     )
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    
+
     objects = NewsletterManager()
-    
+
     class Meta:
         app_label = 'django_cfg_newsletter'
         verbose_name = "Newsletter"
         verbose_name_plural = "Newsletters"
         ordering = ['-created_at']
-    
+
     def __str__(self):
         return self.title
-    
+
     @property
     def subscribers_count(self):
         """Get count of active subscribers."""
@@ -49,11 +50,11 @@ class Newsletter(models.Model):
 
 class NewsletterSubscriptionManager(models.Manager):
     """Custom manager for NewsletterSubscription model."""
-    
+
     def active(self):
         """Get active subscriptions."""
         return self.filter(is_active=True)
-    
+
     def for_newsletter(self, newsletter):
         """Get subscriptions for specific newsletter."""
         return self.filter(newsletter=newsletter, is_active=True)
@@ -61,10 +62,10 @@ class NewsletterSubscriptionManager(models.Manager):
 
 class NewsletterSubscription(models.Model):
     """Newsletter subscription model."""
-    
+
     newsletter = models.ForeignKey(
-        Newsletter, 
-        on_delete=models.CASCADE, 
+        Newsletter,
+        on_delete=models.CASCADE,
         related_name='subscriptions',
         verbose_name="Newsletter"
     )
@@ -79,19 +80,19 @@ class NewsletterSubscription(models.Model):
     is_active = models.BooleanField(default=True, verbose_name="Active")
     subscribed_at = models.DateTimeField(auto_now_add=True)
     unsubscribed_at = models.DateTimeField(null=True, blank=True)
-    
+
     objects = NewsletterSubscriptionManager()
-    
+
     class Meta:
         app_label = 'django_cfg_newsletter'
         verbose_name = "Newsletter Subscription"
         verbose_name_plural = "Newsletter Subscriptions"
         unique_together = ['newsletter', 'email']
         ordering = ['-subscribed_at']
-    
+
     def __str__(self):
         return f"{self.email} -> {self.newsletter.title}"
-    
+
     def unsubscribe(self):
         """Unsubscribe from newsletter."""
         self.is_active = False
@@ -141,7 +142,7 @@ class EmailLog(models.Model):
     created_at = models.DateTimeField('Created At', auto_now_add=True)
     sent_at = models.DateTimeField('Sent At', null=True, blank=True)
     error_message = models.TextField('Error Message', blank=True, null=True)
-    
+
     # Simple tracking fields
     opened_at = models.DateTimeField('Opened At', null=True, blank=True, help_text="When email was first opened")
     clicked_at = models.DateTimeField('Clicked At', null=True, blank=True, help_text="When link was first clicked")
@@ -155,26 +156,26 @@ class EmailLog(models.Model):
     def __str__(self):
         user_info = f"User: {self.user.email}" if self.user else f"Recipient(s): {self.recipient}"
         return f"{user_info} | Subject: {self.subject} | Status: {self.status}"
-    
+
     def mark_opened(self):
         """Mark email as opened (only first time)."""
         if not self.opened_at:
             self.opened_at = timezone.now()
             self.save(update_fields=['opened_at'])
         return self
-    
+
     def mark_clicked(self):
         """Mark email link as clicked (only first time)."""
         if not self.clicked_at:
             self.clicked_at = timezone.now()
             self.save(update_fields=['clicked_at'])
         return self
-    
+
     @property
     def is_opened(self):
         """Check if email was opened."""
         return self.opened_at is not None
-    
+
     @property
     def is_clicked(self):
         """Check if link was clicked."""
@@ -203,11 +204,11 @@ class NewsletterCampaign(models.Model):
     button_text = models.CharField('Button Text', max_length=100, blank=True)
     button_url = models.URLField('Button URL', blank=True)
     secondary_text = models.TextField('Secondary Text', blank=True)
-    
+
     status = models.CharField(
-        'Status', 
-        max_length=10, 
-        choices=CampaignStatus.choices, 
+        'Status',
+        max_length=10,
+        choices=CampaignStatus.choices,
         default=CampaignStatus.DRAFT
     )
     created_at = models.DateTimeField('Created At', auto_now_add=True)
@@ -222,17 +223,17 @@ class NewsletterCampaign(models.Model):
 
     def __str__(self):
         return f"{self.newsletter.title}: {self.subject} ({self.status})"
-    
+
     def send_campaign(self):
         """Send this campaign using MailerEmailService."""
         from .services.email_service import NewsletterEmailService
-        
+
         if self.status != self.CampaignStatus.DRAFT:
             return False
-            
+
         self.status = self.CampaignStatus.SENDING
         self.save()
-        
+
         email_service = NewsletterEmailService()
         result = email_service.send_newsletter_email(
             newsletter=self.newsletter,
@@ -246,14 +247,14 @@ class NewsletterCampaign(models.Model):
             send_to_all=True,
             campaign=self
         )
-        
+
         if result['success']:
             self.status = self.CampaignStatus.SENT
             self.sent_at = timezone.now()
             self.recipient_count = result['sent_count']
         else:
             self.status = self.CampaignStatus.FAILED
-            
+
         self.save()
         return result['success']