feat: add models and partially custom error messages

itd/models/_text.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field
 from itd.models.user import UserPost
 
 
-class _TextObject(BaseModel):
+class TextObject(BaseModel):
     id: UUID
     content: str
     author: UserPost

itd/models/clan.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel, Field
+
+
+class Clan(BaseModel):
+    avatar: str
+    member_count: int = Field(0, alias='memberCount')

itd/models/comment.py

@@ -1,12 +1,9 @@
-from uuid import UUID
-from datetime import datetime
-
 from pydantic import Field
 
-from itd.models._text import _TextObject
+from itd.models._text import TextObject
 
 
-class CommentShort(_TextObject):
+class CommentShort(TextObject):
     likes_count: int = Field(0, alias='likesCount')
     replies_count: int = Field(0, alias='repliesCount')
     is_liked: bool = Field(False, alias='isLiked')

itd/models/pagination.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel, Field
+
+class Pagination(BaseModel):
+    page: int = 1
+    limit: int = 20
+    total: int | None = None
+    has_more: bool = Field(True, alias='hasMore')

itd/models/post.py

@@ -1,10 +1,10 @@
 from pydantic import Field
 
 from itd.models.user import UserPost
-from itd.models._text import _TextObject
+from itd.models._text import TextObject
 
 
-class PostShort(_TextObject):
+class PostShort(TextObject):
     likes_count: int = Field(0, alias='likesCount')
     comments_count: int = Field(0, alias='commentsCount')
     reposts_count: int = Field(0, alias='repostsCount')

itd/models/user.py

@@ -3,6 +3,25 @@ from datetime import datetime
 
 from pydantic import BaseModel, Field
 
+
+class UserPrivacy(BaseModel):
+    private: bool | None = Field(None, alias='isPrivate') # none for not me
+    wall_closed: bool = Field(False, alias='wallClosed')
+
+    model_config = {'populate_by_name': True}
+
+
+class UserProfileUpdate(BaseModel):
+    id: UUID
+    username: str
+    display_name: str = Field(alias='displayName')
+    bio: str | None = None
+
+    updated_at: datetime | None = Field(None, alias='updatedAt')
+
+    model_config = {'populate_by_name': True}
+
+
 class UserNotification(BaseModel):
     id: UUID
     username: str
@@ -16,22 +35,26 @@ class UserPost(UserNotification):
     verified: bool = False
 
 
-class UserSearch(UserPost):
+class UserWhoToFollow(UserPost):
     followers_count: int = Field(0, alias='followersCount')
 
 
-class User(UserSearch):
+class UserFollower(UserPost):
+    is_following: bool = Field(False, alias='isFollowing') # none for me
+
+
+class UserSearch(UserFollower, UserWhoToFollow):
+    pass
+
+
+class User(UserSearch, UserPrivacy):
     banner: str | None = None
     bio: str | None = None
-    pinned_post_id: UUID | None
-
-    private: bool | None = Field(None, alias='isPrivate') # none for not me
-    wall_closed: bool = Field(False, alias='wallClosed')
+    pinned_post_id: UUID | None = Field(None, alias='pinnedPostId')
 
     following_count: int = Field(0, alias='followingCount')
     posts_count: int = Field(0, alias='postsCount')
 
-    is_following: bool | None = Field(None, alias='isFollowing') # none for me
     is_followed: bool | None = Field(None, alias='isFollowedBy') # none for me
 
     created_at: datetime = Field(alias='createdAt')