More spring evals speedup

Author: BigSpaceships

conditional/blueprints/dashboard.py

@@ -57,7 +57,7 @@ def display_dashboard(user_dict=None):
     spring = {}
     c_meetings = get_cm(user_dict['account'])
     spring['committee_meetings'] = len(c_meetings)
-    spring['req_meetings'] = req_cm(user_dict['account'])
+    spring['req_meetings'] = req_cm(user_dict['account'].uid)
     h_meetings = [(m.meeting_id, m.attendance_status) for m in get_hm(user_dict['account'])]
     spring['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
     eval_entry = SpringEval.query.filter(SpringEval.uid == user_dict['account'].uid,

conditional/blueprints/spring_evals.py

@@ -1,3 +1,4 @@
+from time import perf_counter
 import structlog
 from flask import Blueprint, request
 from sqlalchemy import func
@@ -58,6 +59,12 @@ def display_spring_evals(internal=False, user_dict=None):
         MajorProject.date >= start_of_year()
     ).all()
 
+    coop_members = CurrentCoops.query.filter(
+        CurrentCoops.date_created >= start_of_year()
+    ).with_entities(
+        func.array_agg(CurrentCoops.uid)
+    ).scalar()
+
     major_projects = {}
 
     for project in major_project_query:
@@ -73,6 +80,8 @@ def display_spring_evals(internal=False, user_dict=None):
     sp_members = []
     for account in active_members:
         uid = account.uid
+        name = account.cn
+
         spring_entry = SpringEval.query.filter(
             SpringEval.date_created > start_of_year(),
             SpringEval.uid == uid,
@@ -100,18 +109,23 @@ def display_spring_evals(internal=False, user_dict=None):
                 func.array_agg(HouseMeeting.date)
             ).scalar()
 
+        cm_attended_count = cm_count.get(uid, 0)
+        member_major_projects = major_projects.get(uid, [])
+
+        passed_mps = [project for project in member_major_projects if project['status'] == 'Passed']
+
+        req_cm_count = req_cm(uid, coop_members)
+
         member = {
-            'name': account.cn,
+            'name': name,
             'uid': uid,
             'status': spring_entry.status,
-            'committee_meetings': cm_count.get(uid, 0),
-            'req_meetings': req_cm(account),
+            'committee_meetings': cm_attended_count,
+            'req_meetings': req_cm_count,
             'house_meetings_missed': member_missed_hms,
-            'major_projects': major_projects.get(uid, [])
+            'major_projects': member_major_projects
         }
 
-        passed_mps = [project for project in member['major_projects'] if project['status'] == 'Passed']
-
         member['major_projects_len'] = len(member['major_projects'])
         member['major_projects_passed'] = passed_mps
         member['major_projects_passed_len'] = len(member['major_projects_passed'])

conditional/util/member.py

@@ -126,14 +126,20 @@ def get_hm(member, only_absent=False):
     return h_meetings
 
 
-@service_cache(maxsize=128)
-def req_cm(member):
+# @service_cache(maxsize=128)
+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.
-    co_op = CurrentCoops.query.filter(
-        CurrentCoops.uid == member.uid,
-        CurrentCoops.date_created > start_of_year()).first()
-    if co_op:
+    on_coop = False
+    if members_on_coop:
+        on_coop = uid in members_on_coop
+    else:
+        co_op = CurrentCoops.query.filter(
+            CurrentCoops.uid == uid,
+            CurrentCoops.date_created > start_of_year()).first()
+        if co_op:
+            on_coop = True
+    if on_coop:
         return 15
     return 30