✨ created payments client

Author: pcrespov

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/payments.py

@@ -0,0 +1,32 @@
+import logging
+from decimal import Decimal
+
+from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
+from models_library.payments import InvoiceDataGet
+from models_library.products import ProductName
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.users import UserID
+from pydantic import TypeAdapter
+from servicelib.logging_utils import log_decorator
+from servicelib.rabbitmq import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def get_invoice_data(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    user_id: UserID,
+    dollar_amount: Decimal,
+    product_name: ProductName,
+) -> InvoiceDataGet:
+    result: InvoiceDataGet = await rabbitmq_rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("get_invoice_data"),
+        user_id=user_id,
+        dollar_amount=dollar_amount,
+        product_name=product_name,
+    )
+    assert isinstance(result, InvoiceDataGet)  # nosec
+    return result

services/payments/src/simcore_service_payments/services/auto_recharge_process_message.py

@@ -4,17 +4,17 @@
 from typing import cast
 
 from fastapi import FastAPI
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.wallets import (
     GetWalletAutoRecharge,
     PaymentMethodID,
 )
 from models_library.basic_types import NonNegativeDecimal
-from models_library.payments import InvoiceDataGet
-from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.rabbitmq_messages import WalletCreditsMessage
 from models_library.wallets import WalletID
 from pydantic import TypeAdapter
+from servicelib.rabbitmq.rpc_interfaces.webserver import (
+    payments as webserver_payments_rpc,
+)
 from simcore_service_payments.db.auto_recharge_repo import AutoRechargeRepo
 from simcore_service_payments.db.payments_methods_repo import PaymentsMethodsRepo
 from simcore_service_payments.db.payments_transactions_repo import (
@@ -163,14 +163,12 @@ async def _perform_auto_recharge(
 ):
     rabbitmq_rpc_client = get_rabbitmq_rpc_client(app)
 
-    result = await rabbitmq_rpc_client.request(
-        WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_invoice_data"),
+    invoice_data_get = await webserver_payments_rpc.get_invoice_data(
+        rabbitmq_rpc_client,
         user_id=payment_method_db.user_id,
         dollar_amount=wallet_auto_recharge.top_up_amount_in_usd,
         product_name=rabbit_message.product_name,
     )
-    invoice_data_get = TypeAdapter(InvoiceDataGet).validate_python(result)
 
     await pay_with_payment_method(
         gateway=PaymentsGatewayApi.get_from_app_state(app),

services/payments/tests/unit/test_services_auto_recharge_listener.py

@@ -202,7 +202,7 @@ async def get_invoice_data(
         product_name: ProductName,
     ) -> InvoiceDataGet:
         return InvoiceDataGet.model_validate(
-            InvoiceDataGet.model_config["json_schema_extra"]["examples"][0]
+            InvoiceDataGet.model_json_schema()["examples"][0]
         )
 
     await rpc_server.register_router(router, namespace=WEBSERVER_RPC_NAMESPACE)

services/web/server/tests/unit/with_dbs/04/wallets/payments/test_payments_rpc.py

@@ -9,14 +9,11 @@
 
 import pytest
 from aiohttp.test_utils import TestClient
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
-from models_library.payments import InvoiceDataGet
-from models_library.rabbitmq_basic_types import RPCMethodName
-from pydantic import TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
+from servicelib.rabbitmq.rpc_interfaces.webserver.payments import get_invoice_data
 from settings_library.rabbit import RabbitSettings
 from simcore_service_webserver.application_settings import ApplicationSettings
 from simcore_service_webserver.payments.settings import (
@@ -75,13 +72,11 @@ async def test_one_time_payment_worfklow(
 
     assert settings.PAYMENTS_FAKE_COMPLETION is False
 
-    result = await rpc_client.request(
-        WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_invoice_data"),
+    invoice_data_get = await get_invoice_data(
+        rpc_client,
         user_id=logged_user["id"],
         dollar_amount=Decimal(900),
         product_name="osparc",
     )
-    invoice_data_get = InvoiceDataGet.model_validate(result)
     assert invoice_data_get
     assert len(invoice_data_get.user_invoice_address.country) == 2