Rename image_url to image across services, DTOs, repositories, models, and schemas for consistency.

borys25ol · borys25ol · commit b5ab272a123a · 2026-01-26T22:59:02.000+02:00
diff --git a/conduit/api/routes/authentication.py b/conduit/api/routes/authentication.py
@@ -19,10 +19,10 @@ async def register_user(
     """
     Process user registration.
     """
-    user_dto = await user_auth_service.sign_up_user(
+    user_dto, token = await user_auth_service.sign_up_user(
         session=session, user_to_create=payload.to_dto()
     )
-    return UserRegistrationResponse.from_dto(dto=user_dto)
+    return UserRegistrationResponse.from_user(dto=user_dto, token=token)
 
 
 @router.post("/login", response_model=UserLoginResponse)
@@ -32,7 +32,7 @@ async def login_user(
     """
     Process user login.
     """
-    user_dto = await user_auth_service.sign_in_user(
+    user_dto, token = await user_auth_service.sign_in_user(
         session=session, user_to_login=payload.to_dto()
     )
-    return UserLoginResponse.from_dto(dto=user_dto)
+    return UserLoginResponse.from_user(dto=user_dto, token=token)
diff --git a/conduit/api/schemas/requests/user.py b/conduit/api/schemas/requests/user.py
@@ -56,5 +56,5 @@ def to_dto(self) -> UpdateUserDTO:
             password=self.user.password,
             username=self.user.username,
             bio=self.user.bio,
-            image_url=self.user.image,
+            image=self.user.image,
         )
diff --git a/conduit/api/schemas/responses/user.py b/conduit/api/schemas/responses/user.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from conduit.dtos.user import CreatedUserDTO, LoggedInUserDTO, UpdatedUserDTO, UserDTO
+from conduit.dtos.user import UpdatedUserDTO, UserDTO
 
 
 class UserIDData(BaseModel):
@@ -35,15 +35,15 @@ class UserRegistrationResponse(BaseModel):
     user: RegisteredUserData
 
     @classmethod
-    def from_dto(cls, dto: CreatedUserDTO) -> "UserRegistrationResponse":
+    def from_user(cls, dto: UserDTO, token: str) -> "UserRegistrationResponse":
         return UserRegistrationResponse(
             user=RegisteredUserData(
                 id=dto.id,
                 email=dto.email,
                 username=dto.username,
                 bio=dto.bio,
                 image=dto.image,
-                token=dto.token,
+                token=token,
             )
         )
 
@@ -52,14 +52,14 @@ class UserLoginResponse(BaseModel):
     user: LoggedInUserData
 
     @classmethod
-    def from_dto(cls, dto: LoggedInUserDTO) -> "UserLoginResponse":
+    def from_user(cls, dto: UserDTO, token: str) -> "UserLoginResponse":
         return UserLoginResponse(
             user=LoggedInUserData(
                 email=dto.email,
                 username=dto.username,
                 bio=dto.bio,
                 image=dto.image,
-                token=dto.token,
+                token=token,
             )
         )
 
@@ -75,7 +75,7 @@ def from_dto(cls, dto: UserDTO, token: str) -> "CurrentUserResponse":
                 email=dto.email,
                 username=dto.username,
                 bio=dto.bio,
-                image=dto.image_url,
+                image=dto.image,
                 token=token,
             )
         )
diff --git a/conduit/dtos/article.py b/conduit/dtos/article.py
@@ -25,7 +25,7 @@ class ArticleFeedRecordDTO:
     tags: list[str]
     author_username: str
     author_bio: str | None
-    author_image_url: str | None
+    author_image: str | None
     author_following: bool
     created_at: datetime.datetime
     updated_at: datetime.datetime
diff --git a/conduit/dtos/profile.py b/conduit/dtos/profile.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 
 
-@dataclass
+@dataclass(frozen=True)
 class ProfileDTO:
     user_id: int
     username: str
diff --git a/conduit/dtos/user.py b/conduit/dtos/user.py
@@ -9,27 +9,8 @@ class UserDTO:
     email: str
     password_hash: str
     bio: str
-    image_url: str
-    created_at: datetime.datetime
-
-
-@dataclass(frozen=True)
-class CreatedUserDTO:
-    id: int
-    email: str
-    username: str
-    bio: str
     image: str
-    token: str
-
-
-@dataclass(frozen=True)
-class LoggedInUserDTO:
-    email: str
-    username: str
-    bio: str
-    image: str
-    token: str
+    created_at: datetime.datetime
 
 
 @dataclass(frozen=True)
@@ -67,7 +48,7 @@ class UpdateUserDTO:
     email: str | None = None
     password: str | None = None
     bio: str | None = None
-    image_url: str | None = None
+    image: str | None = None
 
 
 @dataclass(frozen=True)
@@ -76,4 +57,4 @@ class UpdateUserRecordDTO:
     email: str | None = None
     password_hash: str | None = None
     bio: str | None = None
-    image_url: str | None = None
+    image: str | None = None
diff --git a/conduit/infrastructure/alembic/versions/c3b4f44a9f22_rename_user_image_url_to_image.py b/conduit/infrastructure/alembic/versions/c3b4f44a9f22_rename_user_image_url_to_image.py
@@ -0,0 +1,29 @@
+"""rename user image_url to image
+
+Revision ID: c3b4f44a9f22
+Revises: 666cc53a93be
+Create Date: 2026-01-26 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "c3b4f44a9f22"
+down_revision: str | None = "666cc53a93be"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.alter_column(
+        "user", "image_url", new_column_name="image", existing_type=sa.String()
+    )
+
+
+def downgrade() -> None:
+    op.alter_column(
+        "user", "image", new_column_name="image_url", existing_type=sa.String()
+    )
diff --git a/conduit/infrastructure/models.py b/conduit/infrastructure/models.py
@@ -20,7 +20,7 @@ class User(Base):
     email: Mapped[str] = mapped_column(unique=True)
     password_hash: Mapped[str]
     bio: Mapped[str]
-    image_url: Mapped[str] = mapped_column(nullable=True)
+    image: Mapped[str] = mapped_column(nullable=True)
     created_at: Mapped[datetime]
     updated_at: Mapped[datetime] = mapped_column(nullable=True)
 
diff --git a/conduit/infrastructure/repositories/article.py b/conduit/infrastructure/repositories/article.py
@@ -59,7 +59,7 @@ def _to_article_feed_record_dto(res: Any) -> ArticleFeedRecordDTO:
             tags=tags,
             author_username=res.username,
             author_bio=res.bio,
-            author_image_url=res.image_url,
+            author_image=res.image,
             author_following=res.following,
             created_at=res.created_at,
             updated_at=res.updated_at,
@@ -148,7 +148,7 @@ async def list_by_followings(
                 Article.updated_at.label("updated_at"),
                 User.username.label("username"),
                 User.bio.label("bio"),
-                User.image_url.label("image_url"),
+                User.image.label("image"),
                 true().label("following"),
                 # Subquery for favorites count.
                 select(func.count(Favorite.article_id))
@@ -187,7 +187,7 @@ async def list_by_followings(
                 User.username,
                 User.bio,
                 User.email,
-                User.image_url,
+                User.image,
             )
         )
         query = query.limit(limit).offset(offset)
@@ -218,7 +218,7 @@ async def list_by_filters(
                 Article.updated_at.label("updated_at"),
                 User.username.label("username"),
                 User.bio.label("bio"),
-                User.image_url.label("image_url"),
+                User.image.label("image"),
                 exists()
                 .where(
                     (Follower.follower_id == user_id)
@@ -256,7 +256,7 @@ async def list_by_filters(
                 User.username,
                 User.bio,
                 User.email,
-                User.image_url,
+                User.image,
             )
             # fmt: on
         )
diff --git a/conduit/infrastructure/repositories/user.py b/conduit/infrastructure/repositories/user.py
@@ -22,7 +22,7 @@ async def add(
                 username=create_item.username,
                 email=create_item.email,
                 password_hash=create_item.password_hash,
-                image_url="https://api.realworld.io/images/smiley-cyrus.jpeg",
+                image="https://api.realworld.io/images/smiley-cyrus.jpeg",
                 bio="",
                 created_at=datetime.now(),
             )
@@ -95,8 +95,8 @@ async def update(
             query = query.values(password_hash=update_item.password_hash)
         if update_item.bio is not None:
             query = query.values(bio=update_item.bio)
-        if update_item.image_url is not None:
-            query = query.values(image_url=update_item.image_url)
+        if update_item.image is not None:
+            query = query.values(image=update_item.image)
 
         result = await session.execute(query)
         return self._to_user_dto(result.scalar_one())
@@ -108,7 +108,7 @@ def _to_user_dto(model: User) -> UserDTO:
             email=model.email,
             password_hash=model.password_hash,
             bio=model.bio,
-            image_url=model.image_url,
+            image=model.image,
             created_at=model.created_at,
         )
         dto.id = model.id
diff --git a/conduit/interfaces/services/auth.py b/conduit/interfaces/services/auth.py
@@ -1,22 +1,16 @@
 import abc
 from typing import Any
 
-from conduit.dtos.user import (
-    CreatedUserDTO,
-    CreateUserDTO,
-    LoggedInUserDTO,
-    LoginUserDTO,
-)
+from conduit.dtos.user import CreateUserDTO, LoginUserDTO, UserDTO
 
 
 class IUserAuthService(abc.ABC):
-
     @abc.abstractmethod
     async def sign_up_user(
         self, session: Any, user_to_create: CreateUserDTO
-    ) -> CreatedUserDTO: ...
+    ) -> tuple[UserDTO, str]: ...
 
     @abc.abstractmethod
     async def sign_in_user(
         self, session: Any, user_to_login: LoginUserDTO
-    ) -> LoggedInUserDTO: ...
+    ) -> tuple[UserDTO, str]: ...
diff --git a/conduit/services/article.py b/conduit/services/article.py
@@ -262,7 +262,7 @@ def _to_article_dto_from_feed_record(record: ArticleFeedRecordDTO) -> ArticleDTO
             author=ArticleAuthorDTO(
                 username=record.author_username,
                 bio=record.author_bio or "",
-                image=record.author_image_url,
+                image=record.author_image,
                 following=record.author_following,
             ),
             created_at=record.created_at,
diff --git a/conduit/services/auth.py b/conduit/services/auth.py
@@ -2,12 +2,7 @@
 from structlog import get_logger
 
 from conduit.core.exceptions import IncorrectLoginInputException, UserNotFoundException
-from conduit.dtos.user import (
-    CreatedUserDTO,
-    CreateUserDTO,
-    LoggedInUserDTO,
-    LoginUserDTO,
-)
+from conduit.dtos.user import CreateUserDTO, LoginUserDTO, UserDTO
 from conduit.interfaces.services.auth import IUserAuthService
 from conduit.interfaces.services.auth_token import IAuthTokenService
 from conduit.interfaces.services.user import IUserService
@@ -27,23 +22,16 @@ def __init__(
 
     async def sign_up_user(
         self, session: AsyncSession, user_to_create: CreateUserDTO
-    ) -> CreatedUserDTO:
+    ) -> tuple[UserDTO, str]:
         user = await self._user_service.create_user(
             session=session, user_to_create=user_to_create
         )
         jwt_token = self._auth_token_service.generate_jwt_token(user=user)
-        return CreatedUserDTO(
-            id=user.id,
-            email=user.email,
-            username=user.username,
-            bio=user.bio,
-            image=user.image_url,
-            token=jwt_token,
-        )
+        return user, jwt_token
 
     async def sign_in_user(
         self, session: AsyncSession, user_to_login: LoginUserDTO
-    ) -> LoggedInUserDTO:
+    ) -> tuple[UserDTO, str]:
         try:
             user = await self._user_service.get_user_by_email(
                 session=session, email=user_to_login.email
@@ -59,10 +47,4 @@ async def sign_in_user(
             raise IncorrectLoginInputException()
 
         jwt_token = self._auth_token_service.generate_jwt_token(user=user)
-        return LoggedInUserDTO(
-            email=user.email,
-            username=user.username,
-            bio=user.bio,
-            image=user.image_url,
-            token=jwt_token,
-        )
+        return user, jwt_token
diff --git a/conduit/services/comment.py b/conduit/services/comment.py
@@ -39,7 +39,7 @@ async def create_article_comment(
             user_id=current_user.id,
             username=current_user.username,
             bio=current_user.bio,
-            image=current_user.image_url,
+            image=current_user.image,
             following=False,
         )
         try:
diff --git a/conduit/services/profile.py b/conduit/services/profile.py
diff --git a/conduit/services/user.py b/conduit/services/user.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/services/test_create_failures.py b/tests/services/test_create_failures.py

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@ def to_dto(self) -> UpdateUserDTO:`
`56`	`56`	`password=self.user.password,`
`57`	`57`	`username=self.user.username,`
`58`	`58`	`bio=self.user.bio,`
`59`		`- image_url=self.user.image,`
	`59`	`+ image=self.user.image,`
`60`	`60`	`)`