Update tests and schemas with stricter validation and content adjustments

Author: borys25ol

conduit/api/schemas/requests/user.py

@@ -1,4 +1,6 @@
-from pydantic import BaseModel, EmailStr, Field
+from typing import Any
+
+from pydantic import BaseModel, EmailStr, Field, field_validator
 
 from conduit.domain.dtos.user import CreateUserDTO, LoginUserDTO, UpdateUserDTO
 
@@ -15,12 +17,17 @@ class UserLoginData(BaseModel):
 
 
 class UserUpdateData(BaseModel):
-    email: str | None = Field(None)
-    password: str | None = Field(None)
-    username: str | None = Field(None)
+    email: EmailStr | None = Field(None)
+    password: str | None = Field(None, min_length=8)
+    username: str | None = Field(None, min_length=3)
     bio: str | None = Field(None)
     image: str | None = Field(None)
 
+    @field_validator("*", mode="before")
+    @classmethod
+    def empty_as_none(cls, v: Any) -> Any:
+        return v or None if isinstance(v, (str,)) else v
+
 
 class UserRegistrationRequest(BaseModel):
     user: UserRegistrationData

tests/api/routes/test_article.py

@@ -14,7 +14,7 @@ async def test_user_can_create_new_article(authorized_test_client: AsyncClient)
     payload = {
         "article": {
             "title": "Test Article",
-            "body": "test body",
+            "body": "test body content",
             "description": "test description",
             "tagList": ["tag1", "tag2", "tag3"],
         }
@@ -30,7 +30,7 @@ async def test_user_can_create_article_without_tags(
     payload = {
         "article": {
             "title": "Test Article",
-            "body": "test body",
+            "body": "test body content",
             "description": "test description",
             "tagList": [],
         }
@@ -46,7 +46,7 @@ async def test_user_can_create_article_without_duplicated_tags(
     payload = {
         "article": {
             "title": "Test Article",
-            "body": "test body",
+            "body": "test body content",
             "description": "test description",
             "tagList": ["tag1", "tag2", "tag2", "tag3", "tag3"],
         }
@@ -63,7 +63,7 @@ async def test_user_can_create_article_with_existing_title(
     payload = {
         "article": {
             "title": test_article.title,
-            "body": "test body",
+            "body": "test body content",
             "description": "test description",
             "tagList": test_article.tags,
         }
@@ -79,7 +79,7 @@ async def test_user_can_retrieve_article_without_tags(
     payload = {
         "article": {
             "title": "Test Article",
-            "body": "test body",
+            "body": "test body content",
             "description": "test description",
             "tagList": [],
         }

tests/api/routes/test_login.py

@@ -17,7 +17,7 @@ async def test_user_successful_login(
     "credentials,",
     (
         {"email": "invalid@gmail.com", "password": "password"},
-        {"email": "test@gmail.com", "password": "invalid"},
+        {"email": "test@gmail.com", "password": "invalidpassword"},
     ),
 )
 @pytest.mark.anyio

tests/conftest.py

@@ -110,7 +110,7 @@ def article_to_create() -> CreateArticleDTO:
     return CreateArticleDTO(
         title="Test Article",
         description="Test Description",
-        body="Test Body",
+        body="Test Body Content",
         tags=["tag1", "tag2"],
     )
 

tests/utils.py

@@ -21,7 +21,7 @@ async def create_another_test_article(
     create_article_dto = CreateArticleDTO(
         title="One More Test Article",
         description="Test Description",
-        body="Test Body",
+        body="Test Body Content",
         tags=["tag1", "tag2", "tag3"],
     )
     return await article_repository.add(