Adding sync command that works, and functioning admin pages

Author: devinmatte

.gitignore

@@ -131,3 +131,5 @@ packet/static/safari-pinned-tab.svg
 packet/static/site.webmanifest
 faviconData.json
 
+# csvs
+*.csv

packet/commands.py

@@ -16,6 +16,7 @@
 from .ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \
     ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \
     ldap_is_on_coop
+from .utils import sync_freshman
 
 
 @app.cli.command('create-secret')
@@ -66,40 +67,7 @@ def sync_freshmen(freshmen_csv):
     freshmen_in_csv = parse_csv(freshmen_csv)
 
     print('Syncing contents with the DB...')
-    freshmen_in_db = {freshman.rit_username: freshman for freshman in Freshman.query.all()}
-
-    for csv_freshman in freshmen_in_csv.values():
-        if csv_freshman.rit_username not in freshmen_in_db:
-            # This is a new freshman so add them to the DB
-            freshmen_in_db[csv_freshman.rit_username] = Freshman(rit_username=csv_freshman.rit_username,
-                                                                 name=csv_freshman.name, onfloor=csv_freshman.onfloor)
-            db.session.add(freshmen_in_db[csv_freshman.rit_username])
-        else:
-            # This freshman is already in the DB so just update them
-            freshmen_in_db[csv_freshman.rit_username].onfloor = csv_freshman.onfloor
-            freshmen_in_db[csv_freshman.rit_username].name = csv_freshman.name
-
-    # Update all freshmen entries that represent people who are no longer freshmen
-    for freshman in filter(lambda freshman: freshman.rit_username not in freshmen_in_csv, freshmen_in_db.values()):
-        freshman.onfloor = False
-
-    # Update the freshmen signatures of each open or future packet
-    for packet in Packet.query.filter(Packet.end > datetime.now()).all():
-        # Handle the freshmen that are no longer onfloor
-        for fresh_sig in filter(lambda fresh_sig: not fresh_sig.freshman.onfloor, packet.fresh_signatures):
-            FreshSignature.query.filter_by(packet_id=fresh_sig.packet_id,
-                                           freshman_username=fresh_sig.freshman_username).delete()
-
-        # Add any new onfloor freshmen
-        # pylint: disable=cell-var-from-loop
-        current_fresh_sigs = set(map(lambda fresh_sig: fresh_sig.freshman_username, packet.fresh_signatures))
-        for csv_freshman in filter(lambda csv_freshman: csv_freshman.rit_username not in current_fresh_sigs and
-                                                        csv_freshman.onfloor and
-                                                        csv_freshman.rit_username != packet.freshman_username,
-                                   freshmen_in_csv.values()):
-            db.session.add(FreshSignature(packet=packet, freshman=freshmen_in_db[csv_freshman.rit_username]))
-
-    db.session.commit()
+    sync_freshman(freshmen_in_csv)
     print('Done!')
 
 

packet/ldap.py

@@ -149,8 +149,8 @@ def ldap_get_eboard_role(member):
 
     return return_val
 
-# Status checkers
 
