Skip to content

Commit 9f0cf48

Browse files
GitHKAndrei Neagu
andauthored
🐛 viewers can now use new style dynamic services (#6023)
Co-authored-by: Andrei Neagu <[email protected]>
1 parent 6f8749d commit 9f0cf48

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
""" Handles request to the viewers redirection entrypoints
22
33
"""
4+
45
import functools
56
import logging
67
import urllib.parse
@@ -16,6 +17,7 @@
1617
from servicelib.aiohttp.typing_extension import Handler
1718
from servicelib.error_codes import create_error_code
1819

20+
from ..director_v2.api import update_dynamic_service_networks_in_project
1921
from ..products.api import get_product_name
2022
from ..utils import compose_support_error_msg
2123
from ..utils_aiohttp import create_redirect_to_page_response
@@ -252,6 +254,7 @@ async def get_redirection_to_viewer(request: web.Request):
252254
file_params.download_link,
253255
product_name=get_product_name(request),
254256
)
257+
await update_dynamic_service_networks_in_project(request.app, project_id)
255258

256259
response = _create_redirect_response_to_view_page(
257260
request.app,
@@ -280,6 +283,7 @@ async def get_redirection_to_viewer(request: web.Request):
280283
service_info=_create_service_info_from(valid_service),
281284
product_name=get_product_name(request),
282285
)
286+
await update_dynamic_service_networks_in_project(request.app, project_id)
283287

284288
response = _create_redirect_response_to_view_page(
285289
request.app,
@@ -315,6 +319,7 @@ async def get_redirection_to_viewer(request: web.Request):
315319
).STUDIES_DEFAULT_FILE_THUMBNAIL,
316320
product_name=get_product_name(request),
317321
)
322+
await update_dynamic_service_networks_in_project(request.app, project_id)
318323

319324
response = _create_redirect_response_to_view_page(
320325
request.app,

services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_handlers.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,10 @@ async def test_dispatch_study_anonymously(
397397
"simcore_service_webserver.director_v2.api.create_or_update_pipeline",
398398
return_value=None,
399399
)
400+
mock_client_director_v2_project_networks = mocker.patch(
401+
"simcore_service_webserver.studies_dispatcher._redirects_handlers.update_dynamic_service_networks_in_project",
402+
return_value=None,
403+
)
400404

401405
response = await client.get(f"{redirect_url}")
402406

@@ -435,6 +439,7 @@ async def test_dispatch_study_anonymously(
435439
assert guest_project["prjOwner"] == data["login"]
436440

437441
assert mock_client_director_v2_func.called
442+
assert mock_client_director_v2_project_networks.called
438443

439444

440445
@pytest.mark.parametrize(
@@ -455,10 +460,14 @@ async def test_dispatch_logged_in_user(
455460
mocks_on_projects_api,
456461
):
457462
assert client.app
458-
mock_client_director_v2_func = mocker.patch(
463+
mock_client_director_v2_pipline_update = mocker.patch(
459464
"simcore_service_webserver.director_v2.api.create_or_update_pipeline",
460465
return_value=None,
461466
)
467+
mock_client_director_v2_project_networks = mocker.patch(
468+
"simcore_service_webserver.studies_dispatcher._redirects_handlers.update_dynamic_service_networks_in_project",
469+
return_value=None,
470+
)
462471

463472
response = await client.get(f"{redirect_url}")
464473

@@ -487,7 +496,8 @@ async def test_dispatch_logged_in_user(
487496
assert expected_project_id == created_project["uuid"]
488497
assert created_project["prjOwner"] == data["login"]
489498

490-
assert mock_client_director_v2_func.called
499+
assert mock_client_director_v2_pipline_update.called
500+
assert mock_client_director_v2_project_networks.called
491501

492502
# delete before exiting
493503
url = client.app.router["delete_project"].url_for(project_id=expected_project_id)

0 commit comments

Comments
 (0)