Renamed duplicated name methods & Moved util function

src/server/routes/apiv3/slack-integration.js

@@ -104,7 +104,7 @@ module.exports = (crowi) => {
     const command = args[0];
 
     try {
-      await crowi.slackBotService.handleCommand(command, client, body, args);
+      await crowi.slackBotService.handleCommandRequest(command, client, body, args);
     }
     catch (error) {
       logger.error(error);
@@ -127,15 +127,6 @@ module.exports = (crowi) => {
     return handleCommands(req, res);
   });
 
-
-  const handleBlockActions = async(client, payload) => {
-    await crowi.slackBotService.handleBlockActions(client, payload);
-  };
-
-  const handleViewSubmission = async(client, payload) => {
-    await crowi.slackBotService.handleViewSubmission(client, payload);
-  };
-
   async function handleInteractions(req, res) {
 
     // Send response immediately to avoid opelation_timeout error
@@ -160,10 +151,10 @@ module.exports = (crowi) => {
     try {
       switch (type) {
         case 'block_actions':
-          await handleBlockActions(client, payload);
+          await crowi.slackBotService.handleBlockActionsRequest(client, payload);
           break;
         case 'view_submission':
-          await handleViewSubmission(client, payload);
+          await crowi.slackBotService.handleViewSubmissionRequest(client, payload);
           break;
         default:
           break;

src/server/service/slack-command-handler/create.js

@@ -2,7 +2,7 @@ const { markdownSectionBlock, inputSectionBlock } = require('@growi/slack');
 const logger = require('@alias/logger')('growi:service:SlackCommandHandler:create');
 
 module.exports = (crowi) => {
-  const createPageInGrowi = require('../../util/createPageInGrowi')(crowi);
+  const createPageInGrowi = require('./util/create-page-in-growi')(crowi);
   const BaseSlackCommandHandler = require('./slack-command-handler');
   const handler = new BaseSlackCommandHandler();
 

src/server/service/slack-command-handler/togetter.js

@@ -6,7 +6,7 @@ const axios = require('axios');
 const logger = require('@alias/logger')('growi:service:SlackBotService:togetter');
 
 module.exports = (crowi) => {
-  const createPageInGrowi = require('../../util/createPageInGrowi')(crowi);
+  const createPageInGrowi = require('./util/create-page-in-growi')(crowi);
   const BaseSlackCommandHandler = require('./slack-command-handler');
   const handler = new BaseSlackCommandHandler();
 

src/server/util/createPageInGrowi.js → src/server/service/slack-command-handler/util/create-page-in-growi.js

@@ -2,10 +2,10 @@ const { markdownSectionBlock } = require('@growi/slack');
 const logger = require('@alias/logger')('growi:util:createPageInGrowi');
 const { reshapeContentsBody } = require('@growi/slack');
 const mongoose = require('mongoose');
+const pathUtils = require('growi-commons').pathUtils;
 
 module.exports = crowi => async(client, payload, path, channelId, contentsBody) => {
   const Page = crowi.model('Page');
-  const pathUtils = require('growi-commons').pathUtils;
   const reshapedContentsBody = reshapeContentsBody(contentsBody);
   try {
     // sanitize path

src/server/service/slackbot.js

@@ -63,7 +63,7 @@ class SlackBotService extends S2sMessageHandlable {
   /**
    * Handle /commands endpoint
    */
-  async handleCommand(command, client, body, ...opt) {
+  async handleCommandRequest(command, client, body, ...opt) {
     let module;
     try {
       module = `./slack-command-handler/${command}`;
@@ -81,8 +81,7 @@ class SlackBotService extends S2sMessageHandlable {
     }
   }
 
-  // handleBlockActions(), handleViewSubmission()
-  async handleBlockActions(client, payload) {
+  async handleBlockActionsRequest(client, payload) {
     const { action_id: actionId } = payload.actions[0];
     const commandName = actionId.split(':')[0];
     const handlerMethodName = actionId.split(':')[1];
@@ -98,7 +97,7 @@ class SlackBotService extends S2sMessageHandlable {
     return;
   }
 
-  async handleViewSubmission(client, payload) {
+  async handleViewSubmissionRequest(client, payload) {
     const { callback_id: callbackId } = payload.view;
     const commandName = callbackId.split(':')[0];
     const handlerMethodName = callbackId.split(':')[1];