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
program-service
Commits
878efc22
Commit
878efc22
authored
4 years ago
by
Kartheek Palla
Browse files
Options
Download
Patches
Plain Diff
Issue #DP-000 fix: opensaber url taking from config
parent
74938da4
SB-23374
SB-25924
copy_issue
copy_issue1
dependabot/npm_and_yarn/src/ajv-6.12.6
dependabot/npm_and_yarn/src/async-2.6.4
dependabot/npm_and_yarn/src/axios-0.21.2
dependabot/npm_and_yarn/src/css-what-5.0.1
dependabot/npm_and_yarn/src/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/elliptic-6.5.4
dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/lodash-4.17.21
dependabot/npm_and_yarn/src/moment-2.29.4
dependabot/npm_and_yarn/src/moment-timezone-0.5.37
dependabot/npm_and_yarn/src/node-fetch-2.6.7
dependabot/npm_and_yarn/src/nth-check-2.0.1
dependabot/npm_and_yarn/src/path-parse-1.0.7
dependabot/npm_and_yarn/src/pathval-1.1.1
dependabot/npm_and_yarn/src/qs-and-body-parser-and-express-6.5.3
dependabot/npm_and_yarn/src/redis-3.1.1
dependabot/npm_and_yarn/src/simple-get-2.8.2
dependabot/npm_and_yarn/src/underscore-1.12.1
eslint_fixes
log_issue
master
program-service
publish_changes
questionset-integration
release-3.8.0
release-3.9.0
release-4.0.0
release-4.1.0
release-4.1.1
release-4.2.0
release-4.3.0
release-4.4.0
release-4.5.0
release-4.6.0
release-4.7.0
release-4.8.0
release-4.9.0
release-5.1.0
revert-147-release-3.9.0
sb-22518
sb-25146
search_issue
sprint-10
sprint-14
sprint-15
sprint-16
sprint-17
sprint-18
sprint-19
sprint-20
sprint-9
test-issue
vk-local-ps-4.4.0
sprint20_RC2
sprint20_RC1
sprint19_RC3
sprint19_RC2
sprint19_RC1
sprint18_RC1
sprint17_RC2
sprint17_RC1
sprint16_RC3
sprint16_RC2
sprint16_RC1
sprint15.1_RC2
sprint15.1_RC1
sprint15_RC4
sprint15_RC3
sprint15_RC2
sprint15_RC1
sprint14_RC1
sprint13_RC4
sprint13_RC3
sprint13_RC2
release-5.1.0_RC1
release-4.9.0_RC1
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.6.0_RC6
release-4.6.0_RC5
release-4.6.0_RC4
release-4.6.0_RC3
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0_RC1
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0_RC9
release-4.2.0_RC8
release-4.2.0_RC7
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.1_RC1
release-4.1.0_RC2
release-4.1.0_RC1
release-4.0.0_RC3
release-4.0.0_RC2
release-4.0.0_RC1
release-3.9.0_RC4
release-3.9.0_RC3
release-3.9.0_RC2
release-3.9.0_RC1
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
program-service_RC22
program-service_RC21
program-service_RC20
program-service_RC19
program-service_RC18
program-service_RC17
program-service_RC16
program-service_RC15
program-service_RC14
program-service_RC13
program-service_RC12
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/envVariables.js
+1
-0
src/envVariables.js
src/service/programService.js
+2
-2
src/service/programService.js
src/service/registryService.js
+6
-6
src/service/registryService.js
with
9 additions
and
8 deletions
+9
-8
src/envVariables.js
+
1
−
0
View file @
878efc22
...
...
@@ -7,6 +7,7 @@ const envVariables = {
port
:
process
.
env
.
sunbird_program_port
||
6000
,
level
:
process
.
env
.
sunbird_service_log_level
||
'
info
'
,
LEARNING_SERVICE_URL
:
process
.
env
.
learning_service_url
,
OPENSABER_SERVICE_URL
:
process
.
env
.
opensaber_service_url
,
config
:
{
user
:
process
.
env
.
sunbird_program_db_user
||
"
postgres
"
,
host
:
process
.
env
.
sunbird_program_db_host
||
"
localhost
"
,
...
...
This diff is collapsed.
Click to expand it.
src/service/programService.js
+
2
−
2
View file @
878efc22
...
...
@@ -598,7 +598,7 @@ function getNominationsList(req, response) {
}
function
getUsersDetails
(
req
,
userId
)
{
const
url
=
`
${
envVariables
.
baseURL
}
/content/reg
/search`
;
const
url
=
`
${
envVariables
.
OPENSABER_SERVICE_URL
}
/search`
;
const
reqData
=
{
"
id
"
:
"
open-saber.registry.search
"
,
"
ver
"
:
"
1.0
"
,
...
...
@@ -626,7 +626,7 @@ function getUsersDetails(req, userId) {
}
function
getOrgDetails
(
req
,
orgId
)
{
const
url
=
`
${
envVariables
.
baseURL
}
/content/reg
/search`
;
const
url
=
`
${
envVariables
.
OPENSABER_SERVICE_URL
}
/search`
;
const
reqData
=
{
"
id
"
:
"
open-saber.registry.search
"
,
"
ver
"
:
"
1.0
"
,
...
...
This diff is collapsed.
Click to expand it.
src/service/registryService.js
+
6
−
6
View file @
878efc22
const
envVariables
=
require
(
'
../envVariables
'
)
const
registryUrl
=
envVariables
[
'
base
URL
'
]
const
registryUrl
=
envVariables
[
'
OPENSABER_SERVICE_
URL
'
]
const
axios
=
require
(
'
axios
'
);
...
...
@@ -10,7 +10,7 @@ class RegistryService {
addRecord
(
value
,
callback
)
{
const
headers
=
this
.
getDefaultHeaders
()
axios
.
post
(
registryUrl
+
'
/
content/reg/
add
'
,
value
.
body
,
headers
)
axios
.
post
(
registryUrl
+
'
/add
'
,
value
.
body
,
headers
)
.
then
((
res
)
=>
{
callback
(
null
,
res
)
},
...
...
@@ -23,7 +23,7 @@ class RegistryService {
updateRecord
(
value
,
callback
)
{
const
headers
=
this
.
getDefaultHeaders
()
axios
.
post
(
registryUrl
+
'
/
content/reg/
update
'
,
value
.
body
,
headers
)
axios
.
post
(
registryUrl
+
'
/update
'
,
value
.
body
,
headers
)
.
then
((
res
)
=>
{
callback
(
null
,
res
)
},
...
...
@@ -36,7 +36,7 @@ class RegistryService {
readRecord
(
value
,
callback
)
{
const
headers
=
this
.
getDefaultHeaders
()
axios
.
post
(
registryUrl
+
'
/
content/reg/
read
'
,
value
.
body
,
headers
)
axios
.
post
(
registryUrl
+
'
/read
'
,
value
.
body
,
headers
)
.
then
((
res
)
=>
{
callback
(
null
,
res
)
},
...
...
@@ -48,7 +48,7 @@ class RegistryService {
searchRecord
(
value
,
callback
)
{
const
headers
=
this
.
getDefaultHeaders
()
axios
.
post
(
registryUrl
+
'
/
content/reg/
search
'
,
value
.
body
,
headers
)
axios
.
post
(
registryUrl
+
'
/search
'
,
value
.
body
,
headers
)
.
then
((
res
)
=>
{
callback
(
null
,
res
)
},
...
...
@@ -60,7 +60,7 @@ class RegistryService {
searchAuditRecords
(
value
,
callback
)
{
const
headers
=
this
.
getDefaultHeaders
()
axios
.
post
(
registryUrl
+
"
/
content/reg/
audit
"
,
value
.
body
,
headers
)
axios
.
post
(
registryUrl
+
"
/audit
"
,
value
.
body
,
headers
)
.
then
((
res
)
=>
{
callback
(
null
,
res
)
},
...
...
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