Skip to content

Commit 0c3eaf7

Browse files
committed
adapts webserver service
1 parent a5f7918 commit 0c3eaf7

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,14 @@ async def get_project_services(request: web.Request) -> web.Response:
560560
NodeServiceGet.model_validate(sv, from_attributes=True)
561561
for sv in batch_got.found_items
562562
],
563-
missing=[
564-
ServiceKeyVersion(key=skey, version=sver)
565-
for skey, sver in batch_got.missing_identifiers
566-
],
563+
missing=(
564+
[
565+
ServiceKeyVersion(key=k, version=v)
566+
for k, v in batch_got.missing_identifiers
567+
]
568+
if batch_got.missing_identifiers
569+
else None
570+
),
567571
)
568572
)
569573

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
from models_library.api_schemas_catalog.service_access_rights import (
1414
ServiceAccessRightsGet,
1515
)
16-
from models_library.api_schemas_catalog.services import MyServiceGet
16+
from models_library.api_schemas_catalog.services import (
17+
MyServiceGet,
18+
MyServicesRpcBatchGet,
19+
)
1720
from models_library.services_history import ServiceRelease
1821
from pytest_mock import MockerFixture
1922
from pytest_simcore.helpers.assert_checks import assert_status
@@ -481,21 +484,23 @@ async def test_get_project_services(
481484
mocker.patch(
482485
"simcore_service_webserver.catalog._service.catalog_rpc.batch_get_my_services",
483486
spec=True,
484-
return_value=[
485-
MyServiceGet(
486-
key=service_key,
487-
release=ServiceRelease(
488-
version=service_version,
489-
version_display=f"v{service_version}",
490-
released="2023-01-01T00:00:00Z",
491-
retired=None,
492-
compatibility=None,
493-
),
494-
owner=logged_user["primary_gid"],
495-
my_access_rights={"execute": True, "write": False},
496-
)
497-
for service_key, service_version in fake_services_in_project
498-
],
487+
return_value=MyServicesRpcBatchGet(
488+
found_items=[
489+
MyServiceGet(
490+
key=service_key,
491+
release=ServiceRelease(
492+
version=service_version,
493+
version_display=f"v{service_version}",
494+
released="2023-01-01T00:00:00Z",
495+
retired=None,
496+
compatibility=None,
497+
),
498+
owner=logged_user["primary_gid"],
499+
my_access_rights={"execute": True, "write": False},
500+
)
501+
for service_key, service_version in fake_services_in_project
502+
]
503+
),
499504
)
500505

501506
assert client.app
@@ -550,6 +555,7 @@ async def test_get_project_services(
550555
},
551556
},
552557
],
558+
"missing": None,
553559
}
554560

555561

0 commit comments

Comments
 (0)