refactor

Author: sanderegg

services/web/server/src/simcore_service_webserver/exporter/_handlers.py

@@ -12,7 +12,7 @@
 from .._constants import RQ_PRODUCT_KEY
 from .._meta import API_VTAG
 from ..login.decorators import login_required
-from ..projects.projects_api import with_project_locked_notified_state
+from ..projects.projects_api import with_project_locked_and_notify
 from ..security.decorators import permission_required
 from ..users.api import get_user_fullname
 from ._formatter.archive import get_sds_archive_path
@@ -43,7 +43,7 @@ async def export_project(request: web.Request):
     project_uuid = request.match_info.get("project_id")
     assert project_uuid  # nosec
 
-    @with_project_locked_notified_state(
+    @with_project_locked_and_notify(
         request.app,
         project_uuid=project_uuid,
         status=ProjectStatus.EXPORTING,

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

@@ -180,7 +180,7 @@ async def _copy() -> None:
                 await long_running_task.result()
 
     if needs_lock_source_project:
-        await projects_api.with_project_locked_notified_state(
+        await projects_api.with_project_locked_and_notify(
             app,
             project_uuid=source_project["uuid"],
             status=ProjectStatus.CLONING,

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

@@ -1261,13 +1261,13 @@ async def try_open_project_for_user(
     """
     try:
 
-        @with_project_locked_notified_state(
+        @with_project_locked_and_notify(
             app,
             project_uuid=project_uuid,
             status=ProjectStatus.OPENING,
             user_id=user_id,
             user_name=await get_user_fullname(app, user_id=user_id),
-            notify_users=False,
+            notify_users=True,
         )
         async def _open_project() -> bool:
             with managed_resource(user_id, client_session_id, app) as user_session:
@@ -1757,7 +1757,7 @@ async def remove_project_dynamic_services(
         save_state = False
     # -------------------
 
-    @with_project_locked_notified_state(
+    @with_project_locked_and_notify(
         app,
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,
@@ -1864,7 +1864,7 @@ async def retrieve_and_notify_project_locked_state(
 R = TypeVar("R")
 
 
-def with_project_locked_notified_state(
+def with_project_locked_and_notify(
     app: web.Application,
     *,
     project_uuid: str,

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

@@ -37,7 +37,7 @@
 from simcore_service_webserver.projects import _crud_api_delete
 from simcore_service_webserver.projects.models import ProjectDict
 from simcore_service_webserver.projects.projects_api import (
-    with_project_locked_notified_state,
+    with_project_locked_and_notify,
 )
 from socketio.exceptions import ConnectionError as SocketConnectionError
 
@@ -230,7 +230,7 @@ async def test_delete_project_while_it_is_locked_raises_error(
 
     project_uuid = user_project["uuid"]
     user_id = logged_user["id"]
-    await with_project_locked_notified_state(
+    await with_project_locked_and_notify(
         app=client.app,
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,