Skip to content

Check if user is spring intro member so it returns the right number of directorships #532

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

Merged
BigSpaceships merged 3 commits into from
Mar 27, 2026
+12 −2
Merged

Check if user is spring intro member so it returns the right number of directorships #532

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2a6b04
Check if user is spring intro member
charlottegeo Mar 27, 2026
2fc1371
removed whitespace
charlottegeo Mar 27, 2026
72cca6e
Merge branch 'develop' into fix-spring-intro-directorships
BigSpaceships Mar 27, 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
14 changes: 12 additions & 2 deletions conditional/util/member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ def get_hm(member, only_absent=False):
# @service_cache(maxsize=128) # Can't hash because members_on_coop is a list
def req_cm(uid, members_on_coop=None):
# Get the number of required committee meetings based on if the member
# is going on co-op in the current operating session.
# is going on co-op in the current operating session, or if the member
# was a spring intro member.
on_coop = False

if members_on_coop:
Expand All @@ -157,7 +158,16 @@ def req_cm(uid, members_on_coop=None):
CurrentCoops.date_created > start_of_year()).first()
if co_op:
on_coop = True
if on_coop:

spring_semester_start = datetime(start_of_year().year + 1, 1, 1)

is_spring_intro = FreshmanEvalData.query.filter(
FreshmanEvalData.uid == uid,
FreshmanEvalData.freshman_eval_result == "Passed",
FreshmanEvalData.eval_date >= spring_semester_start
).first() is not None

if on_coop or is_spring_intro:
return 15
return 30

Expand Down
Loading