Skip to content

Commit 1216a42

Browse files
send email to fogbugz
1 parent 37de58e commit 1216a42

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,15 @@ async def create_conversation_message(request: web.Request):
122122
"last_name": user["last_name"],
123123
"user_email": user["email"],
124124
"conversation_url": _conversation_url,
125+
"message_content": message.content,
125126
"extra_context": _extra_context,
126127
},
127128
)
128129
except Exception: # pylint: disable=broad-except
129130
_logger.exception(
130-
"Failed while sending '%s' email to %s",
131+
"Failed to send '%s' email to %s (this means the FogBugz case for the request was not created).",
131132
template_name,
132-
user["email"],
133+
destination_email,
133134
)
134135

135136
data = ConversationMessageRestGet.from_domain_model(message)

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,29 @@ async def create_support_message_and_check_if_it_is_first_message(
7979
type_=type_,
8080
)
8181

82-
return created_message, True
82+
await _conversation_message_repository.list_(
83+
app,
84+
conversation_id=conversation_id,
85+
offset=0,
86+
limit=1,
87+
order_by=OrderBy(
88+
field=IDStr("created"), direction=OrderDirection.ASC
89+
), # NOTE: ASC - first message first
90+
)
91+
92+
_, messages = await list_messages_for_conversation(
93+
app,
94+
conversation_id=conversation_id,
95+
offset=0,
96+
limit=1,
97+
)
98+
is_first_message = False
99+
if messages:
100+
first_message = messages[0]
101+
is_first_message = first_message.message_id == created_message.message_id
102+
is_first_message = True
103+
104+
return created_message, is_first_message
83105

84106

85107
async def get_message(

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TEST last_name: {{ last_name }}
77
TEST user_email: {{ user_email }}
88
TEST product: {{ product }}
99
TEST conversation_url: {{ conversation_url }}
10+
TEST message_content: {{ message_content }}
1011
TEST extra_context: {{ extra_context }}
1112
-->
1213
<p>
@@ -23,7 +24,11 @@ TEST extra_context: {{ extra_context }}
2324
</p>
2425

2526
<p>
26-
Additional Information:
27+
First message content: {{ message_content }}
28+
</p>
29+
30+
<p>
31+
Extra Contect:
2732
</p>
2833

2934
<pre>

0 commit comments

Comments
 (0)