Merge pull request #276 from VariantEffect/release-2024.2.3

Release 2024.2.3 as part of 2024.3.0

Author: bencap

alembic/versions/44a45d616036_make_index_on_users_unique.py

@@ -0,0 +1,29 @@
+"""Make Index on Users Unique
+
+Revision ID: 44a45d616036
+Revises: ec5d2787bec9
+Create Date: 2024-08-16 13:25:14.980820
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "44a45d616036"
+down_revision = "ec5d2787bec9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_users_username", table_name="users")
+    op.create_index(op.f("ix_users_username"), "users", ["username"], unique=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_users_username"), table_name="users")
+    op.create_index("ix_users_username", "users", ["username"], unique=False)
+    # ### end Alembic commands ###

src/mavedb/models/user.py

@@ -20,7 +20,7 @@ class User(Base):
     __tablename__ = "users"
 
     id = Column(Integer, primary_key=True)
-    username = Column(String, index=True, nullable=False)
+    username = Column(String, index=True, nullable=False, unique=True)
     first_name = Column(String, nullable=True)
     last_name = Column(String, nullable=True)
     email = Column(String, nullable=True)

tests/lib/test_authentication.py

@@ -112,19 +112,6 @@ async def test_get_current_user_nonexistent_user(session, setup_lib_db, with_ema
     session.commit()
 
 
-@pytest.mark.asyncio
-async def test_get_current_user_user_exists_twice(session, setup_lib_db):
-    session.add(User(**TEST_USER))
-    session.commit()
-
-    with pytest.raises(MultipleResultsFound) as exc_info:
-        await get_current_user(None, TEST_USER_DECODED_JWT, session, None)
-    assert "Multiple rows were found when one or none was required" in str(exc_info.value)
-
-    # Some lingering db transaction holds this test open unless it is explicitly closed.
-    session.commit()
-
-
 @pytest.mark.asyncio
 async def test_get_current_user_user_is_inactive(session, setup_lib_db):
     mark_user_inactive(session, TEST_USER["username"])