Skip to content

Commit 39a835f

Browse files
fixing node creation mock
1 parent 786a12f commit 39a835f

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

packages/postgres-database/src/simcore_postgres_database/storage_models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from .models.file_meta_data import file_meta_data
88
from .models.groups import groups, user_to_groups
99
from .models.projects import projects
10+
from .models.projects_nodes import projects_nodes
1011
from .models.tokens import tokens
1112
from .models.users import users
1213

@@ -15,6 +16,7 @@
1516
"file_meta_data",
1617
"metadata",
1718
"projects",
19+
"projects_nodes",
1820
"users",
1921
"groups",
2022
"user_to_groups",

services/storage/tests/fixtures/data_models.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from pytest_simcore.helpers.faker_factories import random_project, random_user
2323
from servicelib.utils import limited_gather
2424
from simcore_postgres_database.models.project_to_groups import project_to_groups
25-
from simcore_postgres_database.storage_models import projects, users
25+
from simcore_postgres_database.storage_models import projects, projects_nodes, users
2626
from sqlalchemy.dialects.postgresql import insert as pg_insert
2727

2828
from ..helpers.utils import get_updated_project
@@ -228,34 +228,25 @@ async def _() -> None:
228228
async def create_project_node(
229229
user_id: UserID, aiopg_engine: Engine, faker: Faker
230230
) -> Callable[..., Awaitable[NodeID]]:
231-
async def _creator(
231+
async def _(
232232
project_id: ProjectID, node_id: NodeID | None = None, **kwargs
233233
) -> NodeID:
234234
async with aiopg_engine.acquire() as conn:
235-
result = await conn.execute(
236-
sa.select(projects.c.workbench).where(
237-
projects.c.uuid == f"{project_id}"
238-
)
239-
)
240-
row = await result.fetchone()
241-
assert row
242-
project_workbench: dict[str, Any] = row[projects.c.workbench]
243235
new_node_id = node_id or NodeID(f"{faker.uuid4()}")
244236
node_data = {
245237
"key": "simcore/services/frontend/file-picker",
246238
"version": "1.0.0",
247239
"label": "pytest_fake_node",
248240
}
249241
node_data.update(**kwargs)
250-
project_workbench.update({f"{new_node_id}": node_data})
251242
await conn.execute(
252-
projects.update()
253-
.where(projects.c.uuid == f"{project_id}")
254-
.values(workbench=project_workbench)
243+
projects_nodes.insert().values(
244+
project_uuid=project_id, node_id=new_node_id, **node_data
245+
)
255246
)
256247
return new_node_id
257248

258-
return _creator
249+
return _
259250

260251

261252
@pytest.fixture

0 commit comments

Comments
 (0)