Merge SQL Middleman and Packet Backend (#11)

* created mediator

* Created packet.py with signature get/sign functions

* Get raw numbers through packet.py middleman

* Formatting fixes

* Added function for is active

* Fixing functions to run after learning how Models work

* Updated numbers function to return map of individual values

* Removed numbers functions in favor of model
Changed return type for signatures to dictionary

* Added sanity checks

* Wrote signature api route

* Fixed imports for pylint

* Fixed bad build, semantic changes

* Added eval support to signing route

* Fix import

* Fixed AttributeError

* import api route

* Fixed packet signing

* Fixed datetime import

* Fix travis build

Author: zedoax

packet/__init__.py

@@ -39,5 +39,7 @@
     from .routes import upperclassmen
 else:
     from .routes import freshmen
+from .routes import api
+
 from . import commands
 from . import models

packet/models.py

@@ -47,21 +47,32 @@ class Packet(db.Model):
     fresh_signatures = relationship("FreshSignature")
     misc_signatures = relationship("MiscSignature")
 
+    def is_open(self):
+        return self.start < datetime.now() < self.end
+
     def signatures_required(self):
-        return len(self.upper_signatures) + len(self.fresh_signatures) + REQUIRED_MISC_SIGNATURES
+        eboard = UpperSignature.query.filter_by(eboard=True).count()
+        return {'eboard': eboard,
+                'upperclassmen': len(self.upper_signatures) - eboard,
+                'freshmen': len(self.fresh_signatures),
+                'misc': REQUIRED_MISC_SIGNATURES}
 
     def signatures_received(self):
         """
         Result capped so it will never be greater than that of signatures_required()
         """
-        upper_count = UpperSignature.query.with_parent(self).filter_by(signed=True).count()
+        eboard_count = UpperSignature.query.with_parent(self).filter_by(signed=True, eboard=True).count()
+        upper_count = UpperSignature.query.with_parent(self).filter_by(signed=True, eboard=False).count()
         fresh_count = FreshSignature.query.with_parent(self).filter_by(signed=True).count()
         misc_count = len(self.misc_signatures)
 
         if misc_count > REQUIRED_MISC_SIGNATURES:
             misc_count = REQUIRED_MISC_SIGNATURES
 
-        return upper_count + fresh_count + misc_count
+        return {'eboard': eboard_count,
+                'upperclassmen': upper_count,
+                'freshmen': fresh_count,
+                'miscellaneous': misc_count}
 
 
 class UpperSignature(db.Model):

packet/packet.py

@@ -0,0 +1,40 @@
+from datetime import datetime
+from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
+
+
+def sign(member_username, freshman_username):
+    freshman = Freshman.query.filter_by(rit_username=freshman_username)[0]
+    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]
+    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
+
+
+def get_signatures(freshman_username):
+    packet = Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet()
+    eboard = UpperSignature.query.filter_by(packet_id=packet.id, eboard=True)
+    upper_signatures = UpperSignature.query.filter_by(packet_id=packet.id, eboard=False)
+    return {'eboard': eboard,
+            'upperclassmen': upper_signatures,
+            'freshmen': FreshSignature.query.filter_by(packet_id=packet.id),
+            'misc': MiscSignature.query.filter_by(packet_id=packet.id)}
+
+
+def get_number_signed(freshman_username):
+    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_received()
+
+
+def get_number_required(freshman_username):
+    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_required()

packet/routes/api.py

@@ -0,0 +1,18 @@
+from packet import auth, app
+from packet.utils import before_request
+from packet.packet import sign
+
+
+@app.route("/api/v1/<member_username>/sign/<packet_username>")
+@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"
+        else:
+            return "Error: UID Submission Mismatch"
+    if not sign(member_username, packet_username):
+        return "Error: Signature not valid.  Reason: Unknown"
+    return "Success: Signed Packet: " + packet_username