@pcrespov review: replace first by one or one_or_none

Author: sanderegg

services/storage/src/simcore_service_storage/modules/db/access_layer.py

@@ -247,7 +247,7 @@ async def get_project_access_rights(
     combined_query = sa.union_all(private_workspace_query, shared_workspace_query)
 
     result = await conn.execute(combined_query)
-    row = result.first()
+    row = result.one_or_none()
 
     if not row:
         # Either project does not exists OR user_id has NO access
@@ -279,7 +279,7 @@ async def get_file_access_rights(
         file_meta_data.c.file_id == f"{file_id}"
     )
     result = await conn.execute(stmt)
-    row = result.first()
+    row = result.one_or_none()
 
     if row:
         if int(row.user_id) == user_id:

services/storage/src/simcore_service_storage/modules/db/tokens.py

@@ -20,7 +20,7 @@ async def _get_tokens_from_db(engine: AsyncEngine, user_id: UserID) -> dict[str,
                 tokens,
             ).where(tokens.c.user_id == user_id)
         )
-        row = result.first()
+        row = result.one_or_none()
         return dict(row) if row else {}
 
 

services/storage/tests/unit/test_db_access_layer.py

@@ -46,8 +46,7 @@ async def prepare_db(
         result = await conn.execute(
             sa.select(users.c.primary_gid).where(users.c.id == user_id)
         )
-        row = result.first()
-        assert row
+        row = result.one()
         user_primary_id = row[0]
 
         result = await conn.execute(
@@ -63,8 +62,7 @@ async def prepare_db(
             )
             .returning(workspaces.c.workspace_id)
         )
-        row = result.first()
-        assert row
+        row = result.one()
         workspace_id = row[0]
 
         await conn.execute(