feature/fix: user profile model created & migrations created and fixed & user model updated

Author: DataRohit

migrations/env.py

@@ -5,7 +5,8 @@
 from sqlmodel import SQLModel
 
 from pkg.config import Config
-from src.auth.models import User
+from src.auth.models import PasswordResetLog, TokenBlacklist, User
+from src.profile.models import UserProfile
 
 config = context.config
 

migrations/versions/2e1f47c5da46_password_reset_log.py

@@ -0,0 +1,32 @@
+"""password_reset_log
+
+Revision ID: 2e1f47c5da46
+Revises: 534a72530dd6
+Create Date: 2024-10-10 04:04:19.461421
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+revision: str = "2e1f47c5da46"
+down_revision: Union[str, None] = "534a72530dd6"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "password_reset_log",
+        sa.Column("uid", sa.UUID(), nullable=False),
+        sa.Column("user_email", sa.VARCHAR(), nullable=False),
+        sa.Column("requested_at", postgresql.TIMESTAMP(), nullable=False),
+        sa.PrimaryKeyConstraint("uid"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("password_reset_log")

migrations/versions/534a72530dd6_token_blacklist_and_password_reset_log.py renamed to migrations/versions/534a72530dd6_token_blacklist.py

@@ -1,4 +1,4 @@
-"""token_blacklist_and_password_reset_log
+"""token_blacklist
 
 Revision ID: 534a72530dd6
 Revises: eb61d8e38af5
@@ -19,13 +19,6 @@
 
 
 def upgrade() -> None:
-    op.create_table(
-        "password_reset_log",
-        sa.Column("uid", sa.UUID(), nullable=False),
-        sa.Column("user_email", sa.VARCHAR(), nullable=False),
-        sa.Column("requested_at", postgresql.TIMESTAMP(), nullable=False),
-        sa.PrimaryKeyConstraint("uid"),
-    )
     op.create_table(
         "token_blacklist",
         sa.Column("uid", sa.UUID(), nullable=False),
@@ -38,4 +31,3 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     op.drop_table("token_blacklist")
-    op.drop_table("password_reset_log")

migrations/versions/b2f432857772_user_profiles.py

@@ -0,0 +1,39 @@
+"""user_profiles
+
+Revision ID: b2f432857772
+Revises: 2e1f47c5da46
+Create Date: 2024-10-09 22:39:33.774071
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+revision: str = "b2f432857772"
+down_revision: Union[str, None] = "2e1f47c5da46"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "user_profiles",
+        sa.Column("uid", sa.UUID(), nullable=False),
+        sa.Column("user_uid", sa.UUID(), nullable=False),
+        sa.Column("bio", sa.VARCHAR(), nullable=False),
+        sa.Column("avatar", sa.VARCHAR(), nullable=False),
+        sa.Column("created_at", postgresql.TIMESTAMP(), nullable=False),
+        sa.Column("updated_at", postgresql.TIMESTAMP(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["user_uid"],
+            ["users.uid"],
+        ),
+        sa.PrimaryKeyConstraint("uid"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("user_profiles")

migrations/versions/eb61d8e38af5_create_users.py renamed to migrations/versions/eb61d8e38af5_users.py

@@ -1,4 +1,4 @@
-"""create_users
+"""users
 
 Revision ID: eb61d8e38af5
 Revises: 

src/auth/models.py

@@ -29,7 +29,9 @@ class User(SQLModel, table=True):
         sa_column=Column(pg.TIMESTAMP, nullable=False, default=datetime.now)
     )
     updated_at: datetime = Field(
-        sa_column=Column(pg.TIMESTAMP, nullable=False, default=datetime.now)
+        sa_column=Column(
+            pg.TIMESTAMP, nullable=False, default=datetime.now, onupdate=datetime.now
+        )
     )
 
     def __repr__(self):

src/auth/service.py

@@ -43,7 +43,6 @@ async def activate_user(self, user_uid: str, session: AsyncSession) -> None:
         user = await session.get(User, user_uid)
         user.is_verified = True
         user.is_active = True
-        user.updated_at = datetime.now()
 
         await session.commit()
         await session.refresh(user)
@@ -54,8 +53,6 @@ async def update_user(
         for field, value in user_data.items():
             setattr(user, field, value)
 
-        user.updated_at = datetime.now()
-
         await session.commit()
         await session.refresh(user)
 

src/profile/__init__.py

@@ -0,0 +1,26 @@
+import uuid
+from datetime import datetime
+
+import sqlalchemy.dialects.postgresql as pg
+from sqlmodel import Column, Field, ForeignKey, SQLModel
+
+
+class UserProfile(SQLModel, table=True):
+    __tablename__ = "user_profiles"
+
+    uid: uuid.UUID = Field(
+        sa_column=Column(pg.UUID, nullable=False, primary_key=True, default=uuid.uuid4)
+    )
+    user_uid: uuid.UUID = Field(
+        sa_column=Column(pg.UUID, ForeignKey("users.uid"), nullable=False)
+    )
+    bio: str = Field(sa_column=Column(pg.VARCHAR, nullable=False))
+    avatar: str = Field(sa_column=Column(pg.VARCHAR, nullable=False))
+    created_at: datetime = Field(
+        sa_column=Column(pg.TIMESTAMP, nullable=False, default=datetime.now)
+    )
+    updated_at: datetime = Field(
+        sa_column=Column(
+            pg.TIMESTAMP, nullable=False, default=datetime.now, onupdate=datetime.now
+        )
+    )