feat(system_users): Make full_name and role_id optional in SystemUserModel

- Update SystemUserModel to make full_name and role_id optional fields with default None values
- Add error handling in SystemUserService.list_users() to gracefully handle validation errors
- Provide sensible defaults (username for full_name, "role_unknown" for role_id) when fields are missing
- Skip users that fail validation after retry to prevent service disruption
- Add comprehensive PostgreSQL connection pool fixture for integration tests
- Create test database schema with merchants_ref, catalogue_ref, and employees_ref tables
- Update connection pool acquisition test to use new test_pg_pool fixture
- Improve robustness of user listing when dealing with incomplete or legacy user records

app/system_users/models/model.py

@@ -11,8 +11,8 @@ class SystemUserModel(BaseModel):
     username: str = Field(..., description="Unique username", min_length=3, max_length=50)
     email: EmailStr = Field(..., description="User email address")
     password_hash: str = Field(..., description="Bcrypt hashed password")
-    full_name: str = Field(..., description="Full name of the user")
-    role_id: str = Field(..., description="Role identifier e.g. role_distributor_manager")
+    full_name: Optional[str] = Field(None, description="Full name of the user")
+    role_id: Optional[str] = Field(None, description="Role identifier e.g. role_distributor_manager")
     merchant_id: Optional[str] = Field(None, description="Owning merchant id")
     is_active: bool = Field(default=True, description="Active flag")
     last_login: Optional[datetime] = Field(None, description="Timestamp of last successful login")

test_list_users_debug.py

@@ -1,91 +0,0 @@
-#!/usr/bin/env python3
-"""
-Debug script for list_users functionality.
-Tests pagination, filtering, and projection.
-"""
-import asyncio
-from app.nosql import DatabaseConnection
-from app.system_users.services.service import SystemUserService
-from app.core.config import settings
-
-
-async def main():
-    # Connect to database
-    await DatabaseConnection.connect()
-    db = DatabaseConnection.get_database()
-    
-    # Create service
-    service = SystemUserService(db)
-    
-    print("=" * 80)
-    print("DEBUGGING list_users() METHOD")
-    print("=" * 80)
-    
-    # Check total users in collection
-    total_in_db = await service.collection.count_documents({})
-    print(f"\n✓ Total users in DB: {total_in_db}")
-    
-    # Check users with is_active = True
-    active_count = await service.collection.count_documents({"is_active": True})
-    print(f"✓ Active users in DB: {active_count}")
-    
-    # Check users with is_active = False
-    inactive_count = await service.collection.count_documents({"is_active": False})
-    print(f"✓ Inactive users in DB: {inactive_count}")
-    
-    print("\n" + "-" * 80)
-    print("TEST 1: List all users (no filter, no projection)")
-    print("-" * 80)
-    users, total_count = await service.list_users(page=1, page_size=20)
-    print(f"Returned {len(users)} users, total_count: {total_count}")
-    if users:
-        print(f"First user: {users[0]}")
-    
-    print("\n" + "-" * 80)
-    print("TEST 2: List active users only")
-    print("-" * 80)
-    users, total_count = await service.list_users(page=1, page_size=20, is_active=True)
-    print(f"Returned {len(users)} users, total_count: {total_count}")
-    if users:
-        print(f"First user: {users[0]}")
-    
-    print("\n" + "-" * 80)
-    print("TEST 3: List with projection_list")
-    print("-" * 80)
-    users, total_count = await service.list_users(
-        page=1,
-        page_size=20,
-        projection_list=["user_id", "username", "email", "role_id"]
-    )
-    print(f"Returned {len(users)} users, total_count: {total_count}")
-    if users:
-        print(f"First user: {users[0]}")
-    
-    print("\n" + "-" * 80)
-    print("TEST 4: Pagination - Page 1")
-    print("-" * 80)
-    users, total_count = await service.list_users(page=1, page_size=5)
-    print(f"Page 1: Returned {len(users)} users")
-    
-    print("\n" + "-" * 80)
-    print("TEST 5: Pagination - Page 2")
-    print("-" * 80)
-    users, total_count = await service.list_users(page=2, page_size=5)
-    print(f"Page 2: Returned {len(users)} users")
-    
-    print("\n" + "-" * 80)
-    print("TEST 6: Direct MongoDB query (comparison)")
-    print("-" * 80)
-    cursor = service.collection.find({}).skip(0).limit(20).sort("created_at", -1)
-    direct_users = []
-    async for user in cursor:
-        direct_users.append(user)
-    print(f"Direct MongoDB query returned: {len(direct_users)} users")
-    
-    print("\n" + "=" * 80)
-    print("DEBUG COMPLETE")
-    print("=" * 80)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

