Merge pull request #5648 from lyttam/BOAC-6260

BOAC-6260: cohort filter for exceptions to minimum term units

Author: mohamalnadi

bea/fixtures/bea-test-data.json

@@ -283,6 +283,11 @@
                     {
                         "status": "Active"
                     }
+                ],
+                "min_units_exception_term": [
+                    {
+                        "term": true
+                    }
                 ]
             },
             {

bea/tests/test_user_role_director.py

@@ -24,7 +24,6 @@
 """
 
 import pytest
-from flask import current_app as app
 
 from bea.config.bea_test_config import BEATestConfig
 from bea.models.advisor_role import AdvisorRole
@@ -43,9 +42,6 @@ class TestUserRoleDirector:
             director_depts.append(memb)
     student = test.test_students[0]
     all_notes = test.get_test_notes(student, -1)[0]
-    app.logger.info(f'{all_notes}')
-    for note in all_notes:
-        app.logger.info(f'{vars(note)}')
 
     def test_log_in(self):
         self.homepage.load_page()

boac/externals/data_loch.py

@@ -1324,6 +1324,12 @@ def get_majors():
     return safe_execute_rds(sql)
 
 
+def get_min_units_exception_terms():
+    sql = f"""SELECT DISTINCT term_id FROM {student_schema()}.term_unit_limits
+        WHERE min_term_units_allowed <> 0.5"""
+    return safe_execute_rds(sql)
+
+
 def get_minors():
     sql = f"""SELECT min.minor AS minor
         FROM {student_schema()}.student_profile_index spi
@@ -1380,6 +1386,7 @@ def get_students_query(  # noqa: C901, PLR0912, PLR0913, PLR0915
     levels=None,
     majors=None,
     midpoint_deficient_grade=None,
+    min_units_exception_term=None,
     minors=None,
     scope=(),
     search_phrase=None,
@@ -1559,6 +1566,10 @@ def get_students_query(  # noqa: C901, PLR0912, PLR0913, PLR0915
                              ON spi.sid = si.sid
                              AND si.term_id >= '{earliest_term_id()}'
                              AND {_incomplete_criteria(incomplete_date_ranges, incomplete_statuses)}"""
+    if min_units_exception_term:
+        query_tables += f' LEFT JOIN {student_schema()}.term_unit_limits tul ON tul.sid = spi.sid'
+        query_filter += ' AND tul.term_id = ANY(%(min_units_exception_term)s) AND tul.min_term_units_allowed <> 0.5'
+        query_bindings.update({'min_units_exception_term': min_units_exception_term})
     if minors:
         query_tables += f' LEFT JOIN {student_schema()}.minors min ON min.sid = spi.sid'
         query_filter += " AND min.minor = ANY(%(minors)s) AND maj.college NOT LIKE 'Graduate%%'"

boac/lib/cohort_utils.py

@@ -252,6 +252,12 @@ def majors():
     return [{'name': major, 'value': major} for major in major_results]
 
 
+@stow('cohort_filter_options_min_unit_exceptions')
+def minimum_unit_exception_terms():
+    terms_with_exceptions = data_loch.get_min_units_exception_terms()
+    return [{'name': row['term_id'], 'value': row['term_id']} for row in terms_with_exceptions]
+
+
 @stow('cohort_filter_options_minors')
 def minors():
     minor_results = [row['minor'] for row in data_loch.get_minors()]

boac/merged/cohort_filter_options.py

@@ -52,6 +52,7 @@
     intended_majors,
     level_options,
     majors,
+    minimum_unit_exception_terms,
     minors,
     student_admit_college_options,
     student_admit_ethnicity_options,
@@ -260,6 +261,13 @@ def get_all_filter_categories(self):
                         key='midpointDeficient',
                         label_primary='Midpoint Deficient Grade',
                     ),
+                    _filter(
+                        key='minUnitsExceptionTerm',
+                        label_primary='Minimum Unit Exception',
+                        options=minimum_unit_exception_terms(),
+                        type_db='string[]',
+                        type_ux='options',
+                    ),
                     _filter(
                         key='minors',
                         label_primary='Minor',

boac/merged/student.py

@@ -360,6 +360,7 @@ def query_students(  # noqa: PLR0913
     limit=50,
     majors=None,
     midpoint_deficient_grade=None,
+    min_units_exception_term=None,
     minors=None,
     offset=0,
     order_by=None,
@@ -427,6 +428,7 @@ def query_students(  # noqa: PLR0913
         levels=levels,
         majors=majors,
         midpoint_deficient_grade=midpoint_deficient_grade,
+        min_units_exception_term=min_units_exception_term,
         minors=minors,
         scope=scope,
         sids=sids,

boac/models/cohort_filter.py

@@ -418,6 +418,7 @@ def _query_students(
         limit=limit,
         majors=((criteria.get('majors') or []) + (criteria.get('graduatePrograms') or [])),
         midpoint_deficient_grade=criteria.get('midpointDeficient'),
+        min_units_exception_term=criteria.get('minUnitsExceptionTerm'),
         minors=criteria.get('minors'),
         offset=offset,
         order_by=order_by,

fixtures/loch/loch.sql

@@ -666,6 +666,15 @@ CREATE TABLE student.student_term_gpas
     units_taken_for_gpa DECIMAL(4,1)
 );
 
+CREATE TABLE student.term_unit_limits
+(
+    sid VARCHAR NOT NULL,
+    term_id VARCHAR(4) NOT NULL,
+    min_term_units_allowed DECIMAL (5,3),
+    max_term_units_allowed DECIMAL (5,3),
+    PRIMARY KEY (sid, term_id)
+);
+
 CREATE TABLE student.visas (
     sid VARCHAR,
     visa_status VARCHAR,
@@ -2657,6 +2666,23 @@ VALUES
 ('3456789012', '2178', 3.2, 15),
 ('5678901234', '2178', 2.1, 14);
 
+INSERT INTO student.term_unit_limits
+(sid, term_id, min_term_units_allowed, max_term_units_allowed)
+VALUES
+('11667051', '2012', 0.5, 20.5),
+('11667051', '2162', 0.5, 20.5),
+('11667051', '2172', 0.5, 20.5),
+('11667051', '2175', 0.5, 20.5),
+('11667051', '2178', 0.000, 20.5),
+('11667051', '2182', 0.5, 16.000),
+('2345678901', '2172', 0.5, 20.5),
+('2345678901', '2175', 22.000, 22.000 ),
+('3456789012', '2178', 0.5, 20.5),
+('5678901234', '2178', 0.5, 20.5),
+('2718281828', '2058', 0.5, 20.5),
+('2718281828', '2102', 0.5, 20.5),
+('3141592653', '2052', 0.5, 20.5);
+
 INSERT INTO student.visas
 (sid, visa_status, visa_type)
 VALUES