cleanup

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, deposit_to_user_wallet_verify
+from utils.clients.wallet_client import deposit_to_user_wallet_submit, deposit_to_user_wallet_verify
 from main import settings
 
 from utils.pna import PNAClient

main/settings.py

@@ -77,12 +77,12 @@ OAUTH2_PROVIDER_ID_TOKEN_MODEL = "gooyal_oauth2.IDToken"
 OAUTH2_PROVIDER_GRANT_MODEL = "gooyal_oauth2.Grant"
 OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = "gooyal_oauth2.RefreshToken"
 
-BASE_OAUTH2_PROVIDER_PUBLIC_URL = config("BASE_OAUTH2_PROVIDER_PUBLIC_URL")
-BASE_OAUTH2_PROVIDER_PRIVATE_URL = config("BASE_OAUTH2_PROVIDER_PRIVATE_URL")
+OAUTH2_PROVIDER_BASE_PUBLIC_URL = config("OAUTH2_PROVIDER_BASE_PUBLIC_URL")
+OAUTH2_PROVIDER_BASE_PRIVATE_URL = config("OAUTH2_PROVIDER_BASE_PRIVATE_URL")
 
-CLIENT_ID = config('CLIENT_ID')
-CLIENT_SECRET = config('CLIENT_SECRET')
-SCOPES = config('SCOPES', default='')
+OAUTH2_PROVIDER_CLIENT_ID = config('OAUTH2_PROVIDER_CLIENT_ID')
+OAUTH2_PROVIDER_CLIENT_SECRET = config('OAUTH2_PROVIDER_CLIENT_SECRET')
+OAUTH2_PROVIDER_SCOPES = config('OAUTH2_PROVIDER_SCOPES', default='')
 OAUTH2_PROVIDER = {
     # this is the list of available scopes
     # 'SCOPES_BACKEND_CLASS': 'apps.gooyal_oauth2.scopes.Scopes',
@@ -91,9 +91,9 @@ OAUTH2_PROVIDER = {
     #            'groups': 'Access to your groups',
     #            'introspection': 'Introspect token scope'},
     'OAUTH2_VALIDATOR_CLASS': 'apps.gooyal_oauth2.validators.OAuth2Validator',
-    'RESOURCE_SERVER_INTROSPECTION_URL': BASE_OAUTH2_PROVIDER_PRIVATE_URL + '/introspect/',
+    'RESOURCE_SERVER_INTROSPECTION_URL': OAUTH2_PROVIDER_BASE_PRIVATE_URL + '/introspect/',
     # 'RESOURCE_SERVER_AUTH_TOKEN': '3yUqsWtwKYKHnfivFcJu', # OR this but not both:
-    'RESOURCE_SERVER_INTROSPECTION_CREDENTIALS': (CLIENT_ID, CLIENT_SECRET),
+    'RESOURCE_SERVER_INTROSPECTION_CREDENTIALS': (OAUTH2_PROVIDER_CLIENT_ID, OAUTH2_PROVIDER_CLIENT_SECRET),
 }
 
 REST_FRAMEWORK = {
@@ -246,7 +246,7 @@ JALALI_DATE_DEFAULTS = {
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": config('BASE_REDIS_URL'),
+        "LOCATION": config('REDIS_BASE_URL'),
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
         }
@@ -257,6 +257,7 @@ PNA_CORPORATION_PIN = config('PNA_CORPORATION_PIN')
 WALLET_BASE_PUBLIC_URL = config('WALLET_BASE_PUBLIC_URL')
 WALLET_RIAL = config('WALLET_RIAL')
 IPG_BASE_PUBLIC_URL = config('IPG_BASE_PUBLIC_URL')
+
 COMMISSION_LEVEL1 = config('COMMISSION_LEVEL1', cast=int)
 COMMISSION_LEVEL2_MIN_AMOUNT = config('COMMISSION_LEVEL2_MIN_AMOUNT', cast=int)
 COMMISSION_LEVEL2_MAX_AMOUNT = config('COMMISSION_LEVEL2_MAX_AMOUNT', cast=int)

utils/clients/wallet_client.py

@@ -6,13 +6,13 @@ from django.core.cache import cache
 from django.db import models
 from httpx import Request
 
-from gooyal_wallet_client import AuthenticatedClient
-from gooyal_wallet_client.models import Transaction, Account, ApplicationDeposit, ApplicationWithdraw
-from gooyal_wallet_client.api.wallet import (wallet_api_application_deposit_create,
+from utils.clients.gooyal_wallet_client import AuthenticatedClient
+from utils.clients.gooyal_wallet_client.models import Transaction, Account, ApplicationDeposit, ApplicationWithdraw
+from utils.clients.gooyal_wallet_client.api.wallet import (wallet_api_application_deposit_create,
                                              wallet_api_application_deposit_verify_retrieve,
                                              wallet_api_application_withdraw_create,
                                              wallet_api_application_withdraw_verify_retrieve)
-from gooyal_wallet_client.types import Response
+from utils.clients.gooyal_wallet_client.types import Response
 
 from django.conf import Settings
 
@@ -37,11 +37,11 @@ def login_as_client_credentials():
 
     data = {
         "grant_type": 'client_credentials',
-        "scope": settings.SCOPES,
+        "scope": settings.OAUTH2_PROVIDER_SCOPES,
     }
-    auth = (settings.CLIENT_ID, settings.CLIENT_SECRET)
+    auth = (settings.OAUTH2_PROVIDER_CLIENT_ID, settings.OAUTH2_PROVIDER_CLIENT_SECRET)
 
-    response = requests.post(f'{settings.BASE_OAUTH2_PROVIDER_PUBLIC_URL}/token/',
+    response = requests.post(f'{settings.OAUTH2_PROVIDER_BASE_PUBLIC_URL}/token/',
                              data=data,
                              auth=auth)
     print(response.content)
@@ -111,12 +111,3 @@ def withdraw_from_user_wallet_verify(payee_wallet, uuid):
     response: ApplicationWithdraw = wallet_api_application_withdraw_verify_retrieve.sync(payee_wallet=payee_wallet, uuid=uuid, client=client)
     print(response)
     return response
-
-
-sample_data = {
-    "uuid": "3fa85f64-5717-4562-b3fc-2c963f66afb1",
-    "payee_id": "5d66d02e-6087-4b0a-bb0c-291d5c11755a",
-    "payee_type": 1,
-    "amount": 2000,
-    "details": "string",
-}