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

django_cfg/apps/newsletter/serializers.py

@@ -2,10 +2,10 @@
 DRF Serializers for newsletter application.
 """
 
-from rest_framework import serializers
 from django.contrib.auth import get_user_model
+from rest_framework import serializers
 
-from .models import Newsletter, NewsletterSubscription, NewsletterCampaign, EmailLog
+from .models import EmailLog, Newsletter, NewsletterCampaign, NewsletterSubscription
 
 User = get_user_model()
 
@@ -14,7 +14,7 @@ class NewsletterSerializer(serializers.ModelSerializer):
     """Serializer for Newsletter model."""
 
     subscribers_count = serializers.IntegerField(read_only=True)
-    
+
     class Meta:
         model = Newsletter
         fields = [
@@ -26,10 +26,10 @@ class NewsletterSerializer(serializers.ModelSerializer):
 
 class NewsletterSubscriptionSerializer(serializers.ModelSerializer):
     """Serializer for NewsletterSubscription model."""
-    
+
     newsletter_title = serializers.CharField(source='newsletter.title', read_only=True)
     user_email = serializers.CharField(source='user.email', read_only=True)
-    
+
     class Meta:
         model = NewsletterSubscription
         fields = [
@@ -43,20 +43,20 @@ class NewsletterSubscriptionSerializer(serializers.ModelSerializer):
 
 class SubscribeSerializer(serializers.Serializer):
     """Simple serializer for newsletter subscription."""
-    
+
     newsletter_id = serializers.IntegerField()
     email = serializers.EmailField()
 
 
 class UnsubscribeSerializer(serializers.Serializer):
     """Simple serializer for unsubscribe."""
-    
+
     subscription_id = serializers.IntegerField()
 
 
 class TestEmailSerializer(serializers.Serializer):
     """Simple serializer for test email."""
-    
+
     email = serializers.EmailField()
     subject = serializers.CharField(max_length=255, default="Django CFG Newsletter Test")
     message = serializers.CharField(default="This is a test email from Django CFG Newsletter.")
@@ -64,9 +64,9 @@ class TestEmailSerializer(serializers.Serializer):
 
 class NewsletterCampaignSerializer(serializers.ModelSerializer):
     """Serializer for NewsletterCampaign model."""
-    
+
     newsletter_title = serializers.CharField(source='newsletter.title', read_only=True)
-    
+
     class Meta:
         model = NewsletterCampaign
         fields = [
@@ -81,16 +81,16 @@ class NewsletterCampaignSerializer(serializers.ModelSerializer):
 
 class SendCampaignSerializer(serializers.Serializer):
     """Simple serializer for sending campaign."""
-    
+
     campaign_id = serializers.IntegerField()
 
 
 class EmailLogSerializer(serializers.ModelSerializer):
     """Serializer for EmailLog model."""
-    
+
     user_email = serializers.CharField(source='user.email', read_only=True)
     newsletter_title = serializers.CharField(source='newsletter.title', read_only=True)
-    
+
     class Meta:
         model = EmailLog
         fields = [

django_cfg/apps/newsletter/services/email_service.py

@@ -5,12 +5,14 @@ Uses the built-in DjangoEmailService for sending emails with proper logging.
 """
 
 import logging
-from typing import List, Optional, Dict, Any
+from typing import Any, Dict, List, Optional
+
 from django.contrib.auth import get_user_model
 from django.utils import timezone
 
 from django_cfg.modules.django_email import DjangoEmailService
-from ..models import Newsletter, NewsletterSubscription, EmailLog
+
+from ..models import EmailLog, Newsletter, NewsletterSubscription
 
 User = get_user_model()
 logger = logging.getLogger(__name__)
@@ -18,16 +20,16 @@ logger = logging.getLogger(__name__)
 
 class NewsletterEmailService:
     """Email service for newsletter application using DjangoEmailService."""
-    
+
     def __init__(self):
         """Initialize the email service."""
         self.email_service = DjangoEmailService()
