django-cfg 1.2.21__py3-none-any.whl → 1.2.22__py3-none-any.whl

django_cfg/__init__.py

@@ -32,7 +32,7 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.2.21"
+__version__ = "1.2.22"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

django_cfg/apps/newsletter/signals.py

@@ -28,14 +28,15 @@ def newsletter_created(sender, instance, created, **kwargs):
 def subscription_created(sender, instance, created, **kwargs):
     """Handle newsletter subscription creation."""
     if created:
-        logger.info(f"New subscription: {instance.email} to newsletter {instance.newsletter.title}")
-        # Add logic for welcome email to new subscribers
-        try:
-            from .services.email_service import NewsletterEmailService
-            email_service = NewsletterEmailService()
-            email_service.send_subscription_welcome_email(instance)
-        except Exception as e:
-            logger.error(f"Failed to send welcome email to {instance.email}: {e}")
+        pass
+        # logger.info(f"New subscription: {instance.email} to newsletter {instance.newsletter.title}")
+        # # Add logic for welcome email to new subscribers
+        # try:
+        #     from .services.email_service import NewsletterEmailService
+        #     email_service = NewsletterEmailService()
+        #     email_service.send_subscription_welcome_email(instance)
+        # except Exception as e:
+        #     logger.error(f"Failed to send welcome email to {instance.email}: {e}")
 
 
 @receiver(pre_delete, sender=NewsletterSubscription)

django_cfg/apps/payments/__init__.py

@@ -0,0 +1,8 @@
+"""
+Universal payments app for Django.
+
+Provides reusable payment functionality with provider abstraction,
+subscription management, and comprehensive audit trails.
+"""
+
+default_app_config = 'django_cfg.apps.payments.apps.PaymentsConfig'

django_cfg/apps/payments/apps.py

@@ -0,0 +1,22 @@
+"""
+Django app configuration for universal payments.
+"""
+
+from django.apps import AppConfig
+
+
+class PaymentsConfig(AppConfig):
+    """Universal payments app configuration."""
+    
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'django_cfg.apps.payments'
+    label = 'django_cfg_payments'
+    verbose_name = 'Universal Payments'
+    
+    def ready(self):
+        """Called when the app is ready."""
+        # Import signals if any
+        try:
+            from . import signals  # noqa
+        except ImportError:
+            pass

django_cfg/apps/payments/managers/__init__.py

@@ -0,0 +1,22 @@
+"""
+Django model managers for universal payments.
+"""
+
+from .payment_manager import UniversalPaymentManager
+from .balance_manager import UserBalanceManager
+from .subscription_manager import SubscriptionManager, EndpointGroupManager
+from .tariff_manager import TariffManager, TariffEndpointGroupManager
+from .api_key_manager import APIKeyManager
+from .currency_manager import CurrencyManager, CurrencyNetworkManager
+
+__all__ = [
+    'UniversalPaymentManager',
+    'UserBalanceManager',
+    'SubscriptionManager',
+    'EndpointGroupManager', 
+    'TariffManager',
+    'TariffEndpointGroupManager',
+    'APIKeyManager',
+    'CurrencyManager',
+    'CurrencyNetworkManager',
+]

django_cfg/apps/payments/managers/api_key_manager.py

@@ -0,0 +1,35 @@
+"""
+API key managers.
+"""
+
+from django.db import models
+from django.utils import timezone
+
+
+class APIKeyManager(models.Manager):
+    """Manager for APIKey model."""
+    
+    def get_active_keys(self, user=None):
+        """Get active API keys."""
+        queryset = self.filter(is_active=True)
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset
+    
+    def get_expired_keys(self):
+        """Get expired API keys."""
+        return self.filter(
+            expires_at__lte=timezone.now()
+        )
+    
+    def get_valid_keys(self, user=None):
+        """Get valid (active and not expired) API keys."""
+        now = timezone.now()
+        queryset = self.filter(
+            is_active=True
+        ).filter(
+            models.Q(expires_at__isnull=True) | models.Q(expires_at__gt=now)
+        )
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset

