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

Qa

docker/prod-values.yml

@@ -1,6 +1,6 @@
 autoscaling:
   enabled: true
-  minReplicas: 4
+  minReplicas: 10
   maxReplicas: 150
 targetAverageUtilization: 100
 resources:

docker/test-values.yml

@@ -160,12 +160,12 @@ environmentVariables:
   - name: BOOKSTORE_ENV
     value: PROD
   - name: BOOK_TIMEOUT
-    value: "30"
+    value: "45"
 
   - name: CALENDAR_ENV
     value: PROD
   - name: CALENDAR_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: CANVAS_ENV
     value: PROD
@@ -175,7 +175,7 @@ environmentVariables:
   - name: CODA_ENV
     value: PROD
   - name: CODA_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: GRAD_ENV
     value: PROD
@@ -185,54 +185,54 @@ environmentVariables:
   - name: GRADEPAGE_ENV
     value: PROD
   - name: GRADEPAGE_TIMEOUT
-    value: "5"
+    value: "10"
 
   - name: GWS_ENV
     value: PROD
   - name: GWS_TIMEOUT
-    value: "5"
+    value: "10"
 
   - name: HFS_ENV
     value: PROD
   - name: HFS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UW_ENV
     value: PROD
   - name: IASYSTEM_UW_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWB_ENV
     value: PROD
   - name: IASYSTEM_UWB_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWT_ENV
     value: PROD
   - name: IASYSTEM_UWT_POOL_SIZE
     value: "10"
   - name: IASYSTEM_UWT_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWEO_AP_ENV
     value: PROD
   - name: IASYSTEM_UWEO_AP_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: IASYSTEM_UWEO_IELP_ENV
     value: PROD
   - name: IASYSTEM_UWEO_IELP_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: LIBCURRICS_ENV
     value: PROD
   - name: LIBCURRICS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: LIBRARIES_ENV
     value: PROD
   - name: LIBRARIES_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: MAILMAN_ENV
     value: EVAL
@@ -251,19 +251,19 @@ environmentVariables:
   - name: PWS_POOL_SIZE
     value: "20"
   - name: PWS_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: SDBMYUW_ENV
     value: PROD
   - name: SDBMYUW_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: SWS_ENV
     value: EVAL
   - name: SWS_POOL_SIZE
     value: "20"
   - name: SWS_TIMEOUT
-    value: "5"
+    value: "45"
 
   - name: SPACE_ENV
     value: EVAL
@@ -278,7 +278,7 @@ environmentVariables:
   - name: UWNETID_ENV
     value: PROD
   - name: UWNETID_TIMEOUT
-    value: "5"
+    value: "15"
 
   - name: UWIDP_ENV
     value: PROD

myuw/dao/__init__.py

@@ -81,5 +81,5 @@ def _get_file_path(settings_key, filename):
 def log_err(logger, msg_str, stacktrace, request):
     logger.error(
         {**get_userids(request=request),
-         **{'at': msg_str,
-            'err': stacktrace.format_exc(chain=False).splitlines()}})
+         **{'Msg': msg_str,
+            'Err': stacktrace.format_exc(chain=False).splitlines()}})

myuw/dao/student_profile.py

@@ -89,16 +89,8 @@ def get_academic_info(request, response):
             response['class_level'] = enrollment.class_level.upper()
             break
 
-    for term in terms:
-        if term in enrollments:
-            enrollment = enrollments[term]
-            if enrollment.has_pending_resident_change:
-                response['has_pending_residency_change'] = True
-                response['pending_residency_change_term'] = {
-                    'year': term.year,
-                    'quarter': term.quarter
-                }
-                break
+    response["pending_residency_change"] = _get_residency_change(
+        terms, enrollments, response['resident_code'])
 
     response['term_majors'] = _get_degrees_for_terms(terms, enrollments,
                                                      "majors")
@@ -176,3 +168,18 @@ def _has_only_dropped_degrees(first, second):
     has_dropped = len(set(first) - set(second)) > 0
     has_added = len(set(second) - set(first)) > 0
     return has_dropped and not has_added
+
+def _get_residency_change(terms, enrollments, current_resident_code):
+    # MUWM-5352
+    for term in terms:
+        if term in enrollments:
+            enrollment = enrollments[term]
+            if (enrollment.pending_resident_code != current_resident_code and
+                    enrollment.pending_resident_code != "0"):
+                # MUWM-5352
+                return {
+                    "pending_resident_code": enrollment.pending_resident_code,
+                    "pending_resident_desc": enrollment.pending_resident_desc,
+                    "term": {"year": term.year, "quarter": term.quarter}
+                }
+    return None

myuw/data/category_links_import.csv

