STABLE: Final schema sync, optimized gitignore

backend/app/models/security.py

@@ -1,44 +1,51 @@
+# /opt/docker/dev/service_finder/backend/app/models/security.py
 import enum
-import uuid
-from datetime import datetime, timedelta
-from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, JSON, Enum, text
-from sqlalchemy.orm import relationship
+from datetime import datetime
+from typing import Optional, TYPE_CHECKING
+from sqlalchemy import String, Integer, ForeignKey, DateTime, text, Enum
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql import func
-from app.db.base_class import Base
+
+# MB 2.0: Központi aszinkron adatbázis motorból származó Base
+from app.database import Base
+
+if TYPE_CHECKING:
+    from .identity import User
 
 class ActionStatus(str, enum.Enum):
-    pending = "pending"   # Jóváhagyásra vár
-    approved = "approved" # Végrehajtva
-    rejected = "rejected" # Elutasítva
-    expired = "expired"   # Lejárt (biztonsági okokból)
+    pending = "pending"
+    approved = "approved"
+    rejected = "rejected"
+    expired = "expired"
 
 class PendingAction(Base):
-    """Négy szem elv: Műveletek, amik jóváhagyásra várnak."""
+    """ Sentinel: Kritikus műveletek jóváhagyási lánca. """
     __tablename__ = "pending_actions"
-    __table_args__ = {"schema": "data"}
+    __table_args__ = {"schema": "system"}
 
-    id = Column(Integer, primary_key=True, index=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     
-    # Ki akarja csinálni?
-    requester_id = Column(Integer, ForeignKey("data.users.id"), nullable=False)
+    # JAVÍTÁS: A User az identity sémában van, nem a data-ban!
+    requester_id: Mapped[int] = mapped_column(Integer, ForeignKey("identity.users.id"), nullable=False)
+    approver_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("identity.users.id"), nullable=True)
     
-    # Ki hagyta jóvá/utasította el?
-    approver_id = Column(Integer, ForeignKey("data.users.id"), nullable=True)
+    status: Mapped[ActionStatus] = mapped_column(
+        Enum(ActionStatus, name="actionstatus", schema="system"), 
+        default=ActionStatus.pending
+    )
     
-    status = Column(Enum(ActionStatus), default=ActionStatus.pending, nullable=False)
-    
-    # Milyen típusú művelet? (pl. "CHANGE_ROLE", "WALLET_ADJUST", "DELETE_LOGS")
-    action_type = Column(String(50), nullable=False)
-    
-    # A művelet adatai JSON-ben (pl. {"user_id": 5, "new_role": "admin"})
-    payload = Column(JSON, nullable=False)
-    
-    # Miért kell ez a művelet? (Indoklás kötelező az audit miatt)
-    reason = Column(String(255), nullable=False)
+    action_type: Mapped[str] = mapped_column(String(50)) # pl. "WALLET_ADJUST"
+    payload: Mapped[dict] = mapped_column(JSONB, nullable=False)
+    reason: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
 
-    created_at = Column(DateTime(timezone=True), server_default=func.now())
-    expires_at = Column(DateTime(timezone=True), default=lambda: datetime.now() + timedelta(hours=24))
-    processed_at = Column(DateTime(timezone=True), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
+    expires_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), 
+        server_default=text("now() + interval '24 hours'")
+    )
+    processed_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
 
-    requester = relationship("User", foreign_keys=[requester_id])
-    approver = relationship("User", foreign_keys=[approver_id])
+    # Kapcsolatok meghatározása (String hivatkozással a körkörös import ellen)
+    requester: Mapped["User"] = relationship("User", foreign_keys=[requester_id])
+    approver: Mapped[Optional["User"]] = relationship("User", foreign_keys=[approver_id])