Skip to content

Commit 1f8f22e

Browse files
fix
1 parent 6487147 commit 1f8f22e

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

services/api-server/src/simcore_service_api_server/api/routes/wallets.py

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
from ...api.dependencies.authentication import get_current_user_id, get_product_name
99
from ...api.dependencies.webserver_rpc import get_wb_api_rpc_client
1010
from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
11+
from ...models.pagination import Page, PaginationParams
1112
from ...models.schemas.errors import ErrorGet
1213
from ...models.schemas.licensed_items import LicensedItemCheckoutData
1314
from ...models.schemas.model_adapter import (
1415
LicensedItemCheckoutGet,
16+
LicensedItemGet,
1517
WalletGetWithAvailableCreditsLegacy,
1618
)
1719
from ...services_rpc.wb_api_server import WbApiRpcClient
@@ -60,26 +62,26 @@ async def get_wallet(
6062
return await webserver_api.get_wallet(wallet_id=wallet_id)
6163

6264

63-
# @router.get(
64-
# "/{wallet_id}/licensed-items",
65-
# response_model=Page[LicensedItemGet],
66-
# status_code=status.HTTP_200_OK,
67-
# responses=WALLET_STATUS_CODES,
68-
# description="Get all available licensed items for a given wallet",
69-
# )
70-
# async def get_available_licensed_items_for_wallet(
71-
# wallet_id: int,
72-
# page_params: Annotated[PaginationParams, Depends()],
73-
# web_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
74-
# product_name: Annotated[str, Depends(get_product_name)],
75-
# user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
76-
# ):
77-
# return await web_api_rpc.get_available_licensed_items_for_wallet(
78-
# product_name=product_name,
79-
# wallet_id=wallet_id,
80-
# user_id=user_id,
81-
# page_params=page_params,
82-
# )
65+
@router.get(
66+
"/{wallet_id}/licensed-items",
67+
response_model=Page[LicensedItemGet],
68+
status_code=status.HTTP_200_OK,
69+
responses=WALLET_STATUS_CODES,
70+
description="Get all available licensed items for a given wallet",
71+
)
72+
async def get_available_licensed_items_for_wallet(
73+
wallet_id: int,
74+
page_params: Annotated[PaginationParams, Depends()],
75+
web_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
76+
product_name: Annotated[str, Depends(get_product_name)],
77+
user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
78+
):
79+
return await web_api_rpc.get_available_licensed_items_for_wallet(
80+
product_name=product_name,
81+
wallet_id=wallet_id,
82+
user_id=user_id,
83+
page_params=page_params,
84+
)
8385

8486

8587
@router.post(

services/web/server/tests/unit/with_dbs/04/licenses/test_licenses_rpc.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,10 @@ async def test_license_checkout_workflow(
192192

193193
checkout = await checkout_licensed_item_for_wallet(
194194
rpc_client,
195-
key=licensed_item_db.key,
196-
version=licensed_item_db.version,
197195
product_name=osparc_product_name,
198196
user_id=logged_user["id"],
199197
wallet_id=1,
198+
licensed_item_id=licensed_item_db.licensed_item_id,
200199
num_of_seats=1,
201200
service_run_id="run_1",
202201
)

0 commit comments

Comments
 (0)