Skip to content

Commit 50204c3

Browse files
fix test
1 parent c629b0a commit 50204c3

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class LicensedItemGet(OutputSchema):
1212
licensed_item_id: LicensedItemID
1313
name: str
14-
license_resource_type: LicensedResourceType
14+
licensed_resource_type: LicensedResourceType
1515
pricing_plan_id: PricingPlanId
1616
created_at: datetime
1717
modified_at: datetime

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LicensedResourceType(StrAutoEnum):
2323
class LicensedItemDB(BaseModel):
2424
licensed_item_id: LicensedItemID
2525
name: str
26-
license_resource_type: LicensedResourceType
26+
licensed_resource_type: LicensedResourceType
2727
pricing_plan_id: PricingPlanId
2828
product_name: ProductName
2929
created: datetime = Field(

services/web/server/src/simcore_service_webserver/catalog/licenses/_licensed_items_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ async def get_licensed_item(
3232
return LicensedItemGet(
3333
licensed_item_id=licensed_item_db.licensed_item_id,
3434
name=licensed_item_db.name,
35-
license_resource_type=licensed_item_db.license_resource_type,
35+
licensed_resource_type=licensed_item_db.licensed_resource_type,
3636
pricing_plan_id=licensed_item_db.pricing_plan_id,
3737
created_at=licensed_item_db.created,
3838
modified_at=licensed_item_db.modified,
@@ -55,7 +55,7 @@ async def list_licensed_items(
5555
LicensedItemGet(
5656
licensed_item_id=licensed_item_db.licensed_item_id,
5757
name=licensed_item_db.name,
58-
license_resource_type=licensed_item_db.license_resource_type,
58+
licensed_resource_type=licensed_item_db.licensed_resource_type,
5959
pricing_plan_id=licensed_item_db.pricing_plan_id,
6060
created_at=licensed_item_db.created,
6161
modified_at=licensed_item_db.modified,

services/web/server/src/simcore_service_webserver/catalog/licenses/_licensed_items_db.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
_SELECTION_ARGS = (
3737
licensed_items.c.licensed_item_id,
3838
licensed_items.c.name,
39-
licensed_items.c.license_resource_type,
39+
licensed_items.c.licensed_resource_type,
4040
licensed_items.c.pricing_plan_id,
4141
licensed_items.c.product_name,
4242
licensed_items.c.created,
@@ -52,15 +52,15 @@ async def create(
5252
*,
5353
product_name: ProductName,
5454
name: str,
55-
license_resource_type: LicensedResourceType,
55+
licensed_resource_type: LicensedResourceType,
5656
pricing_plan_id: PricingPlanId,
5757
) -> LicensedItemDB:
5858
async with transaction_context(get_asyncpg_engine(app), connection) as conn:
5959
result = await conn.stream(
6060
licensed_items.insert()
6161
.values(
6262
name=name,
63-
license_resource_type=license_resource_type,
63+
licensed_resource_type=licensed_resource_type,
6464
pricing_plan_id=pricing_plan_id,
6565
product_name=product_name,
6666
created=func.now(),

services/web/server/tests/unit/with_dbs/04/licenses/test_license_goods_db.py renamed to services/web/server/tests/unit/with_dbs/04/licenses/test_licensed_items_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async def test_licensed_items_db_crud(
4545
client.app,
4646
product_name=osparc_product_name,
4747
name="Model A",
48-
license_resource_type=LicensedResourceType.VIP_MODEL,
48+
licensed_resource_type=LicensedResourceType.VIP_MODEL,
4949
pricing_plan_id=pricing_plan_id,
5050
)
5151
_licensed_item_id = licensed_item_db.licensed_item_id

services/web/server/tests/unit/with_dbs/04/licenses/test_license_goods_handlers.py renamed to services/web/server/tests/unit/with_dbs/04/licenses/test_licensed_items_handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async def test_licensed_items_db_crud(
3838
client.app,
3939
product_name=osparc_product_name,
4040
name="Model A",
41-
license_resource_type=LicensedResourceType.VIP_MODEL,
41+
licensed_resource_type=LicensedResourceType.VIP_MODEL,
4242
pricing_plan_id=pricing_plan_id,
4343
)
4444
_licensed_item_id = licensed_item_db.licensed_item_id

0 commit comments

Comments
 (0)