@@ -30,11 +30,11 @@ PageAcademics,Grades & Transcripts,all,https://sdb.admin.uw.edu/students/uwnetid
 PageAcademics,Graduation,ugrad,,,https://registrar.washington.edu/students/graduation-diplomas/,Application for Graduation (Undergraduate),https://www.uwb.edu/registrar/graduation/apply/,Applying for Graduation (Undergraduate),https://www.tacoma.uw.edu/uwt/registrar/graduation-procedures,Applying to Graduate (Undergraduate),no,,,,,,,,,,,,,
 PageAcademics,Graduation,grad,https://grad.uw.edu/current-students/enrollment-through-graduation/graduation-requirements/,Graduation Requirements (Graduate),,,,,,,no,,,,,,,,,,,,,
 PageAcademics,Tools & Software,all,,,https://scout.uw.edu/seattle,Scout: Discover the UW,https://scout.uw.edu/bothell,Scout: Discover the UW,https://scout.uw.edu/tacoma,Scout: Discover the UW,no,,,,,,,,,,,,,
-PageAcademics,Tools & Software,all,https://itconnect.uw.edu/wares/uware/tableau-software/,Tableau Data Analysis Software,,,,,,,no,,,,,,,,,,,,,
+PageAcademics,Tools & Software,all,https://it.uw.edu/uware/tableau/,Tableau Data Analysis Software,,,,,,,no,,,,,,,,,,,,,
 PageAcademics,Tools & Software,all,https://uw.hosted.panopto.com/,Panopto,,,,,,,yes,,,,,,,,,,,,,
-PageAcademics,Tools & Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software & Hardware for the UW,,,,,,,yes,,,,,,,,,,,,,
+PageAcademics,Tools & Software,all,https://it.uw.edu/software/,Software & Hardware for the UW,,,,,,,yes,,,,,,,,,,,,,
 PageAcademics,Tools & Software,all,http://www.linkedinlearning.uw.edu/,LinkedIn Learning,,,,,,,yes,,,,,,,,,,,,,
-PageAcademics,Tools & Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,,,,,,yes,,,,,,,,,,,,,
+PageAcademics,Tools & Software,all,https://uwconnect.uw.edu/it?id=kb_article_view&sysparm_article=KB0034358,Google Apps,,,,,,,yes,,,,,,,,,,,,,
 PageAcademics,Tools & Software,all,https://www.office.com/,Office 365 Apps,,,,,,,yes,,,,,,,,,,,,,
 PageCalendar,Other Calendars,all,,,http://www.washington.edu/students/reg/calendar.html,All Academic Calendars,http://www.uwb.edu/calendar/academic,Bothell Academic Calendar,https://www.tacoma.uw.edu/uwt/registrar/academic-calendar,Tacoma Academic Calendars,no,,,,,,,,,,,,,
 PageCalendar,Other Calendars,all,,,https://www.washington.edu/calendar/,Campus Event Calendar,https://www.uwb.edu/calendar,Bothell Campus Event Calendar,https://www.tacoma.uw.edu/home/events-calendar,Tacoma Campus Event Calendar,no,,,,,,,,,,,,,

myuw/data/quicklinks.csv

@@ -15,11 +15,11 @@ http://www.washington.edu/students/timeschd/T/,Time Schedule - Tacoma,tacoma,stu
 http://www.washington.edu/students/timeschd/95index.html,Time Schedule - PCE,,student,yes
 https://wellbeing.uw.edu/,Husky Health & Well-Being,seattle,student,
 https://scout.uw.edu,Scout,,student,
-https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,student,
+https://uwconnect.uw.edu/it?id=kb_article_view&sysparm_article=KB0034358,Google Apps,,student,
 https://www.office.com/,Office 365 Apps,,student,
-https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,faculty,
+https://uwconnect.uw.edu/it?id=kb_article_view&sysparm_article=KB0034358,Google Apps,,faculty,
 https://www.office.com/,Office 365 Apps,,faculty,
-https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,employee,
+https://uwconnect.uw.edu/it?id=kb_article_view&sysparm_article=KB0034358,Google Apps,,employee,
 https://www.office.com/,Office 365 Apps,,employee,
 https://washington.zoom.us/,Zoom,,,
 https://uwnetid.washington.edu/manage/?forward,Email Forwarding,,alumni,

myuw/data/resource_link_import.csv

@@ -31,18 +31,18 @@ Academics,Tools and Software,all,http://canvas.uw.edu/,Canvas LMS,,,,,,,no
 Academics,Tools and Software,all,https://notify.uw.edu/,Notify.UW,,,,,,,no
 Academics,Tools and Software,all,,,https://scout.uw.edu/seattle,Scout: Discover the UW,https://scout.uw.edu/bothell,Scout: Discover the UW,https://scout.uw.edu/tacoma,Scout: Discover the UW,no
 Academics,Tools and Software,all,http://grad.uw.edu/for-students-and-post-docs/mygrad-program/,MyGrad – Graduate School Portal,,,,,,,no
