fix

Author: matusdrobuliak66

api/specs/web-server/_licensed_items.py

@@ -48,16 +48,6 @@ async def list_licensed_items(
     ...
 
 
-# @router.get(
-#     "/catalog/licensed-items/{licensed_item_id}",
-#     response_model=Envelope[LicensedItemRestGet],
-# )
-# async def get_licensed_item(
-#     _path: Annotated[LicensedItemsPathParams, Depends()],
-# ):
-#     ...
-
-
 @router.post(
     "/catalog/licensed-items/{licensed_item_id}:purchase",
     response_model=LicensedItemPurchaseGet,

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/licensed_items_purchases.py

@@ -38,6 +38,8 @@ class LicensedItemPurchaseGet(BaseModel):
                     "licensed_item_purchase_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
                     "product_name": "osparc",
                     "licensed_item_id": "303942ef-6d31-4ba8-afbe-dbb1fce2a953",
+                    "key": "Duke",
+                    "version": "1.0.0",
                     "wallet_id": 1,
                     "wallet_name": "My Wallet",
                     "pricing_unit_cost_id": 1,

packages/models-library/src/models_library/api_schemas_webserver/licensed_items.py

@@ -66,11 +66,7 @@ class _ItisVipRestData(OutputSchema):
 
 
 class _ItisVipResourceRestData(OutputSchema):
-    # category_id: IDStr
-    # category_display: str
-    # category_icon: HttpUrl | None = None  # NOTE: Placeholder until provide @odeimaiz
     source: _ItisVipRestData
-    # terms_of_use_url: HttpUrl | None = None  # NOTE: Placeholder until provided @mguidon
 
 
 class LicensedItemRestGet(OutputSchema):
@@ -141,7 +137,14 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                     exclude_unset=True,
                 ),
                 "licensed_resources": [
-                    _ItisVipResourceRestData(**x) for x in item.licensed_resources
+                    _ItisVipResourceRestData(**x)
+                    for x in sorted(
+                        item.licensed_resources,
+                        key=lambda x: datetime.strptime(
+                            x["source"]["features"]["date"], "%Y-%m-%d"
+                        ),
+                        reverse=True,
+                    )
                 ],
                 "category_id": item.licensed_resources[0]["category_id"],
                 "category_display": item.licensed_resources[0]["category_display"],

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -120,6 +120,7 @@ async def get_available_licensed_items_for_wallet(
             NotEnoughAvailableSeatsError: InsufficientNumberOfSeatsError,
             CanNotCheckoutNotEnoughAvailableSeatsError: InsufficientNumberOfSeatsError,
             _CanNotCheckoutServiceIsNotRunningError: CanNotCheckoutServiceIsNotRunningError,
+            # NOTE: missing WalletAccessForbiddenError
         }
     )
     async def checkout_licensed_item_for_wallet(

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/licensed_items_checkouts_db.py

@@ -21,13 +21,13 @@
     pass_or_acquire_connection,
     transaction_context,
 )
-from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 from ....models.licensed_items_checkouts import (
     CreateLicensedItemCheckoutDB,
     LicensedItemCheckoutDB,
 )
+from . import utils as db_utils
 
 _logger = logging.getLogger(__name__)
 
@@ -202,15 +202,11 @@ async def get_currently_used_seats_for_key_version_wallet(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    # licensed_item_id: LicensedItemID,
     key: str,
     version: str,
     wallet_id: WalletID,
     product_name: ProductName,
 ) -> int:
-    def _version(column_or_value):
-        # converts version value string to array[integer] that can be compared
-        return sa.func.string_to_array(column_or_value, ".").cast(ARRAY(INTEGER))
 
     sum_stmt = sa.select(
         sa.func.sum(resource_tracker_licensed_items_checkouts.c.num_of_seats)
@@ -219,8 +215,8 @@ def _version(column_or_value):
         & (resource_tracker_licensed_items_checkouts.c.key == key)
         # If purchased version >= requested version, it covers that version
         & (
-            _version(resource_tracker_licensed_items_checkouts.c.version)
-            >= _version(version)
+            db_utils.version(resource_tracker_licensed_items_checkouts.c.version)
+            >= db_utils.version(version)
         )
         & (resource_tracker_licensed_items_checkouts.c.product_name == product_name)
         & (resource_tracker_licensed_items_checkouts.c.stopped_at.is_(None))

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/licensed_items_purchases_db.py

@@ -16,14 +16,14 @@
     pass_or_acquire_connection,
     transaction_context,
 )
