send email to fogbugz add test

Author: matusdrobuliak66

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

@@ -1,6 +1,9 @@
+import functools
 import logging
+from typing import Any
 
 from aiohttp import web
+from common_library.json_serialization import json_dumps
 from models_library.api_schemas_webserver.conversations import (
     ConversationMessagePatch,
     ConversationMessageRestGet,
@@ -16,6 +19,7 @@
     PageQueryParameters,
 )
 from models_library.rest_pagination_utils import paginate_data
+from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import BaseModel, ConfigDict
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -58,6 +62,10 @@ class _ConversationMessageCreateBodyParams(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
 
+def _json_encoder_and_dumps(obj: Any, **kwargs):
+    return json_dumps(jsonable_encoder(obj), **kwargs)
+
+
 @routes.post(
     f"/{VTAG}/conversations/{{conversation_id}}/messages",
     name="create_conversation_message",
@@ -102,9 +110,11 @@ async def create_conversation_message(request: web.Request):
             email_template_path = await products_web.get_product_template_path(
                 request, template_name
             )
-            _conversation_url = (
-                f"{request.url}/#/conversations/{path_params.conversation_id}"
-            )
+            _url = request.url
+            if _url.port:
+                _conversation_url = f"{_url.scheme}://{_url.host}:{_url.port}/#/conversations/{path_params.conversation_id}"
+            else:
+                _conversation_url = f"{_url.scheme}://{_url.host}/#/conversations/{path_params.conversation_id}"
             _extra_context = conversation.extra_context
             await email_service.send_email_from_template(
                 request,
@@ -124,6 +134,7 @@ async def create_conversation_message(request: web.Request):
                     "conversation_url": _conversation_url,
                     "message_content": message.content,
                     "extra_context": _extra_context,
+                    "dumps": functools.partial(_json_encoder_and_dumps, indent=1),
                 },
             )
         except Exception:  # pylint: disable=broad-except

services/web/server/src/simcore_service_webserver/templates/common/request_support.jinja2

@@ -28,7 +28,7 @@ TEST extra_context: {{ extra_context }}
 </p>
 
 <p>
-  Extra Contect:
+  Extra Context:
 </p>
 
 <pre>

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

@@ -448,3 +448,62 @@ async def test_conversation_messages_nonexistent_resources(
     )
     resp = await client.delete(f"{delete_url}")
     await assert_status(resp, status.HTTP_404_NOT_FOUND)
+
+
+### Test with a database
+@pytest.mark.parametrize("user_role", [UserRole.USER])
+async def test_conversation_messages_with_database(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    mocker: MockerFixture,
+):
+    """Test conversation messages with direct database interaction"""
+    # Mock the email service to verify it's called for first message
+    mock_send_email = mocker.patch(
+        "simcore_service_webserver.email.email_service.send_email_from_template"
+    )
+
+    assert client.app
+
+    # Create a conversation directly via API (no mocks)
+    base_url = client.app.router["list_conversations"].url_for()
+    body = {"name": "Database Test Conversation", "type": "SUPPORT"}
+    resp = await client.post(f"{base_url}", json=body)
+    data, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    conversation_id = data["conversationId"]
+
+    # Verify the conversation was created
+    assert conversation_id is not None
+    assert data["name"] == "Database Test Conversation"
+    assert data["type"] == "SUPPORT"
+
+    # Create a message in the conversation
+    create_message_url = client.app.router["create_conversation_message"].url_for(
+        conversation_id=conversation_id
+    )
+    message_body = {"content": "Hello from database test", "type": "MESSAGE"}
+    resp = await client.post(f"{create_message_url}", json=message_body)
+    message_data, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    # Verify the message was created
+    assert message_data["messageId"] is not None
+    assert message_data["content"] == "Hello from database test"
+    assert message_data["type"] == "MESSAGE"
+    assert message_data["conversationId"] == conversation_id
+
+    # Verify email was sent for first message
+    assert mock_send_email.call_count == 1
+
+    # Create a second message
+    second_message_body = {"content": "Second message", "type": "MESSAGE"}
+    resp = await client.post(f"{create_message_url}", json=second_message_body)
+    second_message_data, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    # Verify the second message was created
+    assert second_message_data["messageId"] is not None
+    assert second_message_data["content"] == "Second message"
+    assert second_message_data["type"] == "MESSAGE"
+    assert second_message_data["conversationId"] == conversation_id
+
+    # Verify email was NOT sent again for second message (still only 1 call)
+    assert mock_send_email.call_count == 1