Introduced groups and added all related endpoints

tests/utils/auth_test_fixtures.py

@@ -6,6 +6,7 @@ from sqlalchemy.orm import Session
 from app.auth.dependencies import get_current_user
 from app.models.auth import CognitoUser
 from app.routers.channels import router as channels_router
+from app.routers.groups import router as groups_router
 from app.routers.playlist import router as playlist_router
 from app.routers.priorities import router as priorities_router
 from app.utils.database import get_db
@@ -60,6 +61,7 @@ def admin_user_client(db_session: Session):
     test_app.include_router(channels_router)
     test_app.include_router(priorities_router)
     test_app.include_router(playlist_router)
+    test_app.include_router(groups_router)
     test_app.dependency_overrides[get_db] = mock_get_db
     test_app.dependency_overrides[get_current_user] = mock_get_current_user_admin
     with TestClient(test_app) as test_client:
@@ -73,6 +75,7 @@ def non_admin_user_client(db_session: Session):
     test_app.include_router(channels_router)
     test_app.include_router(priorities_router)
     test_app.include_router(playlist_router)
+    test_app.include_router(groups_router)
     test_app.dependency_overrides[get_db] = mock_get_db
     test_app.dependency_overrides[get_current_user] = mock_get_current_user_non_admin
     with TestClient(test_app) as test_client:

tests/utils/db_mocks.py

@@ -4,41 +4,25 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from sqlalchemy import (
-    TEXT,
     Boolean,
     Column,
     DateTime,
     ForeignKey,
     Integer,
     String,
-    TypeDecorator,
     UniqueConstraint,
     create_engine,
 )
-from sqlalchemy.orm import declarative_base, sessionmaker
+from sqlalchemy.orm import declarative_base, relationship, sessionmaker
 from sqlalchemy.pool import StaticPool
 
+# Import the actual UUID_COLUMN_TYPE and SQLiteUUID from app.models.db
+from app.models.db import UUID_COLUMN_TYPE, SQLiteUUID
+
 # Create a mock-specific Base class for testing
 MockBase = declarative_base()
 
 
-class SQLiteUUID(TypeDecorator):
-    """Enables UUID support for SQLite."""
-
-    impl = TEXT
-    cache_ok = True
-
-    def process_bind_param(self, value, dialect):
-        if value is None:
-            return value
-        return str(value)
-
-    def process_result_value(self, value, dialect):
-        if value is None:
-            return value
-        return uuid.UUID(value)
-
-
 # Model classes for testing - prefix with Mock to avoid pytest collection
 class MockPriority(MockBase):
     __tablename__ = "priorities"
@@ -46,16 +30,28 @@ class MockPriority(MockBase):
     description = Column(String, nullable=False)
 
 
+class MockGroup(MockBase):
+    __tablename__ = "groups"
+    id = Column(UUID_COLUMN_TYPE, primary_key=True, default=uuid.uuid4)
+    name = Column(String, nullable=False, unique=True)
+    sort_order = Column(Integer, nullable=False, default=0)
+    created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
+    updated_at = Column(
+        DateTime,
+        default=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(timezone.utc),
+    )
+    channels = relationship("MockChannelDB", back_populates="group")
+
+
 class MockChannelDB(MockBase):
     __tablename__ = "channels"
-    id = Column(SQLiteUUID(), primary_key=True, default=uuid.uuid4)
+    id = Column(UUID_COLUMN_TYPE, primary_key=True, default=uuid.uuid4)
     tvg_id = Column(String, nullable=False)
     name = Column(String, nullable=False)
-    group_title = Column(String, nullable=False)
+    group_id = Column(UUID_COLUMN_TYPE, ForeignKey("groups.id"), nullable=False)
     tvg_name = Column(String)
-    __table_args__ = (
-        UniqueConstraint("group_title", "name", name="uix_group_title_name"),
-    )
+    __table_args__ = (UniqueConstraint("group_id", "name", name="uix_group_id_name"),)
     tvg_logo = Column(String)
     created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
     updated_at = Column(
@@ -63,13 +59,14 @@ class MockChannelDB(MockBase):
         default=lambda: datetime.now(timezone.utc),
         onupdate=lambda: datetime.now(timezone.utc),
     )
+    group = relationship("MockGroup", back_populates="channels")
 
 
 class MockChannelURL(MockBase):
     __tablename__ = "channels_urls"
-    id = Column(SQLiteUUID(), primary_key=True, default=uuid.uuid4)
+    id = Column(UUID_COLUMN_TYPE, primary_key=True, default=uuid.uuid4)
     channel_id = Column(
-        SQLiteUUID(), ForeignKey("channels.id", ondelete="CASCADE"), nullable=False
+        UUID_COLUMN_TYPE, ForeignKey("channels.id", ondelete="CASCADE"), nullable=False
     )
     url = Column(String, nullable=False)
     in_use = Column(Boolean, default=False, nullable=False)
@@ -82,6 +79,31 @@ class MockChannelURL(MockBase):
     )
 
 
+def create_mock_priorities_and_group(db_session, priorities, group_name):
+    """Create mock priorities and group for testing purposes.
+
+    Args:
+        db_session: SQLAlchemy session object
+        priorities: List of (id, description) tuples for priorities to create
+        group_name: Name for the new mock group
+
+    Returns:
+        UUID: The ID of the created group
+    """
+    # Create priorities
+    priority_objects = [
+        MockPriority(id=priority_id, description=description)
+        for priority_id, description in priorities
+    ]
+
+    # Create group
+    group = MockGroup(name=group_name)
+    db_session.add_all(priority_objects + [group])
+    db_session.commit()
+
+    return group.id
+
+
 # Create test engine
 engine_mock = create_engine(
     "sqlite:///:memory:",