Removing unnecessary functions and clearing cache

Author: devinmatte

packet/ldap.py

@@ -3,12 +3,12 @@
 from packet import _ldap
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=1024)
 def _ldap_get_group_members(group):
     return _ldap.get_group(group).get_members()
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=2048)
 def _ldap_is_member_of_group(member, group):
     group_list = member.get("memberOf")
     for group_dn in group_list:
@@ -17,7 +17,7 @@ def _ldap_is_member_of_group(member, group):
     return False
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=1024)
 def _ldap_is_member_of_directorship(account, directorship):
     directors = _ldap.get_directorship_heads(directorship)
     for director in directors:
@@ -84,6 +84,11 @@ def ldap_get_live_onfloor():
 
 # Status checkers
 
+@lru_cache(maxsize=1024)
+def ldap_is_eval_director(account):
+    return _ldap_is_member_of_directorship(account, 'evaluations')
+
+
 @lru_cache(maxsize=1024)
 def ldap_is_active(account):
     return _ldap_is_member_of_group(account, 'active')

packet/packet.py

@@ -34,9 +34,14 @@ def sign(signer_username, freshman_username):
         db.session.add(MiscSignature(packet=packet, member=signer_username))
     db.session.commit()
 
+    # Clear functions that read signatures cache
+    get_number_signed.cache_clear()
+    get_signatures.cache_clear()
+
     return True
 
 
+@lru_cache(maxsize=2048)
 def get_signatures(freshman_username):
     packet = Freshman.query.filter_by(rit_username=freshman_username).first().current_packet()
     eboard = UpperSignature.query.filter_by(packet_id=packet.id, eboard=True).order_by(UpperSignature.signed.desc())
@@ -50,7 +55,7 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
-@lru_cache(maxsize=512)
+@lru_cache(maxsize=2048)
 def get_number_signed(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 

packet/routes/shared.py

@@ -1,7 +1,8 @@
-from flask import render_template
 from datetime import datetime
 from itertools import chain
 
+from flask import render_template
+
 from packet import auth, app
 from packet.models import Freshman, Packet
 from packet.packet import get_signatures, get_number_required, get_number_signed

packet/templates/active_packets.html

@@ -33,7 +33,7 @@ <h3 class="page-title">Active Packets</h3>
                                                                  alt="{{ packet.freshman.name }}"
                                                                  src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
                                                                  width="25"
-                                                                 height="25"/> {{ get_freshman_name(packet.freshman.rit_username) }}
+                                                                 height="25"/> {{ packet.freshman.name }} ({{ packet.freshman.rit_username }})
                                                         </a>
                                                     </td>
                                                     <td>

packet/templates/packet.html

@@ -166,7 +166,7 @@ <h5>Upperclassmen Score</h5>
                                                 <img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
                                                      src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
                                                      width="25"
-                                                     height="25"/> {{ get_freshman_name(m.freshman.rit_username) }}
+                                                     height="25"/> {{ m.freshman.name }} ({{ m.freshman.rit_username }})
                                             </a>
                                         </td>
                                         <td width="15%">

packet/templates/upperclassman.html

@@ -32,7 +32,7 @@ <h3 class="page-title">{{ get_display_name(member) }}</h3>
                                                          alt="{{ m.packet.freshman.name }}"
                                                          src="https://profiles.csh.rit.edu/image/{{ m.packet.freshman.rit_username }}"
                                                          width="25"
-                                                         height="25"/> {{ get_freshman_name(m.packet.freshman.name) }}
+                                                         height="25"/> {{ m.packet.freshman.name }} ({{ m.packet.freshman.rit_username }})
                                                 </a>
                                             </td>
                                             <td width="15%">

packet/utils.py

@@ -93,12 +93,4 @@ def get_display_name(username):
         except:
             return username
 
-    @lru_cache(maxsize=4096)
-    def get_freshman_name(username):
-        try:
-            freshman = Freshman.query.filter_by(rit_username=username).first()
-            return freshman.name + " (" + freshman.rit_username + ")"
-        except:
-            return username
-
-    return dict(get_display_name=get_display_name, get_freshman_name=get_freshman_name)
+    return dict(get_display_name=get_display_name)