Merge branch 'client-complete' into client-start

Author: LadyKerr

planventure-api/instance/planventure.db

@@ -12,4 +12,6 @@ werkzeug==2.3.7
 bcrypt==4.0.1
 
 # Database migrations
-Flask-Migrate==4.0.5
+Flask-Migrate==4.0.5
+
+pytest==8.3.2

planventure-api/requirements.txt

@@ -0,0 +1,69 @@
+import pytest
+from .validators import validate_email, validate_username
+
+def test_valid_emails():
+    """Test validation of properly formatted email addresses"""
+    valid_emails = [
+        "test@example.com",
+        "user.name@domain.com",
+        "user+tag@example.co.uk",
+        "123@domain.com",
+        "user@sub.domain.com"
+    ]
+    for email in valid_emails:
+        assert validate_email(email) is True
+
+def test_invalid_emails():
+    """Test validation of improperly formatted email addresses"""
+    invalid_emails = [
+        "test@.com",
+        "@domain.com",
+        "test@domain",
+        "test@domain.",
+        "test.domain.com",
+        "test@domain@.com",
+        "test space@domain.com"
+    ]
+    for email in invalid_emails:
+        assert validate_email(email) is False
+
+def test_edge_cases():
+    """Test validation with edge cases"""
+    assert validate_email("") is False
+    with pytest.raises(TypeError):
+        validate_email(None)
+
+def test_valid_usernames():
+    """Test validation of properly formatted usernames"""
+    valid_usernames = [
+        "user123",
+        "_user",
+        "john_doe",
+        "a123",
+        "Developer42",
+        "code_master",
+        "Alice_Bob_123"
+    ]
+    for username in valid_usernames:
+        assert validate_username(username) is True
+
+def test_invalid_usernames():
+    """Test validation of improperly formatted usernames"""
+    invalid_usernames = [
+        "ab",  # too short
+        "a" * 17,  # too long
+        "123user",  # starts with number
+        "__user",  # multiple underscores at start
+        "user name",  # contains space
+        "user@name",  # special character
+        "-user",  # starts with hyphen
+        "user-",  # ends with hyphen
+    ]
+    for username in invalid_usernames:
+        assert validate_username(username) is False
+
+def test_username_edge_cases():
+    """Test username validation with edge cases"""
+    assert validate_username("") is False
+    with pytest.raises(TypeError):
+        validate_username(None)

planventure-api/utils/test_validators.py

@@ -4,3 +4,42 @@ def validate_email(email: str) -> bool:
     """Validate email format using regex pattern"""
     pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
     return bool(re.match(pattern, email))
+
+def validate_username(username: str) -> bool:
+    """
+    Validates a username according to the following rules:
+    - Between 3 and 16 characters
+    - Starts with a letter or single underscore
+    - Can contain letters, numbers, and underscores after first character
+    - No spaces or special characters
+    
+    Args:
+        username: The username to validate
+        
+    Returns:
+        bool: True if username is valid, False otherwise
+        
+    Raises:
+        TypeError: If username is None
+    """
+    if username is None:
+        raise TypeError("Username cannot be None")
+        
+    # Check for empty string
+    if not username:
+        return False
+        
+    # Check length (3-16 characters)
+    if len(username) < 3 or len(username) > 16:
+        return False
+        
+    # Pattern explanation:
+    # ^            - Start of string
+    # [a-zA-Z_]    - First character must be letter or underscore
+    # (?!_)        - Negative lookahead to prevent multiple underscores at start
+    # [a-zA-Z0-9_] - Remaining characters can be letters, numbers, or underscores
+    # {2,15}       - Length of remaining characters (2-15, plus first character = 3-16 total)
+    # $            - End of string
+    pattern = r'^[a-zA-Z_](?!_)[a-zA-Z0-9_]{2,15}$'
+    
+    return bool(re.match(pattern, username))

planventure-api/utils/validators.py

@@ -12,6 +12,7 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
+    "@mui/icons-material": "^6.2.0",
     "@mui/material": "^6.2.0",
     "@mui/icons-material": "^6.2.0",
     "react": "^18.3.1",
@@ -30,4 +31,4 @@
     "globals": "^15.12.0",
     "vite": "^6.0.1"
   }
-}
+}