some cleanups

This commit is contained in:
Sayyid Hamid Mahdavi 2025-10-23 12:45:09 +03:30
parent a8166a7bdf
commit 413a5497e4
8 changed files with 49 additions and 210 deletions

View file

@ -32,7 +32,7 @@ class ChargeRequestApiView(generics.CreateAPIView):
user = self.request.user user = self.request.user
serializer.save(user = user) serializer.save(user = user)
# TODO: refactor
class ChargeView(UpdateView): class ChargeView(UpdateView):
template_name = 'core/charge.html' template_name = 'core/charge.html'
form_class = ChargeForm form_class = ChargeForm

View file

@ -22,7 +22,6 @@ class AccessToken(AbstractAccessToken):
class Application(AbstractApplication): class Application(AbstractApplication):
id = None id = None
uuid = models.UUIDField(primary_key=True, editable=False, default=uuid.uuid4, unique=True, db_index=True) uuid = models.UUIDField(primary_key=True, editable=False, default=uuid.uuid4, unique=True, db_index=True)
balance = models.BigIntegerField(_('balance'), default=0)
class Meta: class Meta:
abstract = False abstract = False

View file

@ -62,10 +62,6 @@ class User(AbstractUser):
null=True null=True
) )
last_checkout_request = models.DateTimeField(_('otp expire'), max_length=30, blank=True, null=True) last_checkout_request = models.DateTimeField(_('otp expire'), max_length=30, blank=True, null=True)
balance = models.PositiveBigIntegerField(_('balance'), default=0)
iban = models.CharField(null=True, max_length=30, blank=True)
iban_verified = models.BooleanField(null=True)
updated_at = models.DateTimeField(_('last update'), max_length=30, blank=True, null=True, auto_now=True) updated_at = models.DateTimeField(_('last update'), max_length=30, blank=True, null=True, auto_now=True)
last_login = models.DateTimeField(_('last login'), blank=True, null=True) last_login = models.DateTimeField(_('last login'), blank=True, null=True)

View file