+# Status checkers
 def ldap_is_eboard(member):
     """
     :param member: A CSHMember instance

packet/routes/admin.py

@@ -1,9 +1,4 @@
-import csv
-import os
-
-import requests
-from flask import render_template, redirect, request
-from werkzeug.utils import secure_filename
+from flask import render_template
 
 from packet import app
 from packet.models import Packet, Freshman
@@ -12,13 +7,13 @@
 from packet.log_utils import log_cache, log_time
 
 
-@app.route('/admin/')
+@app.route('/admin/packets')
 @log_cache
 @packet_auth
 @admin_auth
 @before_request
 @log_time
-def admin(info=None):
+def admin_packets(info=None):
     open_packets = Packet.open_packets()
 
     # Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required()
@@ -29,9 +24,20 @@ def admin(info=None):
 
     open_packets.sort(key=packet_sort_key, reverse=True)
 
+    return render_template('admin_packets.html',
+                           open_packets=open_packets,
+                           info=info)
+
+
+@app.route('/admin/freshmen')
+@log_cache
+@packet_auth
+@admin_auth
+@before_request
+@log_time
+def admin_freshmen(info=None):
     all_freshmen = Freshman.get_all()
 
-    return render_template('admin.html',
-                           open_packets=open_packets,
+    return render_template('admin_freshmen.html',
                            all_freshmen=all_freshmen,
                            info=info)

packet/routes/api.py

@@ -8,16 +8,23 @@
 
 from packet import app, db
 from packet.context_processors import get_rit_name
-from packet.commands import packet_start_time, packet_end_time
+from packet.commands import packet_start_time, packet_end_time, CSVFreshman
 from packet.ldap import ldap_get_eboard_role, ldap_get_active_rtps, ldap_get_3das, ldap_get_webmasters, \
     ldap_get_drink_admins, ldap_get_constitutional_maintainers, ldap_is_intromember, ldap_get_active_members, \
     ldap_is_on_coop, _ldap_is_member_of_group, ldap_get_member
 from packet.log_utils import log_time
 from packet.mail import send_report_mail, send_start_packet_mail
-from packet.utils import before_request, packet_auth, notify_slack
+from packet.utils import before_request, packet_auth, notify_slack, sync_freshman as sync_freshman_list
 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
+    packet_starting_notification, packets_starting_notification
+
+
+class POSTFreshman:
+    def __init__(self, freshman):
+        self.name = freshman['name'].strip()
+        self.rit_username = freshman['rit_username'].strip()
+        self.onfloor = freshman['onfloor'].strip() == 'TRUE'
 
 
 @app.route('/api/v1/freshmen', methods=['POST'])
@@ -40,43 +47,9 @@ def sync_freshman():
     if not _ldap_is_member_of_group(ldap_get_member(username), 'eboard-evaluations'):
         return 'Forbidden: not Evaluations Director', 403
 
-    freshmen = request.json
-    results = list()
-
-    packets = Packet.query.filter(Packet.end > datetime.now()).all()
-
-    for freshman in freshmen:
-        rit_username = freshman['rit_username']
-        name = freshman['name']
-        onfloor = freshman['onfloor']
-
-        frosh = Freshman.query.filter_by(rit_username=rit_username).first()
-        if frosh:
-            if onfloor and not frosh.onfloor:
-                # Add new onfloor signature
-                for packet in packets:
-                    db.session.add(FreshSignature(packet=packet, freshman=frosh))
-            elif not onfloor and frosh.onfloor:
-                # Remove outdated onfloor signature
-                for packet in packets:
-                    FreshSignature.query.filter_by(packet_id=packet.id, freshman_username=frosh.rit_username).delete()
-
-            frosh.name = name
-            frosh.onfloor = onfloor
-
-            results.append(f"'{name} ({rit_username})' updated")
-        else:
-            frosh = Freshman(rit_username=rit_username, name=name, onfloor=onfloor)
-            db.session.add(frosh)
-            if onfloor:
-                # Add onfloor signature
-                for packet in packets:
-                    db.session.add(FreshSignature(packet=packet, freshman=frosh))
-
-            results.append(f"Freshman '{name} ({rit_username})' created")
-
-    db.session.commit()
-    return dumps(results), 200
+    freshmen_in_post = {freshman.rit_username: freshman for freshman in map(POSTFreshman, request.json)}
+    sync_freshman_list(freshmen_in_post)
+    return dumps('Done'), 200
 
 
 @app.route('/api/v1/packets', methods=['POST'])
@@ -164,7 +137,7 @@ def get_packets_by_user(username: str) -> dict:
     return {packet.id: {
         'start': packet.start,
         'end': packet.end,
-        } for packet in frosh.packets}
+    } for packet in frosh.packets}
 
 
 @app.route('/api/v1/packets/<username>/newest', methods=['GET'])
@@ -178,13 +151,13 @@ def get_newest_packet_by_user(username: str) -> dict:
     packet = frosh.packets[-1]
 
     return {
-            packet.id: {
-                'start': packet.start,
-                'end': packet.end,
-                'required': vars(packet.signatures_required()),
-                'received': vars(packet.signatures_received()),
-                }
-            }
+        packet.id: {
+            'start': packet.start,
+            'end': packet.end,
+            'required': vars(packet.signatures_required()),
+            'received': vars(packet.signatures_received()),
+        }
+    }
 
 
 @app.route('/api/v1/packet/<packet_id>', methods=['GET'])
@@ -197,9 +170,10 @@ def get_packet_by_id(packet_id: int) -> dict:
     packet = Packet.by_id(packet_id)
 
     return {
-            'required': vars(packet.signatures_required()),
-            'received': vars(packet.signatures_received()),
-            }
+        'required': vars(packet.signatures_required()),
+        'received': vars(packet.signatures_received()),
+    }
+
 
 @app.route('/api/v1/sign/<packet_id>/', methods=['POST'])
 @packet_auth
@@ -259,7 +233,7 @@ def report(info):
 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)]
+    dates = [packet.start.date() + timedelta(days=x) for x in range(0, (packet.end - packet.start).days + 1)]
 
     print(dates)
 
@@ -280,15 +254,15 @@ def packet_stats(packet_id):
     total_stats = dict()
     for date in dates:
         total_stats[date.isoformat()] = {
-                'upper': upper_stats[date],
-                'fresh': fresh_stats[date],
-                'misc': misc_stats[date],
-                }
+            'upper': upper_stats[date],
+            'fresh': fresh_stats[date],
+            'misc': misc_stats[date],
+        }
 
     return {
-            'packet_id': packet_id,
-            'dates': total_stats,
-            }
+        'packet_id': packet_id,
+        'dates': total_stats,
+    }
 
 
 def sig2dict(sig):
@@ -298,39 +272,39 @@ def sig2dict(sig):
     """
     packet = Packet.by_id(sig.packet_id)
     return {
-            'date': sig.updated.date(),
-            'packet': {
-                'id': packet.id,
-                'freshman_username': packet.freshman_username,
-                },
-            }
+        'date': sig.updated.date(),
+        'packet': {
+            'id': packet.id,
+            'freshman_username': packet.freshman_username,
+        },
+    }
 
 
 @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()
