✨ fix user name in invoice (#5464)

Author: matusdrobuliak66

packages/models-library/src/models_library/payments.py

@@ -1,6 +1,7 @@
 from decimal import Decimal
 from typing import Any, ClassVar
 
+from models_library.emails import LowerCaseEmailStr
 from pydantic import BaseModel, Field, validator
 
 from .products import StripePriceID, StripeTaxRateID
@@ -42,6 +43,8 @@ class InvoiceDataGet(BaseModel):
     stripe_price_id: StripePriceID
     stripe_tax_rate_id: StripeTaxRateID
     user_invoice_address: UserInvoiceAddress
+    user_name: str
+    user_email: LowerCaseEmailStr
 
     class Config:
         schema_extra: ClassVar[dict[str, Any]] = {
@@ -53,6 +56,8 @@ class Config:
                     "user_invoice_address": UserInvoiceAddress.Config.schema_extra[
                         "examples"
                     ][0],
+                    "user_name": "My Name",
+                    "user_email": LowerCaseEmailStr("[email protected]"),
                 },
             ]
         }

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

@@ -14,7 +14,7 @@
 from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.rabbitmq_messages import WalletCreditsMessage
 from models_library.wallets import WalletID
-from pydantic import EmailStr, parse_obj_as, parse_raw_as
+from pydantic import parse_obj_as, parse_raw_as
 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 (
@@ -166,8 +166,8 @@ async def _perform_auto_recharge(
         wallet_id=rabbit_message.wallet_id,
         wallet_name=f"id={rabbit_message.wallet_id}",
         user_id=payment_method_db.user_id,
-        user_name=f"id={payment_method_db.user_id}",
-        user_email=EmailStr(f"placeholder_{payment_method_db.user_id}@example.itis"),
+        user_name=invoice_data_get.user_name,
+        user_email=invoice_data_get.user_email,
         user_address=invoice_data_get.user_invoice_address,
         stripe_price_id=invoice_data_get.stripe_price_id,
         stripe_tax_rate_id=invoice_data_get.stripe_tax_rate_id,

services/web/server/src/simcore_service_webserver/payments/_methods_api.py

@@ -20,7 +20,7 @@
 from simcore_postgres_database.models.payments_methods import InitPromptAckFlowState
 from yarl import URL
 
-from ..users.api import get_user_name_and_email
+from ..users.api import get_user_display_and_id_names
 from ..wallets.api import get_wallet_by_user
 from . import _rpc
 from ._autorecharge_db import get_wallet_autorecharge
@@ -278,13 +278,13 @@ async def init_creation_of_wallet_payment_method(
     )
     assert user_wallet.wallet_id == wallet_id  # nosec
 
-    user = await get_user_name_and_email(app, user_id=user_id)
+    user = await get_user_display_and_id_names(app, user_id=user_id)
     return await _rpc.init_creation_of_payment_method(
         app,
         wallet_id=wallet_id,
         wallet_name=user_wallet.name,
         user_id=user_id,
-        user_name=user.name,
+        user_name=user.full_name,
         user_email=user.email,
     )
 

services/web/server/src/simcore_service_webserver/payments/_onetime_api.py

@@ -25,7 +25,7 @@
 from ..db.plugin import get_database_engine
 from ..products.api import get_product_stripe_info
 from ..resource_usage.api import add_credits_to_wallet
-from ..users.api import get_user_invoice_address, get_user_name_and_email
+from ..users.api import get_user_display_and_id_names, get_user_invoice_address
 from ..wallets.api import get_wallet_by_user, get_wallet_with_permissions_by_user
 from ..wallets.errors import WalletAccessForbiddenError
 from . import _onetime_db, _rpc
@@ -274,7 +274,7 @@ async def init_creation_of_wallet_payment(
     assert user_wallet.wallet_id == wallet_id  # nosec
 
     # user info
-    user = await get_user_name_and_email(app, user_id=user_id)
+    user = await get_user_display_and_id_names(app, user_id=user_id)
     user_invoice_address = await get_user_invoice_address(app, user_id=user_id)
     # stripe info
     product_stripe_info = await get_product_stripe_info(app, product_name=product_name)
@@ -303,7 +303,7 @@ async def init_creation_of_wallet_payment(
             wallet_id=wallet_id,
             wallet_name=user_wallet.name,
             user_id=user_id,
-            user_name=user.name,
+            user_name=user.full_name,
             user_email=user.email,
             user_address=user_invoice_address,
             stripe_price_id=product_stripe_info.stripe_price_id,
@@ -362,7 +362,7 @@ async def pay_with_payment_method(
     product_stripe_info = await get_product_stripe_info(app, product_name=product_name)
 
     # user info
-    user = await get_user_name_and_email(app, user_id=user_id)
+    user = await get_user_display_and_id_names(app, user_id=user_id)
     user_invoice_address = await get_user_invoice_address(app, user_id=user_id)
 
     settings: PaymentsSettings = get_plugin_settings(app)
@@ -376,7 +376,7 @@ async def pay_with_payment_method(
             wallet_id=wallet_id,
             wallet_name=user_wallet.name,
             user_id=user_id,
-            user_name=user.name,
+            user_name=user.full_name,
             user_email=user.email,
             comment=comment,
         )
@@ -392,7 +392,7 @@ async def pay_with_payment_method(
         wallet_id=wallet_id,
         wallet_name=user_wallet.name,
         user_id=user_id,
-        user_name=user.name,
+        user_name=user.full_name,
         user_email=user.email,
         user_address=user_invoice_address,
         stripe_price_id=product_stripe_info.stripe_price_id,

services/web/server/src/simcore_service_webserver/payments/_rpc_invoice.py

@@ -2,14 +2,15 @@
 
 from aiohttp import web
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
+from models_library.emails import LowerCaseEmailStr
 from models_library.payments import InvoiceDataGet, UserInvoiceAddress
 from models_library.products import CreditResultGet, ProductName, ProductStripeInfoGet
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 
 from ..products.api import get_credit_amount, get_product_stripe_info
 from ..rabbitmq import get_rabbitmq_rpc_server
-from ..users.api import get_user_invoice_address
+from ..users.api import get_user_display_and_id_names, get_user_invoice_address
 
 router = RPCRouter()
 
@@ -31,12 +32,15 @@ async def get_invoice_data(
     user_invoice_address: UserInvoiceAddress = await get_user_invoice_address(
         app, user_id=user_id
     )
+    user_info = await get_user_display_and_id_names(app, user_id=user_id)
 
     return InvoiceDataGet(
         credit_amount=credit_result_get.credit_amount,
         stripe_price_id=product_stripe_info_get.stripe_price_id,
         stripe_tax_rate_id=product_stripe_info_get.stripe_tax_rate_id,
         user_invoice_address=user_invoice_address,
+        user_name=user_info.full_name,
+        user_email=LowerCaseEmailStr(user_info.email),
     )