@ -1,3 +1,5 @@
from functools import cached_property
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models from django.db import models
from django.db import transaction from django.db import transaction
@ -82,16 +84,13 @@ class Category(BaseModel):
class TransactionQuerySet(models.QuerySet): class TransactionQuerySet(models.QuerySet):
pass def available(self):
return self.select_related('payer_wallet', 'payee_wallet')
class Transaction(BaseModel): class Transaction(BaseModel):
amount = models.PositiveBigIntegerField(_('amount'), blank=False, validators=[MinValueValidator(1)]) amount = models.PositiveBigIntegerField(_('amount'), blank=False, validators=[MinValueValidator(1)])
delay = models.PositiveIntegerField(default=0, blank=True) # number of days for delayed payments delay = models.PositiveIntegerField(default=0, blank=True) # number of days for delayed payments
_payer_id = models.UUIDField(blank=True, null=True)
_payer_type = models.IntegerField(choices=TypeChoices.choices, blank=True, null=True)
_payee_id = models.UUIDField(null=True)
_payee_type = models.IntegerField(choices=TypeChoices.choices, blank=True, null=True)
state = models.IntegerField(choices=StateChoices.choices, default=StateChoices.CREATED) state = models.IntegerField(choices=StateChoices.choices, default=StateChoices.CREATED)
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, on_delete=models.PROTECT, application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, on_delete=models.PROTECT,
related_name='transactions', null=True) related_name='transactions', null=True)
@ -125,27 +124,27 @@ class Transaction(BaseModel):
def get_payee(self): def get_payee(self):
return self.payee_wallet.get_owner() return self.payee_wallet.get_owner()
@property @cached_property
def payer_wallet_category(self): def payer_wallet_category(self):
return self.payer_wallet and self.payer_wallet.category_id return self.payer_wallet and self.payer_wallet.category_id
@property @cached_property
def payee_wallet_category(self): def payee_wallet_category(self):
return self.payee_wallet and self.payee_wallet.category_id return self.payee_wallet and self.payee_wallet.category_id
@property @cached_property
def payer(self): def payer(self):
return self.payer_wallet.owner_uuid return self.payer_wallet.owner_uuid
@property @cached_property
def payer_type(self): def payer_type(self):
return self.payer_wallet.owner_type return self.payer_wallet.owner_type
@property @cached_property
def payee(self): def payee(self):
return self.payee_wallet.owner_uuid return self.payee_wallet.owner_uuid
@property @cached_property
def payee_type(self): def payee_type(self):
return self.payee_wallet.owner_type return self.payee_wallet.owner_type
@ -162,8 +161,7 @@ class Transaction(BaseModel):
else: else:
raise APIException(error_message) raise APIException(error_message)
######################## category def withdraw_from_payer_balance(self):
def category_withdraw_from_payer_balance(self):
payer_is_allowed_negative_balance = self.payer_wallet.owner_type == TypeChoices.APPLICATION.value and str( payer_is_allowed_negative_balance = self.payer_wallet.owner_type == TypeChoices.APPLICATION.value and str(
self.payer_wallet.owner_uuid) in settings.ALLOWED_NEGATIVE_BALANCE_APPLICATIONS self.payer_wallet.owner_uuid) in settings.ALLOWED_NEGATIVE_BALANCE_APPLICATIONS
if self.amount > self.payer_wallet.balance and not payer_is_allowed_negative_balance: if self.amount > self.payer_wallet.balance and not payer_is_allowed_negative_balance:
@ -171,10 +169,11 @@ class Transaction(BaseModel):
self.payer_wallet.balance = F('balance') - self.amount self.payer_wallet.balance = F('balance') - self.amount
self.payer_wallet.save(update_fields=['balance']) self.payer_wallet.save(update_fields=['balance'])
def category_deposit_to_payee_balance(self): def deposit_to_payee_balance(self):
self.payee_wallet.balance = F('balance') + self.amount self.payee_wallet.balance = F('balance') + self.amount
self.payee_wallet.save(update_fields=['balance']) self.payee_wallet.save(update_fields=['balance'])
# TODO: refactor
def pay(self, payer_id=None, payer_type=None): def pay(self, payer_id=None, payer_type=None):
if not self.payer_id and not (payer_id and payer_type): if not self.payer_id and not (payer_id and payer_type):
raise APIException('payer identification error') raise APIException('payer identification error')
@ -212,11 +211,12 @@ class Transaction(BaseModel):
payer_id=payer_id, payer_id=payer_id,
payer_type=payer_type payer_type=payer_type
) )
self.category_deposit_to_payee_balance() self.deposit_to_payee_balance()
self.category_withdraw_from_payer_balance() self.withdraw_from_payer_balance()
return self return self
# TODO: refactor
def receipt(self): def receipt(self):
if not self.state == StateChoices.DELAYED: if not self.state == StateChoices.DELAYED:
raise APIException('this transaction is not delayed') raise APIException('this transaction is not delayed')
@ -227,10 +227,10 @@ class Transaction(BaseModel):
StateChoices.SUCCESS, StateChoices.SUCCESS,
error_message='this transaction is not delayed' error_message='this transaction is not delayed'
) )
self.category_deposit_to_payee_balance() self.deposit_to_payee_balance()
return self return self
def category_submit(self): def submit(self):
if not self.payer_wallet: if not self.payer_wallet:
raise APIException('payer identification error') raise APIException('payer identification error')
@ -245,7 +245,7 @@ class Transaction(BaseModel):
raise APIException('this transaction is not ready to pay') raise APIException('this transaction is not ready to pay')
with transaction.atomic(): with transaction.atomic():
self.category_withdraw_from_payer_balance() self.withdraw_from_payer_balance()
self.change_state( self.change_state(
StateChoices.CREATED, StateChoices.CREATED,
StateChoices.PENDING, StateChoices.PENDING,
@ -253,12 +253,12 @@ class Transaction(BaseModel):
) )
return self return self
def category_verify(self): def verify(self):
if not self.state == StateChoices.PENDING: if not self.state == StateChoices.PENDING:
raise APIException('this transaction is not pending') raise APIException('this transaction is not pending')
with transaction.atomic(): with transaction.atomic():
self.category_deposit_to_payee_balance() self.deposit_to_payee_balance()
self.change_state( self.change_state(
StateChoices.PENDING, StateChoices.PENDING,
StateChoices.SUCCESS, StateChoices.SUCCESS,

View file

@ -74,7 +74,7 @@ class DepositSerializer(serializers.ModelSerializer):
with atomic(): with atomic():
try: try:
transaction = Transaction.objects.create_transaction(**validated_data) transaction = Transaction.objects.create_transaction(**validated_data)
transaction.category_submit() transaction.submit()
except IntegrityError as e: except IntegrityError as e:
raise APIException('duplicate uuid') raise APIException('duplicate uuid')
@ -104,7 +104,7 @@ class WithdrawSerializer(serializers.ModelSerializer):
with atomic(): with atomic():
try: try:
transaction = Transaction.objects.create_transaction(**validated_data) transaction = Transaction.objects.create_transaction(**validated_data)
transaction.category_submit() transaction.submit()
except IntegrityError as e: except IntegrityError as e:
raise APIException('duplicate uuid') raise APIException('duplicate uuid')

View file

@ -30,33 +30,24 @@ user_urlpatterns = [
] ]
application_urlpatterns = [ application_urlpatterns = [
path('api/application/balance', application_views.CategoryBalanceAPIView.as_view(), name='application_wallet_balance_api'), path('api/application/balance', application_views.BalanceAPIView.as_view(), name='application_wallet_balance_api'),
path('api/application/user_balance/<uuid>', application_views.UserBalanceAPIView.as_view(), name='application_user_wallet_balance_api'),
path('api/application/user_balance/<uuid>', application_views.CategoryUserBalanceAPIView.as_view(), name='application_user_wallet_balance_api'), path('api/application/', application_views.TransactionListAPIView.as_view(), name='application_transaction_list_api'),
path('api/application/<uuid>/', application_views.TransactionDetailAPIView.as_view(), name='application_transaction_detail'),
path('api/application/deposit/', application_views.CategoryDepositSubmitAPIView.as_view(), name='application_deposit_submit_api'),
path('api/application/deposit/<uuid>/verify', application_views.CategoryDepositVerifyAPIView.as_view(), name='application_deposit_verify_api'),
path('api/application/withdraw/', application_views.CategoryWithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'),
path('api/application/withdraw/<uuid>/verify', application_views.CategoryWithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'),
path('api/application/', application_views.CategoryTransactionListAPIView.as_view(), name='application_transaction_list_api'),
path('api/application/<uuid>/', application_views.CategoryTransactionDetailAPIView.as_view(), name='application_transaction_detail'),
path('api/application/<category_uuid>/balance', application_views.CategoryBalanceAPIView.as_view(), name='application_wallet_balance_api'), path('api/application/<category_uuid>/balance', application_views.BalanceAPIView.as_view(), name='application_wallet_balance_api'),
path('api/application/<category_uuid>/user/<uuid>/balance', application_views.UserBalanceAPIView.as_view(), name='application_user_wallet_balance_api'),
path('api/application/<category_uuid>/user/<uuid>/balance', application_views.CategoryUserBalanceAPIView.as_view(), name='application_user_wallet_balance_api'), path('api/application/<category_uuid>/deposit/', application_views.DepositSubmitAPIView.as_view(), name='application_deposit_submit_api'),
path('api/application/<category_uuid>/deposit/<uuid>/verify', application_views.DepositVerifyAPIView.as_view(), name='application_deposit_verify_api'),
path('api/application/<category_uuid>/deposit/', application_views.CategoryDepositSubmitAPIView.as_view(), name='application_deposit_submit_api'), path('api/application/<category_uuid>/withdraw/', application_views.WithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'),
path('api/application/<category_uuid>/deposit/<uuid>/verify', application_views.CategoryDepositVerifyAPIView.as_view(), name='application_deposit_verify_api'), path('api/application/<category_uuid>/withdraw/<uuid>/verify', application_views.WithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'),
path('api/application/<category_uuid>/withdraw/', application_views.CategoryWithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'), path('api/application/<category_uuid>/', application_views.TransactionListAPIView.as_view(), name='application_transaction_list_api'),
path('api/application/<category_uuid>/withdraw/<uuid>/verify', application_views.CategoryWithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'), path('api/application/<category_uuid>/<uuid>/', application_views.TransactionDetailAPIView.as_view(), name='application_transaction_detail'),
path('api/application/<category_uuid>/', application_views.CategoryTransactionListAPIView.as_view(), name='application_transaction_list_api'),
path('api/application/<category_uuid>/<uuid>/', application_views.CategoryTransactionDetailAPIView.as_view(), name='application_transaction_detail'),
] ]

View file

@ -39,154 +39,6 @@ class BalanceAPIView(generics.RetrieveAPIView):
serializer_class = BalanceSerializer serializer_class = BalanceSerializer
required_scopes = ['wallet.application:get_balance'] required_scopes = ['wallet.application:get_balance']
def get_object(self):
return get_application(self.request)
class UserBalanceAPIView(generics.RetrieveAPIView):
'''
API for getting specified user or application balance.
'''
permission_classes = [IsAuthenticatedOrTokenHasScope]
serializer_class = BalanceSerializer
required_scopes = ['wallet.application:get_user_balance']
def get_object(self):
user_uuid = self.kwargs.get('uuid')
user, created = User.objects.get_or_create(uuid=user_uuid)
# user = get_object_or_404(User.objects.all(), uuid=user_uuid)
return user
class TransactionDetailAPIView(generics.RetrieveAPIView):
permission_classes = [TokenHasScope]
serializer_class = TransactionSerializer
lookup_field = 'uuid'
required_scopes = ['wallet.application:get_transaction_detail']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(Q(application=application) |
Q(payer_id=application.pk, payer_type=TypeChoices.APPLICATION.value) |
Q(payee_id=application.pk, payee_type=TypeChoices.APPLICATION.value)
).all()
class TransactionListAPIView(generics.ListAPIView):
permission_classes = [TokenHasScope]
serializer_class = TransactionSerializer
lookup_field = 'uuid'
required_scopes = ['wallet.application:get_transaction_list']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(Q(application=application) |
Q(payer_id=application.pk, payer_type=TypeChoices.APPLICATION.value) |
Q(payee_id=application.pk, payee_type=TypeChoices.APPLICATION.value)
).all()
# from application to another entity
# TODO: better name
class DepositSubmitAPIView(generics.CreateAPIView):
permission_classes = [IsAuthenticatedOrTokenHasScope]
serializer_class = ApplicationDepositSerializer
required_scopes = ['wallet.application.deposit:submit']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(application=application,
payer_id=application.pk,
payer_type=TypeChoices.APPLICATION.value).all()
def perform_create(self, serializer):
# TODO: get_or_create instead of create if uuid given
# TODO: it is possible to merage create and submit in one step for improve performance
application = get_application(self.request)
instance = serializer.save(payer_id=application.pk,
payer_type=TypeChoices.APPLICATION.value,
application=application)
try:
instance.category_submit()
except Exception as e:
print(e)
APIException('Failed to submit deposit')
class DepositVerifyAPIView(generics.RetrieveAPIView):
permission_classes = [IsAuthenticatedOrTokenHasScope]
serializer_class = ApplicationDepositSerializer
lookup_field = 'uuid'
required_scopes = ['wallet.application.deposit:verify']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(application=application,
payer_id=application.pk,
payer_type=TypeChoices.APPLICATION.value).all()
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
if instance.state == StateChoices.PENDING:
instance.category_verify()
serializer = self.get_serializer(instance)
return Response(serializer.data)
# from another entity to application
class WithdrawSubmitAPIView(generics.CreateAPIView):
permission_classes = [TokenHasScope]
serializer_class = ApplicationWithdrawSerializer
required_scopes = ['wallet.application.withdraw:submit']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(application=application,
payee_id=application.pk,
payee_type=TypeChoices.APPLICATION.value).all()
def perform_create(self, serializer):
# TODO: get_or_create instead of create if uuid given
# TODO: it is possible to merage create and submit in one step for improve performance
application = get_application(self.request)
instance = serializer.save(payee_id=application.pk,
payee_type=TypeChoices.APPLICATION.value,
application=application)
instance.category_submit()
class WithdrawVerifyAPIView(generics.RetrieveAPIView):
permission_classes = [TokenHasScope]
serializer_class = ApplicationWithdrawSerializer
lookup_field = 'uuid'
required_scopes = ['wallet.application.withdraw:verify']
def get_queryset(self):
application = get_application(self.request)
return Transaction.objects.filter(application=application,
payee_id=application.pk,
payee_type=TypeChoices.APPLICATION.value).all()
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
if instance.state == StateChoices.PENDING:
instance.category_verify()
serializer = self.get_serializer(instance)
return Response(serializer.data)
class CategoryBalanceAPIView(generics.RetrieveAPIView):
'''
API for getting specified user or application balance.
'''
permission_classes = [TokenHasScope]
serializer_class = BalanceSerializer
required_scopes = ['wallet.application:get_balance']
def get_object(self): def get_object(self):
category_uuid = self.kwargs.get('category_uuid') category_uuid = self.kwargs.get('category_uuid')
if category_uuid: if category_uuid:
@ -200,7 +52,7 @@ class CategoryBalanceAPIView(generics.RetrieveAPIView):
return wallet return wallet
class CategoryUserBalanceAPIView(generics.RetrieveAPIView): class UserBalanceAPIView(generics.RetrieveAPIView):
''' '''
API for getting specified user or application balance. API for getting specified user or application balance.
''' '''
@ -223,7 +75,7 @@ class CategoryUserBalanceAPIView(generics.RetrieveAPIView):
return wallet return wallet
class CategoryTransactionDetailAPIView(generics.RetrieveAPIView): class TransactionDetailAPIView(generics.RetrieveAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = TransactionSerializer serializer_class = TransactionSerializer
lookup_field = 'uuid' lookup_field = 'uuid'
@ -240,7 +92,7 @@ class CategoryTransactionDetailAPIView(generics.RetrieveAPIView):
).all() ).all()
class CategoryTransactionListAPIView(generics.ListAPIView): class TransactionListAPIView(generics.ListAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = TransactionSerializer serializer_class = TransactionSerializer
lookup_field = 'uuid' lookup_field = 'uuid'
@ -259,7 +111,7 @@ class CategoryTransactionListAPIView(generics.ListAPIView):
# from application to another entity # from application to another entity
# TODO: better name # TODO: better name
class CategoryDepositSubmitAPIView(generics.CreateAPIView): class DepositSubmitAPIView(generics.CreateAPIView):
permission_classes = [IsAuthenticatedOrTokenHasScope] permission_classes = [IsAuthenticatedOrTokenHasScope]
serializer_class = ApplicationDepositSerializer serializer_class = ApplicationDepositSerializer
required_scopes = ['wallet.application.deposit:submit'] required_scopes = ['wallet.application.deposit:submit']
@ -335,13 +187,13 @@ class CategoryDepositSubmitAPIView(generics.CreateAPIView):
# TODO: status code 200 if not created before # TODO: status code 200 if not created before
if created or instance.state == StateChoices.CREATED: if created or instance.state == StateChoices.CREATED:
instance.category_submit() instance.submit()
else: else:
logger.warning(f"Transaction was not in processable state! for {instance.uuid}: {instance.state}") logger.warning(f"Transaction was not in processable state! for {instance.uuid}: {instance.state}")
raise UnprocessableEntity(_('Transaction was not in processable state!')) raise UnprocessableEntity(_('Transaction was not in processable state!'))
class CategoryDepositVerifyAPIView(generics.RetrieveAPIView): class DepositVerifyAPIView(generics.RetrieveAPIView):
permission_classes = [IsAuthenticatedOrTokenHasScope] permission_classes = [IsAuthenticatedOrTokenHasScope]
serializer_class = ApplicationDepositSerializer serializer_class = ApplicationDepositSerializer
lookup_field = 'uuid' lookup_field = 'uuid'
@ -360,14 +212,14 @@ class CategoryDepositVerifyAPIView(generics.RetrieveAPIView):
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
instance = self.get_object() instance = self.get_object()
if instance.state == StateChoices.PENDING: if instance.state == StateChoices.PENDING:
instance.category_verify() instance.verify()
logger.warning(f"Transaction was retrieved for {instance.uuid}: {instance.state}") logger.warning(f"Transaction was retrieved for {instance.uuid}: {instance.state}")
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
return Response(serializer.data) return Response(serializer.data)
# from another entity to application # from another entity to application
class CategoryWithdrawSubmitAPIView(generics.CreateAPIView): class WithdrawSubmitAPIView(generics.CreateAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = ApplicationWithdrawSerializer serializer_class = ApplicationWithdrawSerializer
required_scopes = ['wallet.application.withdraw:submit'] required_scopes = ['wallet.application.withdraw:submit']
@ -445,13 +297,13 @@ class CategoryWithdrawSubmitAPIView(generics.CreateAPIView):
# TODO: status code 200 if not created before # TODO: status code 200 if not created before
if created or instance.state == StateChoices.CREATED: if created or instance.state == StateChoices.CREATED:
instance.category_submit() instance.submit()
else: else:
logger.warning(f"Transaction was not in processable state! for {instance.uuid}: {instance.state}") logger.warning(f"Transaction was not in processable state! for {instance.uuid}: {instance.state}")
raise UnprocessableEntity(_('Transaction was not in processable state!')) raise UnprocessableEntity(_('Transaction was not in processable state!'))
class CategoryWithdrawVerifyAPIView(generics.RetrieveAPIView): class WithdrawVerifyAPIView(generics.RetrieveAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = ApplicationWithdrawSerializer serializer_class = ApplicationWithdrawSerializer
lookup_field = 'uuid' lookup_field = 'uuid'
@ -470,7 +322,7 @@ class CategoryWithdrawVerifyAPIView(generics.RetrieveAPIView):
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
instance = self.get_object() instance = self.get_object()
if instance.state == StateChoices.PENDING: if instance.state == StateChoices.PENDING:
instance.category_verify() instance.verify()
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
return Response(serializer.data) return Response(serializer.data)

View file

@ -133,6 +133,7 @@ class DepositSubmit(generics.CreateAPIView):
serializer.save(payer=payer, application=get_application(self.request)) serializer.save(payer=payer, application=get_application(self.request))
# TODO: refactore
class DepositVerify(generics.RetrieveAPIView): class DepositVerify(generics.RetrieveAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = DepositSerializer serializer_class = DepositSerializer
@ -165,7 +166,7 @@ class WithdrawSubmit(generics.CreateAPIView):
payee = self.request.auth.application.user payee = self.request.auth.application.user
serializer.save(payee=payee, application=get_application(self.request)) serializer.save(payee=payee, application=get_application(self.request))
# TODO: refactor
class WithdrawVerify(generics.RetrieveAPIView): class WithdrawVerify(generics.RetrieveAPIView):
permission_classes = [TokenHasScope] permission_classes = [TokenHasScope]
serializer_class = WithdrawSerializer serializer_class = WithdrawSerializer