addwin/ipg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix(pg): new wallet client to handle category uuid' (#4) from fix/adapt-by-wallet-category into master

Browse source 
Reviewed-on: addwin/pg#4
This commit is contained in:
Sayyid Hamid Mahdavi 2025-10-25 09:54:14 -04:00
commit 66771a56f5
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/pg/models.py
View file

@ -14,7 +14,7 @@ from apps.core.models import BaseModel, BasePGModel
from apps.pg.constans import StateChoices
import uuid
from utils.wallet_client import deposit_to_user_wallet_submit, withdraw_from_user_wallet_verify, \
from utils.wallet_client import deposit_to_user_wallet_submit, \
deposit_to_user_wallet_verify
from utils.pna import PNAClient
@ -129,7 +129,7 @@ class PaymentRequest(models.Model):
'application_details_url': ''
},
}
submit_response = deposit_to_user_wallet_submit(settings.WALLET_CATEGORY_UUID, data)
submit_response = deposit_to_user_wallet_submit(settings.WALLET_RIAL_CATEGORY, data)
if not submit_response or not submit_response.uuid:
logger.error(f"[Deposit Submit] Wallet submission failed | payment_id={self.pk}")
@ -147,7 +147,7 @@ class PaymentRequest(models.Model):
return to_success
def deposit_verify(self):
verify_response = deposit_to_user_wallet_verify(settings.WALLET_CATEGORY_UUID, self.uuid)
verify_response = deposit_to_user_wallet_verify(settings.WALLET_RIAL_CATEGORY, self.uuid)
if not verify_response:
logger.error(f"[Deposit Verify] Failed to get response from wallet service | payment_id={self.pk}")

2
main/settings.py
View file

@ -255,5 +255,5 @@ CACHES = {
PNA_CORPORATION_PIN = config('PNA_CORPORATION_PIN')
WALLET_BASE_PUBLIC_URL = config('WALLET_BASE_PUBLIC_URL')
WALLET_CATEGORY_UUID = config('WALLET_CATEGORY_UUID')
WALLET_RIAL_CATEGORY = config('WALLET_RIAL_CATEGORY')
IPG_BASE_PUBLIC_URL = config('IPG_BASE_PUBLIC_URL')

16
utils/wallet_client.py
View file

@ -10,8 +10,8 @@ from gooyal_wallet_client import AuthenticatedClient
from gooyal_wallet_client.models import MyWallet, UserTransaction, ApplicationDeposit, ApplicationWithdraw
from gooyal_wallet_client.api.wallet import (wallet_api_application_deposit_create_2,
wallet_api_application_deposit_verify_retrieve_2,
wallet_api_application_withdraw_create,
wallet_api_application_withdraw_verify_retrieve)
wallet_api_application_withdraw_create_2,
wallet_api_application_withdraw_verify_retrieve_2)
from gooyal_wallet_client.types import Response
from django.conf import Settings
@ -84,7 +84,6 @@ def deposit_to_user_wallet_submit(category_uuid, data):
client=client,
body=deposit_data)
print(response)
return response
@ -92,28 +91,25 @@ def deposit_to_user_wallet_verify(category_uuid, uuid):
client = get_client()
response: ApplicationDeposit = wallet_api_application_deposit_verify_retrieve_2.sync(category_uuid=category_uuid, uuid=uuid, client=client)
print(response)
return response
def withdraw_from_user_wallet_submit(data):
def withdraw_from_user_wallet_submit(category_uuid, data):
class Tmp():
def to_dict(self):
return data
withdraw_data = Tmp()
client = get_client()
response: ApplicationWithdraw = wallet_api_application_withdraw_create.sync(client=client, body=withdraw_data)
response: ApplicationWithdraw = wallet_api_application_withdraw_create_2.sync(category_uuid=category_uuid, client=client, body=withdraw_data)
print(response)
return response
def withdraw_from_user_wallet_verify(uuid):
def withdraw_from_user_wallet_verify(category_uuid, uuid):
client = get_client()
response: ApplicationWithdraw = wallet_api_application_withdraw_verify_retrieve.sync(uuid=uuid, client=client)
response: ApplicationWithdraw = wallet_api_application_withdraw_verify_retrieve_2.sync(category_uuid=category_uuid, uuid=uuid, client=client)
print(response)
return response