Merge branch 'qa' into feature/MUWM-5233

Dockerfile

@@ -2,7 +2,7 @@ ARG DJANGO_CONTAINER_VERSION=1.4.2
 FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-prewebpack-container
 
 USER root
-RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y
+RUN apt-get update && apt-get install -y postgresql-client libpq-dev
 USER acait
 
 ADD --chown=acait:acait . /app/
@@ -11,7 +11,7 @@ ADD --chown=acait:acait docker/app_start.sh /scripts
 RUN chmod u+x /scripts/app_start.sh
 
 RUN /app/bin/pip install -r requirements.txt
-RUN /app/bin/pip install mysqlclient
+RUN /app/bin/pip install psycopg2
 
 FROM node:16.3-stretch AS node-bundler
 

docker/dev-values.yml

@@ -29,10 +29,10 @@ externalService:
   enabled: true
   name: dev-my-uw-db
   type: ClusterIP
-  serviceAddress: 172.18.0.19
-  servicePort: 3306
+  serviceAddress: 172.18.1.210
+  servicePort: 5432
 database:
-  engine: mysql
+  engine: postgres
   name: myuw_dev
   hostname: dev-my-uw-db
   secretName: dev.my.uw.edu-sql-secrets

docker/prod-values.yml

@@ -61,10 +61,10 @@ externalService:
   enabled: true
   name: my-uw-db
   type: ClusterIP
-  serviceAddress: 172.18.0.19
-  servicePort: 3306
+  serviceAddress: 172.18.1.210
+  servicePort: 5432
 database:
-  engine: mysql
+  engine: postgres
   name: myuw
   hostname: my-uw-db
   secretName: my.uw.edu-sql-secrets
@@ -178,49 +178,49 @@ cronjob:
           cpu: 25m
           memory: 32Mi
     - name: course-cleanup
-      schedule: "1 3 * 1,4,7,9 1"
+      schedule: "1 3 21,26,30 3,6,8,12 *"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "course"]
       resources:
         limits:
-          cpu: 75m
-          memory: 768Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
           memory: 128Mi
     - name: seenreg-cleanup
-      schedule: "1 3 * 1,4,7,9 2"
+      schedule: "1 4 21,26,30 3,6,8,12 *"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "seenreg"]
       resources:
         limits:
-          cpu: 75m
-          memory: 768Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
           memory: 128Mi
     - name: notice-cleanup
-      schedule: "1 3 * * 3"
+      schedule: "1 5 * * 0"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "notice"]
       resources:
         limits:
-          cpu: 75m
-          memory: 1024Mi
+          cpu: 50m
+          memory: 768Mi
         requests:
           cpu: 25m
-          memory: 512Mi
+          memory: 256Mi
     - name: linkvisit-cleanup
-      schedule: "1 3 * * 4"
+      schedule: "1 6 * * 0"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "linkvisit"]
       resources:
         limits:
-          cpu: 100m
-          memory: 1280Mi
+          cpu: 50m
+          memory: 768Mi
         requests:
           cpu: 25m
-          memory: 512Mi
+          memory: 256Mi
 environmentVariables:
   - name: AUTH
     value: SAML

docker/test-values.yml

@@ -51,10 +51,10 @@ externalService:
   enabled: true
   name: test-my-uw-db
   type: ClusterIP
-  serviceAddress: 172.18.0.19
-  servicePort: 3306
+  serviceAddress: 172.18.1.210
+  servicePort: 5432
 database:
-  engine: mysql
+  engine: postgres
   name: myuw_test
   hostname: test-my-uw-db
   secretName: test.my.uw.edu-sql-secrets
@@ -114,49 +114,49 @@ cronjob:
           cpu: 25m
           memory: 32Mi
     - name: course-cleanup
-      schedule: "1 3 * 1,4,7,9 1"
+      schedule: "1 3 21,26,30 3,6,8,12 *"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "course"]
       resources:
         limits:
-          cpu: 75m
-          memory: 128Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
-          memory: 32Mi
+          memory: 128Mi
     - name: seenreg-cleanup
-      schedule: "1 3 * 1,4,7,9 2"
+      schedule: "1 4 21,26,30 3,6,8,12 *"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "seenreg"]
       resources:
         limits:
-          cpu: 75m
-          memory: 128Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
-          memory: 32Mi
+          memory: 128Mi
     - name: notice-cleanup
-      schedule: "1 3 * * 3"
+      schedule: "1 5 * * 0"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "notice"]
       resources:
         limits:
-          cpu: 75m
-          memory: 128Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
-          memory: 32Mi
+          memory: 256Mi
     - name: linkvisit-cleanup
-      schedule: "1 3 * * 4"
+      schedule: "1 6 * * 0"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "linkvisit"]
       resources:
         limits:
-          cpu: 75m
-          memory: 128Mi
+          cpu: 50m
+          memory: 512Mi
         requests:
           cpu: 25m
-          memory: 32Mi
+          memory: 256Mi
 environmentVariables:
   - name: AUTH
     value: SAML

docker/vue-values.yml

@@ -36,10 +36,10 @@ externalService:
   enabled: true
   name: vue-my-uw-db
   type: ClusterIP
-  serviceAddress: 172.18.0.19
-  servicePort: 3306
+  serviceAddress: 172.18.1.210
+  servicePort: 5432
 database:
-  engine: mysql
+  engine: postgres
   name: myuw_test
   hostname: vue-my-uw-db
   secretName: vue.my.uw.edu-sql-secrets

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)
@@ -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():