Merge pull request #232 from ComputerScienceHouse/develop

Version 1.10

Author: devinmatte

Dockerfile

@@ -25,4 +25,4 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 
-CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-"]
+CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]

app.py

@@ -1,6 +1,6 @@
 from conditional import app
 
 if __name__ == "__main__":
-    app.run(host=app.config['IP'], port=app.config['PORT'])
+    app.run(host=app.config['IP'], port=app.config['PORT'], threaded=False)
 
 application = app

conditional/__init__.py

@@ -1,28 +1,26 @@
-# pylint: disable=wrong-import-order
-from ._version import __version__
-
 import os
 from datetime import datetime
 
+import structlog
 from csh_ldap import CSHLDAP
 from flask import Flask, redirect, render_template, g
 from flask_migrate import Migrate
+from flask_gzip import Gzip
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
 from raven.contrib.flask import Sentry
-import structlog
-
-from conditional import config
 
 app = Flask(__name__)
+gzip = Gzip(app)
 
-app.config.from_object(config)
-if os.path.exists(os.path.join(os.getcwd(), "config.py")):
-    app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
-
-app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+# Load default configuration and any environment variable overrides
+_root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+app.config.from_pyfile(os.path.join(_root_dir, "config.env.py"))
 
-app.config["VERSION"] = __version__
+# Load file based configuration overrides if present
+_pyfile_config = os.path.join(_root_dir, "config.py")
+if os.path.exists(_pyfile_config):
+    app.config.from_pyfile(_pyfile_config)
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
@@ -89,8 +87,9 @@ def database_processor(logger, log_method, event_dict):  # pylint: disable=unuse
 
 logger = structlog.get_logger()
 
+# pylint: disable=wrong-import-order
+from conditional.util import context_processors
 from conditional.util.auth import get_user
-
 from .blueprints.dashboard import dashboard_bp  # pylint: disable=ungrouped-imports
 from .blueprints.attendance import attendance_bp
 from .blueprints.major_project_submission import major_project_bp
@@ -148,7 +147,7 @@ def route_errors(error, user_dict=None):
     data = dict()
 
     # Handle the case where the header isn't present
-    if user_dict['username'] is not None:
+    if user_dict['uid'] is not None:
         data['username'] = user_dict['account'].uid
         data['name'] = user_dict['account'].cn
     else:

conditional/_version.py

