From 8db05053d5447d554fd6f475822a414a44c65f23 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 19 Aug 2020 13:00:21 -0300 Subject: [PATCH] fix(all): Code cleanup. --- .../admin.gbapp/services/GBAdminService.ts | 2 +- packages/core.gbapp/services/GBAPIService.ts | 4 ++-- .../services/GBConversationalService.ts | 14 ++++++------- packages/core.gbapp/services/GBMinService.ts | 2 +- packages/kb.gbapp/services/KBService.ts | 20 +++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index ecd5eedf..67b8d5af 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -164,7 +164,7 @@ export class GBAdminService implements IGBAdminService { options.where = { key: key, instanceId: instanceId }; const obj = await GuaribasAdmin.findOne(options); - return Promise.resolve(obj.value); + return obj.value; } public async acquireElevatedToken(instanceId: number): Promise { diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 8d88bbfc..17fd0312 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -70,9 +70,9 @@ class SysClass { try { const res = await request(options); - return Promise.resolve(Buffer.from(res, 'binary').toString); + return Buffer.from(res, 'binary').toString(); } catch (error) { - return Promise.reject(new Error(error)); + throw new Error(error); } } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index 37734a90..e58accb3 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -250,7 +250,7 @@ export class GBConversationalService { const params = { audio: data, contentType: 'audio/l16; rate=44100', - model: "pt-BR_BroadbandModel" + model: 'pt-BR_BroadbandModel' }; speechToText @@ -476,13 +476,13 @@ export class GBConversationalService { if (error.statusCode === 404) { GBLog.warn('NLP application still not publish and there are no other options for answering.'); - return Promise.resolve(false); + return false; } else { const msg = `Error calling NLP, check if you have a published model and assigned keys. Error: ${ error.statusCode ? error.statusCode : '' } {error.message; }`; - return Promise.reject(new Error(msg)); + throw new Error(msg); } // tslint:enable:no-unsafe-any } @@ -506,7 +506,7 @@ export class GBConversationalService { // tslint:ensable:no-unsafe-any if (intent === 'None') { - return Promise.resolve(false); + return false; } GBLog.info(`NLP called: ${intent} ${firstEntity}`); @@ -514,15 +514,15 @@ export class GBConversationalService { try { await step.replaceDialog(`/${intent}`, nlp.entities); - return Promise.resolve(true); + return true; } catch (error) { const msg = `Error finding dialog associated to NLP event: ${intent}: ${error.message}`; - return Promise.reject(new Error(msg)); + throw new Error(msg); } } - return Promise.resolve(false); + return false; } async translate(min: GBMinInstance, key: string, endPoint: string, text: string, language: string): Promise { diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 88db562f..94c3c8a8 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -397,7 +397,7 @@ export class GBMinService { try { const json = await request(options); - return Promise.resolve(JSON.parse(json)); + return JSON.parse(json); } catch (error) { const msg = `[botId:${ instance.botId diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index be5f3281..4f4078cf 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -150,10 +150,10 @@ export class KBService implements IGBKBService { } }); - return Promise.resolve({ question: question, answer: answer }); + return { question: question, answer: answer }; } - return Promise.resolve(undefined); + return undefined; } public async addAnswer(obj: GuaribasAnswer): Promise { @@ -197,17 +197,17 @@ export class KBService implements IGBKBService { if (values && values.length > 0 && values[0]['@search.score'] >= searchScore) { const value = await this.getAnswerById(instance.instanceId, values[0].answerId); if (value !== null) { - return Promise.resolve({ answer: value, questionId: values[0].questionId }); + return { answer: value, questionId: values[0].questionId }; } else { - return Promise.resolve({ answer: undefined, questionId: 0 }); + return { answer: undefined, questionId: 0 }; } } } else { const data = await this.getAnswerByText(instance.instanceId, query); if (data) { - return Promise.resolve({ answer: data.answer, questionId: data.question.questionId }); + return { answer: data.answer, questionId: data.question.questionId }; } else { - return Promise.resolve({ answer: undefined, questionId: 0 }); + return { answer: undefined, questionId: 0 }; } } } @@ -368,11 +368,11 @@ export class KBService implements IGBKBService { lastAnswer = answer1; lastQuestionId = question1.questionId; - return Promise.resolve(question1.questionId); + return question1.questionId; } else { // Skips the header. - return Promise.resolve(undefined); + return undefined; } } }); @@ -573,9 +573,9 @@ export class KBService implements IGBKBService { }); if (item.children) { - return Promise.resolve(doIt(item.children, value.subjectId)); + return doIt(item.children, value.subjectId); } else { - return Promise.resolve(item); + return item; } }); };