Create generic DB_CACHE functions for db.Model classes

OpenOversight/app/main/model_view.py

@@ -6,7 +6,9 @@
 from flask_login import current_user, login_required
 
 from OpenOversight.app.models.database import db
+from OpenOversight.app.models.database_cache import remove_department_cache_entry
 from OpenOversight.app.utils.auth import ac_or_admin_required
+from OpenOversight.app.utils.constants import KEY_DEPT_TOTAL_INCIDENTS
 from OpenOversight.app.utils.db import add_department_query
 from OpenOversight.app.utils.forms import set_dynamic_default
 
@@ -65,7 +67,6 @@ def new(self, form=None):
                     set_dynamic_default(form.department, current_user.dept_pref_rel)
             if hasattr(form, "created_by") and not form.created_by.data:
                 form.created_by.data = current_user.get_id()
-            # TODO: Determine whether creating counts as updating, seems redundant
             if hasattr(form, "last_updated_by"):
                 form.last_updated_by.data = current_user.get_id()
                 form.last_updated_at.data = datetime.datetime.now()
@@ -74,6 +75,10 @@ def new(self, form=None):
             new_obj = self.create_function(form)
             db.session.add(new_obj)
             db.session.commit()
+            if self.create_function.__name__ == "create_incident":
+                remove_department_cache_entry(
+                    new_obj.department_id, KEY_DEPT_TOTAL_INCIDENTS
+                )
             flash(f"{self.model_name} created!")
             return self.get_redirect_url(obj_id=new_obj.id)
         else:

OpenOversight/app/main/views.py

@@ -71,11 +71,14 @@
     User,
     db,
 )
+from OpenOversight.app.models.database_cache import remove_department_cache_entry
 from OpenOversight.app.utils.auth import ac_or_admin_required, admin_required
 from OpenOversight.app.utils.choices import AGE_CHOICES, GENDER_CHOICES, RACE_CHOICES
 from OpenOversight.app.utils.cloud import crop_image, upload_image_to_s3_and_store_in_db
 from OpenOversight.app.utils.constants import (
     ENCODING_UTF_8,
+    KEY_DEPT_TOTAL_ASSIGNMENTS,
+    KEY_DEPT_TOTAL_OFFICERS,
     KEY_OFFICERS_PER_PAGE,
     KEY_TIMEZONE,
 )
@@ -340,6 +343,9 @@ def add_assignment(officer_id):
             current_user.is_area_coordinator
             and officer.department_id == current_user.ac_department_id
         ):
+            remove_department_cache_entry(
+                officer.department_id, KEY_DEPT_TOTAL_ASSIGNMENTS
+            )
             try:
                 add_new_assignment(officer_id, form)
                 flash("Added new assignment!")
@@ -925,6 +931,7 @@ def add_officer():
                 new_form_data[key] = "y"
         form = AddOfficerForm(new_form_data)
         officer = add_officer_profile(form, current_user)
+        remove_department_cache_entry(officer.department_id, KEY_DEPT_TOTAL_OFFICERS)
         flash(f"New Officer {officer.last_name} added to OpenOversight")
         return redirect(url_for("main.submit_officer_images", officer_id=officer.id))
     else:

OpenOversight/app/models/database.py

@@ -3,8 +3,7 @@
 from datetime import date
 
 from authlib.jose import JoseError, JsonWebToken
-from cachetools import TTLCache, cached
-from cachetools.keys import hashkey
+from cachetools import cached
 from flask import current_app
 from flask_login import UserMixin
 from flask_sqlalchemy import SQLAlchemy
@@ -13,13 +12,16 @@
 from sqlalchemy.sql import func as sql_func
 from werkzeug.security import check_password_hash, generate_password_hash
 
+from OpenOversight.app.models.database_cache import (
+    DB_CACHE,
+    department_statistics_cache_key,
+)
 from OpenOversight.app.utils.choices import GENDER_CHOICES, RACE_CHOICES
 from OpenOversight.app.utils.constants import (
     ENCODING_UTF_8,
-    HOUR,
-    KEY_TOTAL_ASSIGNMENTS,
-    KEY_TOTAL_INCIDENTS,
-    KEY_TOTAL_OFFICERS,
+    KEY_DEPT_TOTAL_ASSIGNMENTS,
+    KEY_DEPT_TOTAL_INCIDENTS,
+    KEY_DEPT_TOTAL_OFFICERS,
 )
 from OpenOversight.app.validators import state_validator, url_validator
 
@@ -57,30 +59,6 @@
     ),
 )
 
