Răsfoiți Sursa

refactor: count in try block

Yuki Takei 4 ani în urmă
părinte
comite
381fbc37cf

+ 5 - 5
packages/app/src/server/routes/apiv3/slack-integration-settings.js

@@ -357,19 +357,19 @@ module.exports = (crowi) => {
    *            description: Succeeded to create slack app integration
    *            description: Succeeded to create slack app integration
    */
    */
   router.put('/slack-app-integrations', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
   router.put('/slack-app-integrations', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
-    const slackAppIntegrationRecordsNum = await SlackAppIntegration.countDocuments();
-    if (slackAppIntegrationRecordsNum >= 10) {
+    const { tokenGtoP, tokenPtoG } = await SlackAppIntegration.generateUniqueAccessTokens();
+    try {
+      const count = await SlackAppIntegration.countDocuments();
+      if (count >= 10) {
       const msg = 'Not be able to create more than 10 slack workspace integration settings';
       const msg = 'Not be able to create more than 10 slack workspace integration settings';
       logger.error('Error', msg);
       logger.error('Error', msg);
       return res.apiv3Err(new ErrorV3(msg, 'create-slackAppIntegeration-failed'), 500);
       return res.apiv3Err(new ErrorV3(msg, 'create-slackAppIntegeration-failed'), 500);
     }
     }
 
 
-    const { tokenGtoP, tokenPtoG } = await SlackAppIntegration.generateUniqueAccessTokens();
-    try {
       const slackAppTokens = await SlackAppIntegration.create({
       const slackAppTokens = await SlackAppIntegration.create({
         tokenGtoP,
         tokenGtoP,
         tokenPtoG,
         tokenPtoG,
-        isPrimary: slackAppIntegrationRecordsNum === 0 ? true : undefined,
+        isPrimary: count === 0 ? true : undefined,
         supportedCommandsForBroadcastUse: defaultSupportedCommandsNameForBroadcastUse,
         supportedCommandsForBroadcastUse: defaultSupportedCommandsNameForBroadcastUse,
         supportedCommandsForSingleUse: defaultSupportedCommandsNameForSingleUse,
         supportedCommandsForSingleUse: defaultSupportedCommandsNameForSingleUse,
       });
       });