diff --git a/packet/packet.py b/packet/packet.py index ea138108..ce76f505 100644 --- a/packet/packet.py +++ b/packet/packet.py @@ -64,12 +64,10 @@ def valid_signature(signer_username, freshman_username): 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() diff --git a/packet/routes/shared.py b/packet/routes/shared.py index 3f893cd8..550d9974 100644 --- a/packet/routes/shared.py +++ b/packet/routes/shared.py @@ -4,8 +4,9 @@ from flask import render_template, redirect from packet import auth, app -from packet.models import Freshman, Packet -from packet.packet import get_signatures, get_number_required, get_number_signed, get_upperclassmen_percent +from packet.models import Packet +from packet.packet import get_signatures, get_number_required, get_number_signed, get_upperclassmen_percent, \ + get_freshman from packet.utils import before_request, signed_packet @@ -19,7 +20,7 @@ def logout(): @auth.oidc_auth @before_request def freshman_packet(uid, info=None): - freshman = Freshman.query.filter_by(rit_username=uid).first() + freshman = get_freshman(uid) upperclassmen_percent = get_upperclassmen_percent(uid) signatures = get_signatures(uid) signed_dict = get_number_signed(uid)