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

django_cfg/apps/payments/views/serializers/subscriptions.py

@@ -4,14 +4,19 @@ Subscription serializers for the Universal Payment System v2.0.
 DRF serializers for subscription operations with service integration.
 """
 
-from rest_framework import serializers
-from typing import Dict, Any
+from typing import Any, Dict
+
 from django.contrib.auth import get_user_model
+from rest_framework import serializers
 
-from ...models import Subscription, EndpointGroup, Tariff
-from ...services import get_subscription_service, SubscriptionCreateRequest, SubscriptionUpdateRequest
 from django_cfg.modules.django_logging import get_logger
 
+from ...models import EndpointGroup, Subscription, Tariff
+from ...services import (
+    SubscriptionCreateRequest,
+    get_subscription_service,
+)
+
 User = get_user_model()
 logger = get_logger("subscription_serializers")
 
@@ -22,7 +27,7 @@ class EndpointGroupSerializer(serializers.ModelSerializer):
     
     Used for subscription endpoint group configuration.
     """
-    
+
     class Meta:
         model = EndpointGroup
         fields = [
@@ -42,10 +47,10 @@ class TariffSerializer(serializers.ModelSerializer):
     
     Used for tariff information and selection.
     """
-    
+
     endpoint_groups = EndpointGroupSerializer(many=True, read_only=True)
     endpoint_groups_count = serializers.IntegerField(source='endpoint_groups.count', read_only=True)
-    
+
     class Meta:
         model = Tariff
         fields = [
@@ -70,11 +75,11 @@ class SubscriptionListSerializer(serializers.ModelSerializer):
     
     Optimized for subscription lists with minimal data.
     """
-    
+
     user = serializers.StringRelatedField(read_only=True)
     tariff_name = serializers.CharField(source='tariff.name', read_only=True)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
-    
+
     class Meta:
         model = Subscription
         fields = [
@@ -97,14 +102,14 @@ class SubscriptionSerializer(serializers.ModelSerializer):
     
     Used for subscription detail views and updates.
     """
-    
+
     user = serializers.StringRelatedField(read_only=True)
     tariff = TariffSerializer(read_only=True)
     endpoint_group = EndpointGroupSerializer(read_only=True)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
-    
+
     # Only keep fields that actually exist or are needed
-    
+
     class Meta:
         model = Subscription
         fields = [
@@ -146,7 +151,7 @@ class SubscriptionCreateSerializer(serializers.Serializer):
     
     Validates input and delegates to SubscriptionService.
     """
-    
+
     tariff_id = serializers.IntegerField(
         min_value=1,
         help_text="Tariff ID for the subscription"
@@ -163,64 +168,64 @@ class SubscriptionCreateSerializer(serializers.Serializer):
         max_value=365,
         help_text="Subscription duration in days"
     )
-    
+
     def validate_tariff_id(self, value: int) -> int:
         """Validate tariff exists and is active."""
         if not Tariff.objects.filter(id=value, is_active=True).exists():
             raise serializers.ValidationError(f"Tariff {value} not found or inactive")
         return value
-    
+
     def validate_endpoint_group_id(self, value: int) -> int:
         """Validate endpoint group exists and is active."""
         if value and not EndpointGroup.objects.filter(id=value, is_active=True).exists():
             raise serializers.ValidationError(f"Endpoint group {value} not found or inactive")
         return value
-    
+
     def validate(self, attrs: Dict[str, Any]) -> Dict[str, Any]:
         """Validate subscription creation data."""
         try:
             # Get user from context
             user_id = self.context.get('user_pk') or self.context['request'].user.id
-            
+
             # Create Pydantic request for validation
             request = SubscriptionCreateRequest(
                 user_id=user_id,
                 **attrs
             )
-            
+
             # Store validated request for create method
             self._validated_request = request
             return attrs
-            
+
         except Exception as e:
             logger.error(f"Subscription validation failed: {e}")
             raise serializers.ValidationError(f"Invalid subscription data: {e}")
-    
+
     def create(self, validated_data: Dict[str, Any]) -> Subscription:
         """Create subscription using SubscriptionService."""
         try:
             subscription_service = get_subscription_service()
             result = subscription_service.create_subscription(self._validated_request)
-            
+
             if result.success:
                 # Get the created subscription from database
                 subscription = Subscription.objects.get(id=result.subscription_id)
-                
-                logger.info(f"Subscription created successfully", extra={
+
+                logger.info("Subscription created successfully", extra={
                     'subscription_id': result.subscription_id,
                     'user_id': self._validated_request.user_id,
                     'tariff_id': self._validated_request.tariff_id
                 })
-                
+
                 return subscription
             else:
                 logger.error(f"Subscription creation failed: {result.message}")
                 raise serializers.ValidationError(result.message)
-                
+
         except Exception as e:
             logger.error(f"Subscription creation error: {e}")
             raise serializers.ValidationError(f"Subscription creation failed: {e}")
-    
+
     def to_representation(self, instance: Subscription) -> Dict[str, Any]:
         """Return full subscription data after creation."""
         return SubscriptionSerializer(instance, context=self.context).data
@@ -232,7 +237,7 @@ class SubscriptionUpdateSerializer(serializers.Serializer):
     
     Handles subscription modifications through SubscriptionService.
     """
-    
+
     action = serializers.ChoiceField(
         choices=[
             ('activate', 'Activate'),
@@ -254,29 +259,29 @@ class SubscriptionUpdateSerializer(serializers.Serializer):
         max_value=365,
         help_text="Duration for renewal (required for renew action)"
     )
-    
+
     def validate(self, attrs: Dict[str, Any]) -> Dict[str, Any]:
         """Validate subscription update data."""
         action = attrs.get('action')
         duration_days = attrs.get('duration_days')
-        
+
         if action == 'renew' and not duration_days:
             raise serializers.ValidationError("duration_days is required for renew action")
-        
+
         return attrs
-    
+
     def save(self) -> Dict[str, Any]:
         """Update subscription using SubscriptionService."""
         try:
             subscription_id = self.context.get('subscription_id')
             if not subscription_id:
                 raise serializers.ValidationError("Subscription ID is required")
-            
+
             subscription_service = get_subscription_service()
             action = self.validated_data['action']
             reason = self.validated_data.get('reason')
             duration_days = self.validated_data.get('duration_days')
-            
+
             # Call appropriate service method based on action
             if action == 'activate':
                 result = subscription_service.activate_subscription(subscription_id)
@@ -288,11 +293,11 @@ class SubscriptionUpdateSerializer(serializers.Serializer):
                 result = subscription_service.renew_subscription(subscription_id, duration_days)
             else:
                 raise serializers.ValidationError(f"Unknown action: {action}")
-            
+
             if result.success:
                 # Get updated subscription
                 subscription = Subscription.objects.get(id=result.subscription_id)
-                
+
                 return {
                     'success': True,
                     'message': result.message,
@@ -304,7 +309,7 @@ class SubscriptionUpdateSerializer(serializers.Serializer):
                     'error': result.message,
                     'error_code': result.error_code
                 }
-                
+
         except Exception as e:
             logger.error(f"Subscription update error: {e}")
             return {
@@ -320,27 +325,27 @@ class SubscriptionUsageSerializer(serializers.Serializer):
     
     Used for incrementing usage counters.
     """
-    
+
     endpoint = serializers.CharField(
         required=False,
         allow_blank=True,
         max_length=200,
         help_text="API endpoint used"
     )
-    
+
     def save(self) -> Dict[str, Any]:
         """Increment subscription usage using SubscriptionService."""
         try:
             subscription_id = self.context.get('subscription_id')
             if not subscription_id:
                 raise serializers.ValidationError("Subscription ID is required")
-            
+
             subscription_service = get_subscription_service()
             result = subscription_service.increment_usage(
                 subscription_id=subscription_id,
                 endpoint=self.validated_data.get('endpoint')
             )
-            
+
             if result.success:
                 return {
                     'success': True,
@@ -353,7 +358,7 @@ class SubscriptionUsageSerializer(serializers.Serializer):
                     'error': result.message,
                     'error_code': result.error_code
                 }
-                
+
         except Exception as e:
             logger.error(f"Usage increment error: {e}")
             return {
@@ -369,14 +374,14 @@ class SubscriptionStatsSerializer(serializers.Serializer):
     
     Used for subscription analytics and reporting.
     """
-    
+
     days = serializers.IntegerField(
         default=30,
         min_value=1,
         max_value=365,
         help_text="Number of days to analyze"
     )
-    
+
     def save(self) -> Dict[str, Any]:
         """Get subscription statistics using SubscriptionService."""
         try:
@@ -384,7 +389,7 @@ class SubscriptionStatsSerializer(serializers.Serializer):
             result = subscription_service.get_subscription_stats(
                 days=self.validated_data['days']
             )
-            
+
             if result.success:
                 return {
                     'success': True,
@@ -397,7 +402,7 @@ class SubscriptionStatsSerializer(serializers.Serializer):
                     'error': result.message,
                     'error_code': result.error_code
                 }
-                
+
         except Exception as e:
             logger.error(f"Subscription stats error: {e}")
             return {

django_cfg/apps/payments/views/serializers/webhooks.py

@@ -5,6 +5,7 @@ DRF serializers for webhook endpoints and data validation.
 """
 
 from rest_framework import serializers
+
 from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger(__name__)
@@ -16,11 +17,11 @@ class WebhookSerializer(serializers.Serializer):
     
     Base serializer for all webhook types.
     """
-    
+
     provider = serializers.CharField(max_length=50, help_text="Payment provider name")
     success = serializers.BooleanField(help_text="Processing success status")
     message = serializers.CharField(max_length=500, help_text="Processing message")
-    
+
     class Meta:
         fields = ['provider', 'success', 'message']
 
@@ -31,7 +32,7 @@ class WebhookDataSerializer(serializers.Serializer):
     
     Generic webhook data structure for all providers.
     """
-    
+
     provider = serializers.CharField(max_length=50, help_text="Payment provider name")
     payment_id = serializers.CharField(max_length=256, help_text="Provider payment ID")
     status = serializers.CharField(max_length=50, help_text="Payment status")
@@ -39,13 +40,13 @@ class WebhookDataSerializer(serializers.Serializer):
     currency = serializers.CharField(max_length=10, required=False, help_text="Payment currency")
     transaction_hash = serializers.CharField(max_length=256, required=False, help_text="Blockchain transaction hash")
     confirmations = serializers.IntegerField(required=False, help_text="Number of confirmations")
-    
+
     # Raw webhook data
     raw_data = serializers.JSONField(help_text="Raw webhook payload")
-    
+
     class Meta:
         fields = [
-            'provider', 'payment_id', 'status', 'amount', 
+            'provider', 'payment_id', 'status', 'amount',
             'currency', 'transaction_hash', 'confirmations', 'raw_data'
         ]
 
@@ -56,13 +57,13 @@ class WebhookResponseSerializer(serializers.Serializer):
     
     Standard response format for all webhook endpoints.
     """
-    
+
     success = serializers.BooleanField(help_text="Whether webhook was processed successfully")
     message = serializers.CharField(max_length=500, help_text="Processing result message")
     payment_id = serializers.CharField(max_length=256, required=False, help_text="Internal payment ID")
     provider_payment_id = serializers.CharField(max_length=256, required=False, help_text="Provider payment ID")
     processed_at = serializers.DateTimeField(required=False, help_text="Processing timestamp")
-    
+
     class Meta:
         fields = ['success', 'message', 'payment_id', 'provider_payment_id', 'processed_at']
 
@@ -71,11 +72,11 @@ class WebhookHealthSerializer(serializers.Serializer):
     """
     Serializer for webhook health check response.
     """
-    
+
     status = serializers.CharField(max_length=20, help_text="Health status")
     timestamp = serializers.DateTimeField(help_text="Check timestamp")
     providers = serializers.JSONField(help_text="Provider health status")
-    
+
     class Meta:
         fields = ['status', 'timestamp', 'providers']
 
@@ -84,13 +85,13 @@ class WebhookStatsSerializer(serializers.Serializer):
     """
     Serializer for webhook statistics response.
     """
-    
+
     total_webhooks = serializers.IntegerField(help_text="Total webhooks processed")
     successful_webhooks = serializers.IntegerField(help_text="Successfully processed webhooks")
     failed_webhooks = serializers.IntegerField(help_text="Failed webhook processing attempts")
     success_rate = serializers.FloatField(help_text="Success rate percentage")
     providers = serializers.JSONField(help_text="Per-provider statistics")
-    
+
     class Meta:
         fields = ['total_webhooks', 'successful_webhooks', 'failed_webhooks', 'success_rate', 'providers']
 
@@ -99,12 +100,12 @@ class SupportedProvidersSerializer(serializers.Serializer):
     """
     Serializer for supported providers response.
     """
-    
+
     success = serializers.BooleanField(help_text="Request success status")
     providers = serializers.JSONField(help_text="List of supported providers")
     total_count = serializers.IntegerField(help_text="Total number of providers")
     timestamp = serializers.DateTimeField(help_text="Response timestamp")
-    
+
     class Meta:
         fields = ['success', 'providers', 'total_count', 'timestamp']
 
@@ -115,7 +116,7 @@ class NowPaymentsWebhookSerializer(serializers.Serializer):
     
     Specific to NowPayments IPN format.
     """
-    
+
     payment_id = serializers.CharField(max_length=256, help_text="NowPayments payment ID")
     payment_status = serializers.CharField(max_length=50, help_text="Payment status")
     pay_address = serializers.CharField(max_length=256, required=False, help_text="Payment address")
@@ -128,7 +129,7 @@ class NowPaymentsWebhookSerializer(serializers.Serializer):
     purchase_id = serializers.CharField(max_length=256, required=False, help_text="Purchase ID")
     outcome_amount = serializers.DecimalField(max_digits=20, decimal_places=8, required=False, help_text="Outcome amount")
     outcome_currency = serializers.CharField(max_length=10, required=False, help_text="Outcome currency")
-    
+
     class Meta:
         fields = [
             'payment_id', 'payment_status', 'pay_address', 'price_amount', 'price_currency',

django_cfg/apps/support/admin/__init__.py

@@ -4,9 +4,9 @@ Support admin interfaces using Django-CFG admin system.
 Refactored admin interfaces with Material Icons and optimized queries.
 """
 
-from .support_admin import TicketAdmin, MessageAdmin
-from .filters import TicketUserEmailFilter, TicketUserNameFilter, MessageSenderEmailFilter
-from .resources import TicketResource, MessageResource
+from .filters import MessageSenderEmailFilter, TicketUserEmailFilter, TicketUserNameFilter
+from .resources import MessageResource, TicketResource
+from .support_admin import MessageAdmin, TicketAdmin
 
 __all__ = [
     'TicketAdmin',

django_cfg/apps/support/admin/resources.py

@@ -2,58 +2,58 @@
 Import/Export resources for Support 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
 
-from ..models import Ticket, Message
+from ..models import Message, Ticket
 
 User = get_user_model()
 
 
 class TicketResource(resources.ModelResource):
     """Resource for exporting tickets (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
     )
-    
+
     status_display = fields.Field(
         column_name='status_display',
         attribute='get_status_display',
         readonly=True
     )
-    
+
     messages_count = fields.Field(
         column_name='messages_count',
         readonly=True
     )
-    
+
     last_message_text = fields.Field(
         column_name='last_message_text',
         readonly=True
     )
-    
+
     last_message_at = fields.Field(
         column_name='last_message_at',
         readonly=True,
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     unanswered_messages_count = fields.Field(
         column_name='unanswered_messages_count',
         attribute='unanswered_messages_count',
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
@@ -77,11 +77,11 @@ class TicketResource(resources.ModelResource):
         )
         export_order = fields
         # No import - this is export only
-        
+
     def dehydrate_messages_count(self, ticket):
         """Calculate messages count for export."""
         return ticket.messages.count()
-        
+
     def dehydrate_last_message_text(self, ticket):
         """Get last message text for export."""
         last_message = ticket.last_message
@@ -90,12 +90,12 @@ class TicketResource(resources.ModelResource):
             text = last_message.text
             return text[:100] + '...' if len(text) > 100 else text
         return ''
-        
+
     def dehydrate_last_message_at(self, ticket):
         """Get last message timestamp for export."""
         last_message = ticket.last_message
         return last_message.created_at if last_message else None
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('user').prefetch_related('messages')
@@ -103,49 +103,49 @@ class TicketResource(resources.ModelResource):
 
 class MessageResource(resources.ModelResource):
     """Resource for exporting messages (export only)."""
-    
+
     ticket_uuid = fields.Field(
         column_name='ticket_uuid',
         attribute='ticket__uuid',
         readonly=True
     )
-    
+
     ticket_subject = fields.Field(
         column_name='ticket_subject',
         attribute='ticket__subject',
         readonly=True
     )
-    
+
     sender_email = fields.Field(
         column_name='sender_email',
         attribute='sender__email',
         readonly=True
     )
-    
+
     sender_full_name = fields.Field(
         column_name='sender_full_name',
         attribute='sender__get_full_name',
         readonly=True
     )
-    
+
     is_from_author = fields.Field(
         column_name='is_from_author',
         attribute='is_from_author',
         widget=BooleanWidget(),
         readonly=True
     )
-    
+
     is_from_staff = fields.Field(
         column_name='is_from_staff',
         readonly=True,
         widget=BooleanWidget()
     )
-    
+
     text_preview = fields.Field(
         column_name='text_preview',
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
@@ -168,16 +168,16 @@ class MessageResource(resources.ModelResource):
         )
         export_order = fields
         # No import - this is export only
-        
+
     def dehydrate_is_from_staff(self, message):
         """Check if message is from staff member."""
         return message.sender.is_staff
-        
+
     def dehydrate_text_preview(self, message):
         """Get truncated text preview for export."""
         text = message.text
         return text[:200] + '...' if len(text) > 200 else text
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('ticket', 'sender')