django-cfg 1.3.11__py3-none-any.whl → 1.4.0__py3-none-any.whl

django_cfg/apps/payments/admin_interface/views/api/users.py

@@ -13,7 +13,7 @@ from rest_framework.filters import SearchFilter, OrderingFilter
 
 from django_cfg.apps.payments.admin_interface.views.base import AdminReadOnlyViewSet
 from django_cfg.apps.payments.admin_interface.serializers import AdminUserSerializer
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("admin_user_api")
 

django_cfg/apps/payments/admin_interface/views/api/webhook_admin.py

@@ -24,7 +24,7 @@ from django_cfg.apps.payments.admin_interface.serializers import (
     WebhookActionResultSerializer,
 )
 from django_cfg.apps.payments.models import UniversalPayment
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.services.integrations.ngrok_service import (
     get_all_webhook_urls, 
     get_api_base_url, 

django_cfg/apps/payments/admin_interface/views/api/webhook_public.py

@@ -12,7 +12,7 @@ from rest_framework.permissions import AllowAny
 from django.utils import timezone
 
 from django_cfg.apps.payments.admin_interface.serializers import WebhookStatsSerializer
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("webhook_public_api")
 

django_cfg/apps/payments/admin_interface/views/base.py

@@ -16,7 +16,7 @@ from django.utils import timezone
 from datetime import timedelta
 
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("admin_api")
 
@@ -103,12 +103,39 @@ class AdminTemplateViewMixin:
     """
     Mixin for template views requiring staff access.
     """
-    
+
     def get_context_data(self, **kwargs):
         """Add admin-specific context."""
+        from django.urls import reverse
+
         context = super().get_context_data(**kwargs)
+
+        # Build navigation items for navbar
+        dashboard_url = reverse('cfg_payments_admin:dashboard')
+        payments_url = reverse('cfg_payments_admin:payment-list')
+        webhooks_url = reverse('cfg_payments_admin:webhook-dashboard')
+
+        payment_nav_items = [
+            {
+                'label': 'Dashboard',
+                'url': dashboard_url,
+                'active': self.request.path == dashboard_url or self.request.path.rstrip('/') == dashboard_url.rstrip('/'),
+            },
+            {
+                'label': 'Payments',
+                'url': payments_url,
+                'active': self.request.path.startswith(payments_url.rstrip('/')),
+            },
+            {
+                'label': 'Webhooks',
+                'url': webhooks_url,
+                'active': self.request.path.startswith(webhooks_url.rstrip('/')),
+            },
+        ]
+
         context.update({
             'is_admin_interface': True,
             'admin_user': self.request.user,
+            'payment_nav_items': payment_nav_items,
         })
         return context

django_cfg/apps/payments/apps.py

@@ -5,7 +5,7 @@ Simplified payment system focused on NowPayments with extensible architecture.
 """
 
 from django.apps import AppConfig
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("payments")
 

django_cfg/apps/payments/config/django_cfg_integration.py

@@ -6,8 +6,8 @@ and caching. All payments modules should use this for configuration access.
 """
 
 from typing import Optional
-from django_cfg.core.config import get_current_config
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.core.state import get_current_config
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("payments_django_cfg_integration")
 

django_cfg/apps/payments/config/helpers.py

@@ -8,7 +8,7 @@ from typing import Dict, Any
 from django.conf import settings
 
 from .django_cfg_integration import PaymentsConfigMixin
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("payments_config_helpers")
 
@@ -24,6 +24,7 @@ class MiddlewareConfigHelper(PaymentsConfigMixin):
         return {
             # All settings from BaseCfgAutoModule (django-cfg)
             'enabled': config.enabled and config.middleware_enabled,
+            'api_prefixes': getattr(config, 'api_prefixes', ['/api/']),
             'protected_paths': config.protected_paths,
             'protected_patterns': config.protected_patterns,
             'rate_limiting_enabled': config.rate_limiting_enabled,
@@ -31,7 +32,7 @@ class MiddlewareConfigHelper(PaymentsConfigMixin):
             'usage_tracking_enabled': config.usage_tracking_enabled,
             'track_anonymous_usage': config.track_anonymous_usage,
             'cache_timeouts': config.cache_timeouts,
-            
+
             # Provider API configurations
             'enabled_providers': config.get_enabled_providers(),
             'provider_configs': {

django_cfg/apps/payments/management/commands/cleanup_expired_data.py

@@ -13,7 +13,7 @@ from django.db import transaction
 from django.db.models import Q, Count
 from django.core.cache import cache
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.models import UniversalPayment, APIKey, Transaction
 from django_cfg.apps.payments.services.cache_service import get_cache_service
 

django_cfg/apps/payments/management/commands/currency_stats.py

@@ -13,7 +13,7 @@ from django.utils import timezone
 from django.db.models import Q, Count, Avg, Sum, Max, Min
 from django.contrib.humanize.templatetags.humanize import intcomma
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.models import Currency, Network, ProviderCurrency, UniversalPayment
 from django_cfg.apps.payments.services.providers.registry import get_provider_registry
 

django_cfg/apps/payments/management/commands/manage_currencies.py

@@ -12,7 +12,7 @@ import time
 import concurrent.futures
 from threading import Lock
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.modules.django_currency import CurrencyConverter, CurrencyError
 from django_cfg.apps.payments.models import Currency
 

django_cfg/apps/payments/management/commands/manage_providers.py

@@ -11,7 +11,7 @@ from datetime import timedelta
 from typing import List, Optional, Dict
 import time
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.models import Currency, Network, ProviderCurrency
 from django_cfg.apps.payments.services.providers import (
     get_provider_registry, 

django_cfg/apps/payments/management/commands/process_pending_payments.py

@@ -13,7 +13,7 @@ from django.utils import timezone
 from django.db import transaction
 from django.db.models import Q
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.models import UniversalPayment
 from django_cfg.apps.payments.services.providers.registry import get_provider_registry
 from django_cfg.apps.payments.services.core.payment_service import PaymentService

django_cfg/apps/payments/management/commands/test_providers.py

@@ -11,7 +11,7 @@ import time
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import timezone
 
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from django_cfg.apps.payments.services.providers.registry import get_provider_registry
 from django_cfg.apps.payments.models import Currency, Network
 from django_cfg.apps.payments.services.types.requests import PaymentCreateRequest

django_cfg/apps/payments/middleware/api_access.py

@@ -15,7 +15,7 @@ from django.contrib.auth import get_user_model
 
 from ..models import APIKey, Subscription
 from ..config.helpers import MiddlewareConfigHelper
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 from ..tasks.usage_tracking import (
     update_api_key_usage_async,
     update_subscription_usage_async

django_cfg/apps/payments/middleware/rate_limiting.py

@@ -14,7 +14,7 @@ from django.core.cache import cache
 from datetime import datetime, timedelta
 
 from ..config.helpers import MiddlewareConfigHelper
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("rate_limiting_middleware")
 

django_cfg/apps/payments/middleware/usage_tracking.py

@@ -12,7 +12,7 @@ from django.utils import timezone
 from django.core.cache import cache
 
 from ..config.helpers import MiddlewareConfigHelper
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("usage_tracking_middleware")
 

django_cfg/apps/payments/models/balance.py

@@ -78,11 +78,11 @@ class UserBalance(models.Model):
         ]
         constraints = [
             models.CheckConstraint(
-                check=models.Q(balance_usd__gte=0.0),
+                condition=models.Q(balance_usd__gte=0.0),
                 name='balance_non_negative_check'
             ),
             models.CheckConstraint(
-                check=models.Q(reserved_usd__gte=0.0),
+                condition=models.Q(reserved_usd__gte=0.0),
                 name='reserved_non_negative_check'
             ),
         ]

django_cfg/apps/payments/models/managers/api_key_managers.py

@@ -7,7 +7,7 @@ Optimized querysets and managers for API key operations.
 from django.db import models
 from django.utils import timezone
 from datetime import timedelta
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("api_key_managers")
 

django_cfg/apps/payments/models/managers/balance_managers.py

@@ -6,7 +6,7 @@ Optimized querysets and managers for balance and transaction operations.
 
 from django.db import models, transaction
 from django.utils import timezone
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("balance_managers")
 

django_cfg/apps/payments/models/managers/currency_managers.py

@@ -5,7 +5,7 @@ Optimized querysets and managers for currency operations with django_currency in
 """
 
 from django.db import models
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("currency_managers")
 

django_cfg/apps/payments/models/managers/payment_managers.py

@@ -10,7 +10,7 @@ from datetime import datetime
 from django.db import models
 from django.utils import timezone
 from pydantic import BaseModel, Field, ConfigDict
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("payment_managers")
 

django_cfg/apps/payments/models/managers/subscription_managers.py

@@ -7,7 +7,7 @@ Optimized querysets and managers for subscription and endpoint group operations.
 from django.db import models
 from django.utils import timezone
 from datetime import timedelta
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 logger = get_logger("subscription_managers")
 

django_cfg/apps/payments/models/payments.py

@@ -238,11 +238,11 @@ class UniversalPayment(UUIDTimestampedModel):
         ]
         constraints = [
             models.CheckConstraint(
-                check=models.Q(amount_usd__gte=1.0),
+                condition=models.Q(amount_usd__gte=1.0),
                 name='payments_min_amount_check'
             ),
             models.CheckConstraint(
-                check=models.Q(amount_usd__lte=50000.0),
+                condition=models.Q(amount_usd__lte=50000.0),
                 name='payments_max_amount_check'
             ),
         ]

django_cfg/apps/payments/services/cache_service/__init__.py

@@ -8,7 +8,7 @@ ONLY for API access control - NOT payment data!
 
 from typing import Dict, Any
 from django.core.cache import cache
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 from .interfaces import CacheInterface
 from .simple_cache import SimpleCache

django_cfg/apps/payments/services/cache_service/simple_cache.py

@@ -6,7 +6,7 @@ Basic cache functionality with graceful fallback.
 
 from typing import Optional, Any
 from django.core.cache import cache
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 from .interfaces import CacheInterface
 
@@ -29,15 +29,20 @@ class SimpleCache(CacheInterface):
         """Check if cache is enabled via PaymentsConfig."""
         from django.conf import settings
         import sys
-        
+        import os
+
         # For tests, always enable cache (detect test environment)
-        if 'test' in sys.argv or hasattr(settings, 'TESTING'):
+        # Check multiple ways to detect test environment
+        if ('test' in sys.argv or
+            hasattr(settings, 'TESTING') or
+            'pytest' in sys.modules or
+            'PYTEST_CURRENT_TEST' in os.environ):
             return True
-            
+
         # For development, enable by default
         if settings.DEBUG:
             return True
-            
+
         try:
             from django_cfg.models.payments import PaymentsConfig
             config = PaymentsConfig.get_current_config()

django_cfg/apps/payments/services/core/base.py

@@ -7,7 +7,7 @@ Provides common functionality for all services.
 from abc import ABC
 from typing import Optional, Dict, Any, Type
 from django.db import transaction
-from django_cfg.modules.django_logger import get_logger
+from django_cfg.modules.django_logging import get_logger
 
 from ..types import ServiceOperationResult
 from ...config.django_cfg_integration import PaymentsConfigManager

django_cfg/apps/payments/services/core/currency/__init__.py

@@ -0,0 +1,13 @@
+"""
+Currency operations for payment service.
+
+Provides currency validation and conversion functionality.
+"""
+
+from .currency_validator import CurrencyValidator
+from .currency_converter import CurrencyConverter
+
+__all__ = [
+    'CurrencyValidator',
+    'CurrencyConverter',
+]

django_cfg/apps/payments/services/core/currency/currency_converter.py

@@ -0,0 +1,57 @@
+"""
+Currency conversion.
+
+Converts between USD and cryptocurrencies using exchange rates.
+"""
+
+from decimal import Decimal
+from django_cfg.modules.django_currency import convert_currency, get_exchange_rate
+from ...types import ServiceOperationResult
+
+
+class CurrencyConverter:
+    """Convert between currencies."""
+
+    def __init__(self, base_service):
+        """
+        Initialize converter.
+
+        Args:
+            base_service: Base service instance for error/success result creation
+        """
+        self.base_service = base_service
+
+    def convert_usd_to_crypto(
+        self,
+        amount_usd: float,
+        currency_code: str
+    ) -> ServiceOperationResult:
+        """
+        Convert USD amount to cryptocurrency.
+
+        Args:
+            amount_usd: Amount in USD
+            currency_code: Target cryptocurrency code
+
+        Returns:
+            ServiceOperationResult with conversion data or error
+        """
+        try:
+            # Use django_currency module for conversion
+            crypto_amount = convert_currency(amount_usd, 'USD', currency_code)
+
+            return self.base_service._create_success_result(
+                "Currency converted successfully",
+                {
+                    'amount_usd': amount_usd,
+                    'crypto_amount': Decimal(str(crypto_amount)),
+                    'currency_code': currency_code,
+                    'exchange_rate': get_exchange_rate('USD', currency_code)
+                }
+            )
+
+        except Exception as e:
+            return self.base_service._create_error_result(
+                f"Currency conversion failed: {e}",
+                "conversion_failed"
+            )

django_cfg/apps/payments/services/core/currency/currency_validator.py

@@ -0,0 +1,61 @@
+"""
+Currency validation.
+
+Validates that currencies are active and supported by providers.
+"""
+
+from ....models import Currency, ProviderCurrency
+from ...types import ServiceOperationResult
+
+
+class CurrencyValidator:
+    """Validate currencies for payment operations."""
+
+    def __init__(self, base_service):
+        """
+        Initialize validator.
+
+        Args:
+            base_service: Base service instance for error/success result creation
+        """
+        self.base_service = base_service
+
+    def validate_currency(self, currency_code: str) -> ServiceOperationResult:
+        """
+        Validate currency is supported.
+
+        Checks that:
+        1. Currency exists and is active
+        2. Currency is supported by at least one provider
+
+        Args:
+            currency_code: Currency code to validate (e.g., 'BTC', 'ETH')
+
+        Returns:
+            ServiceOperationResult with currency data or error
+        """
+        try:
+            currency = Currency.objects.get(code=currency_code, is_active=True)
+
+            # Check if currency is supported by any provider
+            provider_currency = ProviderCurrency.objects.filter(
+                currency=currency,
+                is_enabled=True
+            ).first()
+
+            if not provider_currency:
+                return self.base_service._create_error_result(
+                    f"Currency {currency_code} not supported by any provider",
+                    "currency_not_supported"
+                )
+
+            return self.base_service._create_success_result(
+                "Currency is valid",
+                {'currency': currency}  # Wrap in dict for Pydantic
+            )
+
+        except Currency.DoesNotExist:
+            return self.base_service._create_error_result(
+                f"Currency {currency_code} not found",
+                "currency_not_found"
+            )

django_cfg/apps/payments/services/core/operations/__init__.py

@@ -0,0 +1,15 @@
+"""
+Payment operations.
+
+Core payment business logic operations.
+"""
+
+from .payment_creator import PaymentCreator
+from .payment_canceller import PaymentCanceller
+from .status_checker import StatusChecker
+
+__all__ = [
+    'PaymentCreator',
+    'PaymentCanceller',
+    'StatusChecker',
+]

django_cfg/apps/payments/services/core/operations/payment_canceller.py

@@ -0,0 +1,100 @@
+"""
+Payment cancellation logic.
+
+Handles payment cancellation with validation.
+"""
+
+from typing import TYPE_CHECKING
+from ...types import PaymentResult
+from ..utils import DataConverter
+
+if TYPE_CHECKING:
+    from ....models import UniversalPayment
+
+
+class PaymentCanceller:
+    """Handle payment cancellation."""
+
+    def __init__(self, base_service):
+        """
+        Initialize canceller.
+
+        Args:
+            base_service: Base service for transactions, logging, and result creation
+        """
+        self.base_service = base_service
+        self.logger = base_service.logger
+
+    def cancel_payment(self, payment_id: str, reason: str = None) -> PaymentResult:
+        """
+        Cancel payment if possible.
+
+        Args:
+            payment_id: Payment ID to cancel
+            reason: Cancellation reason
+
+        Returns:
+            PaymentResult: Cancellation result
+        """
+        try:
+            from ....models import UniversalPayment
+
+            self.logger.info("Cancelling payment", extra={
+                'payment_id': payment_id,
+                'reason': reason
+            })
+
+            # Get payment
+            try:
+                payment = UniversalPayment.objects.get(id=payment_id)
+            except UniversalPayment.DoesNotExist:
+                return PaymentResult(
+                    success=False,
+                    message=f"Payment {payment_id} not found",
+                    error_code="payment_not_found"
+                )
+
+            # Check if payment can be cancelled
+            if not payment.can_be_cancelled():
+                return PaymentResult(
+                    success=False,
+                    message=f"Payment {payment_id} cannot be cancelled (status: {payment.status})",
+                    error_code="cannot_cancel"
+                )
+
+            # Cancel using manager
+            def cancel_payment_transaction():
+                return payment.cancel(reason)
+
+            success = self.base_service._execute_with_transaction(cancel_payment_transaction)
+
+            if success:
+                payment.refresh_from_db()
+                payment_data = DataConverter.payment_to_data(payment)
+
+                self.base_service._log_operation(
+                    "cancel_payment",
+                    True,
+                    payment_id=payment_id,
+                    reason=reason
+                )
+
+                return PaymentResult(
+                    success=True,
+                    message="Payment cancelled successfully",
+                    payment_id=str(payment.id),
+                    status=payment.status,
+                    data={'payment': payment_data.model_dump()}
+                )
+            else:
+                return PaymentResult(
+                    success=False,
+                    message="Failed to cancel payment",
+                    error_code="cancel_failed"
+                )
+
+        except Exception as e:
+            return PaymentResult(**self.base_service._handle_exception(
+                "cancel_payment", e,
+                payment_id=payment_id
+            ).model_dump())