feat-(all routes, models, migration completed)

This commit is contained in:
2026-11-06 13:39:33 +03:00
parent d1a8c0394b
commit 97caa7e8ff
21 changed files with 319 additions and 230 deletions
+8 -7
View File
@@ -1,6 +1,7 @@
from sqlalchemy.orm import Mapped, mapped_column, relationship
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy import String, DateTime, ForeignKey, text
from sqlalchemy import String, DateTime, ForeignKey
from sqlalchemy.sql import text as sqltext
import uuid
from datetime import datetime
from src.database import Base
@@ -19,17 +20,17 @@ class Chat(Base):
title: Mapped[str] = mapped_column(String(100), nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True),
nullable=False,
server_dafault=text("now()"))
members: Mapped[list["Chat_Member"]] = relationship("Member_Chat",
cascade="True",
back_populates="")
server_default=sqltext("now()"))
members: Mapped[list["ChatMember"]] = relationship("ChatMember",
cascade="all, delete-orphan",
back_populates="chat")
def __repr__(self) -> str:
return f"<Chat(id={self.id}, title={self.title})>"
class Chat_Member(Base):
class ChatMember(Base):
__tablename__ = "chat_members"
chat_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True),
@@ -44,5 +45,5 @@ class Chat_Member(Base):
def __repr__(self) -> str:
return f"<Chat_Member(chat_id={self.chat_id}, user_id={self.user.id})>"
return f"<ChatMember(chat_id={self.chat_id}, user_id={self.user_id})>"
+35 -46
View File
@@ -1,56 +1,45 @@
from sqlalchemy import String, DateTime, ForeignKey, Text, text
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.dialects.postgresql import UUID
from typing import TYPING_CHECKING
import uuid
from datetime import datetime
from sqlalchemy import String, DateTime, ForeignKey, Text
from sqlalchemy.sql import text as sql_text
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.orm import Mapped, mapped_column
from src.database import Base
# if TYPING_CHECKING:
# from src.models.users import User
# from src.models.chats import Chat
class Message(Base):
__tablename__ = "messages"
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True),
primary_key=True,
server_default=uuid.uuid4)
chat_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True),
ForeignKey("chats.id", ondelete="CASCADE"),
nullable=False,
index="True")
sender_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True),
ForeignKey("users.id", ondelete="RESTRICT"),
nullable=False)
text: Mapped[str] = mapped_column(Text,
nullable=False)
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True),
nullable=False,
server_default=text("now()"))
def __repr__(self):
return f"<Message(id={self.id}, chat_id={self.chat_id}, text={self.text[:20]})>"
id: Mapped[uuid.UUID] = mapped_column(
UUID(as_uuid=True),
primary_key=True,
default=uuid.uuid4
)
# async def append_message(self, chat_id: str, msg: dict) -> bool:
# if chat_id not in self.message_db:
# return False
# else:
# self.message_db[chat_id].append(msg)
# self._cache_valid[chat_id] = False
# return True
chat_id: Mapped[uuid.UUID] = mapped_column(
UUID(as_uuid=True),
ForeignKey("chats.id", ondelete="CASCADE"),
nullable=False,
index=True
)
sender_id: Mapped[uuid.UUID] = mapped_column(
UUID(as_uuid=True),
ForeignKey("users.id", ondelete="RESTRICT"),
nullable=False
)
text: Mapped[str] = mapped_column(
Text,
nullable=False
)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True),
nullable=False,
server_default=sql_text("now()")
)
# def get_sorted_messages(self, chat_id: str) -> list[dict]:
# if chat_id not in self.message_db:
# return []
# if self._cache_valid.get(chat_id, False) and chat_id in self._sorted_cache:
# return self._sorted_cache[chat_id]
# sorted_msg = sorted(self.message_db[chat_id], key=lambda x: (x["created_at"], x["id"]))
# self._sorted_cache[chat_id] = sorted_msg
# self._cache_valid[chat_id] = True
# return sorted_msg
def __repr__(self) -> str:
return f"<Message(id={self.id}, chat_id={self.chat_id}, text={self.text[:20]}...)>"
+4 -3
View File
@@ -2,7 +2,8 @@ import uuid
from datetime import datetime
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.orm import Mapped, mapped_column, relationship
from sqlalchemy import String, DateTime, ForeignKey, text
from sqlalchemy import String, DateTime, ForeignKey
from sqlalchemy.sql import text as sqltext
from src.database import Base
class Session(Base):
@@ -11,7 +12,7 @@ class Session(Base):
token_hash: Mapped[str] = mapped_column(String(64), primary_key=True, comment="SHA-256 opaque token")
user_id: Mapped[uuid.UUID] = mapped_column(
UUID(as_uuid=True),
ForeignKey("user.id", ondelete="CASCADE",),
ForeignKey("users.id", ondelete="CASCADE",),
nullable=False,
index=True,
comment="Внешний ключ на идентификатор пользователя")
@@ -21,7 +22,7 @@ class Session(Base):
comment="время истечения сессии")
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True),
nullable=False,
server_default=text("now()"),
server_default=sqltext("now()"),
comment="время создания сессии")
+2 -1
View File
@@ -1,6 +1,7 @@
from sqlalchemy import Column, String, DateTime, Text
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.sql import text as sqltext
import uuid
from datetime import datetime
from src.database import Base
@@ -13,7 +14,7 @@ class User(Base):
username: Mapped[str] = mapped_column(String(32), unique=True, nullable=False, index=True, comment="Логин пользователя")
display_name: Mapped[str] = mapped_column(String(100), nullable=False)
password_hash: Mapped[str] = mapped_column(String, nullable=False, comment="Argon2id hash пароля")
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=sqltext("now()"), nullable=False)
def __repr__(self) -> str: