🐛 Fix project inactivity parsing inside webserver (#5127)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

services/web/server/src/simcore_service_webserver/projects/_crud_handlers.py

@@ -15,6 +15,7 @@
     ProjectGet,
     ProjectUpdate,
 )
+from models_library.generics import Envelope
 from models_library.projects import Project
 from models_library.projects_state import ProjectLocked
 from models_library.rest_pagination import Page
@@ -302,7 +303,7 @@ async def get_project_inactivity(request: web.Request):
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
     )
-    return web.json_response({"data": project_inactivity}, dumps=json_dumps)
+    return web.json_response(Envelope(data=project_inactivity), dumps=json_dumps)
 
 
 #

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -23,7 +23,6 @@
     GetProjectInactivityResponse,
 )
 from models_library.errors import ErrorDict
-from models_library.generics import Envelope
 from models_library.projects import Project, ProjectID, ProjectIDStr
 from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID, NodeIDStr
@@ -1396,7 +1395,7 @@ async def lock_with_notification(
 
 async def get_project_inactivity(
     app: web.Application, project_id: ProjectID, user_id: UserID, product_name: str
-) -> Envelope[GetProjectInactivityResponse]:
+) -> GetProjectInactivityResponse:
     preference = await get_frontend_user_preference(
         app,
         user_id=user_id,
@@ -1414,4 +1413,4 @@ async def get_project_inactivity(
     project_inactivity = await director_v2_api.get_project_inactivity(
         app, project_id, max_inactivity_seconds
     )
-    return parse_obj_as(Envelope[GetProjectInactivityResponse], project_inactivity)
+    return parse_obj_as(GetProjectInactivityResponse, project_inactivity)

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py

@@ -730,7 +730,7 @@ def mock_director_v2_inactivity(
         get_services_pattern,
         status=web.HTTPOk.status_code,
         repeat=True,
-        payload={"data": {"is_inactive": is_inactive}},
+        payload={"is_inactive": is_inactive},
     )
 
 
@@ -765,5 +765,4 @@ async def test_get_project_inactivity(
 
     assert data
     assert error is None
-
-    assert data["data"]["is_inactive"] is is_inactive
+    assert data["is_inactive"] is is_inactive