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

Qa
uw-it-aca · Jan 4, 2024 · c2fb322 · c2fb322
2 parents 5a942fb + 662de45
commit c2fb322
Show file tree

Hide file tree

Showing 281 changed files with 291 additions and 305 deletions.
diff --git a/docker/settings.py b/docker/settings.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from .base_settings import *

diff --git a/docker/urls.py b/docker/urls.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from .base_urls import *

diff --git a/myuw/__init__.py b/myuw/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 default_app_config = 'myuw.apps.MyUWConfig'
diff --git a/myuw/apps.py b/myuw/apps.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from __future__ import unicode_literals

diff --git a/myuw/authorization.py b/myuw/authorization.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import re

diff --git a/myuw/context_processors.py b/myuw/context_processors.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # Determins if the requesting device is a native hybrid app (android/ios)

diff --git a/myuw/dao/__init__.py b/myuw/dao/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/admin.py b/myuw/dao/admin.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/adviser.py b/myuw/dao/adviser.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/affiliation.py b/myuw/dao/affiliation.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/affiliation_data.py b/myuw/dao/affiliation_data.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import os

diff --git a/myuw/dao/applications.py b/myuw/dao/applications.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/calendar.py b/myuw/dao/calendar.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import re

diff --git a/myuw/dao/calendar_mapping.py b/myuw/dao/calendar_mapping.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import csv

diff --git a/myuw/dao/campus_building.py b/myuw/dao/campus_building.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/canvas.py b/myuw/dao/canvas.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/card_display_dates.py b/myuw/dao/card_display_dates.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/category_links.py b/myuw/dao/category_links.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import csv

diff --git a/myuw/dao/category_notice.py b/myuw/dao/category_notice.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/coda.py b/myuw/dao/coda.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/degree.py b/myuw/dao/degree.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/emaillink.py b/myuw/dao/emaillink.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/enrollment.py b/myuw/dao/enrollment.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/exceptions.py b/myuw/dao/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/finance.py b/myuw/dao/finance.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/grad.py b/myuw/dao/grad.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/gws.py b/myuw/dao/gws.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/hfs.py b/myuw/dao/hfs.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/hx_toolkit_dao.py b/myuw/dao/hx_toolkit_dao.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import math

diff --git a/myuw/dao/iasystem.py b/myuw/dao/iasystem.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/instructor.py b/myuw/dao/instructor.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/instructor_mini_course_card.py b/myuw/dao/instructor_mini_course_card.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from myuw.models import UserCourseDisplay

diff --git a/myuw/dao/instructor_schedule.py b/myuw/dao/instructor_schedule.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/library.py b/myuw/dao/library.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/mailman.py b/myuw/dao/mailman.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/myplan.py b/myuw/dao/myplan.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/myuw_notice.py b/myuw/dao/myuw_notice.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/notice.py b/myuw/dao/notice.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
@@ -78,34 +78,19 @@ def _get_user_notices(request, notices):
         notice_dict[notice_hash] = notice
 
     # Set read status for notices already in db
-    keys = notice_dict.keys()
-    user_notices = UserNotices.objects.filter(user=user,
-                                              notice_hash__in=keys)
-    for user_notice in user_notices:
+    for user_notice in UserNotices.objects.filter(
+            user=user, notice_hash__in=notice_dict.keys()):
         matched_notice = notice_dict[user_notice.notice_hash]
         matched_notice.is_read = user_notice.is_read
         notices_with_read_status.append(matched_notice)
         del notice_dict[user_notice.notice_hash]
 
     # Create UserNotices for new notices
-    user_notices_to_create = []
     for notice in notice_dict.values():
-        user_notice = UserNotices()
-        user_notice.notice_hash = notice.id_hash
-        user_notice.user = user
-        cattype = notice.notice_category + notice.notice_type
-        user_notice.notice_cattype = cattype
-
-        user_notices_to_create.append(user_notice)
-
-    try:
-        UserNotices.objects.bulk_create(user_notices_to_create)
-    except IntegrityError:
-        # MUWM-2016.  This should be rare - 2 processes running at just about
-        # exactly the same time.  In that case especially, the bulk create list
-        # should be the same.  And if it isn't, big deal?
-        pass
-
-    # Add newly created UserNotices into returned list
-    notices_with_read_status.extend(list(notice_dict.values()))
+        user_notice, _ = UserNotices.objects.get_or_create(
+            notice_hash=notice.id_hash, user=user, defaults={
+                'notice_cattype': notice.notice_category + notice.notice_type})
+        notice.is_read = user_notice.is_read
+        notices_with_read_status.append(notice)
+
     return notices_with_read_status
diff --git a/myuw/dao/notice_categorization.py b/myuw/dao/notice_categorization.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 NOTICE_CATEGORIES = {

diff --git a/myuw/dao/notice_mapping.py b/myuw/dao/notice_mapping.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/password.py b/myuw/dao/password.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/persistent_messages.py b/myuw/dao/persistent_messages.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/pws.py b/myuw/dao/pws.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/quicklinks.py b/myuw/dao/quicklinks.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import csv

diff --git a/myuw/dao/registration.py b/myuw/dao/registration.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/stud_future_terms.py b/myuw/dao/stud_future_terms.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/student_profile.py b/myuw/dao/student_profile.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/term.py b/myuw/dao/term.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/textbook.py b/myuw/dao/textbook.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/thrive.py b/myuw/dao/thrive.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import csv

diff --git a/myuw/dao/upass.py b/myuw/dao/upass.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/user.py b/myuw/dao/user.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/user_course_display.py b/myuw/dao/user_course_display.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/user_pref.py b/myuw/dao/user_pref.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/dao/uwnetid.py b/myuw/dao/uwnetid.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/dao/visual_schedule.py b/myuw/dao/visual_schedule.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/myuw/event/__init__.py b/myuw/event/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from myuw.util.cache import MyUWMemcachedCache

diff --git a/myuw/event/section_status.py b/myuw/event/section_status.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/myuw/logger/logresp.py b/myuw/logger/logresp.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging