Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-mw-service
Commits
707ef4c3
Commit
707ef4c3
authored
6 years ago
by
revathi
Committed by
kochhar
6 years ago
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-3715 fix: added few more env variables
parent
508592ed
master
dependabot/npm_and_yarn/src/async-2.6.4
dependabot/npm_and_yarn/src/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/flat-and-mocha-5.0.2
dependabot/npm_and_yarn/src/handlebars-4.7.7
dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/lodash-4.17.21
dependabot/npm_and_yarn/src/minimist-and-project-sunbird/telemetry-sdk-and-handlebars-and-mkdirp-1.2.8
release-3.6.0
release-4.3.0
release-4.8.0
release-5.2.0
release-5.3.0
release-5.6.0
release-6.0.0
v1.13.3
v1.13
v1.12
v1.11.1
v1.11
v1.10.1
v1.10
v1.9
tmp-testPR
tmp-sunbird-bootcamp
tmp-rjshrjndrn-patch-1
tmp-revert-118-testPR
tmp-revert-110-logs
tmp-revert-99-revert-98-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-98-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-97-revert-96-rjshrjndrn-patch-1
tmp-revert-96-rjshrjndrn-patch-1
tmp-release-sonarcloud
tmp-release-2.6.0
tmp-release-2.3.0
tmp-release-2.1.1
tmp-release-2.1.0
tmp-release-2.1.0_pluginSearch
tmp-release-2.0.0
tmp-release-1.15
tmp-release-1.14.3
tmp-release-1.14
tmp-release-1.14-sp3
tmp-refactored-dev-deploy
tmp-master
tmp-loadtest
tmp-load-testing
tmp-jenkins-test
tmp-jenkins-pipeline
tmp-final-variable-refac
tmp-dial-assemble-api
tmp-content-update-read
tmp-circleci
release-5.6.0_RC1
release-5.2.0_RC1
release-4.8.5_RC1
release-4.8.0_RC2
release-4.8.0_RC1
release-4.3.0_RC1
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC2
release-3.7.0_RC1
release-3.6.0_RC1
release-3.2.0_RC2
release-3.2.0_RC1
release-3.1.0
release-3.1.0_RC2
release-3.1.0_RC1
release-3.0.1_RC1
release-3.0.0
release-3.0.0_RC1
release-2.10.0
release-2.10.0_RC2
release-2.10.0_RC1
release-2.9.0_RC3
release-2.9.0_RC2
release-2.9.0_RC1
release-2.8.0
release-2.8.0_RC4
release-2.8.0_RC3
release-2.8.0_RC2
release-2.8.0_RC1
release-2.7.0
release-2.7.0_RC2
release-2.7.0_RC1
release-2.6.0
release-2.6.0_RC4
release-2.6.0_RC3
release-2.6.0_RC2
release-2.6.0_RC1
release-2.3.0
release-2.3.0_RC2
release-2.3.0_RC1
release-2.1.1_RC1
release-2.1.0_RC2
release-2.1.0_RC1
release-2.0.0
release-2.0.0_RC5
release-2.0.0_RC4
release-2.0.0_RC3
release-2.0.0_RC2
release-2.0.0_RC1
release-1.15.0
release-1.15_RC7
release-1.15_RC6
release-1.15_RC5
release-1.15_RC4
release-1.15_RC3
release-1.15_RC2
release-1.15_RC1
release-1.14.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app.js
+7
-0
src/app.js
src/middlewares/filter.middleware.js
+5
-1
src/middlewares/filter.middleware.js
src/service/filterService.js
+1
-7
src/service/filterService.js
with
13 additions
and
8 deletions
+13
-8
src/app.js
+
7
−
0
View file @
707ef4c3
...
...
@@ -38,6 +38,12 @@ const dialServiceBaseUrl = process.env.sunbird_dial_service_api_base_url || 'htt
const
whiteListedChannelList
=
process
.
env
.
sunbird_content_service_whitelisted_channels
const
blackListedChannelList
=
process
.
env
.
sunbird_content_service_blacklisted_channels
const
whitelistedframeworkList
=
process
.
env
.
sunbird_content_service_whitelisted_framework
const
blacklistedframeworkList
=
process
.
env
.
sunbird_content_service_blacklisted_framework
const
whitelistedLanguageList
=
process
.
env
.
sunbird_content_service_whitelisted_language
const
blacklistedLanguageList
=
process
.
env
.
sunbird_content_service_blacklisted_language
const
whitelistedCreatorList
=
process
.
env
.
sunbird_content_service_whitelisted_creator
const
blacklistedCreatorList
=
process
.
env
.
sunbird_content_service_blacklisted_creator
const
producerId
=
process
.
env
.
sunbird_environment
+
'
.
'
+
process
.
env
.
sunbird_instance
+
'
.content-service
'
...
...
@@ -151,6 +157,7 @@ const telemetryConfig = {
telemetry
.
init
(
telemetryConfig
)
// function to generate the search string
function
getMetaFilterConfig
()
{
return
setFilterJSONFromEnv
()
}
...
...
This diff is collapsed.
Click to expand it.
src/middlewares/filter.middleware.js
+
5
−
1
View file @
707ef4c3
...
...
@@ -6,8 +6,12 @@ function addMetaFilters (req, res, next) {
// else call the getMetaSearchString() function to generate the search string for the meta filters
filterService
.
getMetaSearchString
(
function
()
{
// Generate JSON and return
return
setFilterJSON
()
})
}
function
setFilterJSON
()
{
}
module
.
exports
.
addMetaFilters
=
addMetaFilters
This diff is collapsed.
Click to expand it.
src/service/filterService.js
+
1
−
7
View file @
707ef4c3
...
...
@@ -6,15 +6,9 @@
*/
var
configUtil
=
require
(
'
sb-config-util
'
)
function
getChannelSearchString
(
callback
)
{
var
searchString
=
configUtil
.
getConfig
(
'
CHANNEL_FILTER_QUERY_STRING
'
)
callback
(
null
,
searchString
)
}
function
getMetaSearchString
(
callback
)
{
var
searchString
=
configUtil
.
getConfig
(
'
CHANNEL
_FILTER_QUERY_STRING
'
)
var
searchString
=
configUtil
.
getConfig
(
'
META
_FILTER_QUERY_STRING
'
)
callback
(
null
,
searchString
)
}
module
.
exports
.
getChannelSearchString
=
getChannelSearchString
module
.
exports
.
getMetaSearchString
=
getMetaSearchString
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets