[haiz] haiz

backend/db/models/users/users.py

@@ -1,15 +1,14 @@
-from uuid import uuid4
-from sqlalchemy import Boolean, ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import Boolean, String
+from sqlalchemy.orm import Mapped, mapped_column
 
-from sqlalchemy.dialects.postgresql import UUID
+from backend.db.models.guid import GUID
 
 from .._model_base import SqlAlchemyBase
 
-class User(SqlAlchemyBase):
+class Users(SqlAlchemyBase):
   __tablename__ = 'users'
 
-  id: Mapped[UUID] = mapped_column(UUID, primary_key=True, default=uuid4, index=True)
+  id: Mapped[GUID] = mapped_column(GUID, primary_key=True, default=GUID.generate, index=True)
   username: Mapped[str | None] = mapped_column(String, unique=True, index=True, nullable=False)
   password: Mapped[str | None] = mapped_column(String, index=True, nullable=False)
   name: Mapped[str | None] = mapped_column(String, index=True, nullable=True)