Refactored and fixed packet signing

Author: JoelEager

packet/routes/api.py

@@ -1,19 +1,31 @@
-from packet import auth, app
+from packet import auth, app, db
 from packet.utils import before_request
-from packet.packet import sign as sign_packet
+from packet.models import Packet, MiscSignature
 
 
-@app.route("/api/v1/<member_username>/sign/<packet_username>", methods=["POST"])
+@app.route("/api/v1/sign/<packet_username>/<packet_id>/", methods=["POST"])
 @auth.oidc_auth
 @before_request
-def sign(member_username, packet_username, info):
-    if info['uid'] != member_username:
-        if info['member_info']:
-            if "eboard-evaluations" not in info['member_info']['group_list']:
-                return "Error: You are not evals"
+def sign(packet_username, packet_id, info):
+    packet = Packet.query.filter_by(freshman_username=packet_username, id=packet_id).first()
+
+    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
+
+            # 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
         else:
-            return "Error: UID Submission Mismatch"
-    if not sign_packet(member_username, packet_username):
-        return "Error: Signature not valid.  Reason: Unknown"
-    return "Success: Signed Packet: " + packet_username
+            # 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 "Error: Signature not valid.  Reason: Unknown"

packet/static/js/signing.js

@@ -13,7 +13,7 @@ $(document).ready(function () {
             .then((willSign) => {
                 if (willSign) {
                     $.ajax({
-                        url: "/api/v1/" + userData + "/sign/" + packetData.freshman_uid,
+                        url: "/api/v1/sign/" + packetData.freshman_uid + "/" + 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

@@ -48,7 +48,8 @@ <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.rit_username }}"
+                                                                data-freshman_uid="{{ packet.freshman_username }}"
+                                                                data-packet_id="{{ packet.id }}"
                                                                 data-freshman_name="{{ get_rit_name(packet.freshman_username) }}">
                                                             Sign
                                                         </button>

packet/templates/packet.html

@@ -13,6 +13,7 @@ <h3>{{ get_rit_name(packet.freshman_username) }}</h3>
                     {% 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>
                     {% elif did_sign %}