Merge branch 'feature/MUWM-5196' of https://github.com/uw-it-aca/myuw …

…into feature/MUWM-5196

docker/prod-values.yml

@@ -178,7 +178,7 @@ cronjob:
           cpu: 25m
           memory: 32Mi
     - name: course-cleanup
-      schedule: "1 7 * * 5"
+      schedule: "21 20 * * 5"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "course"]
       resources:
@@ -189,7 +189,7 @@ cronjob:
           cpu: 25m
           memory: 128Mi
     - name: seenreg-cleanup
-      schedule: "1 5 * * 5"
+      schedule: "1 23 * * 5"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "seenreg"]
       resources:
@@ -200,7 +200,7 @@ cronjob:
           cpu: 25m
           memory: 128Mi
     - name: notice-cleanup
-      schedule: "1 3 * * 3"
+      schedule: "1 21 * * 5"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "notice"]
       resources:
@@ -211,7 +211,7 @@ cronjob:
           cpu: 25m
           memory: 512Mi
     - name: linkvisit-cleanup
-      schedule: "1 3 * * 4"
+      schedule: "1 22 * * 5"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "linkvisit"]
       resources:

myuw/management/commands/db_cleanup.py

@@ -14,7 +14,7 @@
 from uw_sws import sws_now, SWS_TIMEZONE
 from myuw.models import (
     VisitedLinkNew, SeenRegistration, UserNotices, UserCourseDisplay)
-from myuw.dao.term import get_term_by_date, get_term_before
+from myuw.dao.term import get_term_by_date, get_term_before, get_term_after
 from myuw.util.settings import get_cronjob_recipient, get_cronjob_sender
 from myuw.logger.timer import Timer
 
@@ -65,11 +65,19 @@ def deletion(self, ids_to_delete, queryf):
                       ["{}@uw.edu".format(get_cronjob_recipient())])
             raise CommandError(msg)
 
+    def get_cur_term(self):
+        comparison_date = sws_now().date()
+        term = get_term_by_date(comparison_date)
+        # Match MyUW quarter switchS
+        if comparison_date > term.grade_submission_deadline.date():
+            return get_term_after(term)
+        return term
+
     def course_display(self):
         # clean up after one year
         timer = Timer()
         queryf = "DELETE FROM user_course_display_pref WHERE id IN ({})"
-        term = get_term_by_date(sws_now().date())
+        term = self.get_cur_term()
         y = term.year - 1
         q = term.quarter
         qset = UserCourseDisplay.objects.filter(year=y, quarter=q)
@@ -88,7 +96,7 @@ def notice_read(self):
         # clean up after 180 days
         timer = Timer()
         queryf = "DELETE FROM myuw_mobile_usernotices WHERE id IN ({})"
-        cut_off_dt = self.get_cut_off_date()
+        cut_off_dt = self.get_cut_off_date(90)
         qset = UserNotices.objects.filter(first_viewed__lt=cut_off_dt)
         if qset.exists():
             ids_to_delete = qset.values_list('id', flat=True)
@@ -105,7 +113,7 @@ def registration_seen(self):
         # clean up previous quarters'
         timer = Timer()
         queryf = "DELETE FROM myuw_mobile_seenregistration WHERE id IN ({})"
-        term = get_term_before(get_term_by_date(sws_now().date()))
+        term = get_term_before(self.get_cur_term())
         qset = SeenRegistration.objects.filter(
             year=term.year, quarter=term.quarter)
         if qset.exists():
@@ -123,7 +131,7 @@ def link_visited(self):
         # clean up after 180 days
         timer = Timer()
         queryf = "DELETE FROM myuw_visitedlinknew WHERE id IN ({})"
-        cut_off_dt = self.get_cut_off_date()
+        cut_off_dt = self.get_cut_off_date(90)
         qset = VisitedLinkNew.objects.filter(visit_date__lt=cut_off_dt)
         if qset.exists():
             ids_to_delete = qset.values_list('id', flat=True)