zahmis 4 лет назад
Родитель
Сommit
e564dd4a31

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

@@ -76,9 +76,9 @@ export class GrowiToSlackCtrl {
     const { tokenGtoPs } = req;
 
     // retrieve Relation with Installation
-    const relations = await this.relationMockRepository.createQueryBuilder('relation_mock')
-      .where('relation_mock.tokenGtoP IN (:...tokens)', { tokens: tokenGtoPs })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+    const relations = await this.relationMockRepository.createQueryBuilder('relation')
+      .where('relation.tokenGtoP IN (:...tokens)', { tokens: tokenGtoPs })
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getMany();
 
     logger.debug(`${relations.length} relations found`, relations);
@@ -126,9 +126,9 @@ export class GrowiToSlackCtrl {
     const tokenGtoP = tokenGtoPs[0];
 
     // retrieve relation with Installation
-    const relation = await this.relationMockRepository.createQueryBuilder('relation_mock')
+    const relation = await this.relationMockRepository.createQueryBuilder('relation')
       .where('tokenGtoP = :token', { token: tokenGtoP })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getOne();
 
     // Returns the result of the test if it already exists
@@ -194,7 +194,7 @@ export class GrowiToSlackCtrl {
     const expiredAtCommands = addHours(new Date(), 48);
 
     // Transaction is not considered because it is used infrequently,
-    const response = await this.relationMockRepository.createQueryBuilder('relation_mock')
+    const response = await this.relationMockRepository.createQueryBuilder('relation')
       .insert()
       .values({
         installation: order.installation,
@@ -262,9 +262,9 @@ export class GrowiToSlackCtrl {
     const tokenGtoP = tokenGtoPs[0];
 
     // retrieve relation with Installation
-    const relation = await this.relationMockRepository.createQueryBuilder('relation_mock')
+    const relation = await this.relationMockRepository.createQueryBuilder('relation')
       .where('tokenGtoP = :token', { token: tokenGtoP })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getOne();
 
     if (relation == null) {

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

@@ -178,9 +178,9 @@ export class SlackCtrl {
     const installationId = authorizeResult.enterpriseId || authorizeResult.teamId;
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const installation = await this.installationRepository.findByTeamIdOrEnterpriseId(installationId!);
-    const relations = await this.relationMockRepository.createQueryBuilder('relation_mock')
-      .where('relation_mock.installationId = :id', { id: installation?.id })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+    const relations = await this.relationMockRepository.createQueryBuilder('relation')
+      .where('relation.installationId = :id', { id: installation?.id })
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getMany();
 
     if (relations.length === 0) {
@@ -320,9 +320,9 @@ export class SlackCtrl {
     }
 
     // check permission
-    const relations = await this.relationMockRepository.createQueryBuilder('relation_mock')
-      .where('relation_mock.installationId = :id', { id: installation?.id })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+    const relations = await this.relationMockRepository.createQueryBuilder('relation')
+      .where('relation.installationId = :id', { id: installation?.id })
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getMany();
 
     if (relations.length === 0) {

+ 4 - 4
packages/slackbot-proxy/src/services/SelectGrowiService.ts

@@ -99,10 +99,10 @@ export class SelectGrowiService implements GrowiCommandProcessor {
     // ovverride trigger_id
     sendCommandBody.trigger_id = triggerId;
 
-    const relation = await this.relationMockRepository.createQueryBuilder('relation_mock')
-      .where('relation_mock.growiUri =:growiUri', { growiUri })
-      .andWhere('relation_mock.installationId = :id', { id: installation?.id })
-      .leftJoinAndSelect('relation_mock.installation', 'installation')
+    const relation = await this.relationMockRepository.createQueryBuilder('relation')
+      .where('relation.growiUri =:growiUri', { growiUri })
+      .andWhere('relation.installationId = :id', { id: installation?.id })
+      .leftJoinAndSelect('relation.installation', 'installation')
       .getOne();
 
     if (relation == null) {