Skip to content

Commit 015cfce

Browse files
committed
Converted uuid4 to uuid7
1 parent 2314c8a commit 015cfce

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

src/app/core/db/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import uuid as uuid_pkg
2+
from uuid6 import uuid7 #126
23
from datetime import UTC, datetime
34

45
from sqlalchemy import Boolean, DateTime, text
@@ -8,7 +9,7 @@
89

910
class UUIDMixin:
1011
uuid: Mapped[uuid_pkg.UUID] = mapped_column(
11-
UUID, primary_key=True, default=uuid_pkg.uuid4, server_default=text("gen_random_uuid()")
12+
UUID, primary_key=True, default=uuid7(), server_default=text("gen_random_uuid()")
1213
)
1314

1415

src/app/core/schemas.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import uuid as uuid_pkg
2+
from uuid6 import uuid7 #126
23
from datetime import UTC, datetime
34
from typing import Any
45

@@ -13,7 +14,7 @@ class HealthCheck(BaseModel):
1314

1415
# -------------- mixins --------------
1516
class UUIDSchema(BaseModel):
16-
uuid: uuid_pkg.UUID = Field(default_factory=uuid_pkg.uuid4)
17+
uuid: uuid_pkg.UUID = Field(default_factory=uuid7)
1718

1819

1920
class TimestampSchema(BaseModel):

src/app/models/post.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import uuid as uuid_pkg
22
from datetime import UTC, datetime
3-
from uuid6 import uuid7
3+
from uuid6 import uuid7 #126
44

55
from sqlalchemy import DateTime, ForeignKey, String
66
from sqlalchemy.orm import Mapped, mapped_column

src/app/models/user.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from uuid6 import uuid7
1+
from uuid6 import uuid7 #126
22
from datetime import UTC, datetime
33
import uuid as uuid_pkg
44

5-
from sqlalchemy import DateTime, ForeignKey, String
5+
from sqlalchemy import DateTime, ForeignKey, String,UUID
66
from sqlalchemy.orm import Mapped, mapped_column
77

88
from ..core.db.database import Base
@@ -11,15 +11,15 @@
1111
class User(Base):
1212
__tablename__ = "user"
1313

14-
id: Mapped[int] = mapped_column("id", autoincrement=True, nullable=False, unique=True, primary_key=True, init=False)
14+
id: Mapped[int] = mapped_column("id", autoincrement=True,primary_key=True, init=False)
1515

1616
name: Mapped[str] = mapped_column(String(30))
1717
username: Mapped[str] = mapped_column(String(20), unique=True, index=True)
1818
email: Mapped[str] = mapped_column(String(50), unique=True, index=True)
1919
hashed_password: Mapped[str] = mapped_column(String)
2020

2121
profile_image_url: Mapped[str] = mapped_column(String, default="https://profileimageurl.com")
22-
uuid: Mapped[uuid_pkg.UUID] = mapped_column(default_factory=uuid7(), primary_key=True, unique=True)
22+
uuid: Mapped[uuid_pkg.UUID] = mapped_column(UUID(as_uuid=True), default_factory=uuid7, primary_key=True)
2323
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default_factory=lambda: datetime.now(UTC))
2424
updated_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), default=None)
2525
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), default=None)

src/scripts/create_first_superuser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import asyncio
22
import logging
3-
from uuid6 import uuid7
3+
from uuid6 import uuid7 #126
44
from datetime import UTC, datetime
55

66
from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, MetaData, String, Table, insert, select

tests/helpers/generators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from uuid6 import uuid7
1+
from uuid6 import uuid7 #126
22

33
from sqlalchemy.orm import Session
44

0 commit comments

Comments
 (0)