test: fix tests

Author: Ralf Grubenmann

components/renku_data_services/migrations/versions/17eea03f938e_move_user_preferences_to_user_schema.py

@@ -53,21 +53,24 @@ def upgrade() -> None:
 
 
 def downgrade() -> None:
-    op.execute("CREATE SCHEMA user_preferences")
-    op.create_table(
-        "user_preferences",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("user_id", sa.String(), nullable=False),
-        sa.Column(
-            "pinned_projects",
-            sa.JSON().with_variant(postgresql.JSONB(astext_type=sa.Text()), "postgresql"),
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("user_id"),
-        schema="user_preferences",
-    )
     conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    if "user_preferences" not in inspector.get_schema_names():
+        op.execute("CREATE SCHEMA user_preferences")
+    if "user_preferences" not in inspector.get_table_names(schema="user_preferences"):
+        op.create_table(
+            "user_preferences",
+            sa.Column("id", sa.Integer(), nullable=False),
+            sa.Column("user_id", sa.String(), nullable=False),
+            sa.Column(
+                "pinned_projects",
+                sa.JSON().with_variant(postgresql.JSONB(astext_type=sa.Text()), "postgresql"),
+                nullable=False,
+            ),
+            sa.PrimaryKeyConstraint("id"),
+            sa.UniqueConstraint("user_id"),
+            schema="user_preferences",
+        )
     statement = sa.sql.text(
         """
         INSERT INTO user_preferences.user_preferences

test/components/renku_data_services/db/test_sqlalchemy_user_preferences_repo.py

@@ -23,7 +23,7 @@ async def test_user_preferences_insert_get(
     try:
         await create_user_preferences(project_slug=project_slug, repo=user_preferences_repo, user=loggedin_user)
     finally:
-        await user_preferences_repo.delete_user_preferences(user=loggedin_user)
+        await user_preferences_repo.delete_user_preferences(requested_by=loggedin_user)
 
 
 @given(project_slugs=project_slugs_strat)
@@ -38,15 +38,15 @@ async def test_user_preferences_add_pinned_project(
     project_slugs = project_slugs[: app_config.user_preferences_config.max_pinned_projects]
     try:
         for project_slug in project_slugs:
-            await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slug)
+            await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
 
-        res = await user_preferences_repo.get_user_preferences(user=loggedin_user)
+        res = await user_preferences_repo.get_user_preferences(requested_by=loggedin_user)
         assert res.user_id == loggedin_user.id
         assert res.pinned_projects.project_slugs is not None
         assert len(res.pinned_projects.project_slugs) == len(project_slugs)
         assert sorted(res.pinned_projects.project_slugs) == sorted(project_slugs)
     finally:
-        await user_preferences_repo.delete_user_preferences(user=loggedin_user)
+        await user_preferences_repo.delete_user_preferences(requested_by=loggedin_user)
 
 
 @given(project_slugs=project_slugs_strat)
@@ -61,16 +61,16 @@ async def test_user_preferences_add_pinned_project_existing(
     project_slugs = project_slugs[: app_config.user_preferences_config.max_pinned_projects]
     try:
         for project_slug in project_slugs:
-            await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slug)
-        user_preferences_before = await user_preferences_repo.get_user_preferences(user=loggedin_user)
+            await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
+        user_preferences_before = await user_preferences_repo.get_user_preferences(requested_by=loggedin_user)
 
-        await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slugs[0])
+        await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slugs[0])
 
-        user_preferences_after = await user_preferences_repo.get_user_preferences(user=loggedin_user)
+        user_preferences_after = await user_preferences_repo.get_user_preferences(requested_by=loggedin_user)
         assert user_preferences_after.user_id == loggedin_user.id
         assert user_preferences_before.model_dump_json() == user_preferences_after.model_dump_json()
     finally:
-        await user_preferences_repo.delete_user_preferences(user=loggedin_user)
+        await user_preferences_repo.delete_user_preferences(requested_by=loggedin_user)
 
 
 @given(project_slugs=project_slugs_strat)
@@ -85,17 +85,17 @@ async def test_user_preferences_delete_pinned_project(
     project_slugs_valid = project_slugs[: app_config.user_preferences_config.max_pinned_projects]
     try:
         for project_slug in project_slugs_valid:
-            await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slug)
+            await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
 
         for project_slug in project_slugs:
-            await user_preferences_repo.remove_pinned_project(user=loggedin_user, project_slug=project_slug)
+            await user_preferences_repo.remove_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
 
-        res = await user_preferences_repo.get_user_preferences(user=loggedin_user)
+        res = await user_preferences_repo.get_user_preferences(requested_by=loggedin_user)
         assert res.user_id == loggedin_user.id
         assert res.pinned_projects.project_slugs is not None
         assert len(res.pinned_projects.project_slugs) == 0
     finally:
-        await user_preferences_repo.delete_user_preferences(user=loggedin_user)
+        await user_preferences_repo.delete_user_preferences(requested_by=loggedin_user)
 
 
 @given(project_slugs=project_slugs_strat)
@@ -111,18 +111,18 @@ async def test_user_preferences_add_pinned_project_respects_maximum(
     project_slugs_invalid = project_slugs[app_config.user_preferences_config.max_pinned_projects :]
     try:
         for project_slug in project_slugs_valid:
-            await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slug)
+            await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
 
         for project_slug in project_slugs_invalid:
             with pytest.raises(
                 errors.ValidationError, match=r"^ValidationError: Maximum number of pinned projects already allocated"
             ):
-                await user_preferences_repo.add_pinned_project(user=loggedin_user, project_slug=project_slug)
+                await user_preferences_repo.add_pinned_project(requested_by=loggedin_user, project_slug=project_slug)
 
-        res = await user_preferences_repo.get_user_preferences(user=loggedin_user)
+        res = await user_preferences_repo.get_user_preferences(requested_by=loggedin_user)
         assert res.user_id == loggedin_user.id
         assert res.pinned_projects.project_slugs is not None
         assert len(res.pinned_projects.project_slugs) == len(project_slugs_valid)
         assert sorted(res.pinned_projects.project_slugs) == sorted(project_slugs_valid)
     finally:
-        await user_preferences_repo.delete_user_preferences(user=loggedin_user)
+        await user_preferences_repo.delete_user_preferences(requested_by=loggedin_user)

test/utils.py

@@ -79,7 +79,7 @@ async def create_user_preferences(
     project_slug: str, repo: UserPreferencesRepository, user: base_models.APIUser
 ) -> user_preferences_models.UserPreferences:
     """Create user preferencers by adding a pinned project"""
-    user_preferences = await repo.add_pinned_project(user=user, project_slug=project_slug)
+    user_preferences = await repo.add_pinned_project(requested_by=user, project_slug=project_slug)
     assert user_preferences is not None
     assert user_preferences.user_id is not None
     assert user_preferences.pinned_projects is not None