Skip to content

Commit 7ba7cd2

Browse files
committed
Minor refactor of the sign() logic
1 parent f6092d6 commit 7ba7cd2

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

packet/routes/api.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,26 @@ def sign(packet_id, info):
1515
# Check if the CSHer is an upperclassman and if so, sign that row
1616
for sig in filter(lambda sig: sig.member == info["uid"], packet.upper_signatures):
1717
sig.signed = True
18-
db.session.commit()
1918
app.logger.info("Member {} signed packet {} as an upperclassman".format(info["uid"], packet_id))
20-
if not was_100 and packet.is_100():
21-
notify_slack(packet.freshman.name)
22-
return "Success: Signed Packet: " + packet.freshman_username
19+
return commit_sig(packet, was_100)
2320

2421
# The CSHer is a misc so add a new row
2522
db.session.add(MiscSignature(packet=packet, member=info["uid"]))
26-
db.session.commit()
2723
app.logger.info("Member {} signed packet {} as a misc".format(info["uid"], packet_id))
28-
if not was_100 and packet.is_100():
29-
notify_slack(packet.freshman.name)
30-
return "Success: Signed Packet: " + packet.freshman_username
24+
return commit_sig(packet, was_100)
3125
else:
3226
# Check if the freshman is onfloor and if so, sign that row
3327
for sig in filter(lambda sig: sig.freshman_username == info["uid"], packet.fresh_signatures):
3428
sig.signed = True
35-
db.session.commit()
3629
app.logger.info("Freshman {} signed packet {}".format(info["uid"], packet_id))
37-
if not was_100 and packet.is_100():
38-
notify_slack(packet.freshman.name)
39-
return "Success: Signed Packet: " + packet.freshman_username
30+
return commit_sig(packet, was_100)
4031

4132
app.logger.warn("Failed to add {}'s signature to packet {}".format(info["uid"], packet_id))
4233
return "Error: Signature not valid. Reason: Unknown"
34+
35+
def commit_sig(packet, was_100):
36+
db.session.commit()
37+
if not was_100 and packet.is_100():
38+
notify_slack(packet.freshman.name)
39+
40+
return "Success: Signed Packet: " + packet.freshman_username

0 commit comments

Comments
 (0)