Simplified URLs and packet lookup

Author: JoelEager

packet/models.py

@@ -105,8 +105,18 @@ def did_sign(self, username, is_csh):
 
     @classmethod
     def open_packets(cls):
+        """
+        Helper method for fetching all currently open packets
+        """
         return cls.query.filter(cls.start < datetime.now(), cls.end > datetime.now()).all()
 
+    @classmethod
+    def by_id(cls, packet_id):
+        """
+        Helper method for fetching 1 packet by its id
+        """
+        return cls.query.filter_by(id=packet_id).first()
+
 class UpperSignature(db.Model):
     __tablename__ = "signature_upper"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)

packet/routes/api.py

@@ -3,29 +3,29 @@
 from packet.models import Packet, MiscSignature
 
 
-@app.route("/api/v1/sign/<packet_username>/<packet_id>/", methods=["POST"])
+@app.route("/api/v1/sign/<packet_id>/", methods=["POST"])
 @auth.oidc_auth
 @before_request
-def sign(packet_username, packet_id, info):
-    packet = Packet.query.filter_by(freshman_username=packet_username, id=packet_id).first()
+def sign(packet_id, info):
+    packet = Packet.by_id(packet_id)
 
     if packet is not None and packet.is_open():
         if app.config["REALM"] == "csh":
             # Check if the CSHer is an upperclassman and if so, sign that row
             for sig in filter(lambda sig: sig.member == info["uid"], packet.upper_signatures):
                 sig.signed = True
                 db.session.commit()
-                return "Success: Signed Packet: " + packet_username
+                return "Success: Signed Packet: " + packet.freshman_username
 
             # The CSHer is a misc so add a new row
             db.session.add(MiscSignature(packet=packet, member=info["uid"]))
             db.session.commit()
-            return "Success: Signed Packet: " + packet_username
+            return "Success: Signed Packet: " + packet.freshman_username
         else:
             # Check if the freshman is onfloor and if so, sign that row
             for sig in filter(lambda sig: sig.freshman_username == info["uid"], packet.fresh_signatures):
                 sig.signed = True
                 db.session.commit()
-                return "Success: Signed Packet: " + packet_username
+                return "Success: Signed Packet: " + packet.freshman_username
 
     return "Error: Signature not valid.  Reason: Unknown"

packet/routes/freshmen.py

@@ -16,8 +16,7 @@ def index(info=None):
     most_recent_packet = Packet.query.filter_by(freshman_username=info['uid']).order_by(Packet.id.desc()).first()
 
     if most_recent_packet is not None:
-        return redirect(url_for("freshman_packet", freshman_username=most_recent_packet.freshman_username,
-                                packet_id=most_recent_packet.id), 302)
+        return redirect(url_for("freshman_packet", packet_id=most_recent_packet.id), 302)
     else:
         return redirect(url_for("packets"), 302)
 
@@ -26,9 +25,9 @@ def index(info=None):
 @auth.oidc_auth
 @before_request
 def essays(packet_id, info=None):
-    packet = Packet.query.filter_by(freshman_username=info['uid'], id=packet_id).first()
+    packet = Packet.by_id(packet_id)
 
-    if packet is not None:
+    if packet is not None and packet.freshman_username == info["uid"]:
         return render_template("essays.html", info=info, packet=packet)
     else:
         return redirect(url_for("index"), 302)
@@ -38,9 +37,9 @@ def essays(packet_id, info=None):
 @auth.oidc_auth
 @before_request
 def submit_essays(packet_id, info=None):
-    packet = Packet.query.filter_by(freshman_username=info['uid'], id=packet_id).first()
+    packet = Packet.by_id(packet_id)
 
-    if packet is not None:
+    if packet is not None and packet.is_open() and packet.freshman_username == info["uid"]:
         packet.info_eboard = request.form.get("info_eboard", None)
         packet.info_events = request.form.get("info_events", None)
         packet.info_achieve = request.form.get("info_achieve", None)

packet/routes/shared.py

@@ -15,11 +15,11 @@ def logout():
     return redirect("http://csh.rit.edu")
 
 
-@app.route("/packet/<freshman_username>/<packet_id>/")
+@app.route("/packet/<packet_id>/")
 @auth.oidc_auth
 @before_request
-def freshman_packet(freshman_username, packet_id, info=None):
-    packet = Packet.query.filter_by(freshman_username=freshman_username, id=packet_id).first()
+def freshman_packet(packet_id, info=None):
+    packet = Packet.by_id(packet_id)
 
     if packet is None:
         return "Invalid packet or freshman", 404

packet/static/js/signing.js

@@ -13,7 +13,7 @@ $(document).ready(function () {
             .then((willSign) => {
                 if (willSign) {
                     $.ajax({
-                        url: "/api/v1/sign/" + packetData.freshman_uid + "/" + packetData.packet_id + "/",
+                        url: "/api/v1/sign/" + packetData.packet_id + "/",
                         method: "POST",
                         success: function (data) {
                             swal("Congratulations or I'm sorry\nYou've signed " + packetData.freshman_name + "'s packet.", {

packet/templates/active_packets.html

@@ -28,7 +28,7 @@ <h3 class="page-title">Active Packets</h3>
                                     {% for packet in packets %}
                                         <tr {% if packet.did_sign_result %}style="background-color: #4caf505e" {% endif %}>
                                             <td>
-                                                <a href="{{ url_for('freshman_packet', freshman_username=packet.freshman_username, packet_id=packet.id) }}">
+                                                <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                     <img class="eval-user-img"
                                                          alt="{{ get_rit_name(packet.freshman_username) }}"
                                                          src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
@@ -48,7 +48,6 @@ <h3 class="page-title">Active Packets</h3>
                                                 <td class="sign-packet" align="right">
                                                     {% if not packet.did_sign_result and info.uid != packet.rit_username %}
                                                         <button class="btn btn-sm btn-primary sign-button"
-                                                                data-freshman_uid="{{ packet.freshman_username }}"
                                                                 data-packet_id="{{ packet.id }}"
                                                                 data-freshman_name="{{ get_rit_name(packet.freshman_username) }}">
                                                             Sign

packet/templates/packet.html

@@ -12,7 +12,6 @@ <h3>{{ get_rit_name(packet.freshman_username) }}</h3>
                 <div class="col">
                     {% if can_sign and not did_sign %}
                         <button class="btn btn-primary sign-button"
-                                data-freshman_uid="{{ packet.freshman_username }}"
                                 data-packet_id="{{ packet.id }}"
                                 data-freshman_name="{{ get_rit_name(packet.freshman_username) }}">Sign
                         </button>

packet/templates/upperclassman.html

@@ -23,7 +23,7 @@ <h3 class="page-title">{{ get_csh_name(member) }}</h3>
                                     {# Using inline style because of how themeswitcher loads the css theme :( #}
                                     <tr {% if packet.did_sign_result %}style="background-color: #4caf505e" {% endif %}>
                                         <td>
-                                            <a href="{{ url_for('freshman_packet', freshman_username=packet.freshman_username, packet_id=packet.id) }}">
+                                            <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                 <img class="eval-user-img"
                                                      alt="{{ get_rit_name(packet.freshman_username) }}"
                                                      src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"