-    
+
     def _create_email_log(
-        self, 
-        recipient: str, 
-        subject: str, 
-        status: str, 
+        self,
+        recipient: str,
+        subject: str,
+        status: str,
         newsletter: Optional[Newsletter] = None,
         campaign = None
     ) -> EmailLog:
@@ -46,14 +48,14 @@ class NewsletterEmailService:
         """
         try:
             from django.utils import timezone
-            
+
             # Try to find user by email
             user = None
             try:
                 user = User.objects.get(email=recipient)
             except User.DoesNotExist:
                 pass
-            
+
             log_data = {
                 'user': user,
                 'newsletter': newsletter,
@@ -61,18 +63,18 @@ class NewsletterEmailService:
                 'recipient': recipient,
                 'subject': subject,
                 'status': status,
-                'body': f"Newsletter email sent via campaign"
+                'body': "Newsletter email sent via campaign"
             }
-            
+
             # Add sent_at for successful emails
             if status == EmailLog.EmailLogStatus.SENT:
                 log_data['sent_at'] = timezone.now()
-            
+
             return EmailLog.objects.create(**log_data)
         except Exception as e:
             logger.error(f"Failed to create email log: {e}")
             raise
-    
+
     def send_newsletter_email(
         self,
         newsletter: Newsletter,
@@ -133,7 +135,7 @@ class NewsletterEmailService:
                     'sent_count': 0,
                     'failed_count': 0
                 }
-            
+
             if not emails:
                 return {
                     'success': False,
@@ -141,7 +143,7 @@ class NewsletterEmailService:
                     'sent_count': 0,
                     'failed_count': 0
                 }
-            
+
             # Use the optimized send_bulk_email method with tracking
             result = self.send_bulk_email(
                 recipients=emails,
@@ -157,17 +159,17 @@ class NewsletterEmailService:
                 newsletter=newsletter,
                 campaign=campaign
             )
-            
+
             # Add newsletter-specific context to the result
             result.update({
                 'newsletter_id': newsletter.id,
                 'newsletter_title': newsletter.title
             })
-            
+
             logger.info(f"Newsletter '{newsletter.title}' sent to {len(emails)} recipients, {result['sent_count']} successful")
-            
+
             return result
-            
+
         except Exception as e:
             logger.error(f"Failed to send newsletter emails: {e}")
             return {
@@ -176,7 +178,7 @@ class NewsletterEmailService:
                 'sent_count': 0,
                 'failed_count': 0
             }
-    
+
     def send_subscription_welcome_email(self, subscription: NewsletterSubscription) -> bool:
         """
         Send welcome email to new newsletter subscriber.
@@ -190,7 +192,7 @@ class NewsletterEmailService:
         try:
             context = {
                 'email_title': f"Welcome to {subscription.newsletter.title}",
-                'greeting': f"Hello",
+                'greeting': "Hello",
                 'main_text': f"Thank you for subscribing to our newsletter <strong>{subscription.newsletter.title}</strong>!",
                 'main_html_content': f"""
                     <p>You'll receive updates and news directly to your inbox at <strong>{subscription.email}</strong>.</p>
@@ -199,7 +201,7 @@ class NewsletterEmailService:
                 """,
                 'secondary_text': f'If you no longer wish to receive these emails, you can <a href="/mailer/unsubscribe/{subscription.id}/">unsubscribe here</a>.'
             }
-            
+
             self.email_service.send_template(
                 subject=f"Welcome to {subscription.newsletter.title}",
                 template_name="emails/base_email",
@@ -207,14 +209,14 @@ class NewsletterEmailService:
                 recipient_list=[subscription.email],
                 fail_silently=False
             )
-            
+
             logger.info(f"Welcome email sent to {subscription.email}")
             return True
-            
+
         except Exception as e:
             logger.error(f"Failed to send welcome email to {subscription.email}: {e}")
             return False