@@ -137,7 +137,7 @@ def display_attendance_cm(user_dict=None):
     log.info('Display Committee Meeting Attendance Page')
 
     return render_template('attendance_cm.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 
@@ -149,7 +149,7 @@ def display_attendance_ts(user_dict=None):
     log.info('Display Technical Seminar Attendance Page')
 
     return render_template('attendance_ts.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 
@@ -164,7 +164,7 @@ def display_attendance_hm(user_dict=None):
         return redirect("/dashboard")
 
     return render_template('attendance_hm.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            date=datetime.now().strftime("%Y-%m-%d"),
                            members=get_non_alumni_non_coop(internal=True))
 
@@ -435,7 +435,7 @@ def get_seminar_attendees(meeting_id):
     else:
         total_pages = (int(len(all_cm) / 10))
     return render_template('attendance_history.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            history=all_meetings,
                            pending_cm=pend_cm,
                            pending_ts=pend_ts,

conditional/blueprints/attendance.py

@@ -6,6 +6,7 @@
 
 from conditional import auth
 from conditional.util.auth import get_user
+from conditional.util.cache import clear_all_cached_functions
 from conditional.util.ldap import _ldap_is_member_of_directorship
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_current_students
@@ -14,9 +15,6 @@
 from conditional.util.ldap import ldap_get_onfloor_members
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_rtp
-from conditional.util.member import get_members_info
-from conditional.util.member import get_onfloor_members
-from conditional.util.member import get_voting_members
 
 logger = structlog.get_logger()
 cache_bp = Blueprint('cache_bp', __name__)
@@ -45,16 +43,8 @@ def clear_cache(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
     log.info('Purge All Caches')
 
-    _ldap_is_member_of_directorship.cache_clear()
-    ldap_get_member.cache_clear()
-    ldap_get_active_members.cache_clear()
-    ldap_get_intro_members.cache_clear()
-    ldap_get_onfloor_members.cache_clear()
-    ldap_get_current_students.cache_clear()
+    clear_all_cached_functions()
 
-    get_voting_members.cache_clear()
-    get_members_info.cache_clear()
-    get_onfloor_members.cache_clear()
     return "cache cleared", 200
 
 

conditional/blueprints/cache_management.py

@@ -3,9 +3,10 @@
 
 from conditional import db, start_of_year, auth
 from conditional.models.models import CurrentCoops
+from conditional.util.member import req_cm
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_is_eval_director, ldap_is_current_student
 from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
 from conditional.util.ldap import _ldap_remove_member_from_group as ldap_remove_member_from_group
 from conditional.util.ldap import _ldap_is_member_of_group as ldap_is_member_of_group
@@ -23,10 +24,10 @@ def display_co_op_form(user_dict=None):
     log.info('Display Co-Op Submission Page')
 
     co_op = CurrentCoops.query.filter(
-        CurrentCoops.uid == user_dict['username'], CurrentCoops.date_created > start_of_year()).first()
+        CurrentCoops.uid == user_dict['uid'], CurrentCoops.date_created > start_of_year()).first()
 
     return render_template('co_op.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            year=start_of_year().year,
                            on_coop=co_op)
 
@@ -42,20 +43,23 @@ def submit_co_op_form(user_dict=None):
     semester = post_data['semester']
     if post_data['semester'] not in valid_semesters:
         return "Invalid semester submitted", 400
+    if not ldap_is_current_student(user_dict['account']):
+        return "Must be current student", 403
 
     log.info('Submit {} Co-Op'.format(semester))
 
-    if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['username'],
+    if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['uid'],
                                  CurrentCoops.date_created > start_of_year()).first():
         return "User has already submitted this form!", 403
 
     # Add to corresponding co-op ldap group
     ldap_add_member_to_group(user_dict['account'], semester.lower() + '_coop')
 
-    co_op = CurrentCoops(uid=user_dict['username'], semester=semester)
+    co_op = CurrentCoops(uid=user_dict['uid'], semester=semester)
     db.session.add(co_op)
     db.session.flush()
     db.session.commit()
+    req_cm.cache_clear()
 
     return jsonify({"success": True}), 200
 
@@ -81,5 +85,27 @@ def delete_co_op(uid, user_dict=None):
 
     db.session.flush()
     db.session.commit()
+    req_cm.cache_clear()
 
     return jsonify({"success": True}), 200
+
+
+@co_op_bp.route('/co_op/manage')
+@auth.oidc_auth
+@get_user
+def display_co_op_management(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
+    log.info('Display Co-Op Management')
+
+    if not ldap_is_eval_director(user_dict['account']):
+        return "must be eval director", 403
+
+    co_op_list = [(member.semester, member.uid)
+                  for member in CurrentCoops.query.filter(
+            CurrentCoops.date_created > start_of_year(),
+            CurrentCoops.semester != "Neither")]
+
+    return render_template("co_op_management.html",
+                           username=user_dict['uid'],
+                           co_op=co_op_list,
+                           )

conditional/blueprints/co_op.py

@@ -7,7 +7,6 @@
 from conditional.models.models import Conditional, SpringEval, FreshmanEvalData
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_is_eval_director
 
 conditionals_bp = Blueprint('conditionals_bp', __name__)
@@ -24,17 +23,17 @@ def display_conditionals(user_dict=None):
 
     conditionals = [
         {
-            'name': ldap_get_member(c.uid).cn,
+            'uid': c.uid,
             'date_created': c.date_created,
             'date_due': c.date_due,
             'description': c.description,
             'id': c.id
         } for c in
         Conditional.query.filter(
             Conditional.status == "Pending")]
-    # return names in 'first last (username)' format
+
     return render_template('conditional.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            conditionals=conditionals,
                            conditionals_len=len(conditionals))
 

conditional/blueprints/conditional.py

@@ -10,9 +10,8 @@
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
 from conditional.util.housing import get_queue_position
-from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_get_active_members, ldap_is_bad_standing
 from conditional.util.ldap import ldap_is_active
-from conditional.util.ldap import ldap_is_current_student
 from conditional.util.ldap import ldap_is_intromember
 from conditional.util.ldap import ldap_is_onfloor
 from conditional.util.member import get_freshman_data, get_voting_members, get_cm, get_hm, req_cm
@@ -34,11 +33,10 @@ def display_dashboard(user_dict=None):
 
     data = dict()
     data['username'] = user_dict['account'].uid
-    data['name'] = user_dict['account'].cn
     data['active'] = ldap_is_active(user_dict['account'])
+    data['bad_standing'] = ldap_is_bad_standing(user_dict['account'])
     data['onfloor'] = ldap_is_onfloor(user_dict['account'])
     data['voting'] = bool(user_dict['account'].uid in can_vote)
-    data['student'] = ldap_is_current_student(user_dict['account'])
 
     data['voting_count'] = {"Voting Members": len(can_vote),
                             "Active Members": len(ldap_get_active_members())}

conditional/blueprints/dashboard.py

@@ -53,9 +53,9 @@ def display_housing(user_dict=None):
             housing[room] = [name]
             room_list.add(room)
 
-    # return names in 'first last (username)' format
+    # return names in 'first last (uid)' format
     return render_template('housing.html',
-                           username=user_dict['username'],
+                           username=user_dict['uid'],
                            queue=get_housing_queue(ldap_is_eval_director(user_dict['account'])),
                            housing=housing,
                            room_list=sorted(list(room_list)))