diracx-db 0.0.1a35__tar.gz → 0.0.1a37__tar.gz

{diracx_db-0.0.1a35 → diracx_db-0.0.1a37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-db
-Version: 0.0.1a35
+Version: 0.0.1a37
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_db-0.0.1a35 → diracx_db-0.0.1a37}/src/diracx/db/sql/auth/schema.py

@@ -4,6 +4,7 @@ from enum import Enum, auto
 
 from sqlalchemy import (
     JSON,
+    Index,
     String,
     Uuid,
 )
@@ -91,9 +92,11 @@ class RefreshTokens(Base):
     status = EnumColumn(
         "Status", RefreshTokenStatus, server_default=RefreshTokenStatus.CREATED.name
     )
-    creation_time = DateNowColumn("CreationTime")
+    creation_time = DateNowColumn("CreationTime", index=True)
     scope = Column("Scope", String(1024))
 
     # User attributes bound to the refresh token
-    sub = Column("Sub", String(1024))
+    sub = Column("Sub", String(256), index=True)
     preferred_username = Column("PreferredUsername", String(255))
+
+    __table_args__ = (Index("index_status_sub", status, sub),)

{diracx_db-0.0.1a35 → diracx_db-0.0.1a37}/src/diracx/db/sql/sandbox_metadata/db.py

@@ -30,10 +30,11 @@ class SandboxMetadataDB(BaseSQLDB):
         )
         return (await self.conn.execute(stmt)).scalar_one_or_none()
 
-    async def get_sandbox_owner_id(self, pfn: str) -> int | None:
+    async def get_sandbox_owner_id(self, pfn: str, se_name: str) -> int | None:
         """Get the id of the owner of a sandbox."""
         stmt = select(SBOwners.OwnerID).where(
             SBOwners.OwnerID == SandBoxes.OwnerId,
+            SandBoxes.SEName == se_name,
             SandBoxes.SEPFN == pfn,
         )
         return (await self.conn.execute(stmt)).scalar_one_or_none()

{diracx_db-0.0.1a35 → diracx_db-0.0.1a37}/src/diracx_db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-db
-Version: 0.0.1a35
+Version: 0.0.1a37
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_db-0.0.1a35 → diracx_db-0.0.1a37}/tests/jobs/test_sandbox_metadata.py

@@ -200,11 +200,13 @@ async def test_get_sandbox_owner_id(sandbox_metadata_db: SandboxMetadataDB):
         await sandbox_metadata_db.insert_sandbox(owner_id, sandbox_se, pfn, 100)
 
     async with sandbox_metadata_db:
-        sb_owner_id = await sandbox_metadata_db.get_sandbox_owner_id(pfn)
+        sb_owner_id = await sandbox_metadata_db.get_sandbox_owner_id(pfn, sandbox_se)
 
     assert owner_id == 1
     assert sb_owner_id == owner_id
 
     async with sandbox_metadata_db:
-        sb_owner_id = await sandbox_metadata_db.get_sandbox_owner_id("not_found")
+        sb_owner_id = await sandbox_metadata_db.get_sandbox_owner_id(
+            "not_found", sandbox_se
+        )
     assert sb_owner_id is None