Issue #SB-1905 fix: health check api

src/app.js

@@ -25,10 +25,15 @@ const contentProviderApiKey = process.env.sunbird_content_provider_api_key
 const learnerServiceApiKey = process.env.sunbird_learner_service_api_key
 const learnerServiceBaseUrl = process.env.sunbird_learner_service_base_url ? process.env.sunbird_learner_service_base_url : 'https://dev.open-sunbird.org/api'
 
+const learnerServiceLocalBaseUrl = process.env.sunbird_learner_service_local_base_url
+  ? process.env.sunbird_learner_service_local_base_url
+  : 'http://learner-service:9000'
+
 configUtil.setContentProviderApi(contentProviderApiConfig.API)
 configUtil.setConfig('BASE_URL', contentProviderBaseUrl)
 configUtil.setConfig('Authorization_TOKEN', 'Bearer ' + contentProviderApiKey)
 configUtil.setConfig('LEARNER_SERVICE_BASE_URL', learnerServiceBaseUrl)
+configUtil.setConfig('LEARNER_SERVICE_LOCAL_BASE_URL', learnerServiceLocalBaseUrl)
 configUtil.setConfig('LEARNER_SERVICE_AUTHORIZATION_TOKEN', 'Bearer ' + learnerServiceApiKey)
 configUtil.setConfig('DIALCODE_GENERATE_MAX_COUNT', 20000)
 configUtil.setConfig('CONTENT_UPLOAD_REQ_LIMIT', reqDataLimitOfContentUpload)

libs @ 3552f541

-Subproject commit 558c7d68d3839eea2058ee7423af7f00d3aa6b34
+Subproject commit 3552f5411e6b5984a66efcc43e84d988d7ef6126

src/service/contentService.js

@@ -19,12 +19,13 @@ var contentModel = require('../models/contentModel').CONTENT
 var messageUtils = require('./messageUtil')
 var utilsService = require('../service/utilsService')
 var emailService = require('./emailService')
+var cassandraUtils = require('../utils/cassandraUtil')
 
 var filename = path.basename(__filename)
 var contentMessage = messageUtils.CONTENT
 var compositeMessage = messageUtils.COMPOSITE
 var responseCode = messageUtils.RESPONSE_CODE
