Issue #SB-3715 fix: review fixes

src/app.js

@@ -156,16 +156,21 @@ const telemetryConfig = {
 
 telemetry.init(telemetryConfig)
 
-// function to generate the search string
-
+// function to generate the search filter and return JSON Object
 function getMetaFilterConfig () {
-  return setFilterJSONFromEnv()
+// Check if the Filter Config service data is defined, if yes, create Object with it
+  if (filterConfigService !== undefined) {
+    return getFilterJSONfromConfigService()
+  } else {
+    // Call getFilterJSONFromEnv to generate a JSON Object
+    return getFilterJSONFromEnv()
+  }
 }
-function setFilterJSONFromEnv () {
+
+function getFilterJSONFromEnv () {
   // Generate JSON and return
-  return setFilterJSON()
 }
 
-function setFilterJSON () {
-
+function getFilterJSONfromConfigService () {
+  // Generate JSON from Config Service and return
 }

src/middlewares/filter.middleware.js

@@ -3,15 +3,14 @@ var filterService = require('../service/filterService')
 
 function addMetaFilters (req, res, next) {
   // If the request body has filter by metaFilter data, continue with the same filter, do not alter the values
-
-  // else call the getMetaSearchString() function to generate the search string for the meta filters
-  filterService.getMetaSearchString(function () {
+  // else call the getMetaSearchData() function to generate the JSON Object for the meta filters
+  filterService.getMetaSearchData(function () {
     // Generate JSON and return
     return setFilterJSON()
   })
 }
 
 function setFilterJSON () {
-
+// Set the new filter Object for filter request body
 }
 module.exports.addMetaFilters = addMetaFilters

src/service/filterService.js

@@ -6,9 +6,9 @@
  */
 var configUtil = require('sb-config-util')
 
-function getMetaSearchString (callback) {
-  var searchString = configUtil.getConfig('META_FILTER_QUERY_STRING')
-  callback(null, searchString)
+function getMetaSearchData (callback) {
+  var searchData = configUtil.getConfig('META_FILTER_REQUEST_JSON')
+  callback(null, searchData)
 }
 
-module.exports.getMetaSearchString = getMetaSearchString
+module.exports.getMetaSearchData = getMetaSearchData

src/test/appSpec.js

@@ -53,7 +53,9 @@ describe('Check health api', function (done) {
   it('test for blackList metafilter configured', function () {})
   it('test for whitelist metafilter and blackList not configured', function () {})
   it('test for whitelist metafilter and blackList is configured', function () {})
-  it('check if filter JSON is generated', function () { })
+  it('Check if filterConfig service data is available', function () {})
+  it('If FilterConfig is null/undefined, generate filter Object from environment variables', function () { })
+  it('Check if filter JSON is generated', function () { })
 })
 
 // below method used to close server once all the specs are executed

src/test/channelFilterRouteSpec.js

@@ -65,7 +65,3 @@ describe('Check for all route to be calling the AddChannelFilter', function () {
     })
   })
 })
-describe('Check for all route to be calling the AddMetaFilter', function () {
-  it('check for filter in config with route', function () {})
-  it('check for filter in config with value + route', function () {})
-})

src/test/metaFilterRouteSpec.js

+describe('Check for all required route to call the AddMetaFilter', function () {
+  it('check for filter in config with route', function () {})
+  it('check for filter in config with value + route', function () {})
+})

src/test/middlewares/filterMiddlewareSpec.js

+describe('Initialization of meta filters', function () {
+  it('check for the request and then do next', function () {})
+  it('check for no request and get config', function () {})
+  it('check for the filter object property exists in the request body', function () {})
+  it('if filter object property is equal to response body property then do not append property to the filter', function () {})
+  it('if the filter object property is not equal to response body property then append property to the filter', function () {})
+  it('check for getMetaSearchData method creates proper whitelisted search data', function () {})
+  it('check for getMetaSearchData method creates proper blacklisted search data', function () {})
+})

src/test/middlewares/requestMiddlewareSpec.js

@@ -51,10 +51,3 @@ describe('filter of channels', function () {
     })
   })
 })
-
-describe('Initialization of meta filters', function () {
-  it('check for the request and then do next', function () {})
-  it('check for no request and get config', function () {})
-  it('check for getMetaSearchString method creates proper whitelisted search string', function () {})
-  it('check for getMetaSearchString method creates proper blacklisted search string', function () {})
-})

src/test/service/filterServiceSpec.js

@@ -21,8 +21,8 @@ describe('filter service', function () {
   })
 })
 
-describe('content meta filter service', function () {
-  it('check for getMetaSearchString method', function () {})
+describe('content meta filter service from config', function () {
+  it('check for getMetaSearchData method', function () {})
   it('check for whitelisted metafilter set in config', function () {})
   it('check for blacklisted metafilter set in config', function () {})
 })