Skip to content

Chirag - Fix: Added logic to return all events for community calendar #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChiragBellara wants to merge 2 commits into
base: development
Choose a base branch
from
+4 −8
Open

Chirag - Fix: Added logic to return all events for community calendar #2198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da1621e
fix: added logic to return all events for community calendar
ChiragBellara May 5, 2026
accb234
Merge branch 'development' into chirag-fix-event-display-on-community…
ChiragBellara May 19, 2026
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
12 changes: 4 additions & 8 deletions src/controllers/eventController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,10 @@ const autoPromoteFromWaitlist = (event) => {

while (event.currentAttendees < event.maxAttendees && event.waitlist.length > 0) {
const nextEntry = event.waitlist.shift();

if (!nextEntry?.userId) continue;
console.log(`Auto-promoting user from waitlist for event ${event._id}`);
event.currentAttendees += 1;
promotedUsers.push(nextEntry.userId);
if (nextEntry?.userId) {
event.currentAttendees += 1;
promotedUsers.push(nextEntry.userId);
}
}

return promotedUsers;
Expand Down Expand Up @@ -265,7 +264,6 @@ const joinWaitlist = async (req, res) => {
try {
const { eventId } = req.params;
const { userId } = req.body;
console.log('Join waitlist request received');

if (!userId || !mongoose.Types.ObjectId.isValid(userId)) {
return res.status(400).json({ error: 'Invalid userId' });
Expand Down Expand Up @@ -294,7 +292,6 @@ const joinWaitlist = async (req, res) => {
position,
});
} catch (error) {
console.error('JOIN WAITLIST ERROR:', error);
res.status(500).json({
error: 'Failed to join waitlist',
details: error.message,
Expand All @@ -304,7 +301,6 @@ const joinWaitlist = async (req, res) => {

const sendWaitlistNotification = async (user, event) => {
// TODO: Integrate with real notification service (email/queue)
console.log(`Sending waitlist notification for event ${event._id}`);
};

const leaveEvent = async (req, res) => {
Expand Down
Loading