organize with sets

Author: shaeespring

conditional/util/member.py

@@ -23,33 +23,26 @@
 def get_voting_members():
 
     if datetime.today() < datetime(start_of_year().year, 12, 31):
-        semester = "Fall"
+        semester = 'Fall'
     else:
-        semester = "Spring"
+        semester = 'Spring'
 
     active_members = set(member.uid for member in ldap_get_active_members())
     intro_members = set(member.uid for member in ldap_get_intro_members())
-    on_coop = set(
-        member.uid
-        for member in CurrentCoops.query.filter(
-            CurrentCoops.date_created > start_of_year(),
-            CurrentCoops.semester == semester,
-        ).all()
-    )
-    voting_list = list(active_members - intro_members - on_coop)
+    on_coop = set(member.uid for member in CurrentCoops.query.filter(
+        CurrentCoops.date_created > start_of_year(),
+        CurrentCoops.semester == semester).all())
+    voting_set = active_members - intro_members - on_coop
 
     passed_fall = FreshmanEvalData.query.filter(
         FreshmanEvalData.freshman_eval_result == "Passed",
-        FreshmanEvalData.eval_date > start_of_year(),
+        FreshmanEvalData.eval_date > start_of_year()
     ).distinct()
 
     for intro_member in passed_fall:
-        if intro_member.uid not in voting_list:
-            voting_list.append(intro_member.uid)
+        voting_set.add(intro_member.uid)
 
-    voting_list = list(
-        username for username in voting_list if gatekeep_status(username)
-    )
+    voting_list = list(username for username in voting_set if gatekeep_status(username))
     return voting_list