django_cfg/apps/payments/managers/balance_manager.py

@@ -0,0 +1,361 @@
+"""
+User balance manager with atomic operations.
+
+Following CRITICAL_REQUIREMENTS.md:
+- Atomic balance updates
+- Type safety 
+- Event sourcing
+- Proper error handling
+"""
+
+from django.db import models, transaction
+from django.utils import timezone
+from decimal import Decimal
+from typing import Optional, Dict, Any
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class UserBalanceManager(models.Manager):
+    """Manager for UserBalance with atomic operations."""
+    
+    def get_or_create_balance(self, user) -> 'UserBalance':
+        """Get or create user balance atomically."""
+        balance, created = self.get_or_create(
+            user=user,
+            defaults={
+                'amount_usd': Decimal('0'),
+                'reserved_usd': Decimal('0'),
+                'total_earned': Decimal('0'),
+                'total_spent': Decimal('0'),
+            }
+        )
+        
+        if created:
+            logger.info(f"Created new balance for user {user.id}")
+        
+        return balance
+    
+    def add_funds(
+        self, 
+        user,
+        amount_usd: Decimal,
+        description: str,
+        reference_id: Optional[str] = None,
+        payment=None
+    ) -> Dict[str, Any]:
+        """
+        Add funds to user balance atomically.
+        
+        Returns:
+            Dict with operation result and transaction details
+        """
+        if amount_usd <= 0:
+            raise ValueError("Amount must be positive")
+        
+        with transaction.atomic():
+            # Get or create balance with row lock
+            balance = self.select_for_update().get_or_create_balance(user)
+            
+            # Store old values for transaction record
+            old_balance = balance.amount_usd
+            old_earned = balance.total_earned
+            
+            # Update balance
+            balance.amount_usd += amount_usd
+            balance.total_earned += amount_usd
+            balance.last_transaction_at = timezone.now()
+            balance.save()
+            
+            # Create transaction record
+            from ..models.balance import Transaction
+            transaction_record = Transaction.objects.create(
+                user=user,
+                amount_usd=amount_usd,
+                transaction_type=Transaction.TypeChoices.CREDIT,
+                description=description,
+                payment=payment,
+                reference_id=reference_id,
+                balance_before=old_balance,
+                balance_after=balance.amount_usd,
+                metadata={
+                    'total_earned_before': str(old_earned),
+                    'total_earned_after': str(balance.total_earned),
+                }
+            )
+            
+            logger.info(
+                f"Added ${amount_usd} to user {user.id} balance. "
+                f"New balance: ${balance.amount_usd}"
+            )
+            
+            return {
+                'success': True,
+                'old_balance': old_balance,
+                'new_balance': balance.amount_usd,
+                'amount_added': amount_usd,
+                'transaction_id': str(transaction_record.id),
+                'balance_obj': balance
+            }
+    
+    def debit_funds(
+        self,
+        user,
+        amount_usd: Decimal,
+        description: str,
+        reference_id: Optional[str] = None,
+        allow_overdraft: bool = False
+    ) -> Dict[str, Any]:
+        """
+        Debit funds from user balance atomically.
+        
+        Args:
+            user: User object
+            amount_usd: Amount to debit (positive value)
+            description: Transaction description
+            reference_id: Optional reference ID
+            allow_overdraft: Allow negative balance
+            
+        Returns:
+            Dict with operation result
+        """
+        if amount_usd <= 0:
+            raise ValueError("Amount must be positive")
+        
+        with transaction.atomic():
+            # Get balance with row lock
+            balance = self.select_for_update().get_or_create_balance(user)
+            
+            # Check sufficient funds
+            if not allow_overdraft and balance.amount_usd < amount_usd:
+                from ..models.exceptions import InsufficientFundsError
+                from ..models.pydantic_models import MoneyAmount
+                from ..models import CurrencyChoices
+                
+                raise InsufficientFundsError(
+                    message=f"Insufficient funds: ${balance.amount_usd} < ${amount_usd}",
+                    required_amount=MoneyAmount(amount=amount_usd, currency=CurrencyChoices.USD),
+                    available_amount=MoneyAmount(amount=balance.amount_usd, currency=CurrencyChoices.USD),
+                    user_id=user.id
+                )
+            
+            # Store old values
+            old_balance = balance.amount_usd
+            old_spent = balance.total_spent
+            
+            # Update balance
+            balance.amount_usd -= amount_usd
+            balance.total_spent += amount_usd
+            balance.last_transaction_at = timezone.now()
+            balance.save()
+            
+            # Create transaction record
+            from ..models.balance import Transaction
+            transaction_record = Transaction.objects.create(
+                user=user,
+                amount_usd=-amount_usd,  # Negative for debit
+                transaction_type=Transaction.TypeChoices.DEBIT,
+                description=description,
+                reference_id=reference_id,
+                balance_before=old_balance,
+                balance_after=balance.amount_usd,
+                metadata={
+                    'total_spent_before': str(old_spent),
+                    'total_spent_after': str(balance.total_spent),
+                    'allow_overdraft': allow_overdraft,
+                }
+            )
+            
+            logger.info(
+                f"Debited ${amount_usd} from user {user.id} balance. "
+                f"New balance: ${balance.amount_usd}"
+            )
+            
+            return {
+                'success': True,
+                'old_balance': old_balance,
+                'new_balance': balance.amount_usd,
+                'amount_debited': amount_usd,
+                'transaction_id': str(transaction_record.id),
+                'balance_obj': balance
+            }
+    
+    def hold_funds(
+        self,
+        user,
+        amount_usd: Decimal,
+        description: str,
+        reference_id: Optional[str] = None
+    ) -> Dict[str, Any]:
+        """
+        Hold funds (move from available to reserved).
+        
+        Args:
+            user: User object
+            amount_usd: Amount to hold
+            description: Hold description
+            reference_id: Optional reference ID
+            
+        Returns:
+            Dict with operation result
+        """
+        if amount_usd <= 0:
+            raise ValueError("Amount must be positive")
+        
+        with transaction.atomic():
+            # Get balance with row lock
+            balance = self.select_for_update().get_or_create_balance(user)
+            
+            # Check sufficient available funds
+            if balance.amount_usd < amount_usd:
+                from ..models.exceptions import InsufficientFundsError
+                from ..models.pydantic_models import MoneyAmount
+                from ..models import CurrencyChoices
+                
+                raise InsufficientFundsError(
+                    message=f"Insufficient available funds for hold: ${balance.amount_usd} < ${amount_usd}",
+                    required_amount=MoneyAmount(amount=amount_usd, currency=CurrencyChoices.USD),
+                    available_amount=MoneyAmount(amount=balance.amount_usd, currency=CurrencyChoices.USD),
+                    user_id=user.id
+                )
+            
+            # Store old values
+            old_available = balance.amount_usd
+            old_reserved = balance.reserved_usd
+            
+            # Move funds from available to reserved
+            balance.amount_usd -= amount_usd
+            balance.reserved_usd += amount_usd
+            balance.last_transaction_at = timezone.now()
+            balance.save()
+            
+            # Create transaction record
+            from ..models.balance import Transaction
+            transaction_record = Transaction.objects.create(
+                user=user,
+                amount_usd=amount_usd,
+                transaction_type=Transaction.TypeChoices.HOLD,
+                description=description,
+                reference_id=reference_id,
+                balance_before=old_available,
+                balance_after=balance.amount_usd,
+                metadata={
+                    'reserved_before': str(old_reserved),
+                    'reserved_after': str(balance.reserved_usd),
+                    'operation': 'hold_funds',
+                }
+            )
+            
+            logger.info(
+                f"Held ${amount_usd} for user {user.id}. "
+                f"Available: ${balance.amount_usd}, Reserved: ${balance.reserved_usd}"
+            )
+            
+            return {
+                'success': True,
+                'amount_held': amount_usd,
+                'available_balance': balance.amount_usd,
+                'reserved_balance': balance.reserved_usd,
+                'transaction_id': str(transaction_record.id),
+                'balance_obj': balance
+            }
+    
+    def release_funds(
+        self,
+        user,
+        amount_usd: Decimal,
+        description: str,
+        reference_id: Optional[str] = None,
+        refund_to_available: bool = True
+    ) -> Dict[str, Any]:
+        """
+        Release held funds.
+        
+        Args:
+            user: User object
+            amount_usd: Amount to release
+            description: Release description
+            reference_id: Optional reference ID
+            refund_to_available: If True, move to available; if False, remove entirely
+            
+        Returns:
+            Dict with operation result
+        """
+        if amount_usd <= 0:
+            raise ValueError("Amount must be positive")
+        
+        with transaction.atomic():
+            # Get balance with row lock
+            balance = self.select_for_update().get_or_create_balance(user)
+            
+            # Check sufficient reserved funds
+            if balance.reserved_usd < amount_usd:
+                raise ValueError(
+                    f"Insufficient reserved funds: ${balance.reserved_usd} < ${amount_usd}"
+                )
+            
+            # Store old values
+            old_available = balance.amount_usd
+            old_reserved = balance.reserved_usd
+            
+            # Release funds
+            balance.reserved_usd -= amount_usd
+            if refund_to_available:
+                balance.amount_usd += amount_usd
+            else:
+                # Funds are consumed (e.g., for payment)
+                balance.total_spent += amount_usd
+            
+            balance.last_transaction_at = timezone.now()
+            balance.save()
+            
+            # Create transaction record
+            from ..models.balance import Transaction
+            transaction_record = Transaction.objects.create(
+                user=user,
+                amount_usd=amount_usd if refund_to_available else -amount_usd,
+                transaction_type=Transaction.TypeChoices.RELEASE,
+                description=description,
+                reference_id=reference_id,
+                balance_before=old_available,
+                balance_after=balance.amount_usd,
+                metadata={
+                    'reserved_before': str(old_reserved),
+                    'reserved_after': str(balance.reserved_usd),
+                    'refund_to_available': refund_to_available,
+                    'operation': 'release_funds',
+                }
+            )
+            
+            action = "refunded to available" if refund_to_available else "consumed"
+            logger.info(
+                f"Released ${amount_usd} for user {user.id} ({action}). "
+                f"Available: ${balance.amount_usd}, Reserved: ${balance.reserved_usd}"
+            )
+            
+            return {
+                'success': True,
+                'amount_released': amount_usd,
+                'refund_to_available': refund_to_available,
+                'available_balance': balance.amount_usd,
+                'reserved_balance': balance.reserved_usd,
+                'transaction_id': str(transaction_record.id),
+                'balance_obj': balance
+            }
+    
+    def get_balance_summary(self, user) -> Dict[str, Any]:
+        """Get comprehensive balance summary for user."""
+        balance = self.get_or_create_balance(user)
+        
+        return {
+            'user_id': user.id,
+            'available_balance': balance.amount_usd,
+            'reserved_balance': balance.reserved_usd,
+            'total_balance': balance.total_balance,
+            'total_earned': balance.total_earned,
+            'total_spent': balance.total_spent,
+            'last_transaction_at': balance.last_transaction_at,
+            'created_at': balance.created_at,
+            'updated_at': balance.updated_at,
+        }

