fix(relationship): add target in response

app/database/relationship.py

@@ -1,6 +1,8 @@
 from enum import Enum
 
-from .user import User
+from app.models.user import User as APIUser
+
+from .user import User as DBUser
 
 from pydantic import BaseModel
 from sqlmodel import (
@@ -41,14 +43,14 @@ class Relationship(SQLModel, table=True):
         ),
     )
     type: RelationshipType = Field(default=RelationshipType.FOLLOW, nullable=False)
-    target: "User" = SQLRelationship(
+    target: DBUser = SQLRelationship(
         sa_relationship_kwargs={"foreign_keys": "[Relationship.target_id]"}
     )
 
 
 class RelationshipResp(BaseModel):
     target_id: int
-    # FIXME: target: User
+    target: APIUser
     mutual: bool = False
     type: RelationshipType
 
@@ -56,6 +58,8 @@ class RelationshipResp(BaseModel):
     async def from_db(
         cls, session: AsyncSession, relationship: Relationship
     ) -> "RelationshipResp":
+        from app.utils import convert_db_user_to_api_user
+
         target_relationship = (
             await session.exec(
                 select(Relationship).where(
@@ -71,7 +75,7 @@ class RelationshipResp(BaseModel):
         )
         return cls(
             target_id=relationship.target_id,
-            # target=relationship.target,
+            target=await convert_db_user_to_api_user(relationship.target),
             mutual=mutual,
             type=relationship.type,
         )

app/database/user.py

@@ -102,8 +102,8 @@ class User(SQLModel, table=True):
     )
 
     @classmethod
-    def all_select_clause(cls):
-        return select(cls).options(
+    def all_select_option(cls):
+        return (
             joinedload(cls.lazer_profile),  # pyright: ignore[reportArgumentType]
             joinedload(cls.lazer_counts),  # pyright: ignore[reportArgumentType]
             joinedload(cls.daily_challenge_stats),  # pyright: ignore[reportArgumentType]
@@ -121,6 +121,10 @@ class User(SQLModel, table=True):
             selectinload(cls.lazer_replays_watched),  # pyright: ignore[reportArgumentType]
         )
 
+    @classmethod
+    def all_select_clause(cls):
+        return select(cls).options(*cls.all_select_option())
+
 
 # ============================================
 # Lazer API 专用表模型