-    
+
     def send_unsubscribe_confirmation_email(self, subscription: NewsletterSubscription) -> bool:
         """
         Send unsubscribe confirmation email.
@@ -228,7 +230,7 @@ class NewsletterEmailService:
         try:
             context = {
                 'email_title': "Unsubscribe Confirmation",
-                'greeting': f"Hello",
+                'greeting': "Hello",
                 'main_text': f"You have been successfully unsubscribed from <strong>{subscription.newsletter.title}</strong>.",
                 'main_html_content': f"""
                     <p>Your email address <strong>{subscription.email}</strong> will no longer receive emails from this newsletter.</p>
@@ -236,7 +238,7 @@ class NewsletterEmailService:
                     <p>We're sorry to see you go!</p>
                 """
             }
-            
+
             self.email_service.send_template(
                 subject=f"Unsubscribed from {subscription.newsletter.title}",
                 template_name="emails/base_email",
@@ -244,14 +246,14 @@ class NewsletterEmailService:
                 recipient_list=[subscription.email],
                 fail_silently=False
             )
-            
+
             logger.info(f"Unsubscribe confirmation sent to {subscription.email}")
             return True
-            
+
         except Exception as e:
             logger.error(f"Failed to send unsubscribe confirmation to {subscription.email}: {e}")
             return False
-    
+
     def send_bulk_email(
         self,
         recipients: List[str],
@@ -289,7 +291,7 @@ class NewsletterEmailService:
         """
         sent_count = 0
         failed_count = 0
-        
+
         try:
             for recipient in recipients:
                 try:
@@ -303,7 +305,7 @@ class NewsletterEmailService:
                             newsletter=newsletter,
                             campaign=campaign
                         )
-                    
+
                     context = {
                         'email_title': email_title,
                         'greeting': "Hello",
@@ -313,7 +315,7 @@ class NewsletterEmailService:
                         'button_url': button_url,
                         'secondary_text': secondary_text
                     }
-                    
+
                     # Send email with tracking if enabled
                     if enable_tracking and email_log:
                         success = self.email_service.send_template_with_tracking(
@@ -344,7 +346,7 @@ class NewsletterEmailService:
                                 recipient_list=[recipient],
                                 fail_silently=False
                             ) > 0
-                    
+
                     # Update email log status
                     if enable_tracking and email_log:
                         if success:
@@ -360,26 +362,26 @@ class NewsletterEmailService:
                             sent_count += 1
                         else:
                             failed_count += 1
-                            
+
                 except Exception as e:
                     logger.error(f"Failed to send email to {recipient}: {e}")
                     failed_count += 1
-                    
+
                     # Update email log if exists
                     if enable_tracking and email_log:
                         email_log.status = EmailLog.EmailLogStatus.FAILED
                         email_log.error_message = str(e)
                         email_log.save()
-            
+
             logger.info(f"Bulk email sent to {len(recipients)} recipients, {sent_count} successful")
-            
+
             return {
                 'success': sent_count > 0,
                 'sent_count': sent_count,
                 'failed_count': failed_count,
                 'total_recipients': len(recipients)
             }