-from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 from ....exceptions.errors import LicensedItemPurchaseNotFoundError
 from ....models.licensed_items_purchases import (
     CreateLicensedItemsPurchasesDB,
     LicensedItemsPurchasesDB,
 )
+from . import utils as db_utils
 
 _SELECTION_ARGS = (
     resource_tracker_licensed_items_purchases.c.licensed_item_purchase_id,
@@ -177,23 +177,15 @@ async def get_active_purchased_seats_for_key_version_wallet(
     """
     _current_time = datetime.now(tz=UTC)
 
-    def _version(column_or_value):
-        # converts version value string to array[integer] that can be compared
-        return sa.func.string_to_array(column_or_value, ".").cast(ARRAY(INTEGER))
-
     sum_stmt = sa.select(
         sa.func.sum(resource_tracker_licensed_items_purchases.c.num_of_seats)
     ).where(
         (resource_tracker_licensed_items_purchases.c.wallet_id == wallet_id)
-        # & (
-        #     resource_tracker_licensed_items_purchases.c.licensed_item_id
-        #     == licensed_item_id
-        # )
         & (resource_tracker_licensed_items_purchases.c.key == key)
         # If purchased version >= requested version, it covers that version
         & (
-            _version(resource_tracker_licensed_items_purchases.c.version)
-            >= _version(version)
+            db_utils.version(resource_tracker_licensed_items_purchases.c.version)
+            >= db_utils.version(version)
         )
         & (resource_tracker_licensed_items_purchases.c.product_name == product_name)
         & (resource_tracker_licensed_items_purchases.c.start_at <= _current_time)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/utils.py

@@ -0,0 +1,7 @@
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
+
+
+def version(column_or_value):
+    # converts version value string to array[integer] that can be compared
+    return sa.func.string_to_array(column_or_value, ".").cast(ARRAY(INTEGER))

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_repository.py

@@ -207,19 +207,6 @@ async def delete(
 ### LICENSED ITEMS DOMAIN
 
 
-# _SELECTION_LICENSED_ITEM_ARGS = (
-#     licensed_items.c.licensed_item_id,
-#     licensed_items.c.key,
-#     licensed_items.c.version,
-#     licensed_items.c.display_name,
-#     licensed_items.c.licensed_resource_type,
-#     licensed_resources.c.licensed_resource_data,
-#     licensed_items.c.pricing_plan_id,
-#     licensed_items.c.created,
-#     licensed_items.c.modified,
-# )
-
-
 _licensed_resource_subquery = (
     select(
         licensed_item_to_resource.c.licensed_item_id,

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_rest.py

@@ -74,24 +74,6 @@ async def list_licensed_items(request: web.Request):
     )
 
 
-# @routes.get(
-#     f"/{VTAG}/catalog/licensed-items/{{licensed_item_id}}", name="get_licensed_item"
-# )
-# @login_required
-# @permission_required("catalog/licensed-items.*")
-# @handle_plugin_requests_exceptions
-# async def get_licensed_item(request: web.Request):
-#     req_ctx = LicensedItemsRequestContext.model_validate(request)
-#     path_params = parse_request_path_parameters_as(LicensedItemsPathParams, request)
-
-#     licensed_item: LicensedItem = await _licensed_items_service.get_licensed_item(
-#         app=request.app,
-#         licensed_item_id=path_params.licensed_item_id,
-#         product_name=req_ctx.product_name,
-#     )
-#     return envelope_json_response(LicensedItemRestGet.from_domain_model(licensed_item))
-
-
 @routes.post(
     f"/{VTAG}/catalog/licensed-items/{{licensed_item_id}}:purchase",
     name="purchase_licensed_item",