- {{chat.message}}
- ![]()
-
+ {{chat.message.text}}
+ ![]()
+
{{language?.activityIndicationMessage}}
-
diff --git a/src/app/meds-n-labels/activity-3/activity-3.component.spec.ts b/src/app/meds-n-labels/activity-3/activity-3.component.spec.ts
index c98eb2e..07d429f 100644
--- a/src/app/meds-n-labels/activity-3/activity-3.component.spec.ts
+++ b/src/app/meds-n-labels/activity-3/activity-3.component.spec.ts
@@ -14,6 +14,7 @@ import { RouterTestingModule } from '@angular/router/testing';
import { PerformanceDisplayService } from '../../services/performance-display.service';
import { MatDialog } from '@angular/material/dialog';
import { OverlayModule } from '@angular/cdk/overlay';
+import { BotService } from '../../services/BotService/bot.service';
describe('DoctorchatComponent', () => {
let component: DoctorchatComponent;
@@ -24,7 +25,7 @@ describe('DoctorchatComponent', () => {
declarations: [DoctorchatComponent, ButtonNavComponent],
imports: [FormsModule, ToastrModule.forRoot(), RouterTestingModule, OverlayModule],
providers: [DoctorService, APIService, HttpClient, HttpHandler, SharedDataService, DashboardService, ToastrService, InfokitService, LanguageService,
- PerformanceDisplayService, MatDialog]
+ PerformanceDisplayService, MatDialog, BotService]
})
.compileComponents();
}));
diff --git a/src/app/meds-n-labels/activity-3/activity-3.component.ts b/src/app/meds-n-labels/activity-3/activity-3.component.ts
index 9a69d4a..b656e52 100644
--- a/src/app/meds-n-labels/activity-3/activity-3.component.ts
+++ b/src/app/meds-n-labels/activity-3/activity-3.component.ts
@@ -1,9 +1,10 @@
-import { Component, OnInit, AfterViewChecked, ViewChild, ViewContainerRef } from '@angular/core';
+import { AfterViewChecked, Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
import { DoctorService } from '../../services/doctorchat.service';
import { SharedDataService } from '../../services/shared.data.service';
import { InfokitService } from '../../services/infokit.service';
import { DashboardService } from '../../services/dashboard.service';
import { LanguageService } from '../../services/language.service';
+import { BotService } from '../../services/BotService/bot.service';
@Component({
selector: 'app-doctorchat',
@@ -21,7 +22,7 @@ export class DoctorchatComponent implements OnInit, AfterViewChecked {
messages = [];
@ViewChild('chats') chatContainer;
- constructor(private _doctorchat: DoctorService, private _sharedData: SharedDataService, vcr: ViewContainerRef, private _infokitService: InfokitService, private _dashboardService: DashboardService, private _langService: LanguageService) {
+ constructor(private _doctorchat: DoctorService, private _sharedData: SharedDataService, vcr: ViewContainerRef, private _infokitService: InfokitService, private _dashboardService: DashboardService, private _langService: LanguageService, private _botService: BotService) {
}
@@ -39,18 +40,23 @@ export class DoctorchatComponent implements OnInit, AfterViewChecked {
}
send(sentMessage) {
- this.chatMessage = '';
- if (sentMessage) {
- this.messages.push({message: sentMessage, status: 'sent-message'});
- if (localStorage.getItem(DoctorchatComponent._localStorageKey)) {
- this._doctorchat.doctorMessage({message: sentMessage}).subscribe(response => {
- if (response.reply.hasOwnProperty('link') && response.reply.hasOwnProperty('image')) {
- this.messages.push({message: response.reply.message, status: 'recv-message', link: response.reply.link, image: response.reply.image});
- } else {
- this.messages.push({message: response.reply, status: 'recv-message'});
- }
- });
- }
+ this.chatMessage = '';
+ if (sentMessage) {
+ this.messages.push({message: {text: sentMessage}, status: 'sent-message'});
+ if (localStorage.getItem(DoctorchatComponent._localStorageKey)) {
+ this._botService.getIntent(sentMessage).subscribe(intent => {
+ this._botService.getResponse(sentMessage).subscribe(text => {
+ if (this._botService.checkCustomIntent(intent)) {
+ const customResponse = this._botService.getCustomResponse(intent);
+ customResponse['text'] = text;
+ this.messages.push({message: customResponse, status: 'recv-message'});
+ } else {
+ this.messages.push({message: {text}, status: 'recv-message'});
+ }
+ })
+ })
}
+ }
}
}
+
diff --git a/src/app/services/BotService/CustomResponse.ts b/src/app/services/BotService/CustomResponse.ts
new file mode 100644
index 0000000..c7f3172
--- /dev/null
+++ b/src/app/services/BotService/CustomResponse.ts
@@ -0,0 +1,16 @@
+interface CustomResponse {
+ [intent: string]: any
+}
+
+
+export const CustomResponse: CustomResponse = {
+ intro: {
+ image: 'assets/img/intro.png',
+ link: [{name: 'Highlight The Definition', href: 'introduction/activity-1'}, {name: 'An interactive Video', href: 'malaria-101/activity-1-1'}, {name: 'Life cycle of malarial Mosquito', href: 'malaria-101/activity-1-2'}],
+ },
+ prevent: {
+ link: [{name: 'StopTheBreed', href: 'prevent/stop-the-breed/game'}, {name: 'StrideAgainstMalaria', href: 'prevent/stride-against-malaria/game'}],
+ // image: 'assets/img/prevent.png'
+ }
+};
+
diff --git a/src/app/services/BotService/bot.service.ts b/src/app/services/BotService/bot.service.ts
new file mode 100644
index 0000000..c30b1cf
--- /dev/null
+++ b/src/app/services/BotService/bot.service.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { catchError, map } from 'rxjs/operators';
+import { environment } from '../../../environments/environment';
+import { CustomResponse } from './CustomResponse';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class BotService {
+ private readonly _baseAPIURL = environment.rasaCoreBaseURL + environment.rasaCoreEndpoint;
+ private readonly _userID = 'default';
+ private readonly _parse = this._baseAPIURL + this._userID + '/parse';
+ private readonly _respond = this._baseAPIURL + this._userID + '/respond';
+ private readonly _continue = this._baseAPIURL + this._userID + '/continue';
+ private readonly _tracker = this._baseAPIURL + this._userID + '/tracker';
+ private readonly _events = this._tracker + '/events';
+
+ private readonly _headers = new HttpHeaders().set('content-type', 'application/json');
+
+ private response: string;
+ constructor(private http: HttpClient) {}
+
+ getIntent(query: string) {
+ const body = {query: query};
+ return this.http
+ .post(this._parse, body, {headers: this._headers}).pipe(
+ // @ts-ignore
+ map(res => res.tracker.latest_message.intent.name)
+ );
+ }
+
+ getResponse(query: string) {
+ const body = {query: query};
+ return this.http
+ .post(this._respond, body, {headers: this._headers}).pipe(
+ map(res => this.response = res[0].text),
+ catchError(err => Observable.throwError(err))
+ ).catch(err => Observable.throwError(err));
+ }
+
+ checkCustomIntent(intent: any) {
+ return (CustomResponse.hasOwnProperty(intent))
+ }
+
+ getCustomResponse(intent: any) {
+ return CustomResponse[intent];
+ }
+}
+
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index f185d6d..4dfaf76 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,5 +12,10 @@ export const environment = {
authEndpoint: 'auth/',
regEndPoint: 'registration/',
updateEndPoint: 'update-user/',
- localStorageKey: 'pcprepkitUser'
+ localStorageKey: 'pcprepkitUser',
+
+ /* RASA constants */
+ rasaCoreBaseURL: 'http://localhost:5005/',
+ rasaCoreEndpoint: 'conversations/'
};
+
diff --git a/src/tests/Services/bot.service.spec.ts b/src/tests/Services/bot.service.spec.ts
new file mode 100644
index 0000000..6238b83
--- /dev/null
+++ b/src/tests/Services/bot.service.spec.ts
@@ -0,0 +1,67 @@
+import { environment } from '../../environments/environment';
+import { HttpClient } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { BotService } from '../../app/services/BotService/bot.service';
+
+// Test Response Constraints
+const baseChatBot = environment.rasaCoreBaseURL + environment.rasaCoreEndpoint + 'default';
+const mockUserQuery = 'Some mock user query';
+const mockBotResponse = [{text: 'Some mock bot response'}];
+const parseResponse = {intent: 'mockIntent'};
+const responseUrl = baseChatBot + '/respond';
+const parseUrl = baseChatBot + '/parse';
+
+
+describe('BotService', () => {
+ let httpClient: HttpClient;
+ let httpMock: HttpTestingController;
+ let botService: BotService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [
+ HttpClient,
+ BotService
+ ],
+ imports: [
+ RouterTestingModule,
+ HttpClientTestingModule
+ ],
+ });
+ httpClient = TestBed.get(HttpClient);
+ httpMock = TestBed.get(HttpTestingController);
+ botService = TestBed.get(BotService);
+
+ });
+ afterEach(() => {
+ httpMock.verify();
+ });
+
+
+ it('service should be created', () => {
+ expect(botService).toBeTruthy();
+ });
+
+ it('should get a correct text response after querying thr bot', () => {
+ botService.getResponse(mockUserQuery).subscribe(
+ response => {
+ expect(response).toEqual(mockBotResponse[0].text);
+ }
+ );
+ const request = httpMock.expectOne(responseUrl);
+ request.flush(mockBotResponse);
+ });
+
+ it('should parse the user\'s query correctly', () => {
+ botService.getIntent(mockUserQuery).subscribe(
+ response => {
+ expect(response.intent).toEqual(parseResponse.intent);
+ }
+ );
+ const request = httpMock.expectOne(parseUrl);
+ request.flush(parseResponse);
+ });
+});
+