Explorar el Código

move to utils

itizawa hace 4 años
padre
commit
f8bef89e07

+ 2 - 2
packages/slackbot-proxy/src/controllers/growi-to-slack.ts

@@ -19,7 +19,7 @@ import { OrderRepository } from '~/repositories/order';
 import { InstallerService } from '~/services/InstallerService';
 import { InstallerService } from '~/services/InstallerService';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 import { DelegatorTypes, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
 import { DelegatorTypes, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
-import { growiUriInjectionModalDelegator } from '~/services/growi-uri-injector/GrowiUriInjectionModalDelegator';
+import { injectGrowiUriToView } from '~/utils/injectGrowiUriToView';
 
 
 
 
 const logger = loggerFactory('slackbot-proxy:controllers:growi-to-slack');
 const logger = loggerFactory('slackbot-proxy:controllers:growi-to-slack');
@@ -168,7 +168,7 @@ export class GrowiToSlackCtrl {
   injectGrowiUri(req:GrowiReq, growiUri:string):WebAPICallOptions {
   injectGrowiUri(req:GrowiReq, growiUri:string):WebAPICallOptions {
 
 
     if (req.body.view != null) {
     if (req.body.view != null) {
-      growiUriInjectionModalDelegator.inject(req.body, growiUri);
+      injectGrowiUriToView(req.body, growiUri);
     }
     }
 
 
     if (req.body.blocks != null) {
     if (req.body.blocks != null) {

+ 2 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts

@@ -3,7 +3,7 @@ import {
 } from '@tsed/common';
 } from '@tsed/common';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 import { DelegatorTypes, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
 import { DelegatorTypes, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
-import { growiUriInjectionModalDelegator } from '~/services/growi-uri-injector/GrowiUriInjectionModalDelegator';
+import { extractGrowiUriFromView } from '~/utils/extractGrowiUriFromView';
 
 
 @Middleware()
 @Middleware()
 export class ExtractGrowiUriFromReq implements IMiddleware {
 export class ExtractGrowiUriFromReq implements IMiddleware {
@@ -14,7 +14,7 @@ export class ExtractGrowiUriFromReq implements IMiddleware {
 
 
     // extract for modal
     // extract for modal
     if (payload.view != null) {
     if (payload.view != null) {
-      const extractedValues = growiUriInjectionModalDelegator.extract(payload);
+      const extractedValues = extractGrowiUriFromView(payload.view);
       req.growiUri = extractedValues.growiUri;
       req.growiUri = extractedValues.growiUri;
       payload.view.private_metadata = extractedValues.originalData;
       payload.view.private_metadata = extractedValues.originalData;
     }
     }

+ 0 - 32
packages/slackbot-proxy/src/services/growi-uri-injector/GrowiUriInjectionModalDelegator.ts

@@ -1,32 +0,0 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { GrowiUriInjector } from './GrowiUriInjector';
-
-export class GrowiUriInjectionModalDelegator implements GrowiUriInjector {
-
-
-  inject(body: any, growiUri:string): void {
-    if (body.view == null) {
-      return;
-    }
-    const parsedView = JSON.parse(body.view as string);
-    const originalData = JSON.stringify(parsedView.private_metadata);
-
-    parsedView.private_metadata = JSON.stringify({ growiUri, originalData });
-    body.view = JSON.stringify(parsedView);
-  }
-
-  extract(payload: any): {growiUri?:string, originalData:{[key:string]:any}} {
-    if (payload?.view?.private_metadata == null) {
-      return { originalData: {} };
-    }
-    const parsedValues = JSON.parse(payload.view.private_metadata);
-    if (parsedValues.originalData != null) {
-      parsedValues.originalData = JSON.parse(parsedValues.originalData);
-    }
-    return parsedValues;
-
-  }
-
-}
-
-export const growiUriInjectionModalDelegator = new GrowiUriInjectionModalDelegator();

+ 7 - 0
packages/slackbot-proxy/src/utils/extractGrowiUriFromView.ts

@@ -0,0 +1,7 @@
+export const extractGrowiUriFromView = (view:{'private_metadata': string}): {growiUri?:string, originalData:{[key:string]:any}} => {
+  const parsedValues = JSON.parse(view.private_metadata);
+  if (parsedValues.originalData != null) {
+    parsedValues.originalData = JSON.parse(parsedValues.originalData);
+  }
+  return parsedValues;
+};

+ 7 - 0
packages/slackbot-proxy/src/utils/injectGrowiUriToView.ts

@@ -0,0 +1,7 @@
+export const injectGrowiUriToView = (body: {view:string}, growiUri:string): void => {
+  const parsedView = JSON.parse(body.view);
+  const originalData = JSON.stringify(parsedView.private_metadata);
+
+  parsedView.private_metadata = JSON.stringify({ growiUri, originalData });
+  body.view = JSON.stringify(parsedView);
+};