django-cfg 1.2.27__py3-none-any.whl → 1.2.31__py3-none-any.whl

django_cfg/apps/payments/admin/payments_admin.py

@@ -10,6 +10,9 @@ from unfold.decorators import display
 
 from ..models import UniversalPayment
 from .filters import PaymentStatusFilter, PaymentAmountFilter, UserEmailFilter, RecentActivityFilter
+from django_cfg.modules.django_logger import get_logger
+
+logger = get_logger("payments_admin")
 
 
 @admin.register(UniversalPayment)
@@ -35,6 +38,10 @@ class UniversalPaymentAdmin(ModelAdmin):
         'user__last_name'
     ]
     
+    def get_queryset(self, request):
+        """Optimize queryset to prevent N+1 queries."""
+        return super().get_queryset(request).optimized()
+    
     list_filter = [
         PaymentStatusFilter,
         PaymentAmountFilter,
@@ -59,12 +66,16 @@ class UniversalPaymentAdmin(ModelAdmin):
         ('Payment Details', {
             'fields': ['internal_payment_id', 'provider_payment_id', 'provider', 'status']
         }),
+        ('Crypto Details', {
+            'fields': ['pay_address', 'pay_amount', 'network', 'security_nonce', 'transaction_hash', 'sender_address', 'receiver_address', 'crypto_amount', 'confirmations_count'],
+            'classes': ['collapse']
+        }),
         ('Provider Data', {
-            'fields': ['provider_data'],
+            'fields': ['metadata', 'webhook_data'],
             'classes': ['collapse']
         }),
         ('Timestamps', {
-            'fields': ['created_at', 'updated_at'],
+            'fields': ['created_at', 'updated_at', 'expires_at', 'completed_at', 'processed_at'],
             'classes': ['collapse']
         })
     ]
@@ -91,8 +102,8 @@ class UniversalPaymentAdmin(ModelAdmin):
     def amount_display(self, obj):
         """Display amount with currency."""
         return format_html(
-            '<span style="font-weight: bold; font-size: 14px;">${:.2f}</span><br><small>{}</small>',
-            obj.amount_usd,
+            '<span style="font-weight: bold; font-size: 14px;">${}</span><br><small>{}</small>',
+            f"{float(obj.amount_usd):.2f}",
             obj.currency_code
         )
     

django_cfg/apps/payments/config/module.py

@@ -5,12 +5,12 @@ Handles loading and managing payment configurations from project settings.
 """
 
 from typing import Optional
-import logging
+from django_cfg.modules.django_logger import get_logger
 
 from django_cfg.modules.base import BaseCfgModule
 from .settings import PaymentsSettings
 
-logger = logging.getLogger(__name__)
+logger = get_logger("config_module")
 
 
 class PaymentsCfgModule(BaseCfgModule):

django_cfg/apps/payments/config/utils.py

@@ -5,13 +5,13 @@ Helper functions for working with payment configurations.
 """
 
 from typing import Optional
-import logging
+from django_cfg.modules.django_logger import get_logger
 
 from .module import PaymentsCfgModule
 from .settings import PaymentsSettings
 from django_cfg.models.payments import PaymentProviderConfig
 
-logger = logging.getLogger(__name__)
+logger = get_logger("config_utils")
 
 # Global payments configuration instance
 _payments_config = PaymentsCfgModule()

django_cfg/apps/payments/decorators.py

