Merge 0883829 into 8f82b0d

uw-it-aca · Aug 26, 2023 · 15889b0 · 15889b0
2 parents 8f82b0d + 0883829
commit 15889b0
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 33 deletions.
diff --git a/docker/prod-values.yml b/docker/prod-values.yml
@@ -205,22 +205,22 @@ cronjob:
       args: ["db_cleanup", "notice"]
       resources:
         limits:
-          cpu: 100m
-          memory: 768Mi
+          cpu: 75m
+          memory: 1024Mi
         requests:
           cpu: 25m
-          memory: 128Mi
+          memory: 512Mi
     - name: linkvisit-cleanup
       schedule: "1 3 * * 4"
       command: ["/scripts/management_command.sh"]
       args: ["db_cleanup", "linkvisit"]
       resources:
         limits:
           cpu: 100m
-          memory: 2048Mi
+          memory: 1280Mi
         requests:
           cpu: 25m
-          memory: 1024Mi
+          memory: 512Mi
 environmentVariables:
   - name: AUTH
     value: SAML

diff --git a/myuw/management/commands/db_cleanup.py b/myuw/management/commands/db_cleanup.py
@@ -81,8 +81,10 @@ def course_display(self):
             logger.info(
                 "Delete UserCourseDisplay {} {}, Time: {} sec\n".format(
                     y, q, timer.get_elapsed()))
-            logger.info("UserCourseDisplay has {} entries".format(
-                len(UserCourseDisplay.objects.all())))
+        else:
+            logger.info("Found no entry to delete")
+        logger.info("UserCourseDisplay has {} entries".format(
+            UserCourseDisplay.objects.all().count()))
 
     def notice_read(self):
         # clean up after 180 days
@@ -96,8 +98,10 @@ def notice_read(self):
             logger.info(
                 "Delete UserNotices viewed before {} Time: {} sec\n".format(
                     cut_off_dt, timer.get_elapsed()))
-            logger.info("UserNotices has {} entries".format(
-                len(UserNotices.objects.all())))
+        else:
+            logger.info("Found no entry to delete")
+        logger.info("UserNotices has {} entries".format(
+            UserNotices.objects.all().count()))
 
     def registration_seen(self):
         # clean up previous quarters'
@@ -112,8 +116,10 @@ def registration_seen(self):
             logger.info(
                 "Delete SeenRegistration {} {} Time: {}\n".format(
                     term.year, term.quarter, timer.get_elapsed()))
-            logger.info("SeenRegistration has {} entries".format(
-                len(SeenRegistration.objects.all())))
+        else:
+            logger.info("Found no entry to delete")
+        logger.info("SeenRegistration has {} entries".format(
+            SeenRegistration.objects.all().count()))
 
     def link_visited(self):
         # clean up after 180 days
@@ -127,5 +133,7 @@ def link_visited(self):
             logger.info(
                 "Delete VisitedLinkNew viewed before {} Time: {}\n".format(
                     cut_off_dt, timer.get_elapsed()))
-            logger.info("VisitedLinkNew has {} entries".format(
-                len(VisitedLinkNew.objects.all())))
+        else:
+            logger.info("Found no entry to delete")
+        logger.info("VisitedLinkNew has {} entries".format(
+            VisitedLinkNew.objects.all().count()))
diff --git a/myuw/migrations/0022_remove_use_legacy.py b/myuw/migrations/0022_remove_use_legacy.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.18 on 2023-08-24 16:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('myuw', '0021_myuwnotice_recur'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='migrationpreference',
+            name='use_legacy_site',
+        ),
+    ]
diff --git a/myuw/migrations/0023_delete_tuitiondate.py b/myuw/migrations/0023_delete_tuitiondate.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.2.18 on 2023-08-26 01:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('myuw', '0022_remove_use_legacy'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='TuitionDate',
+        ),
+    ]
diff --git a/myuw/models/__init__.py b/myuw/models/__init__.py
@@ -89,15 +89,6 @@ class Meta:
         db_table = "myuw_mobile_user"
 
 
-class TuitionDate(models.Model):
-    user = models.OneToOneField('User', on_delete=models.PROTECT)
-    date_stored = models.DateTimeField(auto_now=True)
-    date = models.DateField()
-
-    class Meta:
-        db_table = "myuw_mobile_tuitiondate"
-
-
 class UserNotices(models.Model):
     notice_hash = models.CharField(max_length=32)
     user = models.ForeignKey('User', on_delete=models.PROTECT)
@@ -400,7 +391,6 @@ class MigrationPreference(models.Model):
     user = models.OneToOneField('User', on_delete=models.CASCADE)
     display_onboard_message = models.BooleanField(default=True)
     display_pop_up = models.BooleanField(default=True)
-    use_legacy_site = models.BooleanField(default=False)
 
     def __init__(self, *args, **kwargs):
         super(MigrationPreference, self).__init__(*args, **kwargs)
@@ -430,21 +420,11 @@ def turn_off_pop_up(cls, user):
             obj.save()
         return obj
 
-    @classmethod
-    @transaction.atomic
-    def set_use_legacy(cls, user, use_legacy_site):
-        obj = MigrationPreference._get_for_update(user)
-        if obj.use_legacy_site != use_legacy_site:
-            obj.use_legacy_site = use_legacy_site
-            obj.save()
-        return obj
-
     def json_data(self):
         return {
             "user": self.user.json_data(),
             "display_pop_up": self.display_pop_up,
             "display_onboard_message": self.display_onboard_message,
-            "use_legacy_site": self.use_legacy_site
         }
 
     def __str__(self):