From 8aec9d3e31834860a9b17041440f5f6ce6bd1ee1 Mon Sep 17 00:00:00 2001
From: xxcxy <bert7914@gmail.com>
Date: Fri, 20 Aug 2021 20:35:41 +0800
Subject: [PATCH 1/2] fix Issue in the email title when the team name has
 symbols

---
 src/common/helper.js                  | 4 ++--
 src/eventHandlers/TeamEventHandler.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/helper.js b/src/common/helper.js
index cb29890a..16292383 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -1038,7 +1038,7 @@ async function getProjects (currentUser, criteria = {}) {
     message: `response body: ${JSON.stringify(res.body)}`
   })
   const result = _.map(res.body, (item) => {
-    return _.pick(item, ['id', 'name', 'invites', 'members'])
+    return _.extend(_.pick(item, ['id', 'invites', 'members']), { name: _.unescape(item.name) })
   })
   return {
     total: Number(_.get(res.headers, 'x-total')),
@@ -1195,7 +1195,7 @@ async function getProjectById (currentUser, id) {
       context: 'getProjectById',
       message: `response body: ${JSON.stringify(res.body)}`
     })
-    return _.pick(res.body, ['id', 'name', 'invites', 'members'])
+    return _.extend(_.pick(res.body, ['id', 'invites', 'members']), { name: _.unescape(res.body.name) })
   } catch (err) {
     if (err.status === HttpStatus.FORBIDDEN) {
       throw new errors.ForbiddenError(
diff --git a/src/eventHandlers/TeamEventHandler.js b/src/eventHandlers/TeamEventHandler.js
index aeec9e25..985ffc61 100644
--- a/src/eventHandlers/TeamEventHandler.js
+++ b/src/eventHandlers/TeamEventHandler.js
@@ -49,7 +49,7 @@ async function sendNotificationEmail (payload) {
   logger.debug({
     component: 'TeamEventHandler',
     context: 'sendNotificationEmail',
-    message: `project id: ${payload.project.id} created with jobs: ${_.join(_.map(payload.jobs, 'id'), ',')}`
+    message: `project id: ${payload.project.id}, subject: ${data.subject}, created with jobs: ${_.join(_.map(payload.jobs, 'id'), ',')}`
   })
 }
 

From c0f968976a6647574cb9bd3a2f6f136910084c25 Mon Sep 17 00:00:00 2001
From: xxcxy <bert7914@gmail.com>
Date: Fri, 20 Aug 2021 22:13:58 +0800
Subject: [PATCH 2/2] fix create project

---
 src/common/helper.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/helper.js b/src/common/helper.js
index 16292383..4d2f1dab 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -1925,7 +1925,8 @@ async function createProject (currentUser, data) {
     context: 'createProject',
     message: `response body: ${JSON.stringify(res)}`
   })
-  return _.get(res, 'body')
+  const result = _.get(res, 'body')
+  return _.extend(result, { name: _.unescape(_.get(result, 'name')) })
 }
 
 /**