Update odr_core test suite

Signed-off-by: Robert Cronin <[email protected]>

modules/odr_core/odr_core/models/base.py

@@ -1,3 +1,3 @@
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 # Create Base class
 Base = declarative_base()

modules/odr_core/odr_core/models/content.py

@@ -10,26 +10,26 @@
     ARRAY,
     DateTime,
 )
-from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 from odr_core.models.base import Base
+from sqlalchemy import Enum as SQLAlchemyEnum
 import enum
 
 
 class ContentType(enum.Enum):
-    IMAGE = "image"
-    VIDEO = "video"
-    VOICE = "voice"
-    MUSIC = "music"
-    TEXT = "text"
+    IMAGE = "IMAGE"
+    VIDEO = "VIDEO"
+    VOICE = "VOICE"
+    MUSIC = "MUSIC"
+    TEXT = "TEXT"
 
 
 class ContentStatus(enum.Enum):
-    PENDING = "pending"
-    AVAILABLE = "available"
-    UNAVAILABLE = "unavailable"
-    DELISTED = "delisted"
+    PENDING = "PENDING"
+    AVAILABLE = "AVAILABLE"
+    UNAVAILABLE = "UNAVAILABLE"
+    DELISTED = "DELISTED"
 
 
 class ContentSourceType(enum.Enum):
@@ -44,13 +44,15 @@ class Content(Base):
     id = Column(Integer, primary_key=True, index=True)
     name = Column(String, nullable=True)
     type = Column(Enum(ContentType))
+    type = Column(SQLAlchemyEnum(ContentType))
     hash = Column(String, index=True)
     phash = Column(String, index=True)
+    url = Column(String, nullable=True)
     width = Column(Integer, nullable=True)
     height = Column(Integer, nullable=True)
     format = Column(String)
     size = Column(Integer)
-    status = Column(Enum(ContentStatus), default=ContentStatus.PENDING)
+    status = Column(SQLAlchemyEnum(ContentStatus), default=ContentStatus.PENDING)
     license = Column(String)
     license_url = Column(String, nullable=True)
     flags = Column(Integer, default=0)
@@ -91,7 +93,7 @@ class ContentSource(Base):
     content_id = Column(Integer, ForeignKey("contents.id"))
     type = Column(Enum(ContentSourceType))
     value = Column(String, unique=True)
-    source_metadata = Column(JSONB, nullable=True)
+    source_metadata = Column(String, nullable=True)  # JSON
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     updated_at = Column(DateTime(timezone=True), onupdate=func.now())
 

modules/odr_core/odr_core/models/team.py

@@ -27,8 +27,5 @@ class UserTeam(Base):
     team_id = Column(Integer, ForeignKey("teams.id"), primary_key=True)
     role = Column(String)  # e.g., 'admin', 'member'
 
-    user = relationship("User", back_populates="team_users")
-    team = relationship("Team", back_populates="team_users")
-
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())

modules/odr_core/odr_core/schemas/content.py

@@ -5,24 +5,24 @@
 
 
 class ContentType(str, Enum):
-    IMAGE = "image"
-    VIDEO = "video"
-    VOICE = "voice"
-    MUSIC = "music"
-    TEXT = "text"
+    IMAGE = "IMAGE"
+    VIDEO = "VIDEO"
+    VOICE = "VOICE"
+    MUSIC = "MUSIC"
+    TEXT = "TEXT"
 
 
 class ContentStatus(str, Enum):
-    PENDING = "pending"
-    AVAILABLE = "available"
-    UNAVAILABLE = "unavailable"
-    DELISTED = "delisted"
+    PENDING = "PENDING"
+    AVAILABLE = "AVAILABLE"
+    UNAVAILABLE = "UNAVAILABLE"
+    DELISTED = "DELISTED"
 
 
 class ContentSourceType(str, Enum):
-    URL = "url"
-    PATH = "path"
-    HUGGING_FACE = "hugging_face"
+    URL = "URL"
+    PATH = "PATH"
+    HUGGING_FACE = "HUGGING_FACE"
 
 
 class ContentAuthorBase(BaseModel):
@@ -79,6 +79,7 @@ class ContentBase(BaseModel):
     phash: str
     width: Optional[int] = None
     height: Optional[int] = None
+    url: List[HttpUrl] = []
     format: str
     size: int
     status: ContentStatus = ContentStatus.PENDING

modules/odr_core/pytest.ini

@@ -0,0 +1,9 @@
+[pytest]
+pythonpath = .
+testpaths = tests
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+markers =
+    unit: marks unit tests
+    integration: marks integration tests

modules/odr_core/tests/conftest.py

@@ -0,0 +1,40 @@
+import pytest
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from odr_core.models.base import Base
+from odr_core.schemas.user import UserCreate
+from odr_core.crud.user import create_user
+
+# Use an in-memory SQLite database for testing
+SQLALCHEMY_DATABASE_URL = "sqlite:///:memory:"
+
+
+@pytest.fixture(scope="session")
+def engine():
+    return create_engine(SQLALCHEMY_DATABASE_URL)
+
+
+@pytest.fixture(scope="session")
+def TestingSessionLocal(engine):
+    return sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+
+@pytest.fixture(scope="function")
+def db(TestingSessionLocal, engine):
+    Base.metadata.create_all(bind=engine)
+    db = TestingSessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
+    Base.metadata.drop_all(bind=engine)
+
+
+@pytest.fixture(scope="function")
+def test_user(db):
+    user_data = UserCreate(
+        username="testuser",
+        email="[email protected]",
+        password="testpassword"
+    )
+    return create_user(db, user_data)

modules/odr_core/tests/test_config.py → modules/odr_core/tests/unit/config/test_config.py

@@ -4,7 +4,7 @@
 def test_settings():
     assert settings.get_db_url().startswith("postgresql://")
     assert settings.API_V1_STR == "/api/v1"
-    assert settings.PROJECT_NAME == "Open Data Repository"
+    assert settings.PROJECT_NAME == "OMI-DataModel"
 
 
 if __name__ == "__main__":