@@ -3,14 +3,14 @@ Decorators for API access control and endpoint registration.
 """
 
 import functools
-import logging
+from django_cfg.modules.django_logger import get_logger
 from typing import Optional, List, Callable, Any
 from django.http import JsonResponse
 from django.conf import settings
 from django.utils import timezone
 from .models import EndpointGroup, Subscription
 
-logger = logging.getLogger(__name__)
+logger = get_logger("decorators")
 
 
 def require_api_key(func: Callable) -> Callable:

django_cfg/apps/payments/management/commands/README.md

@@ -1,178 +1,146 @@
-# Currency Management Commands
+# Payment Management Commands
 
-Management команды для работы с валютами в Universal Payments System.
+Optimized management commands for Django CFG payments system.
 
-## Команды
+## Available Commands
 
-### 🪙 `populate_currencies` - Первоначальное заполнение
+### 1. `manage_currencies` - Currency and Rate Management
 
-Заполняет пустую базу данных валютами из внешних API (CoinGecko, YFinance).
+Universal command for all currency-related operations.
 
-```bash
-# Быстрое заполнение (50 криптовалют + 20 фиатных)
-python manage.py populate_currencies --quick
-
-# Стандартное заполнение (200 криптовалют + 30 фиатных)
-python manage.py populate_currencies
-
-# Только криптовалюты
-python manage.py populate_currencies --crypto-only
-
-# Только фиатные валюты
-python manage.py populate_currencies --fiat-only
-
-# Пропустить существующие валюты
-python manage.py populate_currencies --skip-existing
-```
-
-### 🔄 `update_currencies` - Обновление курсов
-
-Обновляет курсы валют с внешних API.
+#### Usage Examples:
 
 ```bash
-# Обновить устаревшие курсы (старше 6 часов)
-python manage.py update_currencies
+# Update USD exchange rates only
+python manage.py manage_currencies --rates-only
 
-# Принудительно обновить все валюты
-python manage.py update_currencies --force-update
+# Update specific currency rate
+python manage.py manage_currencies --rates-only --currency ETH
 
-# Сухой прогон (показать что будет обновлено)
-python manage.py update_currencies --dry-run
+# Initial population (empty database)
+python manage.py manage_currencies --populate
 
-# Кастомные лимиты
-python manage.py update_currencies --max-crypto 100 --max-fiat 30
+# Full update with fresh rates
+python manage.py manage_currencies --force
 
-# Исключить стейблкоины
-python manage.py update_currencies --exclude-stablecoins
+# Dry run to see what would be updated
+python manage.py manage_currencies --dry-run
 
-# Подробный вывод
-python manage.py update_currencies --verbose
+# Limit number of currencies processed
+python manage.py manage_currencies --populate --max-crypto 100 --max-fiat 20
 ```
 
-### 📊 `currency_stats` - Статистика валют
+#### Options:
+- `--populate` - Initial population mode for empty database
+- `--rates-only` - Only update USD exchange rates  
+- `--currency CODE` - Update specific currency (e.g., BTC, ETH)
+- `--force` - Force refresh all data even if fresh
+- `--dry-run` - Show what would be done without changes
+- `--max-crypto N` - Limit crypto currencies (default: 200)
+- `--max-fiat N` - Limit fiat currencies (default: 50)
 
-Показывает статистику базы данных валют.
+---
 
-```bash
-# Базовая статистика
-python manage.py currency_stats
+### 2. `manage_providers` - Payment Provider Management
 
-# Детальная статистика
-python manage.py currency_stats --detailed
+Universal command for all provider-related operations.
 
-# Показать топ-10 валют
-python manage.py currency_stats --top 10
+#### Usage Examples:
 
-# Проверить устаревшие курсы
-python manage.py currency_stats --check-rates
+```bash
+# Sync all active providers
+python manage.py manage_providers
 
-# Экспортировать в CSV
-python manage.py currency_stats --export-csv currencies.csv
-```
+# Sync specific provider
+python manage.py manage_providers --provider nowpayments
 
-## Автоматизация
+# Sync multiple providers
+python manage.py manage_providers --provider nowpayments,cryptomus
 
-### Cron для регулярного обновления
+# Sync providers + update USD rates
+python manage.py manage_providers --with-rates
 
-```bash
-# Обновлять курсы каждые 6 часов
-0 */6 * * * cd /path/to/project && poetry run python manage.py update_currencies
+# Show provider statistics
+python manage.py manage_providers --stats
 
-# Ежедневная проверка статистики
-0 9 * * * cd /path/to/project && poetry run python manage.py currency_stats --check-rates
+# Dry run to see what would be synced
+python manage.py manage_providers --dry-run --verbose
 ```
 
-### Docker
+#### Options:
+- `--provider NAME` - Specific provider(s) to sync (comma-separated)
+- `--all` - Sync all available providers
+- `--with-rates` - Also update USD exchange rates after sync
+- `--stats` - Show provider statistics
+- `--dry-run` - Show what would be synced without changes
+- `--verbose` - Show detailed progress information
 
-```bash
-# В Docker контейнере
-docker exec -it container_name poetry run python manage.py populate_currencies --quick
-docker exec -it container_name poetry run python manage.py update_currencies
-```
+---
 
-## Примеры использования
+### 3. `currency_stats` - Statistics and Reports
 
-### Первоначальная настройка
+Display currency database statistics and health information.
 
-```bash
-# 1. Заполнить базу данных валютами
-python manage.py populate_currencies --quick
+#### Usage Examples:
 
-# 2. Проверить результат
+```bash
+# Basic statistics
 python manage.py currency_stats
-```
 
-### Регулярное обслуживание
+# Detailed breakdown
+python manage.py currency_stats --detailed
 
-```bash
-# 1. Обновить курсы
-python manage.py update_currencies --verbose
+# Top currencies by value
+python manage.py currency_stats --top 10
 
-# 2. Проверить устаревшие курсы
+# Check rate freshness
 python manage.py currency_stats --check-rates
-
-# 3. При необходимости - принудительное обновление
-python manage.py update_currencies --force-update
 ```
 
-### Production обслуживание
+---
 
-```bash
-# Обновление с минимальными API запросами
-python manage.py update_currencies --max-crypto 50 --max-fiat 20
+## Migration from Old Commands
 
-# Мониторинг состояния
-python manage.py currency_stats --detailed --export-csv daily_report.csv
-```
+| Old Command | New Command |
+|-------------|-------------|
+| `populate_currencies` | `manage_currencies --populate` |
+| `update_currencies` | `manage_currencies` |
+| `update_currency_rates` | `manage_currencies --rates-only` |
+| `sync_providers` | `manage_providers` |
+| `currency_stats` | `currency_stats` (unchanged) |
 
-## Интеграция с django_currency
+## Automation Examples
 
-Команды используют модуль `django_currency.database.database_loader` для:
-
-- ✅ Получения списка валют с CoinGecko
-- ✅ Загрузки курсов фиатных валют с YFinance  
-- ✅ Rate limiting для защиты от API throttling
-- ✅ Кэширования для оптимизации производительности
-- ✅ Pydantic валидации для типобезопасности
-
-## Конфигурация
-
-Настройки в `DatabaseLoaderConfig`:
+### Daily Rate Updates (Crontab)
+```bash
+# Update rates every 6 hours
+0 */6 * * * cd /path/to/project && python manage.py manage_currencies --rates-only
 
-```python
-config = DatabaseLoaderConfig(
-    max_cryptocurrencies=500,        # Максимум криптовалют
-    max_fiat_currencies=50,          # Максимум фиатных валют  
-    min_market_cap_usd=1_000_000,    # Минимальная капитализация
-    coingecko_delay=1.5,             # Задержка между запросами
-    yfinance_delay=0.5,              # Задержка для YFinance
-    exclude_stablecoins=False,       # Исключить стейблкоины
-    cache_ttl_hours=24               # TTL кэша в часах
-)
+# Sync providers once daily
+0 2 * * * cd /path/to/project && python manage.py manage_providers --with-rates
 ```
 
-## Мониторинг
-
-### Логи
+### Initial Setup
+```bash
+# 1. Populate base currencies
+python manage.py manage_currencies --populate
 
-Команды логируют в `django_cfg.apps.payments.management.commands`:
+# 2. Sync payment providers
+python manage.py manage_providers
 
-```python
-import logging
-logger = logging.getLogger('django_cfg.apps.payments.management.commands')
+# 3. Check statistics
+python manage.py manage_providers --stats
+python manage.py currency_stats
 ```
 
-### Метрики
-
-- Количество созданных/обновленных валют
-- Время выполнения API запросов
-- Ошибки валидации и API
-- Статистика курсов валют
+---
 
-## Безопасность
+## Features
 
-- ✅ Rate limiting для API запросов
-- ✅ Atomic транзакции для консистентности
-- ✅ Graceful handling ошибок API
-- ✅ Валидация данных с Pydantic
-- ✅ Rollback при критических ошибках
+- **🚀 Fast**: Optimized database queries and caching
+- **📊 Progress**: Real-time progress reporting and statistics  
+- **🔄 Atomic**: Transaction safety with rollback on errors
+- **🎯 Flexible**: Multiple operation modes and options
+- **📈 Pydantic**: Full type safety with Pydantic models
+- **🛡️ Safe**: Dry-run mode for testing changes
+- **📝 Verbose**: Detailed logging and error reporting

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

@@ -76,7 +76,7 @@ class Command(BaseCommand):
         
         # Basic counts
         total = Currency.objects.count()
-        active = Currency.objects.filter(is_active=True).count()
+        active = Currency.objects.count()
         inactive = total - active
         
         fiat_count = Currency.objects.filter(currency_type=Currency.CurrencyType.FIAT).count()
@@ -84,11 +84,9 @@ class Command(BaseCommand):
         
         active_fiat = Currency.objects.filter(
             currency_type=Currency.CurrencyType.FIAT, 
-            is_active=True
         ).count()
         active_crypto = Currency.objects.filter(
             currency_type=Currency.CurrencyType.CRYPTO, 
-            is_active=True
         ).count()
         
         self.stdout.write(f"\n📈 Overview:")
@@ -119,7 +117,6 @@ class Command(BaseCommand):
         # Top cryptocurrencies by USD value
         top_crypto = Currency.objects.filter(
             currency_type=Currency.CurrencyType.CRYPTO,
-            is_active=True
         ).order_by('-usd_rate')[:options['top']]
         
         if top_crypto:
@@ -134,7 +131,6 @@ class Command(BaseCommand):
         major_fiat = Currency.objects.filter(
             currency_type=Currency.CurrencyType.FIAT,
             code__in=['USD', 'EUR', 'GBP', 'JPY', 'CNY'],
-            is_active=True
         ).order_by('code')
         
         if major_fiat:
@@ -162,12 +158,10 @@ class Command(BaseCommand):
         # Average rates by type
         crypto_avg = Currency.objects.filter(
             currency_type=Currency.CurrencyType.CRYPTO,
-            is_active=True
         ).aggregate(avg_rate=Avg('usd_rate'))['avg_rate']
         
         fiat_avg = Currency.objects.filter(
             currency_type=Currency.CurrencyType.FIAT,
-            is_active=True
         ).aggregate(avg_rate=Avg('usd_rate'))['avg_rate']
         
         self.stdout.write(f"\n📊 Average USD Rates:")
@@ -177,13 +171,8 @@ class Command(BaseCommand):
             self.stdout.write(f"   Fiat currencies: ${fiat_avg:.6f}")
         
         # Min payment amounts
-        min_payment_stats = Currency.objects.values('min_payment_amount').annotate(
-            count=Count('min_payment_amount')
-        ).order_by('min_payment_amount')[:5]
-        
-        self.stdout.write(f"\n💰 Top Min Payment Amounts:")
-        for stat in min_payment_stats:
-            self.stdout.write(f"   ${stat['min_payment_amount']}: {stat['count']} currencies")
+        # Note: min_payment_amount field was removed - now handled at provider level
+        self.stdout.write(f"\n💰 Payment amounts now managed at provider level (ProviderCurrency)")
         
         # Rate freshness distribution
         now = timezone.now()
@@ -219,7 +208,6 @@ class Command(BaseCommand):
         very_old_threshold = now - timedelta(days=30)
         very_old = Currency.objects.filter(
             Q(rate_updated_at__lt=very_old_threshold) | Q(rate_updated_at__isnull=True),
-            is_active=True
         )
         
         if very_old.exists():
@@ -237,7 +225,6 @@ class Command(BaseCommand):
         old_currencies = Currency.objects.filter(
             rate_updated_at__lt=old_threshold,
             rate_updated_at__gte=very_old_threshold,
-            is_active=True
         )
         
         if old_currencies.exists():
@@ -249,7 +236,6 @@ class Command(BaseCommand):
         fresh_threshold = now - timedelta(hours=24)
         fresh = Currency.objects.filter(
             rate_updated_at__gte=fresh_threshold,
-            is_active=True
         ).count()
         
         if fresh > 0:
@@ -258,7 +244,7 @@ class Command(BaseCommand):
             )
         
         # Recommendations
-        total_active = Currency.objects.filter(is_active=True).count()
+        total_active = Currency.objects.count()
         if very_old.count() > 0:
             self.stdout.write(f"\n💡 Recommendations:")
             self.stdout.write(f"   • Run: python manage.py update_currencies --force-update")
@@ -294,8 +280,7 @@ class Command(BaseCommand):
                 
                 # Header
                 writer.writerow([
-                    'code', 'name', 'symbol', 'currency_type', 'decimal_places',
-                    'usd_rate', 'min_payment_amount', 'is_active', 'rate_updated_at'
+                    'code', 'name', 'currency_type', 'usd_rate', 'rate_updated_at'
                 ])
                 
                 # Data
@@ -304,12 +289,8 @@ class Command(BaseCommand):
                     writer.writerow([
                         currency.code,
                         currency.name,
-                        currency.symbol,
                         currency.currency_type,
-                        currency.decimal_places,
                         currency.usd_rate,
-                        currency.min_payment_amount,
-                        currency.is_active,
                         currency.rate_updated_at.isoformat() if currency.rate_updated_at else None
                     ])