Issue #SB-3715 fix: refactoring and var name changes

src/app.js

@@ -10,7 +10,7 @@ var fs = require('fs')
 var configUtil = require('sb-config-util')
 
 const contentProvider = require('sb_content_provider_util')
-var contentMeta = require('./contentMetaFilter')
+var contentMetaProvider = require('./contentMetaFilter')
 // TODO below configuration should to be refactored in a seperate file
 
 const contentProviderConfigPath = path.join(__dirname, '/config/contentProviderApiConfig.json')
@@ -118,7 +118,7 @@ if (defaultChannel) {
           'start service Eg: sunbird_environment = dev, sunbird_instance = sunbird')
           process.exit(1)
         }
-        configUtil.setConfig('META_FILTER_REQUEST_JSON', contentMeta.getMetaFilterConfig())
+        configUtil.setConfig('META_FILTER_REQUEST_JSON', contentMetaProvider.getMetaFilterConfig())
       })
     } else {
       console.log('error in fetching default channel', defaultChannel, err, res)

src/contentMetaFilter.js

@@ -12,32 +12,22 @@ function getMetaFilterConfig () {
     ? process.env.sunbird_content_service_whitelisted_channels.split(',') : []
   var blackListedChannels = process.env.sunbird_content_service_blacklisted_channels
     ? process.env.sunbird_content_service_blacklisted_channels.split(',') : []
-  var allowedFramework = process.env.sunbird_content_filter_framework_whitelist
-    ? process.env.sunbird_content_filter_framework_whitelist.split(',') : []
-  var blackListedFramework = process.env.sunbird_content_filter_framework_blacklist
-    ? process.env.sunbird_content_filter_framework_blacklist.split(',') : []
-  var allowedMimetype = process.env.sunbird_content_filter_mimetype_whitelist
-    ? process.env.sunbird_content_filter_mimetype_whitelist.split(',') : []
-  var blackListedMimetype = process.env.sunbird_content_filter_mimetype_blacklist
-    ? process.env.sunbird_content_filter_mimetype_blacklist.split(',') : []
-  var allowedContenttype = process.env.sunbird_content_filter_contenttype_whitelist
-    ? process.env.sunbird_content_filter_contenttype_whitelist.split(',') : []
-  var blackListedContenttype = process.env.sunbird_content_filter_contenttype_blacklist
-    ? process.env.sunbird_content_filter_contenttype_blacklist.split(',') : []
-  var allowedResourcetype = process.env.sunbird_content_filter_resourcetype_whitelist
-    ? process.env.sunbird_content_filter_resourcetype_whitelist.split(',') : []
-  var blackListedResourcetype = process.env.sunbird_content_filter_resourcetype_blacklist
-    ? process.env.sunbird_content_filter_resourcetype_blacklist.split(',') : []
-
-  var metaFiltersArray = [[allowedChannels, blackListedChannels],
-    [allowedFramework, blackListedFramework],
-    [allowedMimetype, blackListedMimetype],
-    [allowedContenttype, blackListedContenttype],
-    [allowedResourcetype, blackListedResourcetype]]
-  var configArray = []
-  _.forEach(metaFiltersArray, function (value) {
-    configArray.push(generateConfigString(value[0], value[1]))
-  })
+  var allowedFramework = process.env.sunbird_content_service_whitelisted_framework
+    ? process.env.sunbird_content_service_whitelisted_framework.split(',') : []
+  var blackListedFramework = process.env.sunbird_content_service_blacklisted_framework
+    ? process.env.sunbird_content_service_blacklisted_framework.split(',') : []
+  var allowedMimetype = process.env.sunbird_content_service_whitelisted_mimetype
+    ? process.env.sunbird_content_service_whitelisted_mimetype.split(',') : []
+  var blackListedMimetype = process.env.sunbird_content_service_blacklisted_mimetype
+    ? process.env.sunbird_content_service_blacklisted_mimetype.split(',') : []
+  var allowedContenttype = process.env.sunbird_content_service_whitelisted_contenttype
+    ? process.env.sunbird_content_service_whitelisted_contenttype.split(',') : []
+  var blackListedContenttype = process.env.sunbird_content_service_blacklisted_contenttype
+    ? process.env.sunbird_content_service_blacklisted_contenttype.split(',') : []
+  var allowedResourcetype = process.env.sunbird_content_service_whitelisted_resourcetype
+    ? process.env.sunbird_content_service_whitelisted_resourcetype.split(',') : []
+  var blackListedResourcetype = process.env.sunbird_content_service_blacklisted_resourcetype
+    ? process.env.sunbird_content_service_blacklisted_resourcetype.split(',') : []
 
   var configString = {}
   // Function to generate the Config String
@@ -58,22 +48,24 @@ function getMetaFilterConfig () {
   // Check if the Filter Config service data is defined, if yes, create Object with it
   const filterConfigService = ''
   if (filterConfigService === '') {
-    // Call getFilterJSONFromEnv to generate a JSON Object
-    return getFilterJSONFromEnv(configArray)
+    // generate JSON and return the configArray
+    var metaFiltersArray = {'channel': [allowedChannels, blackListedChannels],
+      'framework': [allowedFramework, blackListedFramework],
+      'mimeType': [allowedMimetype, blackListedMimetype],
+      'contentType': [allowedContenttype, blackListedContenttype],
+      'resourceType': [allowedResourcetype, blackListedResourcetype]}
+    var configArray = {}
+    _.forOwn(metaFiltersArray, function (value, key) {
+      configArray['' + key] = generateConfigString(value[0], value[1])
+    })
+    console.log('configArray', configArray)
+    return configArray
   } else {
     // return getFilterJSONfromConfigService()
     return getFilterJSONfromConfigService()
   }
 }
 
-// Generate JSON and return
-function getFilterJSONFromEnv (metaConfigData) {
-  var metaFilterKey = ['channel', 'framework', 'mimeType', 'contentType', 'resourceType']
-  var generateJSON = _.zipObject(metaFilterKey, metaConfigData)
-  //   console.log('genreated json', generateJSON)
-  return generateJSON
-}
-
 function getFilterJSONfromConfigService () {
   // Generate JSON from Config Service and return
   throw new Error('Config service is unavailable')

src/middlewares/filter.middleware.js

-var _ = require('underscore')
 var filterService = require('../service/filterService')
 var LOG = require('sb_logger_util')
 var utilsService = require('../service/utilsService')
@@ -35,18 +34,17 @@ function addMetaFilters (req, res, next) {
 }
 function fetchFilterQuery (req, filter) {
   filterService.getMetadataFilterQuery(function (err, searchJSON) {
-    console.log('err', err)
+    // console.log('err', err)
     if (err) {
-      LOG.error(utilsService.getLoggerData({}, 'ERROR', filename, 'addChannelFilters',
-        'failed to get channels'))
-    } else if (searchJSON && (!_.isEmpty(searchJSON))) {
+      LOG.error(utilsService.getLoggerData({}, 'ERROR', filename, 'fetchFilterQuery',
+        'failed to get fetch filter query'))
+    } else if (searchJSON) {
       for (var key in searchJSON) {
         if (searchJSON.hasOwnProperty(key)) {
-          var val = searchJSON[key]
-
-          if (key === filter && val !== undefined) {
-            var finalval = req.body.request.filters[key] = val
-            return finalval
+          var searchJSONVal = searchJSON[key]
+          if (key === filter && searchJSONVal !== undefined) {
+            var finalFilterValue = req.body.request.filters[key] = searchJSONVal
+            return finalFilterValue
           }
         }
       }