-Academics,Tools and Software,all,https://itconnect.uw.edu/wares/uware/tableau-software/,Tableau Data Analysis Software,,,,,,,no
+Academics,Tools and Software,all,https://it.uw.edu/uware/tableau/,Tableau Data Analysis Software,,,,,,,no
 Academics,Tools and Software,all,https://uw.hosted.panopto.com/,Panopto Lecture Capture,,,,,,,no
-Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Other Software and Hardware Services,,,,,,,no
-Academics,Tools and Software,all,https://itconnect.uw.edu/learn/tools/,Help with Teaching and Learning Tools,,,,,,,no
+Academics,Tools and Software,all,https://it.uw.edu/software/,Other Software and Hardware Services,,,,,,,no
+Academics,Tools and Software,all,https://uwconnect.uw.edu/it?id=service_catalog_category&sys_id=4fbe6c25dbee7f40d6a77a8eaf96193c,Help with Teaching and Learning Tools,,,,,,,no
 Academics,Tools and Software,all,http://www.linkedinlearning.uw.edu/,LinkedIn Learning,,,,,,,no
-Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,,,,,,no
+Academics,Tools and Software,all,https://uwconnect.uw.edu/it?id=kb_article_view&sysparm_article=KB0034358,Google Apps,,,,,,,no
 Academics,Tools and Software,all,https://www.office.com/,Office 365 Apps,,,,,,,no
 "Email, and Accounts and Identity",Email,all,https://outlook.office365.com/uw.edu,UW Office 365 Email,,,,,,,no
 "Email, and Accounts and Identity",Email,all,http://mail.google.com/a/uw.edu,UW Gmail,,,,,,,no
 "Email, and Accounts and Identity",Email,all,http://outlook.com/owa/myuw.net,MyUW.net Email,,,,,,,no
 "Email, and Accounts and Identity",Email,all,https://uwnetid.washington.edu/manage/?forward,Email Forwarding,,,,,,,no
-"Email, and Accounts and Identity",Email,all,,,http://itconnect.uw.edu/connect/email,Email and Calendaring Options,https://www.uwb.edu/it/service-catalog/communications-email,Email and Calendaring Options,http://www.tacoma.uw.edu/admissions/setting-your-uw-email,Setting up your UW email,no
+"Email, and Accounts and Identity",Email,all,,,https://it.uw.edu/guides/email-calendaring/email/,Email and Calendaring Options,https://www.uwb.edu/it/service-catalog/communications-email,Email and Calendaring Options,http://www.tacoma.uw.edu/admissions/setting-your-uw-email,Setting up your UW email,no
 "Email, and Accounts and Identity",Accounts and Identity,all,https://uwnetid.washington.edu/manage/,Manage UW NetID Account,,,,,,,no
 "Email, and Accounts and Identity",Accounts and Identity,all,http://services.uwmedicine.org/passwordportal,UW Medicine Password Portal,,,,,,,no
 "Email, and Accounts and Identity",Accounts and Identity,all,https://identity.uw.edu/,Identity.UW,,,,,,,no
@@ -56,8 +56,8 @@ Services for Faculty and Staff,Finance and Procurement,all,"https://uw.service-n
 Services for Faculty and Staff,Finance and Procurement,all,,,https://finance.uw.edu/ps/,Procurement Services,https://www.uwb.edu/planning-administration/fiscal-audit-services/procurement,Purchasing,https://www.tacoma.uw.edu/fa/finance/procurement,Procurement Services,no
 Services for Faculty and Staff,Finance and Procurement,all,"http://wd5.myworkday.com/uw/login.htmld	",Workday,,,,,,,no
 Services for Faculty and Staff,Others,all,http://registrar.washington.edu/staffandfaculty/electronic-academic-records-system-ears,Electronic Advising Records System (EARS),,,,,,,no
-Services for Faculty and Staff,Others,all,,,https://itconnect.uw.edu/,IT Connect,https://www.uwb.edu/it,Information Technologies,https://www.tacoma.uw.edu/uwt/it,Information Technology,no
-Services for Faculty and Staff,Others,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software and Hardware,,,,,,,no
+Services for Faculty and Staff,Others,all,,,https://it.uw.edu/,UWConnect,https://www.uwb.edu/it,Information Technologies,https://www.tacoma.uw.edu/uwt/it,Information Technology,no
+Services for Faculty and Staff,Others,all,https://it.uw.edu/software/,Software and Hardware,,,,,,,no
 Services for Faculty and Staff,Others,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
 Services for Faculty and Staff,Others,all,,,https://facilities.uw.edu/,UW Facilities,https://www.uwb.edu/facilities/,Facilities and Campus Operations,https://www.tacoma.uw.edu/fa/facilities,Facilities Services,no
 Services for Faculty and Staff,Others,all,,,https://facilities.uw.edu/services/requests,UW Facilities: Request Service,http://dlweb.megamation.com/uwb/DLWEB.php/O4W_INFO_PAGE,Facilities Maintenance Request,https://www.tacoma.uw.edu/fa/facilities/work-order-request,Facilities Services: Work Order Request,no
