Skip to content

Commit 72bdab8

Browse files
fix failing tests
1 parent 7956f60 commit 72bdab8

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

packages/service-library/src/servicelib/redis/_project_document_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async def get_and_increment_project_document_version(
3535
"""
3636
version_key = PROJECT_DOCUMENT_VERSION_KEY.format(project_uuid)
3737
# If key doesn't exist, it's created with value 0 and then incremented to 1
38-
return await redis_client.redis.incr(version_key)
38+
return await int(redis_client.redis.incr(version_key))
3939

4040

4141
async def get_project_document_version(

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
from models_library.workspaces import WorkspaceID, WorkspaceQuery, WorkspaceScope
1717
from pydantic import NonNegativeInt
1818
from servicelib.utils import logged_gather
19-
from simcore_postgres_database.webserver_models import (
20-
ProjectTemplateType as ProjectTemplateTypeDB,
21-
)
2219

2320
from ..folders import _folders_repository
2421
from ..users import users_service
@@ -174,9 +171,7 @@ async def list_projects( # pylint: disable=too-many-arguments
174171
),
175172
# attrs
176173
filter_by_project_type=ProjectTypeAPI.to_project_type_db(project_type),
177-
filter_by_template_type=(
178-
ProjectTemplateTypeDB(template_type) if template_type else None
179-
),
174+
filter_by_template_type=template_type,
180175
filter_trashed=trashed,
181176
filter_hidden=show_hidden,
182177
# composed attrs
@@ -228,11 +223,7 @@ async def list_projects_full_depth( # pylint: disable=too-many-arguments
228223
filter_by_project_type=ProjectTypeAPI.to_project_type_db(
229224
filter_by_project_type
230225
),
231-
filter_by_template_type=(
232-
ProjectTemplateTypeDB(filter_by_template_type)
233-
if filter_by_template_type
234-
else None
235-
),
226+
filter_by_template_type=filter_by_template_type,
236227
search_by_multi_columns=search_by_multi_columns,
237228
search_by_project_name=search_by_project_name,
238229
offset=offset,

services/web/server/tests/unit/isolated/test_projects__db_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
convert_to_schema_names,
2323
create_project_access_rights,
2424
patch_workbench,
25-
update_workbench,
2625
)
2726
from simcore_service_webserver.projects._projects_repository_legacy_utils import (
2827
DB_EXCLUSIVE_COLUMNS,
2928
SCHEMA_NON_NULL_KEYS,
3029
assemble_array_groups,
30+
update_workbench,
3131
)
3232
from simcore_service_webserver.projects.exceptions import (
3333
NodeNotFoundError,

0 commit comments

Comments
 (0)