adds tests

Author: pcrespov

services/web/server/src/simcore_service_webserver/catalog/_tags_handlers.py

@@ -1,14 +1,12 @@
 import logging
 
 from aiohttp import web
-from models_library.api_schemas_webserver.catalog import CatalogServiceGet
 from models_library.basic_types import IdInt
 from servicelib.aiohttp.requests_validation import parse_request_path_parameters_as
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
-from ..tags.schemas import TagGet
 from ._handlers import ServicePathParams
 
 _logger = logging.getLogger(__name__)
@@ -30,8 +28,6 @@ class ServiceTagPathParams(ServicePathParams):
 async def list_service_tags(request: web.Request):
     path_params = parse_request_path_parameters_as(ServicePathParams, request)
     assert path_params  # nosec
-
-    assert list[TagGet]  # nosec
     raise NotImplementedError
 
 
@@ -46,7 +42,6 @@ async def add_service_tag(request: web.Request):
     assert path_params  # nosec
 
     # responds with parent's resource to get the current state (as with patch/update)
-    assert CatalogServiceGet  # nosec
     raise NotImplementedError
 
 
@@ -61,5 +56,4 @@ async def remove_service_tag(request: web.Request):
     assert path_params  # nosec
 
     # responds with parent's resource to get the current state (as with patch/update)
-    assert CatalogServiceGet  # nosec
     raise NotImplementedError

services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py

@@ -216,3 +216,89 @@ async def test_get_and_patch_service(
 
     assert mocked_rpc_catalog_service_api["get_service"].call_count == 1
     assert mocked_rpc_catalog_service_api["update_service"].call_count == 1
+
+
+@pytest.xfail(reason="service tags entrypoints under development")
+@pytest.mark.parametrize(
+    "user_role",
+    [UserRole.USER],
+)
+async def test_tags_in_services(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    mocked_rpc_catalog_service_api: dict[str, MagicMock],
+):
+    assert client.app
+    assert client.app.router
+
+    service_key = "simcore/services/dynamic/someservice"
+    service_version = "3.4.5"
+
+    # the service
+    url = client.app.router["get_service"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+    )
+    response = await client.get(f"{url}")
+    data, error = await assert_status(response, status.HTTP_200_OK)
+    assert not error
+
+    # list tags
+    url = client.app.router["list_service_tags"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+    )
+    response = await client.get(f"{url}")
+    data, error = await assert_status(response, status.HTTP_200_OK)
+
+    assert not error
+    assert not data
+
+    # create a tag
+    fake_tag = {"name": "tag1", "description": "description1", "color": "#f00"}
+    url = client.app.router["create_tag"].url_for()
+    resp = await client.post(f"{url}", json=fake_tag)
+    tag, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    tag_id = tag["id"]
+    assert tag["name"] == fake_tag["name"]
+
+    # add_service_tag
+    url = client.app.router["add_service_tag"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+        tag_id=tag_id,
+    )
+    response = await client.get(f"{url}")
+    data, error = await assert_status(response, status.HTTP_200_OK)
+
+    # list_service_tags
+    url = client.app.router["list_service_tags"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+    )
+    response = await client.put(f"{url}")
+    data, error = await assert_status(response, status.HTTP_200_OK)
+
+    assert not error
+    assert len(data) == 1
+
+    # remove_service_tag
+    url = client.app.router["remove_service_tag"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+        tag_id=tag_id,
+    )
+    response = await client.delete(f"{url}")
+    data, error = await assert_status(response, status.HTTP_204_NO_CONTENT)
+
+    # list_service_tags
+    url = client.app.router["list_service_tags"].url_for(
+        service_key=urllib.parse.quote(service_key, safe=""),
+        service_version=service_version,
+    )
+    response = await client.put(f"{url}")
+    data, error = await assert_status(response, status.HTTP_200_OK)
+
+    assert not error
+    assert not data

services/web/server/tests/unit/with_dbs/03/tags/test_tags.py

@@ -68,7 +68,7 @@ async def test_tags_to_studies(
         added_tags.append(added_tag)
 
         # Add tag to study
-        url = client.app.router["add_tag"].url_for(
+        url = client.app.router["add_project_tag"].url_for(
             project_uuid=user_project.get("uuid"), tag_id=str(added_tag.get("id"))
         )
         resp = await client.put(f"{url}")