fix tests

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/conversations/_controller/_conversations_rest.py

@@ -25,11 +25,11 @@
 )
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
-from simcore_service_webserver.users import users_service
 
 from ..._meta import API_VTAG as VTAG
 from ...login.decorators import login_required
 from ...models import AuthenticatedRequestContext
+from ...users import users_service
 from ...utils_aiohttp import envelope_json_response
 from .. import _conversation_service, conversations_service
 from ._common import ConversationPathParams, raise_unsupported_type

services/web/server/src/simcore_service_webserver/groups/_groups_repository.py

@@ -530,7 +530,7 @@ async def list_users_in_group_with_caller_check(
         ]
 
 
-async def list_all_users_in_group(
+async def list_users_in_group(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
@@ -550,13 +550,12 @@ async def list_all_users_in_group(
 
         # Get all users in the group
         query = (
-            sa.select(
-                users.c.id,
-                users.c.name,
-                users.c.primary_gid,
-                user_to_groups.c.access_rights,
+            sa.select(*_GROUP_COLUMNS)
+            .select_from(
+                groups.join(
+                    user_to_groups, user_to_groups.c.gid == groups.c.gid, isouter=True
+                ).join(users, users.c.id == user_to_groups.c.uid)
             )
-            .select_from(users.join(user_to_groups, users.c.id == user_to_groups.c.uid))
             .where(user_to_groups.c.gid == group_id)
         )
 

services/web/server/src/simcore_service_webserver/groups/_groups_service.py

@@ -165,7 +165,7 @@ async def list_group_members_with_caller_check(
 async def list_group_members(
     app: web.Application, group_id: GroupID
 ) -> list[GroupMember]:
-    return await _groups_repository.list_all_users_in_group(app, group_id=group_id)
+    return await _groups_repository.list_users_in_group(app, group_id=group_id)
 
 
 async def get_group_member(

services/web/server/tests/unit/with_dbs/04/conversations/test_conversations_rest.py

@@ -19,6 +19,7 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver.conversations import _conversation_service
 from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.projects.models import ProjectDict
 
 
 @pytest.fixture
@@ -411,34 +412,40 @@ async def test_conversations_error_handling(
 async def test_conversations_without_type_query_param(
     client: TestClient,
     logged_user: UserInfoDict,
+    user_project: ProjectDict,
 ):
     """Test that endpoints require type query parameter"""
-    base_url = client.app.router["list_conversations"].url_for()
 
-    # Create a conversation first
-    body = {"name": "Test Conversation", "type": "SUPPORT"}
-    resp = await client.post(f"{base_url}", json=body)
+    # Create a conversation via project endpoint first
+    project_id = f"{user_project['uuid']}"
+    project_conversation_url = client.app.router["create_project_conversation"].url_for(
+        project_id=f"{project_id}"
+    )
+    body = {"name": "Test Conversation", "type": "PROJECT_STATIC"}
+    resp = await client.post(f"{project_conversation_url}", json=body)
     data, _ = await assert_status(resp, status.HTTP_201_CREATED)
     conversation_id = data["conversationId"]
 
-    # Test endpoints without type parameter should fail
-    resp = await client.get(f"{base_url}")
+    # Test list endpoint without type parameter should fail
+    list_url = client.app.router["list_conversations"].url_for()
+    resp = await client.get(f"{list_url}")
     await assert_status(resp, status.HTTP_422_UNPROCESSABLE_ENTITY)
 
+    # All other endpoints should be OK
     get_url = client.app.router["get_conversation"].url_for(
         conversation_id=conversation_id
     )
     resp = await client.get(f"{get_url}")
-    await assert_status(resp, status.HTTP_422_UNPROCESSABLE_ENTITY)
+    await assert_status(resp, status.HTTP_400_BAD_REQUEST)
 
     update_url = client.app.router["update_conversation"].url_for(
         conversation_id=conversation_id
     )
     resp = await client.patch(f"{update_url}", json={"name": "Updated"})
-    await assert_status(resp, status.HTTP_422_UNPROCESSABLE_ENTITY)
+    await assert_status(resp, status.HTTP_400_BAD_REQUEST)
 
     delete_url = client.app.router["delete_conversation"].url_for(
         conversation_id=conversation_id
     )
     resp = await client.delete(f"{delete_url}")
-    await assert_status(resp, status.HTTP_422_UNPROCESSABLE_ENTITY)
+    await assert_status(resp, status.HTTP_400_BAD_REQUEST)