Skip to content

fix: check roomNumber key before indexing #608

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
costowell wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: check roomNumber key before indexing #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 4 deletions conditional/util/housing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ def get_housing_queue(is_eval_director=False):
}

queue = ldap.get_group_member_attributes(groups=['current_student'],
excluded_groups=[], attributes=['uid', 'housingPoints', 'cn'])
excluded_groups=[], attributes=['uid', 'housingPoints', 'cn', 'roomNumber'])

# if the user is not evals, they should only see people in the cue without a room number
# if the user is not evals, they should only see people in the queue without a room number
if not is_eval_director:
queue = list(filter(lambda member: member['uid'] in in_queue and member['roomNumber'] is not None, queue))

def member_in_queue(member):
return (
member['uid'] in in_queue
and ('roomNumber' not in member or member['roomNumber'] is not None)
)
queue = list(filter(member_in_queue, queue))

# set the time they were added to the queue
# i'm sorry this is cursed, it's this way because of database structure or something
Expand Down
Loading