dont do unnecessary changes to form

Author: e1011

backend/app/schemas/user.py

@@ -67,16 +67,16 @@ def validate_password(cls, password: Optional[str], info):
         if password:
             errors = []
             if len(password) < 8:
-                errors.append("be at least 8 characters long")
+                errors.append("Password must be at least 8 characters long")
             if not any(char.isupper() for char in password):
-                errors.append("contain at least one uppercase letter")
+                errors.append("Password must contain at least one uppercase letter")
             if not any(char.islower() for char in password):
-                errors.append("contain at least one lowercase letter")
+                errors.append("Password must contain at least one lowercase letter")
             if not any(char in "!@#$%^&*" for char in password):
-                errors.append("contain at least one special character (!, @, #, $, %, ^, &, or *)")
+                errors.append("Password must contain at least one special character (!, @, #, $, %, ^, &, or *)")
 
             if errors:
-                raise ValueError(f"Password must {', '.join(errors)}")
+                raise ValueError(errors)
 
         return password
 

backend/tests/unit/test_user_schema.py

@@ -1,7 +1,7 @@
 import pytest
 from pydantic import ValidationError
 
-from app.schemas.user import UserCreateRequest, UserRole, SignUpMethod
+from app.schemas.user import SignUpMethod, UserCreateRequest, UserRole
 
 
 class TestUserCreateRequestPasswordValidation:
@@ -11,13 +11,13 @@ def test_password_validation_success_valid_password(self):
         """Test that a valid password passes validation"""
         user_data = {
             "first_name": "Test",
-            "last_name": "User", 
+            "last_name": "User",
             "email": "[email protected]",
             "password": "ValidPass123!",
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         # Should not raise any exception
         user_request = UserCreateRequest(**user_data)
         assert user_request.password == "ValidPass123!"
@@ -27,18 +27,18 @@ def test_password_validation_too_short(self):
         user_data = {
             "first_name": "Test",
             "last_name": "User",
-            "email": "[email protected]", 
+            "email": "[email protected]",
             "password": "short1!",  # Only 7 characters
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         with pytest.raises(ValidationError) as exc_info:
             UserCreateRequest(**user_data)
-        
+
         # Check that the error message contains the expected validation message
         error_msg = str(exc_info.value)
-        assert "be at least 8 characters long" in error_msg
+        assert "Password must be at least 8 characters long" in error_msg
 
     def test_password_validation_missing_uppercase(self):
         """Test that password without uppercase letter fails validation"""
@@ -50,12 +50,12 @@ def test_password_validation_missing_uppercase(self):
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         with pytest.raises(ValidationError) as exc_info:
             UserCreateRequest(**user_data)
-        
+
         error_msg = str(exc_info.value)
-        assert "contain at least one uppercase letter" in error_msg
+        assert "Password must contain at least one uppercase letter" in error_msg
 
     def test_password_validation_missing_lowercase(self):
         """Test that password without lowercase letter fails validation"""
@@ -67,12 +67,12 @@ def test_password_validation_missing_lowercase(self):
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         with pytest.raises(ValidationError) as exc_info:
             UserCreateRequest(**user_data)
-        
+
         error_msg = str(exc_info.value)
-        assert "contain at least one lowercase letter" in error_msg
+        assert "Password must contain at least one lowercase letter" in error_msg
 
     def test_password_validation_missing_special_character(self):
         """Test that password without special character fails validation"""
@@ -84,32 +84,32 @@ def test_password_validation_missing_special_character(self):
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         with pytest.raises(ValidationError) as exc_info:
             UserCreateRequest(**user_data)
-        
+
         error_msg = str(exc_info.value)
-        assert "contain at least one special character" in error_msg
+        assert "Password must contain at least one special character" in error_msg
 
     def test_password_validation_multiple_errors(self):
         """Test that password with multiple issues returns all errors"""
         user_data = {
-            "first_name": "Test", 
+            "first_name": "Test",
             "last_name": "User",
             "email": "[email protected]",
             "password": "short",  # Too short, no uppercase, no special char
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         with pytest.raises(ValidationError) as exc_info:
             UserCreateRequest(**user_data)
-        
+
         error_msg = str(exc_info.value)
         # Should contain multiple validation errors
-        assert "be at least 8 characters long" in error_msg
-        assert "contain at least one uppercase letter" in error_msg
-        assert "contain at least one special character" in error_msg
+        assert "Password must be at least 8 characters long" in error_msg
+        assert "Password must contain at least one uppercase letter" in error_msg
+        assert "Password must contain at least one special character" in error_msg
 
     def test_password_validation_google_signup_no_password_required(self):
         """Test that Google signup doesn't require password validation"""
@@ -121,7 +121,7 @@ def test_password_validation_google_signup_no_password_required(self):
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.GOOGLE,
         }
-        
+
         # Should not raise any exception for Google signup
         user_request = UserCreateRequest(**user_data)
         assert user_request.password is None
@@ -131,31 +131,31 @@ def test_password_validation_edge_cases(self):
         # Test with exactly 8 characters
         user_data = {
             "first_name": "Test",
-            "last_name": "User", 
+            "last_name": "User",
             "email": "[email protected]",
             "password": "MinPass1!",  # Exactly 8 chars, meets all requirements
             "role": UserRole.PARTICIPANT,
             "signup_method": SignUpMethod.PASSWORD,
         }
-        
+
         # Should not raise any exception
         user_request = UserCreateRequest(**user_data)
         assert user_request.password == "MinPass1!"
 
     def test_password_validation_all_special_characters(self):
         """Test that all allowed special characters work"""
         special_chars = ["!", "@", "#", "$", "%", "^", "&", "*"]
-        
+
         for char in special_chars:
             user_data = {
                 "first_name": "Test",
                 "last_name": "User",
-                "email": "[email protected]", 
+                "email": "[email protected]",
                 "password": f"ValidPass1{char}",
                 "role": UserRole.PARTICIPANT,
                 "signup_method": SignUpMethod.PASSWORD,
             }
-            
+
             # Should not raise any exception
             user_request = UserCreateRequest(**user_data)
-            assert user_request.password == f"ValidPass1{char}" 
+            assert user_request.password == f"ValidPass1{char}"