adding db test

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/application.py

@@ -26,6 +26,7 @@
 from .garbage_collector.plugin import setup_garbage_collector
 from .groups.plugin import setup_groups
 from .invitations.plugin import setup_invitations
+from .licenses.plugin import setup_licenses
 from .login.plugin import setup_login
 from .long_running_tasks import setup_long_running_tasks
 from .meta_modeling.plugin import setup_meta_modeling
@@ -143,6 +144,9 @@ def create_application() -> web.Application:
     setup_scicrunch(app)
     setup_tags(app)
 
+    # licenses
+    setup_licenses(app)
+
     setup_announcements(app)
     setup_publications(app)
     setup_studies_dispatcher(app)

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -271,6 +271,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     WEBSERVER_DB_LISTENER: bool = True
     WEBSERVER_FOLDERS: bool = True
     WEBSERVER_GROUPS: bool = True
+    WEBSERVER_LICENSES: bool = True
     WEBSERVER_META_MODELING: bool = True
     WEBSERVER_NOTIFICATIONS: bool = Field(default=True)
     WEBSERVER_PRODUCTS: bool = True

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

@@ -2,7 +2,6 @@
 
 import logging
 
-import _license_goods_db
 from aiohttp import web
 from models_library.api_schemas_webserver.license_goods import (
     LicenseGoodGet,
@@ -14,6 +13,7 @@
 from models_library.users import UserID
 from pydantic import NonNegativeInt
 
+from . import _license_goods_db
 from ._models import LicenseGoodsBodyParams
 
 _logger = logging.getLogger(__name__)
@@ -29,7 +29,14 @@ async def get_license_good(
     license_good_db = await _license_goods_db.get(
         app, license_good_id=license_good_id, product_name=product_name
     )
-    return LicenseGoodGet.model_construct(**license_good_db.model_dump())
+    return LicenseGoodGet(
+        license_good_id=license_good_db.license_good_id,
+        name=license_good_db.name,
+        license_resource_type=license_good_db.license_resource_type,
+        pricing_plan_id=license_good_db.pricing_plan_id,
+        created_at=license_good_db.created,
+        modified_at=license_good_db.modified,
+    )
 
 
 async def list_license_goods(
@@ -45,7 +52,14 @@ async def list_license_goods(
     )
     return LicenseGoodGetPage(
         items=[
-            LicenseGoodGet.model_construct(**license_good_db.model_dump())
+            LicenseGoodGet(
+                license_good_id=license_good_db.license_good_id,
+                name=license_good_db.name,
+                license_resource_type=license_good_db.license_resource_type,
+                pricing_plan_id=license_good_db.pricing_plan_id,
+                created_at=license_good_db.created,
+                modified_at=license_good_db.modified,
+            )
             for license_good_db in license_good_db_list
         ],
         total=total_count,

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

@@ -1,10 +1,3 @@
 # mypy: disable-error-code=truthy-function
-from ._license_goods_api import check_user_workspace_access, get_workspace
 
-assert get_workspace  # nosec
-assert check_user_workspace_access  # nosec
-
-__all__: tuple[str, ...] = (
-    "get_workspace",
-    "check_user_workspace_access",
-)
+__all__: tuple[str, ...] = ()

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

@@ -15,12 +15,12 @@
 @app_module_setup(
     __name__,
     ModuleCategory.ADDON,
-    settings_name="WEBSERVER_LICENSE",
+    settings_name="WEBSERVER_LICENSES",
     depends=["simcore_service_webserver.rest"],
     logger=_logger,
 )
-def setup_workspaces(app: web.Application):
-    assert app[APP_SETTINGS_KEY].WEBSERVER_LICENSE  # nosec
+def setup_licenses(app: web.Application):
+    assert app[APP_SETTINGS_KEY].WEBSERVER_LICENSES  # nosec
 
     # routes
     app.router.add_routes(_license_goods_handlers.routes)

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

@@ -1,17 +1,42 @@
+from collections.abc import AsyncIterator
+
 # pylint:disable=unused-variable
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
-from collections.abc import Iterator
-
 import pytest
-import sqlalchemy as sa
-from simcore_postgres_database.models.projects import projects
-from simcore_postgres_database.models.workspaces import workspaces
+from aiohttp.test_utils import TestClient
+from simcore_postgres_database.models.resource_tracker_pricing_plans import (
+    resource_tracker_pricing_plans,
+)
+from simcore_postgres_database.utils_repos import transaction_context
+from simcore_service_webserver.db.plugin import get_asyncpg_engine
 
 
 @pytest.fixture
-def workspaces_clean_db(postgres_db: sa.engine.Engine) -> Iterator[None]:
-    with postgres_db.connect() as con:
-        yield
-        con.execute(workspaces.delete())
-        con.execute(projects.delete())
+async def pricing_plan_id(
+    client: TestClient,
+    osparc_product_name: str,
+) -> AsyncIterator[int]:
+    assert client.app
+
+    async with transaction_context(get_asyncpg_engine(client.app)) as conn:
+        result = await conn.execute(
+            resource_tracker_pricing_plans.insert()
+            .values(
+                product_name=osparc_product_name,
+                display_name="ISolve Thermal",
+                description="",
+                classification="TIER",
+                is_active=True,
+                pricing_plan_key="isolve-thermal",
+            )
+            .returning(resource_tracker_pricing_plans.c.pricing_plan_id)
+        )
+        row = result.first()
+
+    assert row
+
+    yield int(row[0])
+
+    async with transaction_context(get_asyncpg_engine(client.app)) as conn:
+        result = await conn.execute(resource_tracker_pricing_plans.delete())

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

@@ -1,5 +1,3 @@
-from collections.abc import AsyncIterator
-
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
@@ -17,47 +15,12 @@
 from models_library.rest_ordering import OrderBy
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
-from simcore_postgres_database.models.resource_tracker_pricing_plans import (
-    resource_tracker_pricing_plans,
-)
-from simcore_postgres_database.utils_repos import transaction_context
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.db.plugin import get_asyncpg_engine
 from simcore_service_webserver.licenses import _license_goods_db
 from simcore_service_webserver.licenses.errors import LicenseGoodNotFoundError
 from simcore_service_webserver.projects.models import ProjectDict
 
 
-@pytest.fixture
-async def pricing_plan_id(
-    client: TestClient,
-    osparc_product_name: str,
-) -> AsyncIterator[int]:
-    assert client.app
-
-    async with transaction_context(get_asyncpg_engine(client.app)) as conn:
-        result = await conn.execute(
-            resource_tracker_pricing_plans.insert()
-            .values(
-                product_name=osparc_product_name,
-                display_name="ISolve Thermal",
-                description="",
-                classification="TIER",
-                is_active=True,
-                pricing_plan_key="isolve-thermal",
-            )
-            .returning(resource_tracker_pricing_plans.c.pricing_plan_id)
-        )
-        row = result.first()
-
-    assert row
-
-    yield int(row[0])
-
-    async with transaction_context(get_asyncpg_engine(client.app)) as conn:
-        result = await conn.execute(resource_tracker_pricing_plans.delete())
-
-
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_license_goods_db_crud(
     client: TestClient,

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

@@ -0,0 +1,66 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-statements
+from http import HTTPStatus
+
+import pytest
+from aiohttp.test_utils import TestClient
+from models_library.api_schemas_webserver.license_goods import LicenseGoodGet
+from models_library.license_goods import LicenseResourceType
+from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.webserver_login import UserInfoDict
+from servicelib.aiohttp import status
+from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.licenses import _license_goods_db
+from simcore_service_webserver.projects.models import ProjectDict
+
+
+@pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
+async def test_license_goods_db_crud(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    user_project: ProjectDict,
+    osparc_product_name: str,
+    expected: HTTPStatus,
+    pricing_plan_id: int,
+):
+    assert client.app
+
+    # list
+    url = client.app.router["list_license_goods"].url_for()
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert data == []
+
+    license_good_db = await _license_goods_db.create(
+        client.app,
+        product_name=osparc_product_name,
+        name="Model A",
+        license_resource_type=LicenseResourceType.VIP_MODEL,
+        pricing_plan_id=pricing_plan_id,
+    )
+    _license_good_id = license_good_db.license_good_id
+
+    # list
+    url = client.app.router["list_license_goods"].url_for()
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 1
+    assert LicenseGoodGet(**data[0])
+
+    # get
+    url = client.app.router["get_license_good"].url_for(
+        license_good_id=_license_good_id
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert LicenseGoodGet(**data)
+
+    # purchase
+    url = client.app.router["purchase_license_good"].url_for(
+        license_good_id=_license_good_id
+    )
+    resp = await client.post(f"{url}", json={"wallet_id": 1, "num_of_seeds": 5})
+    # NOTE: Not yet implemented