From 31ea0e541ce3888778f4f321c83e27ad09c69d88 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 11 May 2020 10:46:01 -0300 Subject: [PATCH] new(core.gbapp):New BASIC keywords and saving to MSExcel. --- packages/core.gbapp/dialogs/SwitchBot.ts | 2 +- packages/core.gbapp/services/GBCoreService.ts | 2 +- packages/core.gbapp/services/GBDeployer.ts | 2 +- packages/core.gbapp/services/GBImporterService.ts | 2 +- packages/core.gbapp/services/GBMinService.ts | 8 ++++---- packages/kb.gbapp/services/KBService.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/core.gbapp/dialogs/SwitchBot.ts b/packages/core.gbapp/dialogs/SwitchBot.ts index f907658d..27185ff4 100644 --- a/packages/core.gbapp/dialogs/SwitchBot.ts +++ b/packages/core.gbapp/dialogs/SwitchBot.ts @@ -64,7 +64,7 @@ export class SwitchBotDialog extends IGBDialog { let sec = new SecService(); let from = step.context.activity.from.id; const botId = step.result; - const instance = await min.core.loadInstance(botId); + const instance = await min.core.loadInstanceByBotId(botId); await sec.updateUserInstance(from, instance.instanceId); await step.context.sendActivity(`Opa, vamos lá!`); diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index e6b22cc4..67fdae47 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -233,7 +233,7 @@ export class GBCoreService implements IGBCoreService { /** * Loads just one Bot instance. */ - public async loadInstance(botId: string): Promise { + public async loadInstanceByBotId(botId: string): Promise { const options = { where: {} }; options.where = { botId: botId }; diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 7294b3bf..d0a1bdfc 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -213,7 +213,7 @@ export class GBDeployer implements IGBDeployer { } else { let botId = GBConfigService.get('BOT_ID'); - let bootInstance = await this.core.loadInstance(botId); + let bootInstance = await this.core.loadInstanceByBotId(botId); instance.searchHost = bootInstance.searchHost; instance.searchIndex = bootInstance.searchIndex; diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts index 204db1df..9dbcb18e 100644 --- a/packages/core.gbapp/services/GBImporterService.ts +++ b/packages/core.gbapp/services/GBImporterService.ts @@ -61,7 +61,7 @@ export class GBImporter { if (botId === undefined) { botId = GBConfigService.get('BOT_ID'); } - const instance = await this.core.loadInstance(botId); + const instance = await this.core.loadInstanceByBotId(botId); if (instance != null && instance.botId === null) { console.log(`Null BotId after load instance with botId: ${botId}.`); diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index dcde55be..298810fd 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -147,7 +147,7 @@ export class GBMinService { activeMin = toSwitchMin ? toSwitchMin : GBServer.globals.minBoot; let sec = new SecService(); - const instance = await this.core.loadInstance(activeMin.botId); + const instance = await this.core.loadInstanceByBotId(activeMin.botId); let user = await sec.getUserFromSystemId(id); if (user === null) { @@ -158,7 +158,7 @@ export class GBMinService { // User wants to switch bots. if (toSwitchMin !== undefined) { const botId = text; - const instance = await this.core.loadInstance(botId); + const instance = await this.core.loadInstanceByBotId(botId); await sec.updateUserInstance(id, instance.instanceId); await (activeMin as any).whatsAppDirectLine.resetConversationId(id); @@ -300,7 +300,7 @@ export class GBMinService { if (botId === '[default]' || botId === undefined) { botId = GBConfigService.get('BOT_ID'); } - const instance = await this.core.loadInstance(botId); + const instance = await this.core.loadInstanceByBotId(botId); if (instance !== null) { const webchatTokenContainer = await this.getWebchatToken(instance); const speechToken = instance.speechKey != null ? await this.getSTSToken(instance) : null; @@ -411,7 +411,7 @@ export class GBMinService { min.adminService = this.adminService; min.deployService = this.deployer; min.kbService = new KBService(this.core.sequelize); - min.instance = await this.core.loadInstance(min.botId); + min.instance = await this.core.loadInstanceByBotId(min.botId); min.cbMap = {}; min.scriptMap = {}; min.sandBoxMap = {}; diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index c82df06f..9751e122 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -560,7 +560,7 @@ export class KBService implements IGBKBService { GBLog.info(`[GBDeployer] Opening package: ${localPath}`); const packageObject = JSON.parse(Fs.readFileSync(urlJoin(localPath, 'package.json'), 'utf8')); - const instance = await core.loadInstance(packageObject.botId); + const instance = await core.loadInstanceByBotId(packageObject.botId); GBLog.info(`[GBDeployer] Importing: ${localPath}`); const p = await deployer.deployPackageToStorage(instance.instanceId, packageName); await this.importKbPackage(localPath, p, instance);