GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +7 -5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0dc09db4e7 - Show all commits

12
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -2085,14 +2085,16 @@ export class SystemKeywords {
*/
public async merge({ pid, file, data, key1, key2 }): Promise<any> {
if (!data || data.length === 0) {
GBLog.verbose(`BASIC: MERGE running on ${file}: NO DATA.`);
return data;
}
GBLog.info(`BASIC: MERGE running on ${file} and key1: ${key1}, key2: ${key2}...`);
if (!this.cachedMerge[pid]) {
this.cachedMerge[pid] = { file: {} }
}
if (!data) {
GBLog.info(`BASIC: MERGE running on ${file}: NO DATA.`);
return data;
}
const { min, user, params } = await DialogKeywords.getProcessInfo(pid);
@ -2398,7 +2400,7 @@ export class SystemKeywords {
await this.saveToStorageBatch({ pid, table: file, rows: fieldsValuesList });
}
GBLog.info(`BASIC: MERGE updated (merges:${merges}, additions:${adds}, skipped: ${skipped}).`);
GBLog.info(`BASIC: MERGE results: merges:${merges}, additions:${adds}, skipped: ${skipped}.`);
return table;
}