Add static Department functions (#1150)

## Description of Changes
Moved `Department`-related methods to the `Department` object.

## Tests and Linting
- [x] This branch is up-to-date with the `develop` branch.
- [x] Ran `make create_db_diagram` command.
- [x] `pytest` passes on my local development environment.
- [x] `pre-commit` passes on my local development environment.

Author: michplunkett

OpenOversight/app/main/downloads.py

@@ -5,7 +5,6 @@
 from typing import Any, Callable, Dict, List, TypeVar
 
 from flask import Response, abort
-from sqlalchemy.orm import Query
 
 from OpenOversight.app.models.database import (
     Assignment,
@@ -40,7 +39,7 @@ def check_output(output_str):
 
 
 def make_downloadable_csv(
-    query: Query,
+    query: List,
     department_id: int,
     csv_suffix: str,
     field_names: List[str],

OpenOversight/app/main/views.py

@@ -21,7 +21,7 @@
 from flask_login import current_user, login_required, login_user
 from flask_wtf import FlaskForm
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import contains_eager, joinedload, selectinload
+from sqlalchemy.orm import selectinload
 from sqlalchemy.orm.exc import NoResultFound
 
 from OpenOversight.app.auth.forms import LoginForm
@@ -71,20 +71,14 @@
     User,
     db,
 )
-from OpenOversight.app.models.database_cache import (
-    get_database_cache_entry,
-    put_database_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, save_image_to_s3_and_db
 from OpenOversight.app.utils.constants import (
     ENCODING_UTF_8,
     FLASH_MSG_PERMANENT_REDIRECT,
     KEY_DEPT_ALL_ASSIGNMENTS,
-    KEY_DEPT_ALL_INCIDENTS,
     KEY_DEPT_ALL_LINKS,
-    KEY_DEPT_ALL_NOTES,
     KEY_DEPT_ALL_OFFICERS,
     KEY_DEPT_ALL_SALARIES,
     KEY_DEPT_TOTAL_ASSIGNMENTS,
@@ -1572,18 +1566,7 @@ def redirect_download_dept_officers_csv(department_id: int):
 )
 @limiter.limit("5/minute")
 def download_dept_officers_csv(department_id: int):
-    cache_params = (Department(id=department_id), KEY_DEPT_ALL_OFFICERS)
-    officers = get_database_cache_entry(*cache_params)
-    if officers is None:
-        officers = (
-            db.session.query(Officer)
-            .options(joinedload(Officer.assignments).joinedload(Assignment.job))
-            .options(joinedload(Officer.salaries))
-            .filter_by(department_id=department_id)
-            .all()
-        )
-        put_database_cache_entry(*cache_params, officers)
-
+    officers = Department.get_officers(department_id)
     field_names = [
         "id",
         "unique identifier",
@@ -1599,6 +1582,7 @@ def download_dept_officers_csv(department_id: int):
         "job title",
         "most recent salary",
     ]
+
     return make_downloadable_csv(
         officers, department_id, "Officers", field_names, officer_record_maker
     )
@@ -1620,20 +1604,7 @@ def redirect_download_dept_assignments_csv(department_id: int):
 )
 @limiter.limit("5/minute")
 def download_dept_assignments_csv(department_id: int):
-    cache_params = Department(id=department_id), KEY_DEPT_ALL_ASSIGNMENTS
-    assignments = get_database_cache_entry(*cache_params)
-    if assignments is None:
-        assignments = (
-            db.session.query(Assignment)
-            .join(Assignment.base_officer)
-            .filter(Officer.department_id == department_id)
-            .options(contains_eager(Assignment.base_officer))
-            .options(joinedload(Assignment.unit))
-            .options(joinedload(Assignment.job))
-            .all()
-        )
-        put_database_cache_entry(*cache_params, assignments)
-
+    assignments = Department.get_assignments(department_id)
     field_names = [
         "id",
         "officer id",
@@ -1645,6 +1616,7 @@ def download_dept_assignments_csv(department_id: int):
         "unit id",
         "unit description",
     ]
+
     return make_downloadable_csv(
         assignments,
         department_id,
@@ -1670,12 +1642,7 @@ def redirect_download_incidents_csv(department_id: int):
 )
 @limiter.limit("5/minute")
 def download_incidents_csv(department_id: int):
-    cache_params = (Department(id=department_id), KEY_DEPT_ALL_INCIDENTS)
-    incidents = get_database_cache_entry(*cache_params)
-    if incidents is None:
-        incidents = Incident.query.filter_by(department_id=department_id).all()
-        put_database_cache_entry(*cache_params, incidents)
-
+    incidents = Department.get_incidents(department_id)
     field_names = [
         "id",
         "report_num",
@@ -1687,6 +1654,7 @@ def download_incidents_csv(department_id: int):
         "links",
         "officers",
     ]
+
     return make_downloadable_csv(
         incidents,
         department_id,
@@ -1712,18 +1680,7 @@ def redirect_download_dept_salaries_csv(department_id: int):
 )
 @limiter.limit("5/minute")
 def download_dept_salaries_csv(department_id: int):
-    cache_params = (Department(id=department_id), KEY_DEPT_ALL_SALARIES)
-    salaries = get_database_cache_entry(*cache_params)
-    if salaries is None:
-        salaries = (
-            db.session.query(Salary)
-            .join(Salary.officer)
-            .filter(Officer.department_id == department_id)
-            .options(contains_eager(Salary.officer))
-            .all()
-        )
-        put_database_cache_entry(*cache_params, salaries)
-
+    salaries = Department.get_salaries(department_id)
     field_names = [
         "id",
         "officer id",
@@ -1734,6 +1691,7 @@ def download_dept_salaries_csv(department_id: int):
         "year",
         "is_fiscal_year",
     ]
+
     return make_downloadable_csv(
         salaries, department_id, "Salaries", field_names, salary_record_maker
     )
@@ -1751,18 +1709,7 @@ def redirect_download_dept_links_csv(department_id: int):
 @main.route("/download/departments/<int:department_id>/links", methods=[HTTPMethod.GET])
 @limiter.limit("5/minute")
 def download_dept_links_csv(department_id: int):
-    cache_params = (Department(id=department_id), KEY_DEPT_ALL_LINKS)
-    links = get_database_cache_entry(*cache_params)
-    if links is None:
-        links = (
-            db.session.query(Link)
-            .join(Link.officers)
-            .filter(Officer.department_id == department_id)
-            .options(contains_eager(Link.officers))
-            .all()
-        )
-        put_database_cache_entry(*cache_params, links)
-
+    links = Department.get_links(department_id)
     field_names = [
         "id",
         "title",
@@ -1773,6 +1720,7 @@ def download_dept_links_csv(department_id: int):
         "officers",
         "incidents",
     ]
+
     return make_downloadable_csv(
         links, department_id, "Links", field_names, links_record_maker
     )
@@ -1794,18 +1742,7 @@ def redirect_download_dept_descriptions_csv(department_id: int):
 )
 @limiter.limit("5/minute")
 def download_dept_descriptions_csv(department_id: int):
-    cache_params = (Department(id=department_id), KEY_DEPT_ALL_NOTES)
-    notes = get_database_cache_entry(*cache_params)
-    if notes is None:
-        notes = (
-            db.session.query(Description)
-            .join(Description.officer)
-            .filter(Officer.department_id == department_id)
-            .options(contains_eager(Description.officer))
-            .all()
-        )
-        put_database_cache_entry(*cache_params, notes)
-
+    descriptions = Department.get_descriptions(department_id)
     field_names = [
         "id",
         "text_contents",
@@ -1814,8 +1751,9 @@ def download_dept_descriptions_csv(department_id: int):
         "created_at",
         "last_updated_at",
     ]
+
     return make_downloadable_csv(
-        notes, department_id, "Notes", field_names, descriptions_record_maker
+        descriptions, department_id, "Notes", field_names, descriptions_record_maker
     )