Move stats methods to stats.py

Author: mxmeinhold

packet/routes/api.py

@@ -17,6 +17,7 @@
 from packet.models import Packet, MiscSignature, NotificationSubscription, Freshman, FreshSignature, UpperSignature
 from packet.notifications import packet_signed_notification, packet_100_percent_notification, \
         packet_starting_notification, packets_starting_notification
+import packet.stats as stats
 
 
 @app.route('/api/v1/freshmen', methods=['POST'])
@@ -255,80 +256,13 @@ def report(info):
 @app.route('/api/v1/stats/packet/<packet_id>')
 @packet_auth
 def packet_stats(packet_id):
-    packet = Packet.by_id(packet_id)
-
-    dates = [packet.start.date() + timedelta(days=x) for x in range(0, (packet.end-packet.start).days + 1)]
-
-    print(dates)
-
-    upper_stats = {date: list() for date in dates}
-    for uid, date in map(lambda sig: (sig.member, sig.updated),
-                         filter(lambda sig: sig.signed, packet.upper_signatures)):
-        upper_stats[date.date()].append(uid)
-
-    fresh_stats = {date: list() for date in dates}
-    for username, date in map(lambda sig: (sig.freshman_username, sig.updated),
-                              filter(lambda sig: sig.signed, packet.fresh_signatures)):
-        fresh_stats[date.date()].append(username)
-
-    misc_stats = {date: list() for date in dates}
-    for uid, date in map(lambda sig: (sig.member, sig.updated), packet.misc_signatures):
-        misc_stats[date.date()].append(uid)
-
-    total_stats = dict()
-    for date in dates:
-        total_stats[date.isoformat()] = {
-                'upper': upper_stats[date],
-                'fresh': fresh_stats[date],
-                'misc': misc_stats[date],
-                }
-
-    return {
-            'packet_id': packet_id,
-            'dates': total_stats,
-            }
-
-
-def sig2dict(sig):
-    """
-    A utility function for upperclassman stats.
-    Converts an UpperSignature to a dictionary with the date and the packet.
-    """
-    packet = Packet.by_id(sig.packet_id)
-    return {
-            'date': sig.updated.date(),
-            'packet': {
-                'id': packet.id,
-                'freshman_username': packet.freshman_username,
-                },
-            }
+    return stats.packet_stats(packet_id)
 
 
 @app.route('/api/v1/stats/upperclassman/<uid>')
 @packet_auth
 def upperclassman_stats(uid):
-
-    sigs = UpperSignature.query.filter(
-            UpperSignature.signed,
-            UpperSignature.member == uid
-            ).all() + MiscSignature.query.filter(MiscSignature.member == uid).all()
-
-    sig_dicts = list(map(sig2dict, sigs))
-
-    dates = set(map(lambda sd: sd['date'], sig_dicts))
-
-    return {
-            'member': uid,
-            'signatures': {
-                date.isoformat() : list(
-                    map(lambda sd: sd['packet'],
-                        filter(lambda sig, d=date: sig['date'] == d,
-                            sig_dicts
-                            )
-                        )
-                    ) for date in dates
-                }
-            }
+    return stats.upperclassman_stats(uid)
 
 def commit_sig(packet, was_100, uid):
     packet_signed_notification(packet, uid)

packet/stats.py

@@ -0,0 +1,113 @@
+from datetime import timedelta
+
+from packet.models import Packet, MiscSignature, UpperSignature
+
+
+def packet_stats(packet_id):
+    """
+    Gather statistics for a packet in the form of number of signatures per day
+
+    Return format: {
+        packet_id,
+        freshman: {
+            name,
+            rit_username,
+        },
+        dates: {
+           <date>: {
+                upper: [ uid ],
+                misc: [ uid ],
+                fresh: [ freshman_username ],
+           },
+        },
+    }
+    """
+    packet = Packet.by_id(packet_id)
+
+    dates = [packet.start.date() + timedelta(days=x) for x in range(0, (packet.end-packet.start).days + 1)]
+
+    print(dates)
+
+    upper_stats = {date: list() for date in dates}
+    for uid, date in map(lambda sig: (sig.member, sig.updated),
+                         filter(lambda sig: sig.signed, packet.upper_signatures)):
+        upper_stats[date.date()].append(uid)
+
+    fresh_stats = {date: list() for date in dates}
+    for username, date in map(lambda sig: (sig.freshman_username, sig.updated),
+                              filter(lambda sig: sig.signed, packet.fresh_signatures)):
+        fresh_stats[date.date()].append(username)
+
+    misc_stats = {date: list() for date in dates}
+    for uid, date in map(lambda sig: (sig.member, sig.updated), packet.misc_signatures):
+        misc_stats[date.date()].append(uid)
+
+    total_stats = dict()
+    for date in dates:
+        total_stats[date.isoformat()] = {
+                'upper': upper_stats[date],
+                'fresh': fresh_stats[date],
+                'misc': misc_stats[date],
+                }
+
+    return {
+            'packet_id': packet_id,
+            'freshman': {
+                'name': packet.freshman.name,
+                'rit_username': packet.freshman.rit_username,
+                },
+            'dates': total_stats,
+            }
+
+
+def sig2dict(sig):
+    """
+    A utility function for upperclassman stats.
+    Converts an UpperSignature to a dictionary with the date and the packet.
+    """
+    packet = Packet.by_id(sig.packet_id)
+    return {
+            'date': sig.updated.date(),
+            'packet': {
+                'id': packet.id,
+                'freshman_username': packet.freshman_username,
+                },
+            }
+
+
+def upperclassman_stats(uid):
+    """
+    Gather statistics for an upperclassman's signature habits
+
+    Return format: {
+        member: <uid>,
+        signautes: {
+            <date>: [{
+                id: <packet_id>,
+                freshman_username,
+            }],
+        },
+    }
+    """
+
+    sigs = UpperSignature.query.filter(
+            UpperSignature.signed,
+            UpperSignature.member == uid
+            ).all() + MiscSignature.query.filter(MiscSignature.member == uid).all()
+
+    sig_dicts = list(map(sig2dict, sigs))
+
+    dates = set(map(lambda sd: sd['date'], sig_dicts))
+
+    return {
+            'member': uid,
+            'signatures': {
+                date.isoformat() : list(
+                    map(lambda sd: sd['packet'],
+                        filter(lambda sig, d=date: sig['date'] == d,
+                            sig_dicts
+                            )
+                        )
+                    ) for date in dates
+                }
+            }