From 741b40c77b155bb04984249c3baea5728aa78675 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 10 Sep 2023 17:23:32 -0300 Subject: [PATCH] fix(all): Fix search on others bots than boot. --- packages/core.gbapp/services/GBDeployer.ts | 16 ++++++++++++---- packages/kb.gbapp/services/KBService.ts | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index b2326db7..e2ffa8cd 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -720,13 +720,21 @@ export class GBDeployer implements IGBDeployer { GBLogEx.info(instance.instanceId, `Acquiring rebuildIndex mutex...`); release = await GBServer.globals.indexSemaphore.acquire(); GBLogEx.info(instance.instanceId, `Acquire rebuildIndex done.`); + + const key = instance.searchKey ? instance.searchKey : GBServer.globals.minBoot.instance.searchKey; + const searchIndex = instance.searchIndex ? instance.searchIndex : GBServer.globals.minBoot.instance.searchIndex; + const searchIndexer = instance.searchIndexer + ? instance.searchIndexer + : GBServer.globals.minBoot.instance.searchIndexer; + const host = instance.searchHost ? instance.searchHost : GBServer.globals.minBoot.instance.searchHost; + // Prepares search. const search = new AzureSearch( - instance.searchKey, - instance.searchHost, - instance.searchIndex, - instance.searchIndexer + key, + host, + searchIndex, + searchIndexer ); const connectionString = GBDeployer.getConnectionStringFromInstance(instance); const dsName = 'gb'; diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 264ff589..d03f2ae5 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -312,7 +312,7 @@ export class KBService implements IGBKBService { key: key } as any); - const results = await client.search(query, { + const results = await client.search(query.substring(0,499), { filter: `instanceId eq ${instance.instanceId} and skipIndex eq false`, searchFields: ['content', 'subject1', 'subject2', 'subject3', 'subject4'], select: ['instanceId', 'questionId', 'answerId'],