user group updates

Author: anduimagui

src/database/users.py

@@ -32,14 +32,25 @@ async def search_users(cursor: AsyncCursor, filters: UserFilters) -> UserPage:
     page : UserPage
         Paginated search results for users.
     """
-    query = """
+    where_clauses = []
+    params = filters.model_dump()
+
+    # Only add roles filter if present and non-empty
+    if getattr(filters, "roles", None):
+        where_clauses.append("role = ANY(%(roles)s)")
+    
+    # Always allow searching by query
+    where_clauses.append("(%(query)s IS NULL OR name ~* %(query)s)")
+
+    where_sql = " AND ".join(where_clauses) if where_clauses else "TRUE"
+
+    query = f"""
         SELECT
             *, COUNT(*) OVER() AS total_count
         FROM
             users
         WHERE
-            role = ANY(%(roles)s)
-            AND (%(query)s IS NULL OR name ~* %(query)s)
+            {where_sql}
         ORDER BY
             name
         OFFSET
@@ -48,7 +59,7 @@ async def search_users(cursor: AsyncCursor, filters: UserFilters) -> UserPage:
             %(limit)s
         ;
     """
-    await cursor.execute(query, filters.model_dump())
+    await cursor.execute(query, params)
     rows = await cursor.fetchall()
     page = UserPage.from_search(rows, filters)
     return page

src/entities/base.py

@@ -33,6 +33,8 @@ class BaseMetadata(BaseModel):
     @classmethod
     def format_created_at(cls, value):
         """(De)serialisation function for `created_at` timestamp."""
+        if value is None:
+            return timestamp()  # Use default timestamp if None
         if isinstance(value, str):
             return value
         return value.isoformat()
@@ -103,6 +105,8 @@ class BaseEntity(BaseMetadata):
     @classmethod
     def format_modified_at(cls, value):
         """(De)serialisation function for `modified_at` timestamp."""
+        if value is None:
+            return timestamp()  # Use default timestamp if None
         if isinstance(value, str):
             return value
         return value.isoformat()

src/routers/user_groups.py

@@ -36,19 +36,6 @@ class UserGroupUpdate(BaseModel):
     signal_ids: List[int] = []
     user_ids: List[Union[str, int]] = []  # Can be either user IDs or email addresses
     collaborator_map: Dict[str, List[int]] = {}
-    created_at: Optional[str] = None
-    status: Optional[str] = None
-    created_by: Optional[str] = None
-    created_for: Optional[str] = None
-    modified_at: Optional[str] = None
-    modified_by: Optional[str] = None
-    headline: Optional[str] = None
-    attachment: Optional[str] = None
-    steep_primary: Optional[str] = None
-    steep_secondary: Optional[str] = None
-    signature_primary: Optional[str] = None
-    signature_secondary: Optional[str] = None
-    sdgs: Optional[List[str]] = None
 
 
 class UserEmailIdentifier(BaseModel):
@@ -596,20 +583,7 @@ async def update_user_group(
             name=group_data.name,
             signal_ids=group_data.signal_ids,
             user_ids=processed_user_ids,  # Use the processed user IDs
-            collaborator_map=group_data.collaborator_map,
-            created_at=group_data.created_at,
-            status=group_data.status,
-            created_by=group_data.created_by,
-            created_for=group_data.created_for,
-            modified_at=group_data.modified_at,
-            modified_by=group_data.modified_by,
-            headline=group_data.headline,
-            attachment=group_data.attachment,
-            steep_primary=group_data.steep_primary,
-            steep_secondary=group_data.steep_secondary,
-            signature_primary=group_data.signature_primary,
-            signature_secondary=group_data.signature_secondary,
-            sdgs=group_data.sdgs
+            collaborator_map=group_data.collaborator_map
         )
         logger.debug("UserGroup entity created successfully")