From a84d93a25ce4868a92585f7efe50ca117f8d4d80 Mon Sep 17 00:00:00 2001 From: Sayyid Hamid Mahdavi Date: Sat, 25 Oct 2025 15:06:21 +0330 Subject: [PATCH] wallet refactoring one more step --- apps/wallet/admin.py | 2 +- .../0016_rename_category_wallet_and_more.py | 24 +++++++++++++++++++ apps/wallet/urls.py | 6 ++--- apps/wallet/views/application.py | 2 +- apps/wallet/views/user.py | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 apps/wallet/migrations/0016_rename_category_wallet_and_more.py diff --git a/apps/wallet/admin.py b/apps/wallet/admin.py index 07dbbec..8317ba2 100755 --- a/apps/wallet/admin.py +++ b/apps/wallet/admin.py @@ -8,4 +8,4 @@ class TransactionAdmin(admin.ModelAdmin): admin.site.register(Transaction, TransactionAdmin) admin.site.register(Account) -admin.site.register(Category) +admin.site.register(Wallet) diff --git a/apps/wallet/migrations/0016_rename_category_wallet_and_more.py b/apps/wallet/migrations/0016_rename_category_wallet_and_more.py new file mode 100644 index 0000000..99d1a1f --- /dev/null +++ b/apps/wallet/migrations/0016_rename_category_wallet_and_more.py @@ -0,0 +1,24 @@ +# Generated by Django 5.1.7 on 2025-10-25 11:35 + +from django.conf import settings +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wallet', '0015_alter_transaction_payee_account_and_more'), + migrations.swappable_dependency(settings.OAUTH2_PROVIDER_APPLICATION_MODEL), + ] + + operations = [ + migrations.RenameModel( + old_name='Category', + new_name='Wallet', + ), + migrations.RenameField( + model_name='account', + old_name='category', + new_name='wallet', + ), + ] diff --git a/apps/wallet/urls.py b/apps/wallet/urls.py index 373c2a8..4049573 100644 --- a/apps/wallet/urls.py +++ b/apps/wallet/urls.py @@ -12,7 +12,7 @@ user_urlpatterns = [ path('api/transactions/', user_views.TransactionListAPIView.as_view(), name='transaction_list_api'), # path('api/user//balance', user_views.WalletMyAccountBalanceView.as_view(), name='user_wallet_balance_api'), - path('api/user//transactions/', user_views.WalletTransactionListView.as_view(), name='transaction_list_api'), + path('api/user//transactions/', user_views.CategoryTransactionListView.as_view(), name='transaction_list_api'), ] application_urlpatterns = [ @@ -32,8 +32,8 @@ application_urlpatterns = [ path('api/application//withdraw/', application_views.WithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'), path('api/application//withdraw//verify', application_views.WithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'), - path('api/application//', application_views.WalletTransactionListAPIView.as_view(), name='application_transaction_list_api'), - path('api/application///', application_views.WalletTransactionDetailAPIView.as_view(), name='application_transaction_detail'), + path('api/application//', application_views.CategoryTransactionListAPIView.as_view(), name='application_transaction_list_api'), + path('api/application///', application_views.CategoryTransactionDetailAPIView.as_view(), name='application_transaction_detail'), ] diff --git a/apps/wallet/views/application.py b/apps/wallet/views/application.py index 53c99f8..eac7eb2 100755 --- a/apps/wallet/views/application.py +++ b/apps/wallet/views/application.py @@ -12,7 +12,7 @@ from rest_framework.response import Response from apps.users.models import User from apps.wallet.constans import TypeChoices, StateChoices from apps.wallet.filters import AccountFilter, UserTransactionFilter -from apps.wallet.models import Transaction, Category, Account +from apps.wallet.models import Transaction, Wallet, Account from apps.wallet.serializers import ApplicationDepositSerializer, ApplicationWithdrawSerializer, \ TransactionSerializer, AccountSerializer from utils.exceptions import UnprocessableEntity diff --git a/apps/wallet/views/user.py b/apps/wallet/views/user.py index 3ca9470..ef2bc78 100755 --- a/apps/wallet/views/user.py +++ b/apps/wallet/views/user.py @@ -13,7 +13,7 @@ from rest_framework.permissions import AllowAny from rest_framework.response import Response from apps.gooyal_oauth2.rest_framework import IsAuthenticatedOrTokenMatchesOASRequirements -from apps.wallet.models import Transaction, Category, Account +from apps.wallet.models import Transaction, Wallet, Account from apps.wallet.serializers import TransactionSerializer, DepositSerializer, WithdrawSerializer, \ AccountSerializer from ..constans import StateChoices, TypeChoices