From 1084ed0b5c5893032366767c2b2fd07ef6caf8b0 Mon Sep 17 00:00:00 2001
From: Haydar Ghasemi <haydar.ghasemi@gmail.com>
Date: Sat, 25 Oct 2025 17:14:28 +0330
Subject: [PATCH] fix(pg): new wallet client to handle category uuid

new wallet client to handle category uuid
notice: add WALLET_RIAL_CATEGORY to .env
---
 apps/pg/models.py      |  6 +++---
 main/settings.py       |  2 +-
 utils/wallet_client.py | 16 ++++++----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/pg/models.py b/apps/pg/models.py
index 025567e..6396b24 100644
--- a/apps/pg/models.py
+++ b/apps/pg/models.py
@@ -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}")
diff --git a/main/settings.py b/main/settings.py
index 16c1f02..d528c2d 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -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')
diff --git a/utils/wallet_client.py b/utils/wallet_client.py
index 729ae4b..08ba00f 100644
--- a/utils/wallet_client.py
+++ b/utils/wallet_client.py
@@ -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