Cleanup and Refactor

Author: devinmatte

packet/ldap.py

@@ -8,7 +8,6 @@ def _ldap_get_group_members(group):
     return _ldap.get_group(group).get_members()
 
 
-@lru_cache(maxsize=2048)
 def _ldap_is_member_of_group(member, group):
     group_list = member.get("memberOf")
     for group_dn in group_list:

packet/member.py

@@ -6,16 +6,10 @@
 
 
 def sign(signer_username, freshman_username):
-    if signer_username == freshman_username:
-        return False
-
-    freshman_signed = Freshman.query.filter_by(rit_username=freshman_username).first()
-    if freshman_signed is None:
-        return False
-    packet = freshman_signed.current_packet()
-    if packet is None or not packet.is_open():
+    if not valid_signature(signer_username, freshman_username):
         return False
 
+    packet = get_freshman(freshman_username).current_packet()
     upper_signature = UpperSignature.query.filter(UpperSignature.member == signer_username,
                                                   UpperSignature.packet == packet).first()
     fresh_signature = FreshSignature.query.filter(FreshSignature.freshman_username == signer_username,
@@ -27,25 +21,22 @@ def sign(signer_username, freshman_username):
         upper_signature.signed = True
     elif fresh_signature:
         # Make sure only on floor freshmen can sign packets
-        freshman_signer = Freshman.query.filter_by(rit_username=signer_username).first()
+        freshman_signer = get_freshman(signer_username)
         if freshman_signer and not freshman_signer.onfloor:
             return False
         fresh_signature.signed = True
     else:
         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()
-    get_upperclassmen_percent.cache_clear()
+    clear_cache()
 
     return True
 
 
 @lru_cache(maxsize=2048)
 def get_signatures(freshman_username):
-    packet = Freshman.query.filter_by(rit_username=freshman_username).first().current_packet()
+    packet = get_current_packet(freshman_username)
     eboard = UpperSignature.query.filter_by(packet_id=packet.id, eboard=True).order_by(UpperSignature.signed.desc())
     upper_signatures = UpperSignature.query.filter_by(packet_id=packet.id, eboard=False).order_by(
         UpperSignature.signed.desc())
@@ -57,14 +48,40 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
+@lru_cache(maxsize=2048)
+def valid_signature(signer_username, freshman_username):
+    if signer_username == freshman_username:
+        return False
+
+    freshman_signed = get_freshman(freshman_username)
+    if freshman_signed is None:
+        return False
+
+    packet = freshman_signed.current_packet()
+    if packet is None or not packet.is_open():
+        return False
+
+    return True
+
+
+@lru_cache(maxsize=512)
+def get_freshman(freshman_username):
+    return Freshman.query.filter_by(rit_username=freshman_username).first()
+
+
+@lru_cache(maxsize=512)
+def get_current_packet(freshman_username):
+    return get_freshman(freshman_username).current_packet()
+
+
 @lru_cache(maxsize=2048)
 def get_number_signed(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
+    return get_current_packet(freshman_username).signatures_received()
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=2048)
 def get_number_required(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()
+    return get_current_packet(freshman_username).signatures_required()
 
 
 @lru_cache(maxsize=2048)
@@ -78,3 +95,27 @@ def get_upperclassmen_percent(uid):
     upperclassmen_signature = sum(upperclassmen_signature.values())
 
     return upperclassmen_signature / upperclassmen_required * 100
+
+
+@lru_cache(maxsize=512)
+def signed_packets(member):
+    # Checks whether or not member is a freshman
+    if get_freshman(member) is not None:
+        return FreshSignature.query.filter_by(freshman_username=member, signed=True).all()
+    # Checks whether or not member is an upperclassman
+    if UpperSignature.query.filter_by(member=member).first() is not None:
+        return UpperSignature.query.filter_by(member=member, signed=True).all()
+    return MiscSignature.query.filter_by(member=member).all()
+
+
+def clear_cache():
+    """
+    Clear cache of all frequently changing data
+    """
+    get_number_signed.cache_clear()
+    get_signatures.cache_clear()
+    get_number_required.cache_clear()
+    get_upperclassmen_percent.cache_clear()
+    get_freshman.cache_clear()
+    get_current_packet.cache_clear()
+    signed_packets.cache_clear()

packet/packet.py

@@ -11,7 +11,8 @@
                          ldap_is_onfloor,
                          ldap_get_roomnumber,
                          ldap_get_groups)
-from packet.models import Freshman, FreshSignature, Packet, UpperSignature, MiscSignature
+from packet.models import FreshSignature, UpperSignature, MiscSignature
+from packet.packet import get_current_packet, get_freshman
 
 INTRO_REALM = "https://sso.csh.rit.edu/auth/realms/intro"
 
@@ -63,12 +64,12 @@ def get_member_info(uid):
 
 @lru_cache(maxsize=2048)
 def is_on_floor(uid):
-    return (Freshman.query.filter_by(rit_username=uid)).first().onfloor
+    return get_freshman(uid).onfloor
 
 
-@lru_cache(maxsize=4096)
+@lru_cache(maxsize=2048)
 def signed_packet(signer, freshman):
-    packet = Packet.query.filter_by(freshman_username=freshman).first()
+    packet = get_current_packet(freshman)
     freshman_signature = FreshSignature.query.filter_by(packet=packet, freshman_username=signer, signed=True).first()
     upper_signature = UpperSignature.query.filter_by(packet=packet, member=signer, signed=True).first()
     misc_signature = MiscSignature.query.filter_by(packet=packet, member=signer).first()