SB-2658 Content-Filtering

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('underscore')
 
 // TODO below configuration should to be refactored in a seperate file
 
@@ -165,7 +166,9 @@ function getFilterConfig () {
   var allowedChannels = whiteListedChannelList ? whiteListedChannelList.split(',') : []
   var blackListedChannels = blackListedChannelList ? blackListedChannelList.split(',') : []
   var configString = {}
-  if (allowedChannels && allowedChannels.length > 0) {
+  if ((allowedChannels && allowedChannels.length > 0) && (blackListedChannels && blackListedChannels.length > 0)) {
+    configString = _.difference(allowedChannels, blackListedChannels)
+  } else if (allowedChannels && allowedChannels.length > 0) {
     configString = allowedChannels
   } else if (blackListedChannels && blackListedChannels.length > 0) {
     configString = { 'ne': blackListedChannels }

src/routes/frameworkCategoryInstanceRoutes.js

@@ -7,18 +7,21 @@
 var frameworkCategoryInstanceService = require('../service/frameworkCategoryInstanceService')
 var requestMiddleware = require('../middlewares/request.middleware')
 
-var BASE_URL_V1_Framework_Category = '/v1/framework/category'
+var baseUrl = '/v1/framework/category'
 
 module.exports = function (app) {
-  app.route(BASE_URL_V1_Framework_Category + '/read/:categoryID')
+  app.route(baseUrl + '/read/:categoryID')
     .get(requestMiddleware.createAndValidateRequestBody, frameworkCategoryInstanceService.getFrameworkCategoryInstance)
 
-  app.route(BASE_URL_V1_Framework_Category + '/search')
-    .post(requestMiddleware.createAndValidateRequestBody, frameworkCategoryInstanceService.frameworkCategoryInstanceSearch)
+  app.route(baseUrl + '/search')
+    .post(requestMiddleware.createAndValidateRequestBody, requestMiddleware.addChannelFilters,
+      frameworkCategoryInstanceService.frameworkCategoryInstanceSearch)
 
-  app.route(BASE_URL_V1_Framework_Category + '/create')
-    .post(requestMiddleware.createAndValidateRequestBody, frameworkCategoryInstanceService.frameworkCategoryInstanceCreate)
+  app.route(baseUrl + '/create')
+    .post(requestMiddleware.createAndValidateRequestBody,
+      frameworkCategoryInstanceService.frameworkCategoryInstanceCreate)
 
-  app.route(BASE_URL_V1_Framework_Category + '/update/:categoryID')
-    .patch(requestMiddleware.createAndValidateRequestBody, frameworkCategoryInstanceService.frameworkCategoryInstanceUpdate)
+  app.route(baseUrl + '/update/:categoryID')
+    .patch(requestMiddleware.createAndValidateRequestBody,
+      frameworkCategoryInstanceService.frameworkCategoryInstanceUpdate)
 }

src/routes/frameworkTermRoutes.js

@@ -7,18 +7,19 @@
 var frameworkTermService = require('../service/frameworkTermService')
 var requestMiddleware = require('../middlewares/request.middleware')
 
-var BASE_URL_V1_Framework_Term = '/v1/framework/term'
+var baseUrl = '/v1/framework/term'
 
 module.exports = function (app) {
-  app.route(BASE_URL_V1_Framework_Term + '/read/:categoryID')
+  app.route(baseUrl + '/read/:categoryID')
     .get(requestMiddleware.createAndValidateRequestBody, frameworkTermService.getFrameworkTerm)
 
-  app.route(BASE_URL_V1_Framework_Term + '/search')
-    .post(requestMiddleware.createAndValidateRequestBody, frameworkTermService.frameworkTermSearch)
+  app.route(baseUrl + '/search')
+    .post(requestMiddleware.createAndValidateRequestBody, requestMiddleware.addChannelFilters,
+      frameworkTermService.frameworkTermSearch)
 
-  app.route(BASE_URL_V1_Framework_Term + '/create')
+  app.route(baseUrl + '/create')
     .post(requestMiddleware.createAndValidateRequestBody, frameworkTermService.frameworkTermCreate)
 
-  app.route(BASE_URL_V1_Framework_Term + '/update/:categoryID')
+  app.route(baseUrl + '/update/:categoryID')
     .patch(requestMiddleware.createAndValidateRequestBody, frameworkTermService.frameworkTermUpdate)
 }

src/test/appSpec.js

 var server = require('../app.js')
 var configUtil = require('../libs/sb-config-util')
+var _ = require('underscore')
 
 var request = require('request')
 var host = 'http://localhost:5000'
-
+const whiteListedChannelList = process.env.sunbird_content_service_whitelisted_channels
+const blackListedChannelList = process.env.sunbird_content_service_blacklisted_channels
+var whiteListQuery = whiteListedChannelList ? whiteListedChannelList.split(',') : []
+var blackListedChannelListNew = blackListedChannelList ? blackListedChannelList.split(',') : []
+var blackListQuery = {'ne': (blackListedChannelListNew)}
 describe('Check health api', function (done) {
   it('Check with different methods, it should return status code 200', function (done) {
     request.options({
@@ -11,12 +16,34 @@ describe('Check health api', function (done) {
       json: true
     }, function (_error, response, body) {
       expect(body).toBe('OK')
-      var whiteListQuery = (process.env.sunbird_content_service_whitelisted_channels).split(',')
-      var blackListQuery = {'ne': ((process.env.sunbird_content_service_blacklisted_channels).split(','))}
-      expect(configUtil.getConfig('CHANNEL_FILTER_QUERY_STRING')).toEqual(whiteListQuery || blackListQuery)
       done()
     })
   })
+
+  it('test for whiteList configured', function () {
+    if (whiteListQuery && whiteListQuery.lenght > 0) {
+      expect(configUtil.getConfig('CHANNEL_FILTER_QUERY_STRING')).toEqual(whiteListQuery)
+    }
+  })
+
+  it('test for blackList configured', function () {
+    if (!(whiteListQuery && whiteListQuery.lenght > 0) && (blackListQuery && blackListQuery.lenght > 0)) {
+      expect(configUtil.getConfig('CHANNEL_FILTER_QUERY_STRING')).toEqual(blackListQuery)
+    }
+  })
+
+  it('test for whitelist and blackList not configured', function () {
+    if (!(whiteListQuery && whiteListQuery.lenght > 0) && !(blackListQuery && blackListQuery.lenght > 0)) {
+      expect(configUtil.getConfig('CHANNEL_FILTER_QUERY_STRING')).toEqual({})
+    }
+  })
+
+  it('test for whitelist and blackList is configured', function () {
+    if ((whiteListQuery && whiteListQuery.lenght > 0) && (blackListQuery && blackListQuery.lenght > 0)) {
+      var searchQuery = _.difference(whiteListQuery, blackListQuery)
+      expect(configUtil.getConfig('CHANNEL_FILTER_QUERY_STRING')).toEqual(searchQuery)
+    }
+  })
 })
 
 // below method used to close server once all the specs are executed