django_cfg/apps/payments/managers/currency_manager.py

@@ -0,0 +1,32 @@
+"""
+Currency managers.
+"""
+
+from django.db import models
+
+
+class CurrencyManager(models.Manager):
+    """Manager for Currency model."""
+    
+    def get_active_currencies(self):
+        """Get active currencies."""
+        return self.filter(is_active=True)
+    
+    def get_fiat_currencies(self):
+        """Get fiat currencies."""
+        return self.filter(currency_type='fiat', is_active=True)
+    
+    def get_crypto_currencies(self):
+        """Get cryptocurrencies."""
+        return self.filter(currency_type='crypto', is_active=True)
+
+
+class CurrencyNetworkManager(models.Manager):
+    """Manager for CurrencyNetwork model."""
+    
+    def get_active_networks(self, currency=None):
+        """Get active networks."""
+        queryset = self.filter(is_active=True)
+        if currency:
+            queryset = queryset.filter(currency=currency)
+        return queryset

django_cfg/apps/payments/managers/payment_manager.py

@@ -0,0 +1,44 @@
+"""
+Payment manager for UniversalPayment model.
+"""
+
+from django.db import models
+
+
+class UniversalPaymentManager(models.Manager):
+    """Manager for UniversalPayment model."""
+    
+    def create_payment(self, user, amount_usd: float, currency_code: str, provider: str):
+        """Create a new payment."""
+        payment = self.create(
+            user=user,
+            amount_usd=amount_usd,
+            currency_code=currency_code.upper(),
+            provider=provider,
+            status=self.model.PaymentStatus.PENDING
+        )
+        return payment
+    
+    def get_pending_payments(self, user=None):
+        """Get pending payments for user or all users."""
+        queryset = self.filter(status=self.model.PaymentStatus.PENDING)
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset
+    
+    def get_completed_payments(self, user=None):
+        """Get completed payments for user or all users."""
+        queryset = self.filter(status=self.model.PaymentStatus.COMPLETED)
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset
+    
+    def get_failed_payments(self, user=None):
+        """Get failed/expired payments for user or all users."""
+        queryset = self.filter(status__in=[
+            self.model.PaymentStatus.FAILED, 
+            self.model.PaymentStatus.EXPIRED
+        ])
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset

