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
bf468561
Commit
bf468561
authored
4 years ago
by
Vaishali Khandagale
Browse files
Options
Download
Patches
Plain Diff
Fix: orgData is not pushed in the nominations list
parent
e73dc44f
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
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/service/programService.js
+3
-4
src/service/programService.js
with
3 additions
and
4 deletions
+3
-4
src/service/programService.js
+
3
−
4
View file @
bf468561
...
...
@@ -514,7 +514,7 @@ function getNominationsList(req, response) {
result
:
err
}));
})
}
else
if
(
data
.
request
.
limit
===
0
)
{
}
else
if
(
data
.
request
.
limit
===
0
)
{
model
.
nomination
.
findAll
({
where
:
{
...
findQuery
...
...
@@ -522,7 +522,7 @@ function getNominationsList(req, response) {
attributes
:
[...
data
.
request
.
fields
||
[]]
}).
then
(
async
(
result
)
=>
{
let
aggregatedRes
=
await
aggregatedNominationCount
(
data
,
result
);
return
response
.
status
(
200
).
send
(
successResponse
({
apiId
:
'
api.nomination.list
'
,
ver
:
'
1.0
'
,
...
...
@@ -557,7 +557,7 @@ function getNominationsList(req, response) {
userList
.
push
(
data
.
user_id
);
if
(
data
.
organisation_id
)
{
orgList
.
push
(
data
.
organisation_id
);
orgList
.
push
(
data
.
organisation_id
.
slice
(
2
)
);
}
})
if
(
_
.
isEmpty
(
userList
))
{
...
...
@@ -571,7 +571,6 @@ function getNominationsList(req, response) {
}
forkJoin
(
getUsersDetails
(
req
,
userList
),
getOrgDetails
(
req
,
orgList
)).
subscribe
((
resData
)
=>
{
_
.
forEach
(
resData
,
function
(
data
)
{
if
(
data
.
data
.
result
&&
!
_
.
isEmpty
(
_
.
get
(
data
,
'
data.result.User
'
)))
{
_
.
forEach
(
data
.
data
.
result
.
User
,
(
userData
)
=>
{
...
...
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