damanukyan/pay-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: test command

Browse Source
This commit is contained in:
Daniil Manukian
2026-05-09 00:14:12 +03:00
parent 22f27fa524
commit be8aee7b73
8 changed files with 126 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/infrastructure/config/settings.py
View File

@@ -96,10 +96,6 @@ class Settings(BaseSettings):
CLOUD_KASSIR_PUBLIC_ID: str = ''
CLOUD_KASSIR_API_SECRET: str = ''
CLOUD_KASSIR_INN: str = ''
CLOUD_KASSIR_API_BASE_URL: str = 'https://api.cloudpayments.ru'
CLOUD_KASSIR_SUCCESS_URL: str | None = None
CLOUD_KASSIR_FAIL_URL: str | None = None
LOG_LEVEL: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO"
LOG_FORMAT: Literal["JSON", "TEXT"] = "TEXT"
@@ -276,23 +272,21 @@ class Settings(BaseSettings):
data['CLOUD_KASSIR_PUBLIC_ID'] = str(ck_public).strip()
data['CLOUD_KASSIR_API_SECRET'] = str(ck_secret).strip()
else:
cloudkassir = read_secret_optional('cloudkassir')
if cloudkassir:
ck_ci = {str(k).lower(): v for k, v in cloudkassir.items()}
public_id_ck = ck_ci.get('public_id')
api_secret_ck = ck_ci.get('api_secret')
if api_secret_ck is None:
api_secret_ck = ck_ci.get('secret')
if public_id_ck is not None and str(public_id_ck).strip():
data['CLOUD_KASSIR_PUBLIC_ID'] = str(public_id_ck).strip()
if api_secret_ck is not None and str(api_secret_ck).strip():
data['CLOUD_KASSIR_API_SECRET'] = str(api_secret_ck).strip()
inn_ck = ck_ci.get('inn')
if inn_ck is not None and str(inn_ck).strip():
data['CLOUD_KASSIR_INN'] = str(inn_ck).strip()
base_ck = ck_ci.get('api_base_url')
if base_ck is not None and str(base_ck).strip():
data['CLOUD_KASSIR_API_BASE_URL'] = str(base_ck).strip()
cloudkassir = read_secret('cloudkassir')
ck_ci = {str(k).lower(): v for k, v in cloudkassir.items()}
public_id_ck = ck_ci.get('public_id')
api_secret_ck = ck_ci.get('api_secret')
if api_secret_ck is None:
api_secret_ck = ck_ci.get('secret')
missing_ck = []
if public_id_ck is None or not str(public_id_ck).strip():
missing_ck.append('public_id')
if api_secret_ck is None or not str(api_secret_ck).strip():
missing_ck.append('api_secret')
if missing_ck:
raise RuntimeError(f'Vault secret cloudkassir missing non-empty keys: {missing_ck} (mount={mount},path=cloudkassir)')
data['CLOUD_KASSIR_PUBLIC_ID'] = str(public_id_ck).strip()
data['CLOUD_KASSIR_API_SECRET'] = str(api_secret_ck).strip()
return data