main functions fix

models.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Column, Integer, String, DateTime, Boolean, ForeignKey, Text, JSON
 from sqlalchemy.orm import relationship
-from datetime import datetime
+from datetime import datetime, timezone
 from database import Base
 
 
@@ -13,10 +13,10 @@ class User(Base):
     username = Column(String(255))
     first_name = Column(String(255))
     last_name = Column(String(255))
-    created_at = Column(DateTime, default=datetime.utcnow)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
     is_admin = Column(Boolean, default=False)
-    # Клиентский счет в формате: XX-XX-XX-XX-XX-XX-XX-XX (8 пар цифр через дефис)
-    account_number = Column(String(23), unique=True, nullable=True, index=True)
+    # Клиентский счет в формате: XX-XX-XX-XX-XX-XX-XX (7 пар цифр через дефис)
+    account_number = Column(String(20), unique=True, nullable=True, index=True)
 
     # Связи
     participations = relationship("Participation", back_populates="user")
@@ -32,9 +32,9 @@ class Lottery(Base):
     id = Column(Integer, primary_key=True)
     title = Column(String(500), nullable=False)
     description = Column(Text)
-    created_at = Column(DateTime, default=datetime.utcnow)
-    start_date = Column(DateTime)
-    end_date = Column(DateTime)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    start_date = Column(DateTime(timezone=True))
+    end_date = Column(DateTime(timezone=True))
     is_active = Column(Boolean, default=True)
     is_completed = Column(Boolean, default=False)
     prizes = Column(JSON)  # Список призов в формате JSON
@@ -60,15 +60,18 @@ class Participation(Base):
     __tablename__ = "participations"
 
     id = Column(Integer, primary_key=True)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=True)  # Опционально
     lottery_id = Column(Integer, ForeignKey("lotteries.id"), nullable=False)
-    created_at = Column(DateTime, default=datetime.utcnow)
+    account_number = Column(String(20), nullable=True, index=True)  # Счет участника (XX-XX-XX-XX-XX-XX-XX)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
     
     # Связи
     user = relationship("User", back_populates="participations")
     lottery = relationship("Lottery", back_populates="participations")
 
     def __repr__(self):
+        if self.account_number:
+            return f"<Participation(account={self.account_number}, lottery_id={self.lottery_id})>"
         return f"<Participation(user_id={self.user_id}, lottery_id={self.lottery_id})>"
 
 
@@ -78,15 +81,18 @@ class Winner(Base):
 
     id = Column(Integer, primary_key=True)
     lottery_id = Column(Integer, ForeignKey("lotteries.id"), nullable=False)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=True)  # Опционально
+    account_number = Column(String(20), nullable=True, index=True)  # Счет победителя
     place = Column(Integer, nullable=False)  # Место (1, 2, 3...)
     prize = Column(String(500))  # Описание приза
     is_manual = Column(Boolean, default=False)  # Был ли установлен вручную
-    created_at = Column(DateTime, default=datetime.utcnow)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
 
     # Связи
     user = relationship("User")
     lottery = relationship("Lottery")
 
     def __repr__(self):
+        if self.account_number:
+            return f"<Winner(lottery_id={self.lottery_id}, account={self.account_number}, place={self.place})>"
         return f"<Winner(lottery_id={self.lottery_id}, user_id={self.user_id}, place={self.place})>"