Merge pull request #2986 from uw-it-aca/qa

Remove field no longer used (#2985)

Author: fanglinfang

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

myuw/management/commands/db_cleanup.py

@@ -26,14 +26,12 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument('name', choices=[
-            'course', 'notice', 'seenreg', 'linkvisit', 'noop'],
+            'course', 'notice', 'seenreg', 'linkvisit'],
             help="The table to check ")
 
     def handle(self, *args, **options):
         self.action = options['name']
 
-        if self.action == 'noop':
-            return
         if self.action == 'course':
             self.course_display()
         if self.action == 'notice':
@@ -81,8 +79,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 +96,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 +114,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 +131,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()))

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',
+        ),
+    ]

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',
+        ),
+    ]

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

myuw_vue/components/home/new_student/to-register.vue

@@ -97,19 +97,15 @@
                 v-uw-collapse.measlesimmunization
                 type="button"
                 class="btn btn-link p-0 border-0 align-top notice-link text-start myuw-text-md"
-              >Measles, mumps immunization is required by the first day of classes</button>
+              >Immunization records are required by the 3rd week of your first quarter</button>
               <uw-collapse id="measlesimmunization">
                 <div class="p-3 mt-2 bg-light text-dark notice-body">
                   <p>All students under 22 must submit evidence of measles, mumps immunity and a
                     conjugate meningitis ACWY vaccination given at age 16 or older. Students age
                     22 and older must submit evidence of measles and mumps immunity, either through
                     vaccinations (two MMR vaccinations) or lab evidence of positive titer.
-                    <a v-if="seattle" href="https://www.washington.edu/newhuskies/must-do/send-proof-of-immunity/">
-                    Get detailed instructions here.</a>
-                    <a v-if="tacoma" href="https://www.tacoma.uw.edu/registrar/newly-admitted-students#permalink-16114">
-                    Get detailed instructions here.</a>
-                    <a v-if="bothell" href="https://wellbeing.uw.edu/medical/immunizations/immunization-requirement/">
-                    Get detailed instructions here.</a>
+                    <a href="https://wellbeing.uw.edu/medical/immunizations/immunization-requirement/">
+                    Learn more about immunization requirements and deadlines.</a>
                   </p>
                 </div>
               </uw-collapse>