Merge branch 'feature/sc-request-call' of github.com:odeimaiz/osparc-simcore into feature/sc-request-call

Author: odeimaiz

services/static-webserver/client/source/class/osparc/ui/message/FlashMessageOEC.js

@@ -141,7 +141,7 @@ qx.Class.define("osparc.ui.message.FlashMessageOEC", {
         if (confirmationWindow.getConfirmed()) {
           const extraContext = extraContextTA.getValue()
           const friendlyContext = this.__getSupportFriendlyContext();
-          const text = "Dear Support team,\n" + extraContext + "\n" + friendlyContext;
+          const text = "Dear Support Team,\n" + extraContext + "\n" + friendlyContext;
           textToAddMessageField(text);
           // This should be an automatic response in the chat
           const msg = this.tr("Thanks, your report has been sent.<br>Our support team will get back to you.");

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

@@ -22,20 +22,22 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import BaseModel, ConfigDict
 from servicelib.aiohttp import status
+from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
     parse_request_query_parameters_as,
 )
 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 ...email import email_service
+from ...fogbugz.settings import FogbugzSettings
 from ...login.decorators import login_required
 from ...models import AuthenticatedRequestContext
 from ...products import products_web
+from ...users import users_service
 from ...utils_aiohttp import envelope_json_response
 from .. import _conversation_message_service, _conversation_service
 from ._common import ConversationPathParams, raise_unsupported_type
@@ -107,10 +109,50 @@ async def create_conversation_message(request: web.Request):
     )
 
     # NOTE: This is done here in the Controller layer, as the interface around email currently needs request
-    if is_first_message:
+    product = products_web.get_current_product(request)
+    fogbugz_settings_or_none: FogbugzSettings | None = request.app[
+        APP_SETTINGS_KEY
+    ].WEBSERVER_FOGBUGZ
+    if (
+        product.support_standard_group_id
+        and fogbugz_settings_or_none is not None
+        and is_first_message
+    ):
+        _logger.debug(
+            "Support settings available and FogBugz client configured, creating FogBugz case."
+        )
+        assert product.support_assigned_fogbugz_project_id  # nosec
+
+        try:
+            _url = request.url
+            _conversation_url = f"{_url.scheme}://{_url.host}/#/conversation/{path_params.conversation_id}"
+
+            await _conversation_service.create_fogbugz_case_for_support_conversation(
+                request.app,
+                conversation=_conversation,
+                user_id=req_ctx.user_id,
+                message_content=message.content,
+                conversation_url=_conversation_url,
+                host=request.host,
+                product_support_assigned_fogbugz_project_id=product.support_assigned_fogbugz_project_id,
+                fogbugz_url=str(fogbugz_settings_or_none.FOGBUGZ_URL),
+            )
+        except Exception:  # pylint: disable=broad-except
+            _logger.exception(
+                "Failed to create support request FogBugz case for conversation %s.",
+                _conversation.conversation_id,
+            )
+
+    elif (
+        product.support_standard_group_id
+        and fogbugz_settings_or_none is None
+        and is_first_message
+    ):
+        _logger.debug(
+            "Support settings available, but no FogBugz client configured, sending email instead to create FogBugz case."
+        )
         try:
             user = await users_service.get_user(request.app, req_ctx.user_id)
-            product = products_web.get_current_product(request)
             template_name = "request_support.jinja2"
             destination_email = product.support_email
             email_template_path = await products_web.get_product_template_path(
@@ -141,6 +183,8 @@ async def create_conversation_message(request: web.Request):
                 template_name,
                 destination_email,
             )
+    else:
+        _logger.debug("No support settings available, skipping FogBugz case creation.")
 
     data = ConversationMessageRestGet.from_domain_model(message)
     return envelope_json_response(data, web.HTTPCreated)

services/web/server/src/simcore_service_webserver/conversations/_conversation_repository.py

@@ -279,6 +279,9 @@ async def update(
         **updates.model_dump(exclude_unset=True),
         conversations.c.modified.name: func.now(),
     }
+    _name = _updates.get("name", "Default")
+    if _name is None:
+        _updates["name"] = "no name"
 
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(

services/web/server/src/simcore_service_webserver/conversations/_conversation_service.py

@@ -1,7 +1,9 @@
 # pylint: disable=unused-argument
 
+import json
 import logging
 from typing import Any
+from urllib.parse import urljoin
 
 from aiohttp import web
 from models_library.basic_types import IDStr
@@ -22,6 +24,7 @@
     notify_conversation_deleted,
     notify_conversation_updated,
 )
+from ..fogbugz import FogbugzCaseCreate, get_fogbugz_rest_client
 from ..groups.api import list_user_groups_ids_with_read_access
 from ..products import products_service
 from ..projects._groups_repository import list_project_groups
@@ -240,3 +243,54 @@ async def list_support_conversations_for_user(
         limit=limit,
         order_by=OrderBy(field=IDStr("conversation_id"), direction=OrderDirection.DESC),
     )
+
+
+async def create_fogbugz_case_for_support_conversation(
+    app: web.Application,
+    *,
+    conversation: ConversationGetDB,
+    user_id: UserID,
+    message_content: str,
+    conversation_url: str,
+    host: str,
+    product_support_assigned_fogbugz_project_id: int,
+    fogbugz_url: str,
+) -> None:
+    """Creates a FogBugz case for a support conversation and updates the conversation with the case URL."""
+    user = await users_service.get_user(app, user_id)
+
+    description = f"""
+    Dear Support Team,
+
+    We have received a support request from {user["first_name"]} {user["last_name"]} ({user["email"]}) on {host}.
+
+    All communication should take place in the Platform Support Center at the following link: {conversation_url}
+
+    First message content: {message_content}
+
+    Extra content: {json.dumps(conversation.extra_context)}
+    """
+
+    fogbugz_client = get_fogbugz_rest_client(app)
+    fogbugz_case_data = FogbugzCaseCreate(
+        fogbugz_project_id=product_support_assigned_fogbugz_project_id,
+        title=f"Request for Support on {host}",
+        description=description,
+    )
+    case_id = await fogbugz_client.create_case(fogbugz_case_data)
+
+    # Update conversation with FogBugz case URL
+    await update_conversation(
+        app,
+        project_id=None,
+        conversation_id=conversation.conversation_id,
+        updates=ConversationPatchDB(
+            extra_context=conversation.extra_context
+            | {
+                "fogbugz_case_url": urljoin(
+                    f"{fogbugz_url}",
+                    f"f/cases/{case_id}",
+                )
+            },
+        ),
+    )

services/web/server/src/simcore_service_webserver/fogbugz/__init__.py

@@ -0,0 +1,8 @@
+# mypy: disable-error-code=truthy-function
+from ._client import FogbugzCaseCreate, FogbugzRestClient, get_fogbugz_rest_client
+
+__all__ = [
+    "get_fogbugz_rest_client",
+    "FogbugzCaseCreate",
+    "FogbugzRestClient",
+]

services/web/server/src/simcore_service_webserver/fogbugz/_client.py

@@ -21,13 +21,9 @@
 _JSON_CONTENT_TYPE = "application/json"
 _UNKNOWN_ERROR_MESSAGE = "Unknown error occurred"
 
-_FOGBUGZ_TIMEOUT: float = Field(
-    default=45.0, description="API request timeout in seconds"
-)
-
 
 class FogbugzCaseCreate(BaseModel):
-    fogbugz_project_id: str = Field(description="Project ID in Fogbugz")
+    fogbugz_project_id: int = Field(description="Project ID in Fogbugz")
     title: str = Field(description="Case title")
     description: str = Field(description="Case description/first comment")
 
@@ -36,7 +32,7 @@ class FogbugzRestClient:
     """REST client for Fogbugz API"""
 
     def __init__(self, api_token: SecretStr, base_url: AnyUrl) -> None:
-        self._client = httpx.AsyncClient(timeout=_FOGBUGZ_TIMEOUT)
+        self._client = httpx.AsyncClient()
         self._api_token = api_token
         self._base_url = base_url
 
@@ -57,7 +53,7 @@ async def create_case(self, data: FogbugzCaseCreate) -> str:
         json_payload = {
             "cmd": "new",
             "token": self._api_token.get_secret_value(),
-            "ixProject": data.fogbugz_project_id,
+            "ixProject": f"{data.fogbugz_project_id}",
             "sTitle": data.title,
             "sEvent": data.description,
         }

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

@@ -461,7 +461,7 @@ async def test_conversation_messages_with_database(
     mock_send_email = mocker.patch(
         "simcore_service_webserver.email.email_service.send_email_from_template"
     )
-
+    mocker.patch("simcore_service_webserver.products.products_web.get_current_product")
     assert client.app
 
     # Create a conversation directly via API (no mocks)

services/web/server/tests/unit/with_dbs/04/test_fogbugz_client.py

@@ -4,6 +4,7 @@
 # pylint: disable=too-many-arguments
 # pylint: disable=too-many-statements
 
+import json
 from collections.abc import Iterator
 
 import httpx
@@ -94,11 +95,20 @@ async def test_fogubugz_client(
     fogbugz_client = get_fogbugz_rest_client(client.app)
     assert fogbugz_client
 
+    _json = {"first_key": "test", "second_key": "test2"}
+    _description = f"""
+    Dear Support Team,
+
+    We have received a support request.
+
+    Extra content: {json.dumps(_json)}
+    """
+
     case_id = await fogbugz_client.create_case(
         data=FogbugzCaseCreate(
-            fogbugz_project_id="45",
+            fogbugz_project_id=45,
             title="Matus Test Automatic Creation of Fogbugz Case",
-            description="This is a test case",
+            description=_description,
         )
     )
     assert case_id == _IXBUG_DUMMY