Refactor cache clearing and implement it

Author: mbillow

.pylintrc

@@ -83,7 +83,7 @@ ignored-argument-names = _.*
 max-locals = 15
 max-returns = 6
 max-branches = 12
-max-statements = 50
+max-statements = 55
 max-parents = 7
 max-attributes = 10
 min-public-methods = 2

conditional/__init__.py

@@ -24,14 +24,7 @@
 from conditional.blueprints.conditional import conditionals_bp
 from conditional.blueprints.member_management import member_management_bp
 from conditional.blueprints.slideshow import slideshow_bp
-
-from conditional.util.ldap import ldap_get_housing_points
-from conditional.util.ldap import ldap_get_active_members
-from conditional.util.ldap import ldap_get_intro_members
-from conditional.util.ldap import ldap_get_non_alumni_members
-from conditional.util.ldap import ldap_get_onfloor_members
-from conditional.util.ldap import ldap_get_current_students
-from conditional.util.ldap import ldap_get_name
+from conditional.blueprints.cache_management import cache_bp
 
 app.register_blueprint(dashboard_bp)
 app.register_blueprint(attendance_bp)
@@ -43,6 +36,7 @@
 app.register_blueprint(conditionals_bp)
 app.register_blueprint(member_management_bp)
 app.register_blueprint(slideshow_bp)
+app.register_blueprint(cache_bp)
 
 logger.info('conditional started')
 
@@ -57,15 +51,6 @@ def static_proxy(path):
 def default_route():
     return redirect('/dashboard')
 
-@app.route('/clearcache')
-def clear_cache():
-    ldap_get_housing_points.cache_clear()
-    ldap_get_active_members.cache_clear()
-    ldap_get_intro_members.cache_clear()
-    ldap_get_non_alumni_members.cache_clear()
-    ldap_get_onfloor_members.cache_clear()
-    ldap_get_current_students.cache_clear()
-    ldap_get_name.cache_clear()
 
 @app.cli.command()
 def zoo():

conditional/blueprints/cache_management.py

@@ -0,0 +1,62 @@
+import structlog
+
+from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_get_housing_points
+from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_get_intro_members
+from conditional.util.ldap import ldap_get_non_alumni_members
+from conditional.util.ldap import ldap_get_onfloor_members
+from conditional.util.ldap import ldap_get_current_students
+from conditional.util.ldap import ldap_get_name
+
+from flask import Blueprint, request, redirect
+
+logger = structlog.get_logger()
+cache_bp = Blueprint('cache_bp', __name__)
+
+
+@cache_bp.route('/clearcache')
+def clear_cache():
+    user_name = request.headers.get('x-webauth-user')
+
+    if not ldap_is_eval_director(user_name):
+        return redirect("/dashboard")
+
+    logger.info('api', action='purge system cache')
+
+    ldap_get_housing_points.cache_clear()
+    ldap_get_active_members.cache_clear()
+    ldap_get_intro_members.cache_clear()
+    ldap_get_non_alumni_members.cache_clear()
+    ldap_get_onfloor_members.cache_clear()
+    ldap_get_current_students.cache_clear()
+    ldap_get_name.cache_clear()
+    return "cache cleared", 200
+
+
+def clear_housing_points_cache():
+    ldap_get_housing_points.cache_clear()
+
+
+def clear_active_members_cache():
+    ldap_get_active_members.cache_clear()
+
+
+def clear_intro_members_cache():
+    ldap_get_intro_members.cache_clear()
+
+
+def clear_non_alumni_cache():
+    ldap_get_non_alumni_members.cache_clear()
+
+
+def clear_onfloor_members_cache():
+    ldap_get_onfloor_members.cache_clear()
+
+
+def clear_current_students_cache():
+    ldap_get_current_students.cache_clear()
+
+
+def clear_user_cache(username):
+    ldap_get_name(username).cache_clear()

conditional/blueprints/dashboard.py

@@ -85,7 +85,6 @@ def get_voting_members():
     return voting_list
 
 
-# pylint: disable=too-many-statements
 @dashboard_bp.route('/dashboard/')
 def display_dashboard():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),

conditional/blueprints/member_management.py

@@ -21,6 +21,9 @@
 from conditional.models.models import OnFloorStatusAssigned
 from conditional.models.models import SpringEval
 
+from conditional.blueprints.cache_management import clear_active_members_cache
+from conditional.blueprints.cache_management import clear_onfloor_members_cache
+
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_financial_director
 from conditional.util.ldap import ldap_set_roomnumber
@@ -261,6 +264,7 @@ def member_management_edituser(uid):
                     {
                         'active': False
                     })
+            clear_active_members_cache()
     else:
         logger.info('backend', action="edit freshman account %s room: %s onfloor: %s eval_date: %s" %
             (uid, post_data['roomNumber'], post_data['onfloorStatus'],
@@ -454,4 +458,7 @@ def member_management_upgrade_user():
 
     db.session.flush()
     db.session.commit()
+
+    clear_onfloor_members_cache()
+
     return jsonify({"success": True}), 200