Easier to follow active member logic

Author: mbillow

conditional/blueprints/co_op.py

@@ -17,7 +17,7 @@
 def display_co_op_form():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
                      request_id=str(uuid.uuid4()))
-    log.info('frontend', action='display conditional listing page')
+    log.info('frontend', action='display co-op submission page')
 
     # get user data
     user_name = request.headers.get('x-webauth-user')

conditional/util/member.py

@@ -29,11 +29,13 @@ def get_voting_members():
     else:
         semester = 'Spring'
 
-    voting_list = [uid for uid in [member.uid for member in ldap_get_active_members()]
-                   if uid not in [member.uid for member in ldap_get_intro_members()] and
-                   uid not in [member.uid for member in CurrentCoops.query.filter(
-                       CurrentCoops.date_created > start_of_year(),
-                       CurrentCoops.semester == semester).all()]]
+    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)
 
     passed_fall = FreshmanEvalData.query.filter(
         FreshmanEvalData.freshman_eval_result == "Passed"