Skip to content
Open
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
38 changes: 29 additions & 9 deletions backend/routes/friendRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ router.get('/getFriends', verifyToken, async (req, res) => {
]
}).populate('requester recipient', 'username');


const friends = friendships.map(friendship => {
return friendship.requester._id.toString() === userId.toString()
? friendship.recipient
Expand All @@ -207,22 +206,43 @@ router.get('/getFriends', verifyToken, async (req, res) => {

const friendIds = friends.map(friend => friend._id);

// fetch friends objects
const friendsObjects= await User.find({
_id: { $in: friendIds }
const friendsObjects = await User.find({
_id: { $in: friendIds.map(id => new mongoose.Types.ObjectId(id)) }
});

console.log(`GET: /friends friends found`);

const checkedInFriends = await Classroom.find(
{ checked_in: { $in: friendIds.map(id => new mongoose.Types.ObjectId(id)) } },
{ checked_in: 1, _id: 1 }
);

const checkedInMap = new Map();
checkedInFriends.forEach(classroom => {
classroom.checked_in.forEach(friendId => {
checkedInMap.set(friendId.toString(), classroom._id);
});
});

const friendsWithCheckInData = friendsObjects.map(friend => {
const friendData = friend.toObject();
const classroomId = checkedInMap.get(friend._id.toString());
if (classroomId) {
friendData.checkedIn = classroomId.toString();
}
return friendData;
});

console.log(`GET: /getFriends friends found`);
res.json({
success: true,
message: 'Friends found',
data: friendsObjects
})
data: friendsWithCheckInData
});
} catch (error) {
console.log(`GET: /getFriends failed`);
res.json({
success: false,
message: error.message
})
});
}
});

Expand Down