Skip to content

[Kickstart] Teams Improvement #597

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
briannval wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[Kickstart] Teams Improvement #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a79954
Teams Kickstart Improvement
briannval Nov 12, 2025
cd7220e
Remove unnecessary param
briannval Nov 12, 2025
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
2 changes: 1 addition & 1 deletion services/teams/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const leaveTeam = async (event, ctx, callback) => {
}
});

await teamHelpers.leaveTeam(data.memberID, data.eventID, data.year, data.teamID);
await teamHelpers.leaveTeam(data.memberID, data.eventID, data.year);

const response = helpers.createResponse(200, {
message: "Successfully left team.",
Expand Down
21 changes: 8 additions & 13 deletions services/teams/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,13 @@ export default {
// Remove member from the team
team.memberIDs = team.memberIDs.filter((id) => id !== memberID);

// TODO: delete team if empty ?
await this._putTeam(team, false);
if (team.memberIDs.length === 0) {
await db.deleteOne(team.id, TEAMS_TABLE, {
"eventID;year": eventID_year
});
} else {
await this._putTeam(team, false);
}

// Remove teamID from user registration
registration.teamID = "";
Expand Down Expand Up @@ -342,17 +347,7 @@ export default {
"eventID;year": eventID_year
});

if (res.teamID) {
// If user is already on a team, remove them from that team on the Teams table
const team = await this._getTeamFromUserRegistration(
memberID,
eventID,
year
);
team.memberIDs = team.memberIDs.filter((id) => id !== memberID);
await this._putTeam(team, false);
}

// at this point, they are guaranteed to not be in a team, due to the above check
res.teamID = params.id;

let conditionExpression =
Expand Down
Loading