-            
+
         except Exception as e:
             logger.error(f"Failed to send bulk emails: {e}")
             return {

django_cfg/apps/newsletter/signals.py

@@ -5,9 +5,10 @@ Handles automatic email notifications and newsletter management.
 """
 
 import logging
+
+from django.contrib.auth import get_user_model
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
-from django.contrib.auth import get_user_model
 
 from .models import Newsletter, NewsletterSubscription
 
@@ -59,7 +60,7 @@ def auto_subscribe_new_users(sender, instance, created, **kwargs):
         try:
             # Find newsletters with auto_subscribe enabled
             auto_newsletters = Newsletter.objects.filter(auto_subscribe=True, is_active=True)
-            
+
             for newsletter in auto_newsletters:
                 NewsletterSubscription.objects.get_or_create(
                     newsletter=newsletter,
@@ -70,6 +71,6 @@ def auto_subscribe_new_users(sender, instance, created, **kwargs):
                     }
                 )
                 logger.info(f"Auto-subscribed {instance.email} to {newsletter.title}")
-                
+
         except Exception as e:
             logger.error(f"Failed to auto-subscribe user {instance.email}: {e}")

django_cfg/apps/newsletter/urls.py

@@ -2,8 +2,8 @@
 DRF URLs for newsletter application.
 """
 
-from django.urls import path, include
-from rest_framework.routers import DefaultRouter
+from django.urls import include, path
+
 from . import views
 
 app_name = 'cfg_newsletter'
@@ -13,28 +13,28 @@ api_urlpatterns = [
     # Newsletters
     path('newsletters/', views.NewsletterListView.as_view(), name='newsletter-list'),
     path('newsletters/<int:pk>/', views.NewsletterDetailView.as_view(), name='newsletter-detail'),
-    
+
     # Subscriptions
     path('subscribe/', views.SubscribeView.as_view(), name='subscribe'),
     path('unsubscribe/', views.UnsubscribeView.as_view(), name='unsubscribe'),
     path('subscriptions/', views.SubscriptionListView.as_view(), name='subscription-list'),
-    
+
     # Campaigns
     path('campaigns/', views.NewsletterCampaignListView.as_view(), name='campaign-list'),
     path('campaigns/<int:pk>/', views.NewsletterCampaignDetailView.as_view(), name='campaign-detail'),
     path('campaigns/send/', views.SendCampaignView.as_view(), name='send-campaign'),
-    
+
     # Email operations
     path('test/', views.TestEmailView.as_view(), name='test-email'),
     path('bulk/', views.BulkEmailView.as_view(), name='bulk-email'),
-    
+
     # Logs
     path('logs/', views.EmailLogListView.as_view(), name='email-logs'),
 ]
 
 urlpatterns = [
     path('', include(api_urlpatterns)),
-    
+
     # Tracking endpoints (no auth required) - accept any string to handle invalid UUIDs gracefully
     path('track/open/<str:email_log_id>/', views.TrackEmailOpenView.as_view(), name='track-open'),
     path('track/click/<str:email_log_id>/', views.TrackEmailClickView.as_view(), name='track-click'),

django_cfg/apps/newsletter/views/__init__.py

@@ -3,44 +3,39 @@ Newsletter views package.
 """
 
 # Newsletter views
-from .newsletters import NewsletterListView, NewsletterDetailView
-
-# Subscription views  
-from .subscriptions import SubscribeView, UnsubscribeView, SubscriptionListView
-
 # Campaign views
-from .campaigns import (
-    NewsletterCampaignListView, 
-    NewsletterCampaignDetailView, 
-    SendCampaignView
-)
+from .campaigns import NewsletterCampaignDetailView, NewsletterCampaignListView, SendCampaignView
 
 # Email views
-from .emails import TestEmailView, BulkEmailView, EmailLogListView
+from .emails import BulkEmailView, EmailLogListView, TestEmailView
+from .newsletters import NewsletterDetailView, NewsletterListView
+
+# Subscription views
+from .subscriptions import SubscribeView, SubscriptionListView, UnsubscribeView
 
 # Tracking views
-from .tracking import TrackEmailOpenView, TrackEmailClickView
+from .tracking import TrackEmailClickView, TrackEmailOpenView
 
 __all__ = [
     # Newsletters
     'NewsletterListView',
     'NewsletterDetailView',
-    
+
     # Subscriptions
-    'SubscribeView', 
+    'SubscribeView',
     'UnsubscribeView',
     'SubscriptionListView',
-    
+
     # Campaigns
     'NewsletterCampaignListView',
-    'NewsletterCampaignDetailView', 
+    'NewsletterCampaignDetailView',
     'SendCampaignView',
-    
+
     # Emails
     'TestEmailView',
-    'BulkEmailView', 
+    'BulkEmailView',
     'EmailLogListView',
-    
+
     # Tracking
     'TrackEmailOpenView',
     'TrackEmailClickView',

django_cfg/apps/newsletter/views/campaigns.py

@@ -2,27 +2,27 @@
 Campaign views.
 """
 
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics, status
-from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
-from drf_spectacular.utils import extend_schema
+from rest_framework.response import Response
 
 from ..models import NewsletterCampaign
 from ..serializers import (
+    ErrorResponseSerializer,
     NewsletterCampaignSerializer,
-    SendCampaignSerializer,
     SendCampaignResponseSerializer,
-    ErrorResponseSerializer,
+    SendCampaignSerializer,
 )
 
 
 class NewsletterCampaignListView(generics.ListCreateAPIView):
     """List and create newsletter campaigns."""
-    
+
     queryset = NewsletterCampaign.objects.all()
     serializer_class = NewsletterCampaignSerializer
     permission_classes = [IsAuthenticated]
-    
+
     @extend_schema(
         summary="List Newsletter Campaigns",
         description="Get a list of all newsletter campaigns.",
@@ -31,7 +31,7 @@ class NewsletterCampaignListView(generics.ListCreateAPIView):
     )
     def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
-    
+
     @extend_schema(
         summary="Create Newsletter Campaign",
         description="Create a new newsletter campaign.",
@@ -45,11 +45,11 @@ class NewsletterCampaignListView(generics.ListCreateAPIView):
 
 class NewsletterCampaignDetailView(generics.RetrieveUpdateDestroyAPIView):
     """Retrieve, update, or delete a newsletter campaign."""
-    
+
     queryset = NewsletterCampaign.objects.all()
     serializer_class = NewsletterCampaignSerializer
     permission_classes = [IsAuthenticated]
-    
+
     @extend_schema(
         summary="Get Campaign Details",
         description="Retrieve details of a specific newsletter campaign.",
@@ -58,7 +58,7 @@ class NewsletterCampaignDetailView(generics.RetrieveUpdateDestroyAPIView):
     )
     def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
-    
+
     @extend_schema(
         summary="Update Campaign",
         description="Update a newsletter campaign.",
@@ -68,7 +68,7 @@ class NewsletterCampaignDetailView(generics.RetrieveUpdateDestroyAPIView):
     )
     def put(self, request, *args, **kwargs):
         return super().put(request, *args, **kwargs)
-    
+
     @extend_schema(
         summary="Delete Campaign",
         description="Delete a newsletter campaign.",
@@ -81,10 +81,10 @@ class NewsletterCampaignDetailView(generics.RetrieveUpdateDestroyAPIView):
 
 class SendCampaignView(generics.CreateAPIView):
     """Send a newsletter campaign."""
-    
+
     serializer_class = SendCampaignSerializer
     permission_classes = [IsAuthenticated]
-    
+
     @extend_schema(
         summary="Send Newsletter Campaign",
         description="Send a newsletter campaign to all subscribers.",
@@ -99,20 +99,20 @@ class SendCampaignView(generics.CreateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        
+
         campaign_id = serializer.validated_data['campaign_id']
-        
+
         try:
             campaign = NewsletterCampaign.objects.get(id=campaign_id)
-            
+
             if campaign.status != NewsletterCampaign.CampaignStatus.DRAFT:
                 return Response(
                     {'success': False, 'error': 'Campaign is not in draft status'},
                     status=status.HTTP_400_BAD_REQUEST
                 )
-            
+
             success = campaign.send_campaign()
-            
+
             if success:
                 # Get updated campaign data
                 campaign.refresh_from_db()
@@ -130,7 +130,7 @@ class SendCampaignView(generics.CreateAPIView):
                     {'success': False, 'error': 'Failed to send campaign'},
                     status=status.HTTP_400_BAD_REQUEST
                 )
-                
+
         except NewsletterCampaign.DoesNotExist:
             return Response(
                 {'success': False, 'error': 'Campaign not found'},