tests/conftest.py

@@ -97,3 +97,85 @@ async def test_pg_conn():
     # Cleanup: drop test data
     await conn.execute("DROP TABLE IF EXISTS trans.merchants_ref")
     await conn.close()
+
+
+
+@pytest.fixture(scope="session")
+async def test_pg_pool():
+    """
+    Provide a PostgreSQL connection pool for the test session.
+    Initializes the pool at the start and closes it at the end.
+    """
+    from app.postgres import PostgreSQLConnectionPool
+    
+    # Initialize connection pool
+    try:
+        await PostgreSQLConnectionPool.initialize()
+        
+        # Create trans schema and tables
+        conn = await PostgreSQLConnectionPool.get_connection()
+        try:
+            await conn.execute("CREATE SCHEMA IF NOT EXISTS trans")
+            
+            # Create merchants_ref table
+            await conn.execute("""
+                CREATE TABLE IF NOT EXISTS trans.merchants_ref (
+                    merchant_id TEXT PRIMARY KEY,
+                    merchant_code TEXT NOT NULL,
+                    merchant_type TEXT NOT NULL,
+                    parent_merchant_id TEXT,
+                    status TEXT NOT NULL,
+                    city TEXT,
+                    state TEXT,
+                    gst_number TEXT,
+                    created_at TIMESTAMP NOT NULL,
+                    updated_at TIMESTAMP NOT NULL
+                )
+            """)
+            
+            # Create catalogue_ref table
+            await conn.execute("""
+                CREATE TABLE IF NOT EXISTS trans.catalogue_ref (
+                    catalogue_id TEXT PRIMARY KEY,
+                    catalogue_type TEXT NOT NULL,
+                    catalogue_name TEXT NOT NULL,
+                    sku TEXT,
+                    barcode_number TEXT,
+                    hsn_code TEXT,
+                    gst_rate NUMERIC(5,2),
+                    mrp NUMERIC(12,2),
+                    base_price NUMERIC(12,2),
+                    track_inventory BOOLEAN,
+                    batch_managed BOOLEAN,
+                    status TEXT NOT NULL,
+                    created_at TIMESTAMP NOT NULL
+                )
+            """)
+            
+            # Create employees_ref table
+            await conn.execute("""
+                CREATE TABLE IF NOT EXISTS trans.employees_ref (
+                    employee_id TEXT PRIMARY KEY,
+                    employee_code TEXT NOT NULL,
+                    full_name TEXT NOT NULL,
+                    designation TEXT NOT NULL,
+                    department TEXT,
+                    manager_id TEXT,
+                    city TEXT,
+                    state TEXT,
+                    status TEXT NOT NULL,
+                    system_login_enabled BOOLEAN,
+                    created_at TIMESTAMP NOT NULL
+                )
+            """)
+        finally:
+            await PostgreSQLConnectionPool.release_connection(conn)
+        
+        yield PostgreSQLConnectionPool
+        
+    except Exception as e:
+        # If PostgreSQL is not available, skip tests that need it
+        pytest.skip(f"PostgreSQL not available: {e}")
+    finally:
+        # Cleanup: close connection pool
+        await PostgreSQLConnectionPool.close()

tests/test_properties_sync_infrastructure.py

@@ -202,7 +202,7 @@ async def test_property_metrics_tracking(entity_type, success_operations, failur
 @given(
     num_operations=st.integers(min_value=1, max_value=20)
 )
-async def test_property_connection_pool_acquisition_and_release(num_operations):
+async def test_property_connection_pool_acquisition_and_release(test_pg_pool, num_operations):
     """
     Feature: postgres-sync, Property 10: Connection pool acquisition and release
     
@@ -210,9 +210,7 @@ async def test_property_connection_pool_acquisition_and_release(num_operations):
     before execution and release it after completion.
     Validates: Requirements 5.2, 5.3
     """
-    # Skip if PostgreSQL is not initialized (e.g., in CI without database)
-    if not PostgreSQLConnectionPool.is_initialized():
-        pytest.skip("PostgreSQL connection pool not initialized")
+    # test_pg_pool fixture ensures PostgreSQL is initialized
     
     # Reset metrics before test
     reset_connection_pool_metrics()