hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Fix populated user data for get awardings endpoint (CC-14)

pull/33/head
HardiReady 2018-04-11 20:08:09 +02:00
parent 3256cfd57d
commit 910df3d267
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/apib/data_structures/_awarding.apib
View File

@ -15,8 +15,9 @@ Awarding associating a decoration to a user
# AwardingPopulated (Awarding) # AwardingPopulated (Awarding)
Awarding with populated decoration and proposer Awarding with populated decoration, proposer and army-user
## Properties ## Properties
+ proposer (Proposer, required) - app user who requested this awarding + proposer (Proposer, required) - app user who requested this awarding
+ decorationId (Decoration, required) - populated decoration object that is given with the awarding + decorationId (Decoration, required) - populated decoration object that is given with the awarding
+ userId (User, required) - populated user who gets this awarding

2
api/routes/awardings.js
View File

@ -33,7 +33,7 @@ awarding.route('/')
filter.confirmed = 0; filter.confirmed = 0;
} }
AwardingModel.find(filter, {}, {sort: {date: 'desc'}}) AwardingModel.find(filter, {}, {sort: {date: 'desc'}})
.populate('decorationId').populate('proposer', resultSet) .populate('decorationId').populate('proposer', resultSet).populate('userId')
.exec((err, items) => { .exec((err, items) => {
if (err) { if (err) {
err.status = codes.servererror; err.status = codes.servererror;