Skip to content

Commit fca8e5c

Browse files
committed
Moving signed_notification into commit_sig
1 parent b689a70 commit fca8e5c

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

packet/routes/api.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,18 @@ def sign(packet_id, info):
2424
for sig in filter(lambda sig: sig.member == info["uid"], packet.upper_signatures):
2525
sig.signed = True
2626
app.logger.info("Member {} signed packet {} as an upperclassman".format(info["uid"], packet_id))
27-
packet_signed_notification(packet, info["uid"])
28-
return commit_sig(packet, was_100)
27+
return commit_sig(packet, was_100, info["uid"])
2928

3029
# The CSHer is a misc so add a new row
3130
db.session.add(MiscSignature(packet=packet, member=info["uid"]))
3231
app.logger.info("Member {} signed packet {} as a misc".format(info["uid"], packet_id))
33-
packet_signed_notification(packet, info["uid"])
34-
return commit_sig(packet, was_100)
32+
return commit_sig(packet, was_100, info["uid"])
3533
else:
3634
# Check if the freshman is onfloor and if so, sign that row
3735
for sig in filter(lambda sig: sig.freshman_username == info["uid"], packet.fresh_signatures):
3836
sig.signed = True
3937
app.logger.info("Freshman {} signed packet {}".format(info["uid"], packet_id))
40-
packet_signed_notification(packet, info["uid"])
41-
return commit_sig(packet, was_100)
38+
return commit_sig(packet, was_100, info["uid"])
4239

4340
app.logger.warn("Failed to add {}'s signature to packet {}".format(info["uid"], packet_id))
4441
return "Error: Signature not valid. Reason: Unknown"
@@ -67,7 +64,8 @@ def report(info):
6764
return "Success: " + get_rit_name(info['uid']) + " sent a report"
6865

6966

70-
def commit_sig(packet, was_100):
67+
def commit_sig(packet, was_100, uid):
68+
packet_signed_notification(packet, uid)
7169
db.session.commit()
7270
if not was_100 and packet.is_100():
7371
packet_100_percent_notification(packet)

0 commit comments

Comments
 (0)