-# This is a last recently used cache that also utilizes a time-to-live function for each
-# value saved in it (12 hours).
-# TODO: Change this into a singleton so that we can clear values when updates happen
-DATABASE_CACHE = TTLCache(maxsize=1024, ttl=12 * HOUR)
-
-
-# TODO: In the singleton create functions for other model types.
-def _date_updated_cache_key(update_type: str):
-    """Return a key function to calculate the cache key for Department
-    methods using the department id and a given update type.
-
-    Department.id is used instead of a Department obj because the default Python
-    __hash__ is unique per obj instance, meaning multiple instances of the same
-    department will have different hashes.
-
-    Update type is used in the hash to differentiate between the update types we compute
-    per department.
-    """
-
-    def _cache_key(dept: "Department"):
-        return hashkey(dept.id, update_type)
-
-    return _cache_key
-
 
 class Department(BaseModel):
     __tablename__ = "departments"
@@ -117,7 +95,10 @@ def to_custom_dict(self):
             "unique_internal_identifier_label": self.unique_internal_identifier_label,
         }
 
-    @cached(cache=DATABASE_CACHE, key=_date_updated_cache_key(KEY_TOTAL_ASSIGNMENTS))
+    @cached(
+        cache=DB_CACHE,
+        key=department_statistics_cache_key(KEY_DEPT_TOTAL_ASSIGNMENTS),
+    )
     def total_documented_assignments(self):
         return (
             db.session.query(Assignment.id)
@@ -126,13 +107,18 @@ def total_documented_assignments(self):
             .count()
         )
 
-    @cached(cache=DATABASE_CACHE, key=_date_updated_cache_key(KEY_TOTAL_INCIDENTS))
+    @cached(
+        cache=DB_CACHE,
+        key=department_statistics_cache_key(KEY_DEPT_TOTAL_INCIDENTS),
+    )
     def total_documented_incidents(self):
         return (
             db.session.query(Incident).filter(Incident.department_id == self.id).count()
         )
 
-    @cached(cache=DATABASE_CACHE, key=_date_updated_cache_key(KEY_TOTAL_OFFICERS))
+    @cached(
+        cache=DB_CACHE, key=department_statistics_cache_key(KEY_DEPT_TOTAL_OFFICERS)
+    )
     def total_documented_officers(self):
         return (
             db.session.query(Officer).filter(Officer.department_id == self.id).count()

OpenOversight/app/models/database_cache.py

@@ -0,0 +1,44 @@
+from cachetools import TTLCache
+from cachetools.keys import hashkey
+
+from OpenOversight.app.utils.constants import HOUR
+
+
+DB_CACHE = TTLCache(maxsize=1024, ttl=12 * HOUR)
+
+
+def _department_key(department_id: str, update_type: str):
+    """Create unique department key."""
+    return hashkey(department_id, update_type, "Department")
+
+
+def department_statistics_cache_key(update_type: str):
+    """Return a key function to calculate the cache key for Department
+    methods using the department id and a given update type.
+
+    Department.id is used instead of a Department obj because the default Python
+    __hash__ is unique per obj instance, meaning multiple instances of the same
+    department will have different hashes.
+
+    Update type is used in the hash to differentiate between the update types we compute
+    per department.
+    """
+
+    def _cache_key(department):
+        return _department_key(department.id, update_type)
+
+    return _cache_key
+
+
+def has_department_cache_entry(department_id: str, update_type: str) -> bool:
+    """Department key exists in cache."""
+    key = _department_key(department_id, update_type)
+    return key in DB_CACHE.keys()
+
+
+def remove_department_cache_entry(department_id: str, update_type: str) -> None:
+    """Remove department key from cache if it exists."""
+
+    key = _department_key(department_id, update_type)
+    if key in DB_CACHE.keys():
+        del DB_CACHE[key]

OpenOversight/app/templates/sort.html

@@ -80,7 +80,7 @@ <h3>Your account has been disabled due to too many incorrect classifications/tag
              role="button">Email us to get it enabled again</a>
         </p>
       {% else %}
-        <h3>All images have been classfied!</h3>
+        <h3>All images have been classified!</h3>
         <p>
           <a href="{{ url_for("main.submit_data") }}"
              class="btn btn-lg btn-primary"

OpenOversight/app/utils/constants.py

@@ -2,9 +2,9 @@
 
 
 # Cache Key Constants
-KEY_TOTAL_ASSIGNMENTS = "total_assignments"
-KEY_TOTAL_INCIDENTS = "total_incidents"
-KEY_TOTAL_OFFICERS = "total_officers"
+KEY_DEPT_TOTAL_ASSIGNMENTS = "total_assignments"
+KEY_DEPT_TOTAL_INCIDENTS = "total_incidents"
+KEY_DEPT_TOTAL_OFFICERS = "total_officers"
 
 # Config Key Constants
 KEY_DATABASE_URI = "SQLALCHEMY_DATABASE_URI"

OpenOversight/tests/conftest.py

@@ -87,7 +87,7 @@ def __init__(
     ("IVANA", "", "TINKLE"),
     ("SEYMOUR", "", "BUTZ"),
     ("HAYWOOD", "U", "CUDDLEME"),
-    ("BEA", "", "PROBLEM"),
+    ("BEA", "", "O'PROBLEM"),
     ("URA", "", "SNOTBALL"),
     ("HUGH", "", "JASS"),
 ]