From d5f42982f61e10e3e6150f71a8fc23cc6c6abf6c Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Mon, 23 Nov 2020 08:33:48 -0300
Subject: [PATCH] fix(analytics.gblib): Improvements in customer feedback.

---
 .../analytics.gblib/services/AnalyticsService.ts | 12 ++++++------
 .../dialogs/FeedbackDialog.ts                    | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/analytics.gblib/services/AnalyticsService.ts b/packages/analytics.gblib/services/AnalyticsService.ts
index 80f1eaed9..3ebb83cfa 100644
--- a/packages/analytics.gblib/services/AnalyticsService.ts
+++ b/packages/analytics.gblib/services/AnalyticsService.ts
@@ -53,22 +53,22 @@ export class AnalyticsService {
   }
 
   public async updateConversationRate(
-    instanceId: number, 
+    instanceId: number,
     conversationId: number,
     rate: number
   ): Promise<GuaribasConversation> {
-    const options = { where: {} };
-    // TODO: Filter by instanceId: instanceId
-    options.where = {  conversationId: conversationId };
+    const options = { where: { } };
+
+    options.where = { conversationId: conversationId,  instanceId: instanceId };
     const item = await GuaribasConversation.findOne(options);
     item.rate = rate;
-    item.rateDate = new Date();    
+    item.rateDate = new Date();
     return item.save();
   }
 
 
   public async createMessage(
-    instanceId: number, 
+    instanceId: number,
     conversation: GuaribasConversation,
     userId: number,
     content: string
diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
index 5adc62840..13dd05766 100644
--- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
+++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
@@ -44,6 +44,7 @@ import { CSService } from '../services/CSService';
 import { Messages } from '../strings';
 import { SecService } from '../../security.gbapp/services/SecService';
 import { GBServer } from '../../../src/app';
+import { AnalyticsService } from '../../analytics.gblib/services/AnalyticsService';
 
 /**
  * Dialog for feedback collecting.
@@ -141,20 +142,25 @@ export class FeedbackDialog extends IGBDialog {
           const user = await min.userProfile.get(step.context, {});
 
           const rate = await AzureText.getSentiment(
-            minBoot.instance.textAnalyticsKey ?   minBoot.instance.textAnalyticsKey : minBoot.instance.textAnalyticsKey,
-            minBoot.instance.textAnalyticsEndpoint ?              minBoot.instance.textAnalyticsEndpoint : minBoot.instance.textAnalyticsEndpoint,
+            minBoot.instance.textAnalyticsKey ? minBoot.instance.textAnalyticsKey : minBoot.instance.textAnalyticsKey,
+            minBoot.instance.textAnalyticsEndpoint ? minBoot.instance.textAnalyticsEndpoint : minBoot.instance.textAnalyticsEndpoint,
             user.systemUser.locale,
             step.result
           );
 
-          const fixedLocale= 'en-US';
+          // Updates values to perform Bot Analytics.
+
+          // const analytics = new AnalyticsService();
+          // analytics.updateConversationRate(min.instance.instanceId, user.conversation, rate);
+
+          const fixedLocale = 'en-US';
           if (rate > 0.5) {
-              await min.conversationalService.sendText(min, step, Messages[fixedLocale].glad_you_liked);
+            await min.conversationalService.sendText(min, step, Messages[fixedLocale].glad_you_liked);
           } else {
 
             const message = min.core.getParam<string>(min.instance, "Feedback Improve Message",
               Messages[fixedLocale].we_will_improve); // TODO: Improve to be multi-language.
-            
+
             await min.conversationalService.sendText(min, step, message);
           }