Optimized Committee Meeting Query

Author: mbillow

conditional/blueprints/dashboard.py

@@ -14,7 +14,6 @@
 from conditional.models.models import Conditional
 from conditional.models.models import HouseMeeting
 from conditional.models.models import SpringEval
-from conditional.models.models import CommitteeMeeting
 
 from conditional.util.housing import get_queue_position
 from conditional.util.flask import render_template
@@ -116,15 +115,6 @@ def display_dashboard():
     data['conditionals'] = conditionals
     data['conditionals_len'] = len(conditionals)
 
-    cm_attendance = [
-        {
-            'type': m.committee,
-            'datetime': m.timestamp.date()
-        } for m in CommitteeMeeting.query.filter(
-            CommitteeMeeting.id.in_(c_meetings),
-            CommitteeMeeting.timestamp > start_of_year()
-        )]
-
     hm_attendance = [
         {
             'reason': m.excuse,
@@ -139,8 +129,8 @@ def display_dashboard():
             MemberHouseMeetingAttendance.attendance_status == "Absent",
             HouseMeeting.date > start_of_year())]
 
-    data['cm_attendance'] = cm_attendance
-    data['cm_attendance_len'] = len(cm_attendance)
+    data['cm_attendance'] = c_meetings
+    data['cm_attendance_len'] = len(c_meetings)
     data['hm_attendance'] = hm_attendance
     data['hm_attendance_len'] = len(hm_attendance)
 

conditional/templates/dashboard.html

@@ -274,7 +274,7 @@ <h3 class="panel-title">Become Active</h3>
                     <h3 class="panel-title">Housing Status</h3>
                 </div>
                 <div class="panel-body table-fill">
-                    
+
                     <table class="table table-striped table-responsive no-bottom-margin">
                         <tbody>
                         <tr>
@@ -349,10 +349,10 @@ <h3 class="panel-title">Directorship Meeting Attendance</h3>
                         </tr>
                         </thead>
                         <tbody>
-                        {% for a in cm_attendance %}
+                        {% for meeting in cm_attendance %}
                         <tr>
-                            <td>{{a['type']}}</td>
-                            <td>{{a['datetime']}}</td>
+                            <td>{{meeting['committee']}}</td>
+                            <td>{{meeting['timestamp']}}</td>
                         </tr>
                         {% endfor %}
                         </tbody>

conditional/util/member.py

@@ -116,15 +116,22 @@ def get_onfloor_members():
 
 
 def get_cm(member):
-    try:
-        c_meetings = [m.meeting_id for m in
-                      MemberCommitteeAttendance.query.filter(
-                          MemberCommitteeAttendance.uid == member.uid
-                      ) if CommitteeMeeting.query.filter(
-                          CommitteeMeeting.timestamp > start_of_year(),
-                          CommitteeMeeting.id == m.meeting_id).first().approved]
-    except AttributeError:
-        c_meetings = []
+    c_meetings = [{
+        "uid": cm.uid,
+        "timestamp": cm.timestamp,
+        "committee": cm.committee
+    } for cm in CommitteeMeeting.query.join(
+        MemberCommitteeAttendance,
+        MemberCommitteeAttendance.meeting_id == CommitteeMeeting.id
+        ).with_entities(
+            MemberCommitteeAttendance.uid,
+            CommitteeMeeting.timestamp,
+            CommitteeMeeting.committee
+            ).filter(
+                CommitteeMeeting.timestamp > start_of_year(),
+                MemberCommitteeAttendance.uid == member.uid,
+                CommitteeMeeting.approved == True # pylint: disable=singleton-comparison
+                ).all()]
     return c_meetings