refactor: user infrastructure models use integer foreign keys

fiqrikm18 · fiqrikm18 · commit d260fa8094ba · 2026-08-01T13:05:06.000+07:00
diff --git a/src/modules/user/infrastructure/models/refresh_token_model.py b/src/modules/user/infrastructure/models/refresh_token_model.py
@@ -1,8 +1,6 @@
 from datetime import datetime
-from uuid import UUID
 
 from sqlalchemy import Boolean, DateTime, ForeignKey, Index, String
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.shared.database.mixin.tenant import TenantMixin
@@ -26,8 +24,7 @@ class UserSessionModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_sessions_device_info", "device_info"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         nullable=False,
     )
diff --git a/src/modules/user/infrastructure/models/user_address_model.py b/src/modules/user/infrastructure/models/user_address_model.py
@@ -1,7 +1,4 @@
-from uuid import UUID
-
 from sqlalchemy import Boolean, ForeignKey, Index, String
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -25,8 +22,7 @@ class UserAddressModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_addresses_country", "country"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         nullable=False,
     )
diff --git a/src/modules/user/infrastructure/models/user_contact_model.py b/src/modules/user/infrastructure/models/user_contact_model.py
@@ -1,8 +1,6 @@
 from enum import Enum
-from uuid import UUID
 
 from sqlalchemy import Boolean, ForeignKey, Index, String
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -34,8 +32,7 @@ class UserContactModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_contacts_is_primary", "is_primary"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         nullable=False,
     )
diff --git a/src/modules/user/infrastructure/models/user_profile_model.py b/src/modules/user/infrastructure/models/user_profile_model.py
@@ -1,7 +1,4 @@
-from uuid import UUID
-
 from sqlalchemy import Date, ForeignKey, Index, String, Text
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -20,8 +17,7 @@ class UserProfileModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
     __tablename__ = "user_profiles"
     __table_args__ = (Index("ix_user_profiles_user_id", "user_id", unique=True),)
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         unique=True,
         nullable=False,
diff --git a/src/modules/user/infrastructure/models/user_security_model.py b/src/modules/user/infrastructure/models/user_security_model.py
@@ -1,8 +1,6 @@
 from datetime import datetime
-from uuid import UUID
 
 from sqlalchemy import Boolean, DateTime, ForeignKey, Index, Integer, String
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -25,8 +23,7 @@ class UserSecurityModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_security_two_factor_enabled", "two_factor_enabled"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         unique=True,
         nullable=False,
diff --git a/src/modules/user/infrastructure/models/user_settings_model.py b/src/modules/user/infrastructure/models/user_settings_model.py
@@ -1,8 +1,5 @@
-from uuid import UUID
-
 from sqlalchemy import ForeignKey, Index
 from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -41,8 +38,7 @@ class UserSettingsModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_settings_preferences", "preferences", postgresql_using="gin"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         unique=True,
         nullable=False,
diff --git a/src/modules/user/infrastructure/models/user_verification_model.py b/src/modules/user/infrastructure/models/user_verification_model.py
@@ -1,8 +1,6 @@
 from datetime import datetime
-from uuid import UUID
 
 from sqlalchemy import Boolean, DateTime, ForeignKey, Index, String
-from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.modules.user.infrastructure.models.user_model import UserModel
@@ -26,8 +24,7 @@ class UserVerificationModel(Base, TimeStampMixin, SoftDeleteMixin, TenantMixin):
         Index("ix_user_verifications_token", "verification_token"),
     )
 
-    user_id: Mapped[UUID] = mapped_column(
-        PG_UUID(as_uuid=True),
+    user_id: Mapped[int] = mapped_column(
         ForeignKey("users.id"),
         nullable=False,
     )
