feat: convert slackId to growi user

https://youtrack.weseek.co.jp/issue/GW-7697
- Add method to find username by slack Id
- Convert slack Id to growi username if slack Id exists (on progress)

packages/app/src/client/services/PersonalContainer.js

@@ -56,6 +56,7 @@ export default class PersonalContainer extends Container {
         lang: currentUser.lang,
         isGravatarEnabled: currentUser.isGravatarEnabled,
         apiToken: currentUser.apiToken,
+        slackId: currentUser.slackId,
       });
     }
     catch (err) {

packages/app/src/components/Me/BasicInfoSettings.jsx

@@ -79,18 +79,6 @@ class BasicInfoSettings extends React.Component {
             )}
           </div>
         </div>
-        <div className="form-group row">
-          <label htmlFor="userForm[slackId]" className="text-left text-md-right col-md-3 col-form-label">{t('Slack ID')}</label>
-          <div className="col-md-6">
-            <input
-              className="form-control"
-              type="text"
-              name="userForm[slackId]"
-              defaultValue={personalContainer.state.slackId}
-              onChange={(e) => { personalContainer.changeSlackId(e.target.value) }}
-            />
-          </div>
-        </div>
 
         <div className="form-group row">
           <label className="text-left text-md-right col-md-3 col-form-label">{t('Disclose E-mail')}</label>
@@ -140,6 +128,19 @@ class BasicInfoSettings extends React.Component {
             }
           </div>
         </div>
+        <div className="form-group row">
+          <label htmlFor="userForm[slackId]" className="text-left text-md-right col-md-3 col-form-label">{t('Slack ID')}</label>
+          <div className="col-md-6">
+            <input
+              className="form-control"
+              type="text"
+              key={personalContainer.state.slackId}
+              name="userForm[slackId]"
+              defaultValue={personalContainer.state.slackId}
+              onChange={(e) => { personalContainer.changeSlackId(e.target.value) }}
+            />
+          </div>
+        </div>
 
         <div className="row my-3">
           <div className="offset-4 col-5">

packages/app/src/server/models/user.js

@@ -690,6 +690,13 @@ module.exports = function(crowi) {
     user.save();
   };
 
+  userSchema.statics.findUserBySlackId = function(slackId) {
+    if (slackId == null) {
+      return Promise.resolve(null);
+    }
+    return this.findOne({ slackId });
+  };
+
   class UserUpperLimitException {
 
     constructor() {

packages/app/src/server/service/slack-command-handler/keep.js

@@ -12,6 +12,7 @@ module.exports = (crowi) => {
   const createPageService = new CreatePageService(crowi);
   const BaseSlackCommandHandler = require('./slack-command-handler');
   const handler = new BaseSlackCommandHandler();
+  const { User } = crowi.models;
 
   handler.handleCommand = async function(growiCommand, client, body, respondUtil) {
     await respondUtil.respond({
@@ -89,6 +90,11 @@ module.exports = (crowi) => {
     });
   }
 
+  function findUserBySlackId(slackId) {
+    const userData = User.findUserBySlackId(slackId);
+    return userData ? userData.username : slackId;
+  }
+
   handler.keepGetMessages = async function(client, channelId, newest, oldest) {
     let result;
 
@@ -148,16 +154,18 @@ module.exports = (crowi) => {
       .forEach((message) => {
         // increment contentsBody while removing the same headers
         // exclude header
+
+        const messageUsername = findUserBySlackId(message.user);
         const lastMessageTs = Math.floor(lastMessage.ts / 60);
         const messageTs = Math.floor(message.ts / 60);
-        if (lastMessage.user === message.user && lastMessageTs === messageTs) {
+        if (lastMessage.user === messageUsername && lastMessageTs === messageTs) {
           cleanedContents.push(`${message.text}\n`);
         }
         // include header
         else {
           const ts = (parseInt(message.ts) - grwTzoffset) * 1000;
           const time = format(new Date(ts), 'h:mm a');
-          cleanedContents.push(`${message.user}  ${time}\n${message.text}\n`);
+          cleanedContents.push(`${messageUsername}  ${time}\n${message.text}\n`);
           lastMessage = message;
         }
       });