wallet with category
This commit is contained in:
Sayyid Hamid Mahdavi
parent
eefc6dd4c1
commit
3a5dfb1448
6 changed files with 372 additions and 228 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from .models import Transaction
|
from .models import Transaction, Wallet, Category
|
||||||
|
|
||||||
class TransactionAdmin(admin.ModelAdmin):
|
class TransactionAdmin(admin.ModelAdmin):
|
||||||
list_display = ['uuid', 'amount', 'created_at', 'updated_at', 'payer_id', 'payer_type', 'payee_id', 'payee_type', 'state', 'application']
|
list_display = ['uuid', 'amount', 'created_at', 'updated_at', 'payer_id', 'payer_type', 'payee_id', 'payee_type', 'state', 'application']
|
||||||
|
|
@ -7,3 +7,5 @@ class TransactionAdmin(admin.ModelAdmin):
|
||||||
list_filter = ['state', 'payer_type', 'payee_type']
|
list_filter = ['state', 'payer_type', 'payee_type']
|
||||||
|
|
||||||
admin.site.register(Transaction, TransactionAdmin)
|
admin.site.register(Transaction, TransactionAdmin)
|
||||||
|
admin.site.register(Wallet)
|
||||||
|
admin.site.register(Category)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
# Generated by Django 5.1.4 on 2025-08-19 08:46
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
import uuid
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('wallet', '0007_alter_transaction_created_at_and_more'),
|
||||||
|
migrations.swappable_dependency(settings.OAUTH2_PROVIDER_APPLICATION_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='transaction',
|
||||||
|
options={'ordering': ['-created_at']},
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='transaction',
|
||||||
|
name='created_at',
|
||||||
|
field=models.DateTimeField(auto_now_add=True, db_index=True, default=None),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='transaction',
|
||||||
|
name='updated_at',
|
||||||
|
field=models.DateTimeField(auto_now=True, db_index=True, default=None),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Category',
|
||||||
|
fields=[
|
||||||
|
('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False, unique=True)),
|
||||||
|
('created_at', models.DateTimeField(auto_now_add=True, db_index=True)),
|
||||||
|
('updated_at', models.DateTimeField(auto_now=True, db_index=True)),
|
||||||
|
('label', models.CharField(max_length=255, verbose_name='label')),
|
||||||
|
('application', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.OAUTH2_PROVIDER_APPLICATION_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Wallet',
|
||||||
|
fields=[
|
||||||
|
('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False, unique=True)),
|
||||||
|
('created_at', models.DateTimeField(auto_now_add=True, db_index=True)),
|
||||||
|
('updated_at', models.DateTimeField(auto_now=True, db_index=True)),
|
||||||
|
('owner_uuid', models.UUIDField(db_index=True)),
|
||||||
|
('owner_type', models.IntegerField(choices=[(1, 'user'), (2, 'application')], db_index=True)),
|
||||||
|
('balance', models.BigIntegerField(default=0, verbose_name='balance')),
|
||||||
|
('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='wallet.category')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='transaction',
|
||||||
|
name='payee_wallet',
|
||||||
|
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='payee_wallet_transactions', to='wallet.wallet'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='transaction',
|
||||||
|
name='payer_wallet',
|
||||||
|
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='payer_wallet_transactions', to='wallet.wallet'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -74,16 +74,23 @@ class Category(BaseModel):
|
||||||
|
|
||||||
|
|
||||||
class TransactionQuerySet(models.QuerySet):
|
class TransactionQuerySet(models.QuerySet):
|
||||||
pass
|
def migrate(self):
|
||||||
|
for transaction in self:
|
||||||
|
payer = transaction.get_payer()
|
||||||
|
payee = transaction.get_payee()
|
||||||
|
payer_wallet, created = Wallet.objects.get_or_create(owner_uuid=transaction.payer_id, owner_type=transaction.payer_type, defaults={'balance': payer.balance})
|
||||||
|
payee_wallet, created = Wallet.objects.get_or_create(owner_uuid=transaction.payee_id, owner_type=transaction.payee_type, defaults={'balance': payer.balance})
|
||||||
|
transaction.payer_wallet = payer_wallet
|
||||||
|
transaction.payee_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_id = models.UUIDField(blank=True, null=True)
|
||||||
# payer_type = models.IntegerField(choices=TypeChoices.choices, blank=True, null=True)
|
payer_type = models.IntegerField(choices=TypeChoices.choices, blank=True, null=True)
|
||||||
# payee_id = models.UUIDField()
|
payee_id = models.UUIDField()
|
||||||
# payee_type = models.IntegerField(choices=TypeChoices.choices, blank=True, 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)
|
||||||
|
|
@ -103,6 +110,12 @@ class Transaction(BaseModel):
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ['-created_at']
|
ordering = ['-created_at']
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
try:
|
||||||
|
return f"{self.get_payer()} -> {self.get_payee()} ({self.uuid}): {self.amount} - {self.get_state_display()}"
|
||||||
|
except:
|
||||||
|
return str(self.uuid)
|
||||||
|
|
||||||
# unique_together = ('application', 'detail_id',)
|
# unique_together = ('application', 'detail_id',)
|
||||||
|
|
||||||
def withdraw_from_payer_balance(self):
|
def withdraw_from_payer_balance(self):
|
||||||
|
|
@ -297,197 +310,162 @@ class Transaction(BaseModel):
|
||||||
print('update details')
|
print('update details')
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
def __str__(self):
|
######################## category
|
||||||
try:
|
def category_withdraw_from_payer_balance(self):
|
||||||
return f"{self.get_payer()} -> {self.get_payee()} ({self.uuid}): {self.amount} - {self.get_state_display()}"
|
payer_is_allowed_negative_balance = self.payer_type == TypeChoices.APPLICATION.value and str(
|
||||||
except:
|
self.payer_id) in settings.ALLOWED_NEGATIVE_BALANCE_APPLICATIONS
|
||||||
return str(self.uuid)
|
if self.amount > self.payer_wallet.balance and not payer_is_allowed_negative_balance:
|
||||||
|
raise APIException('not enough balance')
|
||||||
|
self.payer_wallet.balance = F('balance') - self.amount
|
||||||
|
self.payer_wallet.save(update_fields=['balance'])
|
||||||
|
|
||||||
# def withdraw_from_payer_balance(self):
|
def category_deposit_to_payee_balance(self):
|
||||||
# payer = self.get_payer()
|
self.payee_wallet.balance = F('balance') + self.amount
|
||||||
# payer_is_allowed_negative_balance = self.payer_type==TypeChoices.APPLICATION.value and str(self.payer_id) in settings.ALLOWED_NEGATIVE_BALANCE_APPLICATIONS
|
self.payee_wallet.save(update_fields=['balance'])
|
||||||
# if self.amount > payer.balance and not payer_is_allowed_negative_balance :
|
|
||||||
# raise APIException('not enough balance')
|
def pay(self, payer_id=None, payer_type=None):
|
||||||
# payer.balance = F('balance') - self.amount
|
if not self.payer_id and not (payer_id and payer_type):
|
||||||
# payer.save(update_fields=['balance'])
|
raise APIException('payer identification error')
|
||||||
#
|
|
||||||
# def deposit_to_payee_balance(self):
|
if self.payer_id and payer_id and not (self.payer_id == payer_id and self.payer_type == payer_type):
|
||||||
# payee = self.get_payee()
|
raise APIException('payer identification error')
|
||||||
# payee.balance = F('balance') + self.amount
|
|
||||||
# payee.save(update_fields=['balance'])
|
if not self.state == StateChoices.CREATED:
|
||||||
#
|
raise APIException('this transaction is not ready to pay')
|
||||||
# def get_pay_entity(self, entity_id, entity_type):
|
|
||||||
# if entity_type == TypeChoices.APPLICATION:
|
if not self.payer_id:
|
||||||
# entity: Application = Application.objects.get(pk=entity_id)
|
self.payer_id = payer_id
|
||||||
# else:
|
self.payer_type = payer_type
|
||||||
# entity: User = User.objects.get(pk=entity_id)
|
|
||||||
#
|
payer = self.get_payer()
|
||||||
# return entity
|
|
||||||
#
|
if payer.balance < self.amount:
|
||||||
# def get_payer(self):
|
raise APIException('not enough balance')
|
||||||
# return self.get_pay_entity(self.payer_id, self.payer_type)
|
|
||||||
#
|
with transaction.atomic():
|
||||||
# def get_payee(self):
|
if self.delay:
|
||||||
# return self.get_pay_entity(self.payee_id, self.payee_type)
|
self.change_state(
|
||||||
#
|
StateChoices.CREATED,
|
||||||
# def change_state(self, from_state, to_state, error_message=None, **data):
|
StateChoices.DELAYED,
|
||||||
# if self.state == from_state:
|
error_message='this transaction is not ready to pay',
|
||||||
# updated = Transaction.objects.filter(pk=self.pk, state=from_state).update(
|
payer_id=payer_id,
|
||||||
# state=to_state,
|
payer_type=payer_type
|
||||||
# **data
|
)
|
||||||
# )
|
|
||||||
# if updated: # double check in db level
|
else:
|
||||||
# self.state = to_state
|
self.change_state(
|
||||||
# else:
|
StateChoices.CREATED,
|
||||||
# raise APIException(error_message)
|
StateChoices.SUCCESS,
|
||||||
# else:
|
error_message='this transaction is not ready to pay',
|
||||||
# raise APIException(error_message)
|
payer_id=payer_id,
|
||||||
#
|
payer_type=payer_type
|
||||||
# def pay(self, payer_id=None, payer_type=None):
|
)
|
||||||
# if not self.payer_id and not (payer_id and payer_type):
|
self.deposit_to_payee_balance()
|
||||||
# raise APIException('payer identification error')
|
|
||||||
#
|
self.withdraw_from_payer_balance()
|
||||||
# if self.payer_id and payer_id and not (self.payer_id == payer_id and self.payer_type == payer_type):
|
return self
|
||||||
# raise APIException('payer identification error')
|
|
||||||
#
|
def receipt(self):
|
||||||
# if not self.state == StateChoices.CREATED:
|
if not self.state == StateChoices.DELAYED:
|
||||||
# raise APIException('this transaction is not ready to pay')
|
raise APIException('this transaction is not delayed')
|
||||||
#
|
|
||||||
# if not self.payer_id:
|
with transaction.atomic():
|
||||||
# self.payer_id = payer_id
|
self.change_state(
|
||||||
# self.payer_type = payer_type
|
StateChoices.DELAYED,
|
||||||
#
|
StateChoices.SUCCESS,
|
||||||
# payer = self.get_payer()
|
error_message='this transaction is not delayed'
|
||||||
#
|
)
|
||||||
# if payer.balance < self.amount:
|
self.deposit_to_payee_balance()
|
||||||
# raise APIException('not enough balance')
|
return self
|
||||||
#
|
|
||||||
# with transaction.atomic():
|
def category_submit(self):
|
||||||
# if self.delay:
|
if not self.payer_wallet:
|
||||||
# self.change_state(
|
raise APIException('payer identification error')
|
||||||
# StateChoices.CREATED,
|
|
||||||
# StateChoices.DELAYED,
|
if not self.payee_wallet:
|
||||||
# error_message='this transaction is not ready to pay',
|
raise APIException('payee identification error')
|
||||||
# payer_id=payer_id,
|
|
||||||
# payer_type=payer_type
|
if not self.state == StateChoices.CREATED:
|
||||||
# )
|
raise APIException('this transaction is not ready to pay')
|
||||||
#
|
|
||||||
# else:
|
with transaction.atomic():
|
||||||
# self.change_state(
|
self.category_withdraw_from_payer_balance()
|
||||||
# StateChoices.CREATED,
|
self.change_state(
|
||||||
# StateChoices.SUCCESS,
|
StateChoices.CREATED,
|
||||||
# error_message='this transaction is not ready to pay',
|
StateChoices.PENDING,
|
||||||
# payer_id=payer_id,
|
error_message=_('this transaction is not ready to pay')
|
||||||
# payer_type=payer_type
|
)
|
||||||
# )
|
return self
|
||||||
# self.deposit_to_payee_balance()
|
|
||||||
#
|
def category_verify(self):
|
||||||
# self.withdraw_from_payer_balance()
|
if not self.state == StateChoices.PENDING:
|
||||||
# return self
|
raise APIException('this transaction is not pending')
|
||||||
#
|
|
||||||
# def receipt(self):
|
with transaction.atomic():
|
||||||
# if not self.state == StateChoices.DELAYED:
|
self.category_deposit_to_payee_balance()
|
||||||
# raise APIException('this transaction is not delayed')
|
self.change_state(
|
||||||
#
|
StateChoices.PENDING,
|
||||||
# with transaction.atomic():
|
StateChoices.SUCCESS,
|
||||||
# self.change_state(
|
error_message=_('this transaction is not pending')
|
||||||
# StateChoices.DELAYED,
|
)
|
||||||
# StateChoices.SUCCESS,
|
return self
|
||||||
# error_message='this transaction is not delayed'
|
|
||||||
# )
|
def category_get_role(self, entity):
|
||||||
# self.deposit_to_payee_balance()
|
if self.payer_wallet.owner_uuid == entity.uuid:
|
||||||
# return self
|
return 1
|
||||||
#
|
elif self.payee_wallet.owner_uuid == entity.uuid:
|
||||||
# def submit(self):
|
return 2
|
||||||
# payer = self.get_payer()
|
else:
|
||||||
# payee = self.get_payee()
|
return 0
|
||||||
#
|
|
||||||
# if not payer:
|
def category_update_details(self, force_update=False):
|
||||||
# raise APIException('payer identification error')
|
if not isinstance(self.details, dict):
|
||||||
#
|
self.details = {}
|
||||||
# if not payee:
|
self.save()
|
||||||
# raise APIException('payee identification error')
|
# detail = {'payer_name', 'payee_name', 'application_name', 'payer_avatar_url', 'payee_avatar_url', 'application_avatar_url'}
|
||||||
#
|
is_updated = False
|
||||||
# if not self.state == StateChoices.CREATED:
|
if not self.details.get('payer_name'):
|
||||||
# raise APIException('this transaction is not ready to pay')
|
print('update payer')
|
||||||
#
|
if self.payer_wallet.owner_type == TypeChoices.USER:
|
||||||
# with transaction.atomic():
|
payer_details: PublicUser = get_user_details(self.payer_wallet.owner_uuid)
|
||||||
# self.withdraw_from_payer_balance()
|
self.details['payer_name'] = payer_details.first_name + payer_details.last_name
|
||||||
# self.change_state(
|
self.details['payer_avatar_url'] = payer_details.avatar
|
||||||
# StateChoices.CREATED,
|
else:
|
||||||
# StateChoices.PENDING,
|
payer_details = get_application_details(self.payer_id)
|
||||||
# error_message='this transaction is not ready to pay'
|
self.details['payer_name'] = payer_details.name
|
||||||
# )
|
# TODO: get avatar from details
|
||||||
# return self
|
is_updated = True
|
||||||
#
|
print("payer_details:", payer_details)
|
||||||
# def verify(self):
|
print("is_updated:", is_updated)
|
||||||
# if not self.state == StateChoices.PENDING:
|
|
||||||
# raise APIException('this transaction is not pending')
|
if not self.details.get('payee_name'):
|
||||||
#
|
print('update payee')
|
||||||
# with transaction.atomic():
|
if self.payee_wallet.owner_type == TypeChoices.USER:
|
||||||
# self.deposit_to_payee_balance()
|
payee_details: PublicUser = get_user_details(self.payee_wallet.owner_uuid)
|
||||||
# self.change_state(
|
self.details['payee_name'] = payee_details.first_name + payee_details.last_name
|
||||||
# StateChoices.PENDING,
|
self.details['payee_avatar_url'] = payee_details.avatar
|
||||||
# StateChoices.SUCCESS,
|
else:
|
||||||
# error_message='this transaction is not pending'
|
payee_details = get_application_details(self.payee_id)
|
||||||
# )
|
self.details['payee_name'] = payee_details.name
|
||||||
# return self
|
# TODO: get avatar from details
|
||||||
#
|
|
||||||
# def get_role(self, entity):
|
is_updated = True
|
||||||
#
|
print("payee_details:", payee_details)
|
||||||
# if self.payer_id == entity.uuid:
|
print("is_updated:", is_updated)
|
||||||
# return 1
|
|
||||||
# elif self.payee_id == entity.uuid:
|
if not self.details.get('application_name'):
|
||||||
# return 2
|
print('update application')
|
||||||
# else:
|
application_details = get_application_details(self.application_id)
|
||||||
# return 0
|
print('application_details:', application_details)
|
||||||
#
|
try:
|
||||||
# def update_details(self, force_update=False):
|
self.details['application_name'] = application_details.name
|
||||||
# if not isinstance(self.details, dict):
|
# TODO: get avatar from details
|
||||||
# self.details = {}
|
|
||||||
# self.save()
|
is_updated = True
|
||||||
# # detail = {'payer_name', 'payee_name', 'application_name', 'payer_avatar_url', 'payee_avatar_url', 'application_avatar_url'}
|
except Exception as e:
|
||||||
# is_updated = False
|
print("something went wrong")
|
||||||
# if not self.details.get('payer_name'):
|
print(e)
|
||||||
# if self.payer_type == TypeChoices.USER.value:
|
|
||||||
# payer_details: PublicUser = get_user_details(self.payer_id)
|
if is_updated:
|
||||||
# self.details['payer_name'] = payer_details.first_name + payer_details.last_name
|
print('update details')
|
||||||
# self.details['payer_avatar_url'] = payer_details.avatar
|
self.save()
|
||||||
# else:
|
|
||||||
# payer_details = get_application_details(self.payer_id)
|
|
||||||
# self.details['payer_name'] = payer_details.name
|
|
||||||
# #TODO: get avatar from details
|
|
||||||
#
|
|
||||||
# is_updated = True
|
|
||||||
#
|
|
||||||
# if not self.details.get('payee_name'):
|
|
||||||
# if self.payee_type == TypeChoices.USER.value:
|
|
||||||
# payee_details: PublicUser = get_user_details(self.payee_id)
|
|
||||||
# self.details['payee_name'] = payee_details.first_name + payee_details.last_name
|
|
||||||
# self.details['payee_avatar_url'] = payee_details.avatar
|
|
||||||
# else:
|
|
||||||
# payee_details = get_application_details(self.payee_id)
|
|
||||||
# self.details['payee_name'] = payee_details.name
|
|
||||||
# #TODO: get avatar from details
|
|
||||||
#
|
|
||||||
# is_updated = True
|
|
||||||
#
|
|
||||||
# if not self.details.get('application_name'):
|
|
||||||
# application_details = get_application_details(self.application_id)
|
|
||||||
# try:
|
|
||||||
# self.details['application_name'] = application_details.name
|
|
||||||
# # TODO: get avatar from details
|
|
||||||
#
|
|
||||||
# is_updated = True
|
|
||||||
# except Exception as e:
|
|
||||||
# pass
|
|
||||||
#
|
|
||||||
# if is_updated:
|
|
||||||
# self.save()
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# def __str__(self):
|
|
||||||
# try:
|
|
||||||
# return f"{self.get_payer()} -> {self.get_payee()} ({self.uuid}): {self.amount} - {self.get_state_display()}"
|
|
||||||
# except:
|
|
||||||
# return str(self.uuid)
|
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,13 @@ app_name = "wallet"
|
||||||
user_urlpatterns = [
|
user_urlpatterns = [
|
||||||
path('transactions/', user_views.TransactionListView.as_view(), name='user_transaction_list_page'),
|
path('transactions/', user_views.TransactionListView.as_view(), name='user_transaction_list_page'),
|
||||||
path('transactions/<pk>', user_views.TransactionDetailView.as_view(), name='user_transaction_detail_page'),
|
path('transactions/<pk>', user_views.TransactionDetailView.as_view(), name='user_transaction_detail_page'),
|
||||||
path('api/wallet/balance', user_views.MyWalletBalanceView.as_view(), name='user_wallet_balance_api'),
|
path('api/wallet/balance', user_views.CategoryMyWalletBalanceView.as_view(), name='user_wallet_balance_api'),
|
||||||
path('api/transactions/', user_views.TransactionList.as_view(), name='transaction_list_api'),
|
path('api/transactions/', user_views.CategoryTransactionListView.as_view(), name='transaction_list_api'),
|
||||||
|
|
||||||
|
path('api/user/<category_uuid>/balance', user_views.CategoryMyWalletBalanceView.as_view(), name='user_wallet_balance_api'),
|
||||||
|
path('api/user/<category_uuid>/transactions/', user_views.CategoryTransactionListView.as_view(), name='transaction_list_api'),
|
||||||
|
|
||||||
|
|
||||||
# path('api/transactions/<uuid>', TransactionDetail.as_view(), name='transaction_detail_api'),
|
# path('api/transactions/<uuid>', TransactionDetail.as_view(), name='transaction_detail_api'),
|
||||||
# path('api/transactions/<uuid>/pay', TransactionPay.as_view(), name='transaction_pay_api'),
|
# path('api/transactions/<uuid>/pay', TransactionPay.as_view(), name='transaction_pay_api'),
|
||||||
# path('api/transactions/<uuid>/receipt', TransactionReceipt.as_view(), name='transaction_receipt_api'),
|
# path('api/transactions/<uuid>/receipt', TransactionReceipt.as_view(), name='transaction_receipt_api'),
|
||||||
|
|
@ -25,24 +30,24 @@ user_urlpatterns = [
|
||||||
]
|
]
|
||||||
|
|
||||||
application_urlpatterns = [
|
application_urlpatterns = [
|
||||||
path('api/application/balance', application_views.BalanceAPIView.as_view(), name='application_wallet_balance_api'),
|
path('api/application/balance', application_views.CategoryBalanceAPIView.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/deposit/', application_views.DepositSubmitAPIView.as_view(), name='application_deposit_submit_api'),
|
path('api/application/deposit/', application_views.CategoryDepositSubmitAPIView.as_view(), name='application_deposit_submit_api'),
|
||||||
path('api/application/deposit/<uuid>/verify', application_views.DepositVerifyAPIView.as_view(), name='application_deposit_verify_api'),
|
path('api/application/deposit/<uuid>/verify', application_views.CategoryDepositVerifyAPIView.as_view(), name='application_deposit_verify_api'),
|
||||||
|
|
||||||
path('api/application/withdraw/', application_views.WithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'),
|
path('api/application/withdraw/', application_views.CategoryWithdrawSubmitAPIView.as_view(), name='application_withdraw_submit_api'),
|
||||||
path('api/application/withdraw/<uuid>/verify', application_views.WithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'),
|
path('api/application/withdraw/<uuid>/verify', application_views.CategoryWithdrawVerifyAPIView.as_view(), name='application_withdraw_verify_api'),
|
||||||
|
|
||||||
path('api/application/', application_views.TransactionListAPIView.as_view(), name='application_transaction_list_api'),
|
path('api/application/', application_views.CategoryTransactionListAPIView.as_view(), name='application_transaction_list_api'),
|
||||||
path('api/application/<uuid>/', application_views.TransactionDetailAPIView.as_view(), name='application_transaction_detail'),
|
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.CategoryBalanceAPIView.as_view(), name='application_wallet_balance_api'),
|
||||||
|
|
||||||
path('api/application/<category_uuid>/user_balance/<uuid>', application_views.CategoryUserBalanceAPIView.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.CategoryDepositSubmitAPIView.as_view(), name='application_deposit_submit_api'),
|
path('api/application/<category_uuid>/deposit/', application_views.CategoryDepositSubmitAPIView.as_view(), name='application_deposit_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>/deposit/<uuid>/verify', application_views.CategoryDepositVerifyAPIView.as_view(), name='application_deposit_verify_api'),
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,11 @@ class CategoryBalanceAPIView(generics.RetrieveAPIView):
|
||||||
|
|
||||||
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:
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
|
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
||||||
category=category)
|
category=category)
|
||||||
|
|
@ -200,7 +204,11 @@ class CategoryUserBalanceAPIView(generics.RetrieveAPIView):
|
||||||
|
|
||||||
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:
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
|
|
||||||
user_uuid = self.kwargs.get('uuid')
|
user_uuid = self.kwargs.get('uuid')
|
||||||
user, created = User.objects.get_or_create(uuid=user_uuid)
|
user, created = User.objects.get_or_create(uuid=user_uuid)
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
|
|
@ -216,6 +224,7 @@ class CategoryTransactionDetailAPIView(generics.RetrieveAPIView):
|
||||||
required_scopes = ['wallet.application:get_transaction_detail']
|
required_scopes = ['wallet.application:get_transaction_detail']
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
|
# TODO: what about category
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
return Transaction.objects.filter(Q(application=application) |
|
return Transaction.objects.filter(Q(application=application) |
|
||||||
Q(payer_wallet__owner_uuid=application.pk,
|
Q(payer_wallet__owner_uuid=application.pk,
|
||||||
|
|
@ -232,6 +241,7 @@ class CategoryTransactionListAPIView(generics.ListAPIView):
|
||||||
required_scopes = ['wallet.application:get_transaction_list']
|
required_scopes = ['wallet.application:get_transaction_list']
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
|
# TODO: what about category?
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
return Transaction.objects.filter(Q(application=application) |
|
return Transaction.objects.filter(Q(application=application) |
|
||||||
Q(payer_wallet__owner_uuid=application.pk,
|
Q(payer_wallet__owner_uuid=application.pk,
|
||||||
|
|
@ -250,22 +260,27 @@ class CategoryDepositSubmitAPIView(generics.CreateAPIView):
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
category_uuid = self.kwargs.get('category_uuid')
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
||||||
category=category)
|
category=category)
|
||||||
return Transaction.objects.filter(application=application,
|
return Transaction.objects.filter(application=application, payer_wallet=wallet).all()
|
||||||
payer_wallet__owner_uuid=application.pk,
|
|
||||||
payer_wallet__owner_type=TypeChoices.APPLICATION).all()
|
|
||||||
|
|
||||||
def perform_create(self, serializer):
|
def perform_create(self, serializer):
|
||||||
# TODO: get_or_create instead of create if uuid given
|
# 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
|
# TODO: it is possible to merage create and submit in one step for improve performance
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=self.kwargs.get('category_uuid'))
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
wallet = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
if category_uuid:
|
||||||
instance = serializer.save(payer_wallet=wallet,
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
application=application)
|
else:
|
||||||
|
category = None
|
||||||
|
wallet = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
||||||
|
category=category)
|
||||||
|
instance = serializer.save(payer_wallet=wallet, application=application)
|
||||||
try:
|
try:
|
||||||
instance.submit()
|
instance.submit()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
@ -281,7 +296,11 @@ class CategoryDepositVerifyAPIView(generics.RetrieveAPIView):
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=self.kwargs.get('category_uuid'))
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
wallet = Wallet.objects.get(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
wallet = Wallet.objects.get(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
||||||
return Transaction.objects.filter(application=application,
|
return Transaction.objects.filter(application=application,
|
||||||
payer_wallet=wallet).all()
|
payer_wallet=wallet).all()
|
||||||
|
|
@ -303,7 +322,10 @@ class CategoryWithdrawSubmitAPIView(generics.CreateAPIView):
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
category_uuid = self.kwargs.get('category_uuid')
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
wallet, created = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
||||||
category=category)
|
category=category)
|
||||||
|
|
@ -313,8 +335,13 @@ class CategoryWithdrawSubmitAPIView(generics.CreateAPIView):
|
||||||
# TODO: get_or_create instead of create if uuid given
|
# 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
|
# TODO: it is possible to merage create and submit in one step for improve performance
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=self.kwargs.get('category_uuid'))
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
wallet = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
if category_uuid:
|
||||||
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
|
wallet = Wallet.objects.get_or_create(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION,
|
||||||
|
category=category)
|
||||||
instance = serializer.save(payee_wallet=wallet, application=application)
|
instance = serializer.save(payee_wallet=wallet, application=application)
|
||||||
|
|
||||||
instance.submit()
|
instance.submit()
|
||||||
|
|
@ -328,10 +355,13 @@ class CategoryWithdrawVerifyAPIView(generics.RetrieveAPIView):
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
application = get_application(self.request)
|
application = get_application(self.request)
|
||||||
category = get_object_or_404(Category.objects.all(), uuid=self.kwargs.get('category_uuid'))
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
wallet = Wallet.objects.get(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
wallet = Wallet.objects.get(owner_uuid=application.uuid, owner_type=TypeChoices.APPLICATION, category=category)
|
||||||
return Transaction.objects.filter(application=application,
|
return Transaction.objects.filter(application=application, payee_wallet=wallet).all()
|
||||||
payee_wallet=wallet).all()
|
|
||||||
|
|
||||||
def retrieve(self, request, *args, **kwargs):
|
def retrieve(self, request, *args, **kwargs):
|
||||||
instance = self.get_object()
|
instance = self.get_object()
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,12 @@ from django_filters.rest_framework import DjangoFilterBackend
|
||||||
|
|
||||||
from oauth2_provider.contrib.rest_framework import TokenHasScope, IsAuthenticatedOrTokenHasScope
|
from oauth2_provider.contrib.rest_framework import TokenHasScope, IsAuthenticatedOrTokenHasScope
|
||||||
from rest_framework import generics, permissions
|
from rest_framework import generics, permissions
|
||||||
|
from rest_framework.generics import get_object_or_404
|
||||||
from rest_framework.permissions import AllowAny
|
from rest_framework.permissions import AllowAny
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
|
||||||
from apps.gooyal_oauth2.rest_framework import IsAuthenticatedOrTokenMatchesOASRequirements
|
from apps.gooyal_oauth2.rest_framework import IsAuthenticatedOrTokenMatchesOASRequirements
|
||||||
from apps.wallet.models import Transaction
|
from apps.wallet.models import Transaction, Category, Wallet
|
||||||
from apps.wallet.serializers import UserTransactionSerializer, DepositSerializer, WithdrawSerializer, \
|
from apps.wallet.serializers import UserTransactionSerializer, DepositSerializer, WithdrawSerializer, \
|
||||||
MyWalletSerializer
|
MyWalletSerializer
|
||||||
from ..constans import StateChoices, TypeChoices
|
from ..constans import StateChoices, TypeChoices
|
||||||
|
|
@ -222,3 +223,60 @@ class TransactionDetailView(UpdateView):
|
||||||
result = transaction.receipt()
|
result = transaction.receipt()
|
||||||
messages.error(self.request, _('success.'))
|
messages.error(self.request, _('success.'))
|
||||||
return super().form_valid(form)
|
return super().form_valid(form)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class CategoryMyWalletBalanceView(generics.RetrieveAPIView):
|
||||||
|
'''
|
||||||
|
API for getting authenticated user balance.
|
||||||
|
'''
|
||||||
|
permission_classes = [IsAuthenticatedOrTokenHasScope]
|
||||||
|
serializer_class = MyWalletSerializer
|
||||||
|
required_scopes = ['wallet.wallet:get_balance']
|
||||||
|
|
||||||
|
def get_object(self):
|
||||||
|
user = self.request.user
|
||||||
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
|
|
||||||
|
wallet, created = Wallet.objects.get_or_create(owner_uuid=user.uuid, owner_type=TypeChoices.USER,
|
||||||
|
category=category)
|
||||||
|
return wallet
|
||||||
|
|
||||||
|
|
||||||
|
# this is application create invoice view
|
||||||
|
class CategoryTransactionListView(generics.ListAPIView):
|
||||||
|
'''
|
||||||
|
GET: API for getting list of transactions for authenticated user
|
||||||
|
POST: API for creating transaction for transferring funds from authenticated user to application owner. (deprecated)
|
||||||
|
args:
|
||||||
|
- user: authenticated user
|
||||||
|
|
||||||
|
'''
|
||||||
|
permission_classes = [IsAuthenticatedOrTokenMatchesOASRequirements]
|
||||||
|
serializer_class = UserTransactionSerializer
|
||||||
|
required_alternate_scopes = {
|
||||||
|
"GET": [['wallet.user:transaction_list']],
|
||||||
|
# "POST": [['wallet.invoice:create']],
|
||||||
|
}
|
||||||
|
|
||||||
|
filter_backends = (DjangoFilterBackend,)
|
||||||
|
filterset_class = UserTransactionFilter
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
user = self.request.user
|
||||||
|
category_uuid = self.kwargs.get('category_uuid')
|
||||||
|
if category_uuid:
|
||||||
|
category = get_object_or_404(Category.objects.all(), uuid=category_uuid)
|
||||||
|
else:
|
||||||
|
category = None
|
||||||
|
|
||||||
|
wallet, created = Wallet.objects.get_or_create(owner_uuid=user.uuid, owner_type=TypeChoices.USER,
|
||||||
|
category=category)
|
||||||
|
|
||||||
|
return Transaction.objects.filter(Q(payee_wallet=wallet) |
|
||||||
|
Q(payer_wallet=wallet)).all()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue