Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions app/data/allocations-dao.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,24 @@ const AllocationsDAO = function(db){
if (err) return callback(err, null);
if (!allocations.length) return callback("ERROR: No allocations found for the user", null);

let doneCounter = 0;
const userAllocations = [];
const userIds = allocations.map(alloc => alloc.userId);

allocations.forEach( alloc => {
userDAO.getUserById(alloc.userId, (err, user) => {
if (err) return callback(err, null);

alloc.userName = user.userName;
alloc.firstName = user.firstName;
alloc.lastName = user.lastName;
userDAO.getUsersByIds(userIds, (err, users) => {
if (err) return callback(err, null);

doneCounter += 1;
userAllocations.push(alloc);
const usersById = {};
users.forEach(user => { usersById[user._id] = user; });

if (doneCounter === allocations.length) {
callback(null, userAllocations);
allocations.forEach(alloc => {
const user = usersById[parseInt(alloc.userId)];
if (user) {
alloc.userName = user.userName;
alloc.firstName = user.firstName;
alloc.lastName = user.lastName;
}
});

callback(null, allocations);
});
});
};
Expand Down
7 changes: 7 additions & 0 deletions app/data/user-dao.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ function UserDAO(db) {
}, callback);
};

this.getUsersByIds = (userIds, callback) => {
const parsedIds = [...new Set(userIds.map(id => parseInt(id)))];
usersCol.find({
_id: { $in: parsedIds }
}).toArray(callback);
};

this.getUserByUserName = (userName, callback) => {
usersCol.findOne({
userName: userName
Expand Down