updates tests

Author: pcrespov

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -30,6 +30,8 @@
 )
 from models_library.api_schemas_webserver.resource_usage import PricingPlanGet
 from models_library.api_schemas_webserver.wallets import WalletGet
+from models_library.api_schemas_webserver.users import ProfileGet as WebProfileGet
+from models_library.api_schemas_webserver.users import ProfileUpdate as WebProfileUpdate
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
@@ -78,6 +80,7 @@
     WalletGetWithAvailableCreditsLegacy,
 )
 from ..models.schemas.profiles import Profile, ProfileUpdate
+from ..models.schemas.profiles import Profile, ProfileUpdate, UserRoleEnum
 from ..models.schemas.solvers import SolverKeyId
 from ..models.schemas.studies import StudyPort
 from ..utils.client_base import BaseServiceClientApi, setup_client_instance
@@ -243,17 +246,33 @@ async def _wait_for_long_running_task_results(self, lrt_response: httpx.Response
     async def get_me(self) -> Profile:
         response = await self.client.get("/me", cookies=self.session_cookies)
         response.raise_for_status()
-        profile: Profile | None = (
-            Envelope[Profile].model_validate_json(response.text).data
+
+        got: WebProfileGet | None = (
+            Envelope[WebProfileGet].model_validate_json(response.text).data
+        )
+        assert got is not None  # nosec
+
+        return Profile(
+            first_name=got.first_name,
+            last_name=got.last_name,
+            id=got.id,
+            login=got.login,
+            role=UserRoleEnum(got.role),
+            groups=got.groups.model_dump() if got.groups else None,  # type: ignore
+            gravatar_id=got.gravatar_id,
         )
-        assert profile is not None  # nosec
-        return profile
 
     @_exception_mapper(_PROFILE_STATUS_MAP)
     async def update_me(self, *, profile_update: ProfileUpdate) -> Profile:
+
+        update = WebProfileUpdate(
+            first_name=profile_update.first_name,
+            last_name=profile_update.last_name,
+        )
+
         response = await self.client.patch(
             "/me",
-            json=profile_update.model_dump(exclude_none=True),
+            json=update.model_dump(exclude_none=True, exclude_unset=True),
             cookies=self.session_cookies,
         )
         response.raise_for_status()

services/api-server/tests/unit/_with_db/test_api_user.py

@@ -4,12 +4,12 @@
 
 
 import json
-from copy import deepcopy
 
 import httpx
 import pytest
 import respx
 from fastapi import FastAPI
+from models_library.api_schemas_webserver.users import ProfileGet as WebProfileGet
 from respx import MockRouter
 from simcore_service_api_server._meta import API_VTAG
 from simcore_service_api_server.core.settings import ApplicationSettings
@@ -32,7 +32,7 @@ def mocked_webserver_service_api(app: FastAPI):
     ) as respx_mock:
         # NOTE: webserver-api uses the same schema as api-server!
         # in-memory fake data
-        me = deepcopy(Profile.model_config["json_schema_extra"]["example"])
+        me = WebProfileGet.model_json_schema()["examples"][0]
 
         def _get_me(request):
             return httpx.Response(status.HTTP_200_OK, json={"data": me})