-// var hcMessages = messageUtils.HEALTH_CHECK
+var hcMessages = messageUtils.HEALTH_CHECK
 var reqMsg = messageUtils.REQUEST
 
 /**
@@ -52,71 +53,87 @@ function getContentTypeForContent () {
 }
 
 // Function help to check health api
-// function getChecksObj (name, healthy, err, errMsg) {
-//   return {
-//     name: name,
-//     healthy: healthy,
-//     err: err,
-//     errmsg: errMsg
-//   }
-// };
+function getChecksObj (name, healthy, err, errMsg) {
+  return {
+    name: name,
+    healthy: healthy,
+    err: err,
+    errmsg: errMsg
+  }
+};
 
 // Function help to check health api
-// function getHealthCheckResp (rsp, healthy, checksArrayObj) {
-//   delete rsp.responseCode
-//   rsp.result = {}
-//   rsp.result.name = messageUtils.SERVICE.NAME
-//   rsp.result.version = messageUtils.API_VERSION.V1
-//   rsp.result.healthy = healthy
-//   rsp.result.check = checksArrayObj
-//   return rsp
-// }
+function getHealthCheckResp (rsp, healthy, checksArrayObj) {
+  delete rsp.responseCode
+  rsp.result = {}
+  rsp.result.name = messageUtils.SERVICE.NAME
+  rsp.result.version = messageUtils.API_VERSION.V1
+  rsp.result.healthy = healthy
+  rsp.result.check = checksArrayObj
+  return rsp
+}
 
 function checkHealth (req, response) {
-  return response.status(200).send('ok')
-//     var rspObj = req.rspObj;
-//     var checksArrayObj = [];
-//     var isEkStepHealthy, isLSHealthy, isDbConnected;
-//     var csApiStart = Date.now();
-//     async.parallel([
-//         function(CB) {
-//             var apiCallStart = Date.now();
-//             contentProvider.ekStepHealthCheck(function(err, res) {
-//                 if(res && res.result && res.result.healthy) {
-//                     isEkStepHealthy = true;
-//                     checksArrayObj.push(getChecksObj(hcMessages.EK_STEP.NAME, isEkStepHealthy, "", ""));
-//                 } else {
-//                     isEkStepHealthy = false;
-//                     checksArrayObj.push(getChecksObj(hcMessages.EK_STEP.NAME, isEkStepHealthy,
-//                     hcMessages.EK_STEP.FAILED_CODE, hcMessages.EK_STEP.FAILED_MESSAGE));
-//                 }
-//                 CB();
-//             })
-//         },
-//         function(CB) {
-//             var apiCallStart = Date.now();
-//             contentProvider.learnerServiceHealthCheck(function(err, res) {
-//                 if(res && res.result && res.result.healthy) {
-//                     isLSHealthy = true;
-//                     checksArrayObj.push(getChecksObj(hcMessages.LEARNER_SERVICE.NAME, isLSHealthy, "", ""));
-//                 } else {
-//                     isLSHealthy = false;
-//                     checksArrayObj.push(getChecksObj(hcMessages.LEARNER_SERVICE.NAME,
-//                      isLSHealthy, hcMessages.LEARNER_SERVICE.FAILED_CODE,
-//                      hcMessages.LEARNER_SERVICE.FAILED_MESSAGE));
-//                 }
-//                 CB();
-//             })
-//         }
-//     ], function() {
-//         if(isEkStepHealthy && isLSHealthy && isDbConnected) {
-//             var rsp = respUtil.successResponse(rspObj);
-//             return response.status(200).send(getHealthCheckResp(rsp, true, checksArrayObj));
-//         } else {
-//             var rsp = respUtil.successResponse(rspObj);
-//             return response.status(500).send(getHealthCheckResp(rsp, false, checksArrayObj));
-//         }
-//     });
+  var rspObj = req.rspObj
+  var checksArrayObj = []
+  var isEkStepHealthy
+  var isLSHealthy
+  var isDbConnected
+  async.parallel([
+    function (CB) {
+      var cassandraStatus = cassandraUtils.getCassandraStatus()
+      if (cassandraStatus) {
+        isDbConnected = true
+        checksArrayObj.push(getChecksObj(hcMessages.CASSANDRA_DB.NAME, isDbConnected, '', ''))
+      } else {
+        isDbConnected = false
+        checksArrayObj.push(getChecksObj(hcMessages.CASSANDRA_DB.NAME, isDbConnected,
+          hcMessages.CASSANDRA_DB.FAILED_CODE, hcMessages.CASSANDRA_DB.FAILED_MESSAGE))
+      }
+      CB()
+    },
+    function (CB) {
+      contentProvider.ekStepHealthCheck(function (err, res) {
+        if (err) {
+          isEkStepHealthy = false
+          checksArrayObj.push(getChecksObj(hcMessages.EK_STEP.NAME, isEkStepHealthy,
+            hcMessages.EK_STEP.FAILED_CODE, hcMessages.EK_STEP.FAILED_MESSAGE))
+        } else if (res && res.result && res.result.healthy) {
+          isEkStepHealthy = true
+          checksArrayObj.push(getChecksObj(hcMessages.EK_STEP.NAME, isEkStepHealthy, '', ''))
+        } else {
+          isEkStepHealthy = false
+          checksArrayObj.push(getChecksObj(hcMessages.EK_STEP.NAME, isEkStepHealthy,
+            hcMessages.EK_STEP.FAILED_CODE, hcMessages.EK_STEP.FAILED_MESSAGE))
+        }
+        CB()
+      })
+    },
+    function (CB) {
+      contentProvider.learnerServiceHealthCheck(function (err, res) {
+        if (err) {
+          isLSHealthy = false
+          checksArrayObj.push(getChecksObj(hcMessages.LEARNER_SERVICE.NAME,
+            isLSHealthy, hcMessages.LEARNER_SERVICE.FAILED_CODE, hcMessages.LEARNER_SERVICE.FAILED_MESSAGE))
+        } else if (res && res.result && res.result.response && res.result.response.healthy) {
+          isLSHealthy = true
+          checksArrayObj.push(getChecksObj(hcMessages.LEARNER_SERVICE.NAME, isLSHealthy, '', ''))
+        } else {
+          isLSHealthy = false
+          checksArrayObj.push(getChecksObj(hcMessages.LEARNER_SERVICE.NAME,
+            isLSHealthy, hcMessages.LEARNER_SERVICE.FAILED_CODE, hcMessages.LEARNER_SERVICE.FAILED_MESSAGE))
+        }
+        CB()
+      })
+    }
+  ], function () {
+    var rsp = respUtil.successResponse(rspObj)
+    if (isEkStepHealthy && isLSHealthy && isDbConnected) {
+      return response.status(200).send(getHealthCheckResp(rsp, true, checksArrayObj))
+    } else {
+      return response.status(500).send(getHealthCheckResp(rsp, false, checksArrayObj))
+    }
+  })
 }
 
 function searchAPI (req, response) {
@@ -410,7 +427,7 @@ function uploadContentAPI (req, response) {
       ])
     })
   } else {
-    var queryString = {fileUrl: data.queryParams.fileUrl}
+    var queryString = { fileUrl: data.queryParams.fileUrl }
     async.waterfall([
 
       function (CBW) {
@@ -726,7 +743,7 @@ function retireContentAPI (req, response) {
             errMsg = res && res.params ? res.params.errmsg : contentMessage.GET_MY.FAILED_MESSAGE
             respCode = res && res.responseCode ? res.responseCode : responseCode.SERVER_ERROR
             httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
-            failedContent.push({contentId: contentId, errCode: errCode, errMsg: errMsg})
+            failedContent.push({ contentId: contentId, errCode: errCode, errMsg: errMsg })
           }
           CBE(null, null)
         })

src/service/messageUtil.js

@@ -406,13 +406,18 @@ exports.EMAIL = {
 exports.HEALTH_CHECK = {
   EK_STEP: {
     NAME: 'ekstep.api',
-    FAILED_CODE: 'EK_STEP_HEALTH_FAILED',
-    FAILED_MESSAGE: 'Ekstep service is not healthy'
+    FAILED_CODE: 'CONTENT_PROVIDER_HEALTH_FAILED',
+    FAILED_MESSAGE: 'Content provider service is not healthy'
   },
   LEARNER_SERVICE: {
     NAME: 'learnerservice.api',
     FAILED_CODE: 'LEARNER_SERVICE_HEALTH_FAILED',
     FAILED_MESSAGE: 'Learner service is not healthy'
+  },
+  CASSANDRA_DB: {
+    NAME: 'cassandra.db',
+    FAILED_CODE: 'CASSANDRA_HEALTH_FAILED',
+    FAILED_MESSAGE: 'Cassandra db is not connected'
   }
 }
 

src/service/utilsService.js

@@ -15,7 +15,12 @@ function getAppIDForRESP (path) {
   var arr = path.split(':')[0].split('/').filter(function (n) {
     return n !== ''
   })
-  var appId = 'api.' + arr[arr.length - 2] + '.' + arr[arr.length - 1]
+  var appId
+  if (arr.length === 1) {
+    appId = 'api.' + arr[arr.length - 1]
+  } else {
+    appId = 'api.' + arr[arr.length - 2] + '.' + arr[arr.length - 1]
+  }
   return appId
 }
 

src/utils/cassandraUtil.js

@@ -3,6 +3,8 @@ var LOG = require('sb_logger_util')
 var path = require('path')
 var filename = path.basename(__filename)
 var contactPoints = process.env.sunbird_cassandra_ips.split(',')
+var isCassandraConnected = false
+
 models.setDirectory(path.join(__dirname, '.', '..', 'models', 'cassandra')).bind(
   {
     clientOptions: {
@@ -21,12 +23,19 @@ models.setDirectory(path.join(__dirname, '.', '..', 'models', 'cassandra')).bind
   },
   function (err) {
     if (err) {
+      isCassandraConnected = false
       LOG.error({filename, 'Error connecting to the database: ': err})
       throw err
     } else {
+      isCassandraConnected = true
       LOG.info({filename, 'connecting to database': 'success'})
     }
   }
 )
 
+function getCassandraStatus () {
+  return isCassandraConnected
+}
+
 module.exports = models
+module.exports.getCassandraStatus = getCassandraStatus