Issue #SB-5932 fix: removed default channel dependency and added 'sunbird' as...

Issue #SB-5932 fix: removed default channel dependency and added 'sunbird' as default channel if nothing is set

src/app.js

@@ -8,6 +8,7 @@ var TelemetryUtil = require('sb_telemetry_util')
 var telemetry = new TelemetryUtil()
 var fs = require('fs')
 var configUtil = require('sb-config-util')
+var _ = require('lodash')
 
 const contentProvider = require('sb_content_provider_util')
 var contentMetaProvider = require('./contentMetaFilter')
@@ -125,35 +126,37 @@ require('./routes/pluginsRoutes')(app)
 // this middleware route add after all the routes
 require('./middlewares/proxy.middleware')(app)
 
+function startServer () {
+  this.server = http.createServer(app).listen(port, function () {
+    console.log('server running at PORT [%d]', port)
+    if (!process.env.sunbird_environment || !process.env.sunbird_instance) {
+      console.error('please set environment variable sunbird_environment, sunbird_instance' +
+      'start service Eg: sunbird_environment = dev, sunbird_instance = sunbird')
+      process.exit(1)
+    }
+    contentMetaProvider.getMetaFilterConfig().then((configStr) => {
+      configUtil.setConfig('META_FILTER_REQUEST_JSON', configStr)
+    }).catch((err) => {
+      console.log('error in getting meta filters', err)
+      process.exit(1)
+    })
+  })
+}
+
 // Create server
+configUtil.setConfig('DEFAULT_CHANNEL', 'sunbird')
 if (defaultChannel) {
   contentProvider.getChannel(defaultChannel, (err, res) => {
-    if (res && res.result.response.count > 0 && res.result.response.content[0].hashTagId) {
-      configUtil.setConfig('DEFAULT_CHANNEL', res.result.response.content[0].hashTagId)
-      console.log('DEFAULT_CHANNEL', configUtil.getConfig('DEFAULT_CHANNEL'))
-      this.server = http.createServer(app).listen(port, function () {
-        console.log('server running at PORT [%d]', port)
-        if (!process.env.sunbird_environment || !process.env.sunbird_instance) {
-          console.error('please set environment variable sunbird_environment, sunbird_instance' +
-          'start service Eg: sunbird_environment = dev, sunbird_instance = sunbird')
-          process.exit(1)
-        }
-        contentMetaProvider.getMetaFilterConfig().then((configStr) => {
-          configUtil.setConfig('META_FILTER_REQUEST_JSON', configStr)
-        }).catch((err) => {
-          console.log('error in getting meta filters', err)
-          process.exit(1)
-        })
-      })
-    } else {
-      console.log('error in fetching default channel', defaultChannel, err, res)
-      process.exit(1)
+    var defaultHashTagId = _.get(res, 'result.response.content[0].hashTagId')
+    if (defaultHashTagId) {
+      configUtil.setConfig('DEFAULT_CHANNEL', defaultHashTagId)
     }
+    console.log('Error fetching default channel', err)
+    console.log('DEFAULT_CHANNEL', configUtil.getConfig('DEFAULT_CHANNEL'))
+    startServer()
   })
 } else {
-  console.error('please set environment variable sunbird_default_channel ' +
-  'start service Eg: sunbird_default_channel = sunbird')
-  process.exit(1)
+  startServer()
 }
 
 // Close server, when we start for test cases

libs @ d9df799b

-Subproject commit fa8b5d1c378fb7c44aa410465957611931b1b023
+Subproject commit d9df799bcf7a3f63f85230956ad945bcd45e91e2

src/service/contentService.js

@@ -56,7 +56,7 @@ function searchAPI (req, response) {
 }
 
 function searchContentAPI (req, response) {
-  return search(getContentTypeForContent(), req, response, ['content'])
+  return search(getContentTypeForContent(), req, response, ['Content'])
 }
 
 // This function used for performance log

src/service/courseService.js

@@ -102,6 +102,7 @@ function searchCourseAPI (req, response) {
   }
 
   data.request.filters.contentType = getContentTypeForCourse()
+  data.request.filters.objectType = ['Course']
   var ekStepReqData = {
     request: data.request
   }