From fc576f44d58349d00b8259631c5990f1f9aa0f93 Mon Sep 17 00:00:00 2001
From: Vaibhav Bhuva <vaibhav.bhuva@tarento.com>
Date: Thu, 11 Nov 2021 14:10:31 +0530
Subject: [PATCH] Issue #SB-23374 fix: Bulk upload question API URL issue fixes

---
 src/service/kafkaQumlConsumerService.js | 23 ++++++++++++++++-------
 src/service/qumlBulkService.js          |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/service/kafkaQumlConsumerService.js b/src/service/kafkaQumlConsumerService.js
index 3a1fad3..947023d 100644
--- a/src/service/kafkaQumlConsumerService.js
+++ b/src/service/kafkaQumlConsumerService.js
@@ -18,6 +18,14 @@ const templateClassMap = {
   "3" : 'mcq-horizontal'
 }
 const total_options = 4;
+const ASSET_CREATE_URL="/asset/v1/create";
+const ASSET_UPLOAD_URL="/asset/v1/upload/";
+const QUESTION_CREATE_URL="/question/v4/create"
+const QUESTION_REVIEW_URL="/question/v4/review/";
+const QUESTION_PUBLISH_URL="/question/v4/publish/";
+const QUESTION_UPDATE_URL="/question/v4/update/";
+const QUESTIONSET_ADD_URL="/questionset/v4/add";
+
 const rspObj = {};
 
 const qumlConsumer = () => {
@@ -147,7 +155,7 @@ const createAssest = (question, data, callback) => {
       }
   };
   console.log("createAssest request Body =====>", reqBody);
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/asset/v1/create`, {
+  fetch(`${envVariables.baseURL}${ASSET_CREATE_URL}`, {
       method: "POST", // or 'PUT'
       headers: {
         "X-Channel-ID": question.channel,
@@ -158,6 +166,7 @@ const createAssest = (question, data, callback) => {
     })
     .then((response) => response.json())
     .then((assetResponseData) => {
+      console.log("createAssest response =====>", assetResponseData);
       if (assetResponseData.responseCode && _.toLower(assetResponseData.responseCode) === "ok") {
         data['identifier'] = assetResponseData.result.identifier;
         callback(null, data);
@@ -179,7 +188,7 @@ const uploadAsset = (data, callback) => {
   console.log("uploadAsset : ==> ", data);
   var formdata = new FormData();
   formdata.append("file", fs.createReadStream(data.filePath), data.name);
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/asset/v1/upload/${data.identifier}`, {
+  fetch(`${envVariables.baseURL}${ASSET_UPLOAD_URL}${data.identifier}`, {
       method: "POST", // or 'PUT'
       headers: {
         "Authorization" : `Bearer ${envVariables.SUNBIRD_PORTAL_API_AUTH_TOKEN}`
@@ -333,7 +342,7 @@ const createQuestion = (questionBody, callback) => {
   };
   //fetch call for creating a question.
   console.log('createQuestionBody::' , JSON.stringify(createApiData));
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/question/v1/create`, {
+  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}${QUESTION_CREATE_URL}`, {
       method: "POST", // or 'PUT'
       headers: {
         "Content-Type": "application/json",
@@ -365,7 +374,7 @@ const reviewQuestion = (status, questionRes, callback) => {
   }
 
   let reviewData = { request: { question: {} } };
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/question/v1/review/${questionRes.result.identifier}`,
+  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}${QUESTION_REVIEW_URL}${questionRes.result.identifier}`,
     {
       method: "POST", // or 'PUT'
       headers: {
@@ -402,7 +411,7 @@ const publishQuestion = (status, questionRes, callback) => {
   }
   let publishApiData = { request: { question: {} } };
   fetch(
-    `${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/question/v1/publish/${questionRes.result.identifier}`,
+    `${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}${QUESTION_PUBLISH_URL}${questionRes.result.identifier}`,
     {
       method: "POST", // or 'PUT'
       headers: {
@@ -444,7 +453,7 @@ const linkQuestionToQuestionSet = (questionData, questionRes, callback) => {
         "children": [questionRes.result.identifier] } }
   };
   fetch(
-    `${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/questionset/v1/add`,
+    `${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}${QUESTIONSET_ADD_URL}`,
     {
       method: "PATCH", // or 'PUT'
       headers: {
@@ -495,7 +504,7 @@ const updateResponse = (updateData, updateMessage) => {
     }
   };
   console.log("updateResponse :: request Body::", updateNewData);
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/question/v1/update/${updateData}`, {
+  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}${QUESTION_UPDATE_URL}${updateData}`, {
       method: "PATCH", // or 'PUT'
       headers: {
         "Content-Type": "application/json",
diff --git a/src/service/qumlBulkService.js b/src/service/qumlBulkService.js
index bab0185..0779d31 100644
--- a/src/service/qumlBulkService.js
+++ b/src/service/qumlBulkService.js
@@ -20,7 +20,7 @@ const bulkUploadConfig = {
 };
 const max_options_limit = 4;
 let uploadCsvConfig;
-
+const QS_HIERARCHY_READ_URL = `${envVariables.baseURL}/questionset/v4/hierarchy/`;
 const bulkUpload = async (req, res) => {
   bulkUploadErrorMsgs = []
   const rspObj = req.rspObj
@@ -263,7 +263,7 @@ const qumlSearch = (req, res) => {
 //Read QuestionSet Hierarchy function;
 const getQuestionSetHierarchy = (questionSetId,reqHeaders,  callback) => {
   if (_.isEmpty(questionSetId)) { return callback(null, {}); }
-  fetch(`${envVariables.SUNBIRD_ASSESSMENT_SERVICE_BASE_URL}/questionset/v1/hierarchy/${questionSetId}?mode=edit`, {
+  fetch(`${QS_HIERARCHY_READ_URL}${questionSetId}?mode=edit`, {
     method: "GET",
     headers: reqHeaders
   })
-- 
GitLab