| 
22 | 22 | from pytest_simcore.helpers.faker_factories import random_project, random_user  | 
23 | 23 | from servicelib.utils import limited_gather  | 
24 | 24 | 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  | 
26 | 26 | from sqlalchemy.dialects.postgresql import insert as pg_insert  | 
27 | 27 | 
 
  | 
28 | 28 | from ..helpers.utils import get_updated_project  | 
@@ -228,34 +228,25 @@ async def _() -> None:  | 
228 | 228 | async def create_project_node(  | 
229 | 229 |     user_id: UserID, aiopg_engine: Engine, faker: Faker  | 
230 | 230 | ) -> Callable[..., Awaitable[NodeID]]:  | 
231 |  | -    async def _creator(  | 
 | 231 | +    async def _(  | 
232 | 232 |         project_id: ProjectID, node_id: NodeID | None = None, **kwargs  | 
233 | 233 |     ) -> NodeID:  | 
234 | 234 |         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]  | 
243 | 235 |             new_node_id = node_id or NodeID(f"{faker.uuid4()}")  | 
244 | 236 |             node_data = {  | 
245 | 237 |                 "key": "simcore/services/frontend/file-picker",  | 
246 | 238 |                 "version": "1.0.0",  | 
247 | 239 |                 "label": "pytest_fake_node",  | 
248 | 240 |             }  | 
249 | 241 |             node_data.update(**kwargs)  | 
250 |  | -            project_workbench.update({f"{new_node_id}": node_data})  | 
251 | 242 |             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 | +                )  | 
255 | 246 |             )  | 
256 | 247 |         return new_node_id  | 
257 | 248 | 
 
  | 
258 |  | -    return _creator  | 
 | 249 | +    return _  | 
259 | 250 | 
 
  | 
260 | 251 | 
 
  | 
261 | 252 | @pytest.fixture  | 
 | 
0 commit comments