Merge branch 'feat/growi-bot' into feat/create-modal-after-typing-growi-register

.github/workflows/ci-slackbot-proxy.yml

@@ -7,6 +7,7 @@ on:
       - tmp/**
     paths:
       - .github/workflows/ci-slackbot-proxy.yml
+      - packages/slack/*
       - packages/slackbot-proxy/*
       - package.json
       - yarn.lock

packages/slack/.eslintignore

@@ -1,2 +1,2 @@
-/dist/**
+/lib/**
 /node_modules/**

packages/slack/.gitignore

@@ -1 +1 @@
-/dist/
+/lib/

packages/slack/package.json

@@ -2,8 +2,8 @@
   "name": "@growi/slack",
   "version": "0.9.0-RC",
   "license": "MIT",
-  "main": "dist/index.js",
-  "files": ["dist"],
+  "main": "lib/index.js",
+  "files": ["lib"],
   "scripts": {
     "build": "yarn tsc",
     "tsc": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",

packages/slack/tsconfig.build.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "dist",
+    "outDir": "lib",
     "declaration": true,
     "noResolve": false,
     "preserveConstEnums": true,

packages/slack/tsconfig.json

@@ -20,10 +20,10 @@
 
     /* Module Resolution Options */
     "moduleResolution": "node",
-    "baseUrl": ".",
+    "baseUrl": "src",
     "paths": {
-      "~/*": ["src/*"],
-      "^/*": ["./*"],
+      "~/*": ["./*"],
+      "^/*": ["../*"],
     },
     "typeRoots": [
       "../../node_modules/@types",

packages/slackbot-proxy/src/controllers/slack.ts

@@ -3,7 +3,10 @@ import {
 } from '@tsed/common';
 import { parse } from '@growi/slack/src/utils/slash-command-parser';
 import { Installation } from '~/entities/installation';
+import { Order } from '~/entities/order';
+
 import { InstallationRepository } from '~/repositories/installation';
+import { OrderRepository } from '~/repositories/order';
 import { InstallerService } from '~/services/InstallerService';
 import { RegisterService } from '~/services/RegisterService';
 
@@ -18,30 +21,32 @@ export class SlackCtrl {
   installationRepository: InstallationRepository;
 
   @Inject()
-  registerService: RegisterService
+  orderRepository: OrderRepository;
 
+  @Inject()
+  registerService: RegisterService;
 
-   growiCommandsMappings = {
-     register: async(body:{[key:string]:string}):Promise<void> => this.registerService.execSlashCommand(body),
-   };
+  growiCommandsMappings = {
+    register: async(body:{[key:string]:string}):Promise<void> => this.registerService.execSlashCommand(body),
+  };
 
   @Get('/testsave')
-   testsave(): void {
-     const installation = new Installation();
-     installation.data = {
-       team: undefined,
-       enterprise: undefined,
-       user: {
-         id: '',
-         token: undefined,
-         scopes: undefined,
-       },
-     };
-
-     // const installationRepository = getRepository(Installation);
-
-     this.installationRepository.save(installation);
-   }
+  testsave(): void {
+    const installation = new Installation();
+    installation.data = {
+      team: undefined,
+      enterprise: undefined,
+      user: {
+        id: '',
+        token: undefined,
+        scopes: undefined,
+      },
+    };
+
+    // const installationRepository = getRepository(Installation);
+
+    this.installationRepository.save(installation);
+  }
 
 
   @Get('/install')
@@ -74,6 +79,27 @@ export class SlackCtrl {
     await executeGrowiCommand(body);
     res.send();
 
+    const installation = await this.installationRepository.findByID('1');
+    if (installation == null) {
+      throw new Error('installation is reqiured');
+    }
+
+    // Find the latest order by installationId
+    let order = await this.orderRepository.findOne({
+      installation: installation.id,
+    }, {
+      order: {
+        createdAt: 'DESC',
+      },
+    });
+
+    if (order == null || order.isExpired()) {
+      order = await this.orderRepository.save({ installation: installation.id });
+    }
+
+    console.log('body', body);
+    console.log('order', order);
+
     return 'This action will be handled by bolt service.';
   }
 

packages/slackbot-proxy/src/entities/installation.ts

@@ -2,10 +2,11 @@ import {
   Required,
 } from '@tsed/schema';
 import {
-  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn,
+  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, OneToMany,
 } from 'typeorm';
 
 import { Installation as SlackInstallation } from '@slack/oauth';
+import { Order } from './order';
 
 @Entity()
 export class Installation {

packages/slackbot-proxy/src/entities/order.ts

@@ -0,0 +1,38 @@
+import {
+  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne,
+} from 'typeorm';
+import { Installation } from './installation';
+
+@Entity()
+export class Order {
+
+  @PrimaryGeneratedColumn()
+  readonly id: number;
+
+  @CreateDateColumn()
+  readonly createdAt: Date;
+
+  @UpdateDateColumn()
+  readonly updatedAt: Date;
+
+  @ManyToOne(() => Installation)
+  readonly installation: number;
+
+  @Column({ nullable: true, default: false })
+  isCompleted?: boolean;
+
+  @Column({ nullable: true })
+  growiUrl?: string;
+
+  @Column({ nullable: true })
+  growiAccessToken?: string;
+
+  @Column({ nullable: true })
+  proxyAccessToken?: string;
+
+  isExpired():boolean {
+    // TODO GW-5555 implement this
+    return false;
+  }
+
+}

packages/slackbot-proxy/src/repositories/order.ts

@@ -0,0 +1,10 @@
+import {
+  Repository, EntityRepository,
+} from 'typeorm';
+
+import { Order } from '~/entities/order';
+
+@EntityRepository(Order)
+export class OrderRepository extends Repository<Order> {
+
+}

packages/slackbot-proxy/src/services/RecieveService.ts

@@ -1,15 +1,15 @@
 import { Service } from '@tsed/di';
-// import { parse } from '@growi/slack/src/utils/slash-command-parser';
+import { parse } from '@growi/slack/lib/utils/slash-command-parser';
 
 @Service()
 export class ReceiveService {
 
   receiveContentsFromSlack(body:{[key:string]:string}) : string {
-    // const parseBody = parse(body);
-    // if (parseBody.growiCommandType === 'register') {
-    //   console.log('register action occured');
-    //   return 'register action occurd';
-    // }
+    const parseBody = parse(body);
+    if (parseBody.growiCommandType === 'register') {
+      console.log('register action occured');
+      return 'register action occurd';
+    }
     return 'return receiveContentsFromSlack';
   }