Configured eager loading for the signatures relationships

Author: JoelEager

packet/models.py

@@ -61,9 +61,11 @@ class Packet(db.Model):
     info_achieve = Column(Text, nullable=True)  # Used to fulfil the technical achievements list requirement
 
     freshman = relationship("Freshman", back_populates="packets")
-    upper_signatures = relationship("UpperSignature", order_by="UpperSignature.signed.desc(), UpperSignature.updated")
-    fresh_signatures = relationship("FreshSignature", order_by="FreshSignature.signed.desc(), FreshSignature.updated")
-    misc_signatures = relationship("MiscSignature", order_by="MiscSignature.updated")
+    upper_signatures = relationship("UpperSignature", order_by="UpperSignature.signed.desc(), UpperSignature.updated",
+                                    lazy="subquery")
+    fresh_signatures = relationship("FreshSignature", order_by="FreshSignature.signed.desc(), FreshSignature.updated",
+                                    lazy="subquery")
+    misc_signatures = relationship("MiscSignature", order_by="MiscSignature.updated", lazy="subquery")
 
     def is_open(self):
         return self.start < datetime.now() < self.end

packet/routes/shared.py

@@ -5,7 +5,6 @@
 from packet import auth, app
 from packet.utils import before_request
 from packet.models import MiscSignature, Packet
-from packet.debug_utils import log_time, log_cache
 
 
 @app.route('/logout')
@@ -52,43 +51,16 @@ def freshman_packet(freshman_username, packet_id, info=None):
 @app.route("/packets/")
 @auth.oidc_auth
 @before_request
-@log_time
 def packets(info=None):
-    @log_time
-    def query():
-        return Packet.query.filter(Packet.start < datetime.now(), Packet.end > datetime.now()).all()
-
-    open_packets = query()
+    open_packets = Packet.query.filter(Packet.start < datetime.now(), Packet.end > datetime.now()).all()
 
     # Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required()
-    @log_time
-    def prec_1():
-        for packet in open_packets:
-            packet.did_sign_result = packet.did_sign(info["uid"], app.config["REALM"] == "csh")
-
-    @log_time
-    def prec_2():
-        for packet in open_packets:
-            packet.signatures_received_result = packet.signatures_received()
-
-    @log_time
-    def prec_3():
-        for packet in open_packets:
-            packet.signatures_required_result = packet.signatures_required()
-
-    @log_time
-    def sort():
-        open_packets.sort(key=lambda packet: packet.signatures_received_result.total, reverse=True)
-        open_packets.sort(key=lambda packet: packet.did_sign_result, reverse=True)
+    for packet in open_packets:
+        packet.did_sign_result = packet.did_sign(info["uid"], app.config["REALM"] == "csh")
+        packet.signatures_received_result = packet.signatures_received()
+        packet.signatures_required_result = packet.signatures_required()
 
-    @log_time
-    def render():
-        return render_template("active_packets.html", info=info, packets=open_packets)
+    open_packets.sort(key=lambda packet: packet.signatures_received_result.total, reverse=True)
+    open_packets.sort(key=lambda packet: packet.did_sign_result, reverse=True)
 
-    prec_1()
-    prec_2()
-    prec_3()
-    sort()
-    out = render()
-    log_cache()
-    return out
+    return render_template("active_packets.html", info=info, packets=open_packets)