Merge pull request #16 from zedoax/master

Packet.Sign Function Fix

Author: devinmatte

packet/models.py

@@ -89,7 +89,7 @@ class UpperSignature(db.Model):
 class FreshSignature(db.Model):
     __tablename__ = "signature_fresh"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)
-    freshman = Column(ForeignKey("freshman.rit_username"), primary_key=True)
+    freshman_username = Column(ForeignKey("freshman.rit_username"), primary_key=True)
     signed = Column(Boolean, default=False, nullable=False)
     updated = Column(DateTime, default=datetime.now, onupdate=datetime.now, nullable=False)
 

packet/packet.py

@@ -3,22 +3,26 @@
 
 
 def sign(member_username, freshman_username):
-    freshman = Freshman.query.filter_by(rit_username=freshman_username)[0]
+    freshman = Freshman.query.filter_by(rit_username=freshman_username).first()
+    if freshman is None:
+        return False
+
     packet = freshman.current_packet()
     if packet is None:
         return False
     if not packet.is_open():
         return False
 
-    upper_signature = UpperSignature.query.filter_by(member=member_username)[0]
-    fresh_signature = FreshSignature.query.filter_by(member=member_username)[0]
+    upper_signature = UpperSignature.query.filter_by(member=member_username).first()
+    fresh_signature = FreshSignature.query.filter_by(freshman_username=member_username).first()
     if upper_signature:
         upper_signature.signed = True
     elif fresh_signature:
         fresh_signature.signed = True
     else:
         db.session.add(MiscSignature(packet.id, member_username, datetime.now(), packet))
     db.session.commit()
+
     return True