refaktorálás javításai

backend/app/models/system.py

@@ -1,19 +1,26 @@
 # /opt/docker/dev/service_finder/backend/app/models/system.py
 import uuid
 from datetime import datetime
+from enum import Enum
 from typing import Optional
-from sqlalchemy import String, Integer, Boolean, DateTime, text, UniqueConstraint, ForeignKey, Text
+from sqlalchemy import String, Integer, Boolean, DateTime, text, UniqueConstraint, ForeignKey, Text, Enum as SQLEnum
 from sqlalchemy.orm import Mapped, mapped_column
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.sql import func
-from app.db.base_class import Base
+from app.database import Base
+
+class ParameterScope(str, Enum):
+    GLOBAL = "global"
+    COUNTRY = "country"
+    REGION = "region"
+    USER = "user"
 
 class SystemParameter(Base):
     """ Dinamikus konfigurációs motor (Global -> Org -> User). """
     __tablename__ = "system_parameters"
     __table_args__ = (
         UniqueConstraint('key', 'scope_level', 'scope_id', name='uix_param_scope'),
-        {"extend_existing": True}
+        {"schema": "system", "extend_existing": True}
     )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
@@ -21,8 +28,8 @@ class SystemParameter(Base):
     category: Mapped[str] = mapped_column(String, server_default="general", index=True)
     value: Mapped[dict] = mapped_column(JSONB, nullable=False)
     
-    scope_level: Mapped[str] = mapped_column(String(30), server_default=text("'global'"), index=True)
-    scope_id: Mapped[Optional[str]] = mapped_column(String(50)) 
+    scope_level: Mapped[ParameterScope] = mapped_column(SQLEnum(ParameterScope, name="parameter_scope"), server_default=ParameterScope.GLOBAL.value, index=True)
+    scope_id: Mapped[Optional[str]] = mapped_column(String(50))
     
     is_active: Mapped[bool] = mapped_column(Boolean, default=True)
     description: Mapped[Optional[str]] = mapped_column(String)
@@ -35,7 +42,7 @@ class InternalNotification(Base):
     Ezek az üzenetek várják a felhasználót belépéskor.
     """
     __tablename__ = "internal_notifications"
-    __table_args__ = ({"schema": "data", "extend_existing": True})
+    __table_args__ = ({"schema": "system", "extend_existing": True})
 
     id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     user_id: Mapped[int] = mapped_column(ForeignKey("identity.users.id", ondelete="CASCADE"), nullable=False, index=True)