From f163dde5b2f8e709815fe7f715059fa9c4634b91 Mon Sep 17 00:00:00 2001
From: GotPPay <bilal@saburly.com>
Date: Fri, 30 Mar 2018 11:52:04 +0200
Subject: [PATCH] wait until unswer is ready

---
 backend/helpers/externalSource.js | 4 ++--
 backend/models/alexa.js           | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/helpers/externalSource.js b/backend/helpers/externalSource.js
index 7c87b00..2719ca9 100644
--- a/backend/helpers/externalSource.js
+++ b/backend/helpers/externalSource.js
@@ -33,10 +33,10 @@ getDataFromWPJSON = function (sourceUrl, page = 1, maxPosts = 10) {
 }
 
 module.exports = {
-  getAnswerFromWP : function (sourceUrl){
+  getAnswerFromWP : async function (sourceUrl){
     //This function will extract needed data from JSON, which we got from getDataFromWPJSON
     //At the moment, it's taking titles and creates answer
-    return new Promise((resolve,reject)=>{
+    return await new Promise((resolve,reject)=>{
       getDataFromWPJSON(sourceUrl).then(rawData=>{
         let result='';
         rawData.forEach(post=>{
diff --git a/backend/models/alexa.js b/backend/models/alexa.js
index 636185d..a3deb6c 100644
--- a/backend/models/alexa.js
+++ b/backend/models/alexa.js
@@ -77,11 +77,7 @@ module.exports = {
                 answer = intent.answer;
                 break;
               case constants.answerType.EXTERNAL_SOURCE_WP_JSON:
-                predefinedSourceHelper.getAnswerFromWP(intent.externalAnswerSource).then(result=>{
-                  answer=result;
-                }).catch(err=>{
-                  answer=err;
-                });
+                answer = predefinedSourceHelper.getAnswerFromWP(intent.externalAnswerSource);
                 break;
               case constants.answerType.EXTERNAL_SOURCE_RSS:
                 answer = 'Not implemented yet'