Просмотр исходного кода

Merge pull request #3753 from weseek/feat/5829-5864-create-relation

Feat/5829 5864 create relation
itizawa 4 лет назад
Родитель
Сommit
3ffd8ae7b7

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

@@ -14,9 +14,6 @@ import { OrderRepository } from '~/repositories/order';
 import { InstallerService } from '~/services/InstallerService';
 import loggerFactory from '~/utils/logger';
 
-import { Relation } from '~/entities/relation';
-import { Order } from '~/entities/order';
-
 
 const logger = loggerFactory('slackbot-proxy:controllers:growi-to-slack');
 
@@ -112,11 +109,12 @@ export class GrowiToSlackCtrl {
 
     logger.debug('relation test is success', order);
 
-    // TODO GW-5864 issue relation
+    // Transaction is not considered because it is used infrequently,
+    const createdRelation = await this.relationRepository.save({
+      installation: order.installation, tokenGtoP: order.growiAccessToken, tokenPtoG: order.proxyAccessToken, growiUri: order.growiUrl,
+    });
 
-    // return order temporary
-    // TODO return new relation
-    return res.send({ order });
+    return res.send({ relation: createdRelation });
   }
 
 }

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

@@ -2,7 +2,7 @@ import {
   Required,
 } from '@tsed/schema';
 import {
-  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, OneToMany,
+  Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn,
 } from 'typeorm';
 
 import { Installation as SlackInstallation } from '@slack/oauth';