@@ -153,7 +153,7 @@ Teaching,Grading,all,https://apps.registrar.washington.edu/grade-change/pages/ch
 Teaching,Grading,all,,,https://registrar.washington.edu/staffandfaculty/grading-resources/,Faculty Resource on Grading,https://www.uwb.edu/registrar/policies/grading,Grading Policies,https://www.tacoma.uw.edu/uwt/registrar/grading-policy,Grading Policy,no
 Teaching,Tools,all,https://canvas.uw.edu,Canvas LMS,,,,,,,no
 Teaching,Tools,all,https://uw.hosted.panopto.com,Panopto Lecture Capture,,,,,,,no
-Teaching,Tools,all,https://itconnect.uw.edu/learn/tools/polleverywhere/,Poll Everywhere,,,,,,,no
+Teaching,Tools,all,https://uwconnect.uw.edu/it?id=sc_entry&sys_id=d6353a45db4abbc037ae9ec6db9619a5&sysparm_category=4fbe6c25dbee7f40d6a77a8eaf96193c,Poll Everywhere,,,,,,,no
 Teaching,Tools,all,https://coda.uw.edu,Course Stats,,,,,,,no
 Teaching,Tools,all,https://washington.zoom.us,Zoom,,,,,,,no
 Research,Research Administration,all,https://www.washington.edu/research/,UW Research,,,,,,,no
@@ -173,7 +173,7 @@ Research,Research Data and Publishing,all,https://www.lib.washington.edu/dataser
 Research,Research Data and Publishing,all,https://guides.lib.uw.edu/research/dmg,Research Data Services,,,,,,,no
 Research,Research Data and Publishing,all,,,https://www.lib.washington.edu/openscholarship,"Open Scholarship Commons: Tools, Services, Consultations",https://guides.lib.uw.edu/bothell/digitalscholarship,Digital Scholarship,https://guides.lib.uw.edu/tacdigitalscholarship,Digital Scholarship,no
 Research,Research Data and Publishing,all,https://guides.lib.uw.edu/research/spoa,Scholarly Publishing and Open Access,,,,,,,no
-Research,Technical Support,all,https://itconnect.uw.edu/help/,UW-IT Technical Support,,,,,,,no
+Research,Technical Support,all,https://it.uw.edu/help/,UW-IT Technical Support,,,,,,,no
 Research,Technical Support,all,https://uw.service-now.com/sp?id=sc_audience&sys_id=bd183bc1db07bb8c37ae9ec6db9619d9&sysparm_category=bd183bc1db07bb8c37ae9ec6db9619d9,UW-IT Services for Researchers,,,,,,,no
-Research,Technical Support,all,https://itconnect.uw.edu/research/,UW-IT Research Computing Resources,,,,,,,no
+Research,Technical Support,all,https://it.uw.edu/guides/research/,UW-IT Research Computing Resources,,,,,,,no
 Research,Technical Support,all,https://www.lib.washington.edu/dataservices/tools/storage-options,Data Storage Options,,,,,,,no

myuw/resources/sws/file/student/v5/enrollment.json_reg_id_10000000000000000000000000000002_verbose_true_transcriptable_course_all_changed_since_date_

@@ -37,6 +37,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/10000000000000000000000000000002.json",

myuw/resources/sws/file/student/v5/enrollment.json_reg_id_10000000000000000000000000000010_verbose_true_transcriptable_course_all_changed_since_date_

@@ -35,6 +35,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/10000000000000000000000000000010.json",
@@ -166,6 +168,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/10000000000000000000000000000010.json",
@@ -374,6 +378,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/10000000000000000000000000000010.json",

myuw/resources/sws/file/student/v5/enrollment.json_reg_id_12345678901234567890123456789012_verbose_true_transcriptable_course_all_changed_since_date_

@@ -32,6 +32,8 @@
     "PendingHonorsChange": false,
     "PendingMajorChange": false,
     "PendingResidentChange": false,
+    "PendingResidencyDescription": null,
+    "PendingResident": "0",
     "PendingSpecialProgramChange": false,
     "Person": {
         "Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -348,6 +350,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -399,6 +403,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -455,6 +461,8 @@
             "PendingHonorsChange": false,
             "PendingMajorChange": false,
             "PendingResidentChange": false,
+            "PendingResidencyDescription": null,
+            "PendingResident": "0",
             "PendingSpecialProgramChange": false,
             "Person": {
                 "Href": "/student/v5/person/12345678901234567890123456789012.json",