django_cfg/apps/payments/managers/subscription_manager.py

@@ -0,0 +1,37 @@
+"""
+Subscription managers.
+"""
+
+from django.db import models
+from django.utils import timezone
+
+
+class SubscriptionManager(models.Manager):
+    """Manager for Subscription model."""
+    
+    def get_active_subscriptions(self, user=None):
+        """Get active subscriptions."""
+        queryset = self.filter(
+            status='active',
+            expires_at__gt=timezone.now()
+        )
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset
+    
+    def get_expired_subscriptions(self, user=None):
+        """Get expired subscriptions."""
+        queryset = self.filter(
+            expires_at__lte=timezone.now()
+        )
+        if user:
+            queryset = queryset.filter(user=user)
+        return queryset
+
+
+class EndpointGroupManager(models.Manager):
+    """Manager for EndpointGroup model."""
+    
+    def get_active_groups(self):
+        """Get active endpoint groups."""
+        return self.filter(is_active=True)

django_cfg/apps/payments/managers/tariff_manager.py

@@ -0,0 +1,29 @@
+"""
+Tariff managers.
+"""
+
+from django.db import models
+
+
+class TariffManager(models.Manager):
+    """Manager for Tariff model."""
+    
+    def get_active_tariffs(self):
+        """Get active tariffs."""
+        return self.filter(is_active=True).order_by('monthly_price')
+    
+    def get_free_tariffs(self):
+        """Get free tariffs."""
+        return self.filter(monthly_price=0, is_active=True)
+    
+    def get_paid_tariffs(self):
+        """Get paid tariffs."""
+        return self.filter(monthly_price__gt=0, is_active=True)
+
+
+class TariffEndpointGroupManager(models.Manager):
+    """Manager for TariffEndpointGroup model."""
+    
+    def get_enabled_for_tariff(self, tariff):
+        """Get enabled endpoint groups for tariff."""
+        return self.filter(tariff=tariff, is_enabled=True)

django_cfg/apps/payments/middleware/__init__.py

@@ -0,0 +1,13 @@
+"""
+Middleware for universal payments.
+"""
+
+from .api_access import APIAccessMiddleware
+from .rate_limiting import RateLimitingMiddleware
+from .usage_tracking import UsageTrackingMiddleware
+
+__all__ = [
+    'APIAccessMiddleware',
+    'RateLimitingMiddleware', 
+    'UsageTrackingMiddleware',
+]