+        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
-                }
-            }
+        '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
+        }
+    }
+
 
 def commit_sig(packet, was_100, uid):
     packet_signed_notification(packet, uid)

packet/static/js/admin.js

@@ -34,8 +34,14 @@ $(document).ready(function () {
         makePackets();
     });
 
+    $("#sync-freshmen").click(() => {
+        syncFreshmen();
+    })
+
 });
 
+// Is this gross, yes. Do I feel like cleaning it up yet, no.
+
 let makePackets = () => {
     let freshmen = [];
     let fileUpload = document.getElementById("newPacketsFile");
@@ -77,3 +83,49 @@ let makePackets = () => {
         }
     }
 }
+
+
+let syncFreshmen = () => {
+    let freshmen = [];
+    let fileUpload = document.getElementById("currentFroshFile");
+    let regex = /^([a-zA-Z0-9\s_\\.\-:])+(.csv|.txt)$/;
+    if (regex.test(fileUpload.value.toLowerCase())) {
+        if (typeof (FileReader) != "undefined") {
+            let reader = new FileReader();
+            reader.onload = (e) => {
+                let rows = e.target.result.split("\n");
+                for (let i = 0; i < rows.length; i++) {
+                    let cells = rows[i].split(",");
+                    if (cells.length > 1) {
+                        freshmen.push({
+                            rit_username: cells[3],
+                            name: cells[0],
+                            onfloor: cells[1]
+                        });
+                    }
+                }
+                if (freshmen.length >= 1) {
+                    $("#sync-freshmen").append("&nbsp;<span class=\"spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span>");
+                    $("#sync-freshmen").attr('disabled', true);
+                    fetch('/api/v1/freshmen',
+                        {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify(freshmen)
+                        }
+                    ).then(response => {
+                        if (response.status < 300) {
+                            $('#sync-freshmen-modal').modal('hide');
+                            location.reload();
+                        } else {
+                            alert("There was an syncing freshmen")
+                        }
+                    })
+                }
+            }
+            reader.readAsText(fileUpload.files[0]);
+        }
+    }
+}