solve merge conflicts

Author: matusdrobuliak66

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

@@ -63,20 +63,10 @@ class LicensedItemDB(BaseModel):
     modified: datetime
     trashed: datetime | None
 
-    licensed_resource_data: dict[str, Any] | None
-
-    pricing_plan_id: PricingPlanId | None
-    product_name: ProductName | None
-
-    # states
-    created: datetime
-    modified: datetime
-    trashed: datetime | None
-
     model_config = ConfigDict(from_attributes=True)
 
 
 class LicensedItemUpdateDB(BaseModel):
-    display_name: str | None = None
+    licensed_resource_name: str | None = None
     pricing_plan_id: PricingPlanId | None = None
     trash: bool | None = None

packages/postgres-database/src/simcore_postgres_database/models/licensed_items.py

@@ -6,7 +6,12 @@
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-from ._common import RefActions, column_modified_datetime, column_trashed_datetime
+from ._common import (
+    RefActions,
+    column_created_datetime,
+    column_modified_datetime,
+    column_trashed_datetime,
+)
 from .base import metadata
 
 
@@ -42,12 +47,6 @@ class LicensedResourceType(str, enum.Enum):
         nullable=True,
         doc="Resource metadata. Used for read-only purposes",
     ),
-    sa.Column(
-        "licensed_resource_data",
-        postgresql.JSONB,
-        nullable=True,
-        doc="Resource metadata. Used for read-only purposes",
-    ),
     sa.Column(
         "pricing_plan_id",
         sa.BigInteger,
@@ -71,6 +70,7 @@ class LicensedResourceType(str, enum.Enum):
         nullable=True,
         doc="Product name identifier. If None, then the item is not exposed",
     ),
+    column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     column_trashed_datetime("licensed_item"),
 )

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

@@ -34,7 +34,6 @@
 _logger = logging.getLogger(__name__)
 
 
-_SELECTION_ARGS = get_columns_from_db_model(licensed_items, LicensedItemDB)
 _SELECTION_ARGS = get_columns_from_db_model(licensed_items, LicensedItemDB)
 
 
@@ -63,7 +62,6 @@ async def create(
             .returning(*_SELECTION_ARGS)
         )
         row = result.one()
-        row = result.one()
         return LicensedItemDB.model_validate(row)
 
 

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

@@ -56,7 +56,7 @@ async def list_licensed_items(
     offset: NonNegativeInt,
     limit: int,
     order_by: OrderBy,
-) -> LicensedItemGetPage:
+) -> LicensedItemPage:
     total_count, items = await _licensed_items_repository.list_(
         app,
         product_name=product_name,
@@ -77,7 +77,7 @@ async def list_licensed_items(
                 created_at=licensed_item_db.created,
                 modified_at=licensed_item_db.modified,
             )
-            for licensed_item_db in licensed_item_db_list
+            for licensed_item_db in items
         ],
         total=total_count,
     )

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

@@ -52,10 +52,9 @@ async def test_licensed_items_db_crud(
         client.app,
         product_name=osparc_product_name,
         licensed_resource_name="Model A",
-        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
-        pricing_plan_id=pricing_plan_id,
         licensed_resource_data=VIP_DETAILS_EXAMPLE,
+        pricing_plan_id=pricing_plan_id,
     )
     licensed_item_id = got.licensed_item_id
 
@@ -121,6 +120,7 @@ async def test_licensed_items_db_trash(
             product_name=osparc_product_name,
             licensed_resource_name=name,
             licensed_resource_type=LicensedResourceType.VIP_MODEL,
+            licensed_resource_data=VIP_DETAILS_EXAMPLE,
             pricing_plan_id=pricing_plan_id,
         )
         licensed_item_ids.append(licensed_item_db.licensed_item_id)

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

@@ -55,6 +55,12 @@ async def test_licensed_items_listing(
     data, _ = await assert_status(resp, status.HTTP_200_OK)
     assert len(data) == 1
     assert LicensedItemRestGet(**data[0])
+    assert data[0]["licensedResourceData"][
+        "additionalField"
+    ]  # <-- Testing nested camel case
+    assert data[0]["licensedResourceData"]["features"][
+        "additionalField"
+    ]  # <-- Testing nested camel case
 
     # get
     url = client.app.router["get_licensed_item"].url_for(