Feature/show blocked users

libs/features/convs-mgr/conversations/chats/src/lib/components/chats-list/chats-list.component.html

@@ -13,6 +13,7 @@
           <button mat-menu-item (click)="updateList('stashed', 'Stashed')">Stashed</button>
           <button mat-menu-item (click)="updateList('completed', 'Completed')">Completed</button> -->
           <button mat-menu-item (click)="updateList('all', 'All')">All</button>
+          <button mat-menu-item (click)="updateList('blocked', 'Help Requests')">Help Requests</button>
         </mat-menu>
         <div class="menu-title">
           {{ selected }} ({{displayedChats.length}})

libs/features/convs-mgr/conversations/chats/src/lib/components/chats-list/chats-list.component.ts

@@ -44,6 +44,7 @@ export class ChatsListComponent implements AfterViewInit
   paused: Chat[];
   completed: Chat[];
   stashed: Chat[];
+  blocked: Chat[];
 
   @ViewChildren(MatPaginator) paginator: QueryList<MatPaginator>;
 
@@ -101,10 +102,16 @@ export class ChatsListComponent implements AfterViewInit
     this.onboarding = [];
     this.completed = [];
     this.stashed = [];
+    this.blocked = [];
   }
 
   categorize(chat: Chat)
   {
+    if(chat.isConversationComplete === -1) {
+      this.blocked.push(chat);
+      return;
+    }
+
     switch(chat.flow)
     {
       case ChatFlowStatus.PausedByAgent:
@@ -189,6 +196,9 @@ export class ChatsListComponent implements AfterViewInit
       case "completed":
         this.displayedChats = this.completed;
         break;
+      case "blocked":
+        this.displayedChats = this.blocked;
+        break;
       case 'all':
       default:
         this.displayedChats = this.chats;

libs/features/convs-mgr/dashboard/src/lib/components/trainer-stats/trainer-dashboard-stats.component.html

@@ -16,7 +16,7 @@
   </mat-card>
 
   <mat-card fxFlex="23" class="stats-card">
-    <div class="stats-number">{{pendingAssessments}}</div>
+    <div class="stats-number">{{pausedChats}}</div>
     <div class="stats-title">Paused Chats</div>
     <div class="stats-difference negative">
       <i class="fas fa-arrow-circle-down"></i> decrease

libs/features/convs-mgr/dashboard/src/lib/components/trainer-stats/trainer-dashboard-stats.component.ts

@@ -1,6 +1,6 @@
 import { Component} from '@angular/core';
 
-import { Chat, ChatFlowStatus } from '@app/model/convs-mgr/conversations/chats';
+import { Chat, ChatFlowStatus, ChatStatus } from '@app/model/convs-mgr/conversations/chats';
 import { ChatsStore } from '@app/state/convs-mgr/conversations/chats';
 
 @Component({
@@ -14,7 +14,7 @@ export class TrainerStatsComponent
   engagedChats: number;
   activeChats: number;
   seekingAssistance: number;
-  pendingAssessments: number;
+  pausedChats: number;
 
   constructor(private _chats$: ChatsStore)
   {
@@ -24,11 +24,9 @@ export class TrainerStatsComponent
   getChatStats(chats: Chat[])
   {
     this.engagedChats = chats.length;
-    this.activeChats = chats.filter(chat => chat.flow !== ChatFlowStatus.Completed).length;
-    const helpRequests = chats.filter(chat => chat.flow === ChatFlowStatus.Paused).length;
-    const offlineRequests = chats.filter(chat => chat.flow === ChatFlowStatus.OnWaitlist).length;
-    this.seekingAssistance = helpRequests + offlineRequests;
-    this.pendingAssessments = chats.filter(chat => chat.flow === ChatFlowStatus.PendingAssessment).length;
+    this.activeChats = chats.filter(chat => chat.status === ChatStatus.Running).length;
+    this.seekingAssistance = chats.filter(chat => chat.isConversationComplete === -1).length;
+    this.pausedChats = chats.filter(chat => chat.status === (ChatStatus.PausedByAgent)).length;
   }
 
 }

libs/functions/bot-engine/main/src/lib/handlers/send-outgoing-message.handler.ts

@@ -83,16 +83,20 @@ export class SendOutgoingMsgHandler extends FunctionHandler<Message, RestResult>
       // Check if the last message sent was more than 24hours ago
       if ((Date.now() - latestMessageTime) > 86400000) {
         const templateConfig = communicationChannel.templateConfig;
+        if(templateConfig) {
         // Send the opt-in message template
 
         // Get the opt-in message template
         outgoingMessagePayload = activeChannel
-                                  .parseOutMessageTemplate(templateConfig, outgoingPayload.endUserPhoneNumber, outgoingPayload);
+        .parseOutMessageTemplate(templateConfig, outgoingPayload.endUserPhoneNumber, outgoingPayload);
+        }
       }}
 
       // STEP 5: Send the message
       await activeChannel.send(outgoingMessagePayload as any);
 
+      tools.Logger.error(() => `[WhatsAppSendOutgoingMsgHandler].execute - Success in sending message ${JSON.stringify(outgoingMessagePayload)}`);
+
       return { success: true } as RestResult200;
     } catch (error) {
       tools.Logger.error(() => `[WhatsAppSendOutgoingMsgHandler].execute - Encountered an error ${error}`);

libs/functions/bot-engine/whatsapp/src/lib/models/whatsapp-active-channel.model.ts

@@ -63,7 +63,7 @@ export class WhatsappActiveChannel implements ActiveChannel
   {
     // Create the message template payload which will be sent to whatsapp
     const messageTemplate = new WhatsappOutgoingMessageParser()
-                              .parseOutMessageTemplate(templateConfig, phone, message);
+                              .getMessageTemplateParserOut(templateConfig, phone, message);
 
     return messageTemplate;
   }
@@ -106,7 +106,7 @@ export class WhatsappActiveChannel implements ActiveChannel
       this._tools.Logger.log(() => `[SendWhatsAppMessageModel].sendMessage: Success in sending message ${JSON.stringify(response.data)}`);
 
       // Mark the conversation as complete
-      this.endUserService.setConversationComplete(`w_${this.channel.n}_${whatsappMessage.to}`, +1).then(() => {
+      this.endUserService.setConversationComplete(`w_${this.channel.n}_${whatsappMessage.to}`, 1).then(() => {
 
         this._tools.Logger.log(() => `[SendWhatsAppMessageModel].sendMessage: Conversation marked as complete`);
       }).catch(err => {

libs/model/convs-mgr/conversations/chats/src/lib/chat.interface.ts

@@ -51,6 +51,8 @@ export interface Chat extends IObject
   instructors?: string[];
 
   lastMsg?: any;
+
+  isConversationComplete?: number;
 }
 
 export interface ChatUserInfo {