mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-05-21 13:18:53 +00:00
Revert "fix(challenge export): do not fetch users and tasks concurrently"
This reverts commit 4d88787ba0.
This commit is contained in:
parent
da4dd07de1
commit
9988b1e82d
1 changed files with 12 additions and 13 deletions
|
|
@ -591,22 +591,21 @@ api.exportChallengeCsv = {
|
|||
// computation on MongoDB but then iterated through all
|
||||
// results on the server so the perf difference isn't that big (hopefully)
|
||||
|
||||
const members = await User
|
||||
.find({ challenges: challengeId })
|
||||
.select(nameFields)
|
||||
.sort({ _id: 1 })
|
||||
.lean() // so we don't involve mongoose
|
||||
.exec();
|
||||
const [members, tasks] = await Promise.all([
|
||||
User.find({ challenges: challengeId })
|
||||
.select(nameFields)
|
||||
.sort({ _id: 1 })
|
||||
.lean() // so we don't involve mongoose
|
||||
.exec(),
|
||||
|
||||
const tasks = Tasks.Task
|
||||
.find({
|
||||
Tasks.Task.find({
|
||||
'challenge.id': challengeId,
|
||||
userId: { $exists: true },
|
||||
})
|
||||
.sort({ userId: 1, text: 1 })
|
||||
.select('userId type text value notes streak')
|
||||
.lean() // so we don't involve mongoose
|
||||
.exec();
|
||||
}).sort({ userId: 1, text: 1 })
|
||||
.select('userId type text value notes streak')
|
||||
.lean()
|
||||
.exec(),
|
||||
]);
|
||||
|
||||
let resArray = members
|
||||
.map(member => [member._id, member.profile.name, member.auth.local.username]);
|
||||
|
|
|
|||
Loading…
Reference in a new issue