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

Fix/muwm 5362 (#3152)

Author: fanglinfang

docker/prod-values.yml

@@ -1,7 +1,7 @@
 autoscaling:
   enabled: true
   minReplicas: 4
-  maxReplicas: 120
+  maxReplicas: 150
 targetAverageUtilization: 100
 resources:
   limits:

myuw/dao/canvas.py

@@ -9,12 +9,14 @@
 from uw_canvas.sections import Sections
 from uw_canvas.courses import Courses
 from uw_canvas.models import CanvasCourse, CanvasSection
-from uw_sws.exceptions import InvalidCanvasIndependentStudyCourse
+from uw_sws.exceptions import (
+    InvalidCanvasIndependentStudyCourse, InvalidCanvasSection)
 from myuw.dao import log_err
 from myuw.dao.pws import get_regid_of_current_user
 from myuw.dao.term import get_comparison_datetime
 
 logger = logging.getLogger(__name__)
+canvas_enrollments = Enrollments()
 
 
 def canvas_prefetch():
@@ -26,9 +28,11 @@ def _method(request):
 def get_canvas_active_enrollments(request):
     if not hasattr(request, "canvas_act_enrollments"):
         request.canvas_act_enrollments = (
-            Enrollments().get_enrollments_for_regid(
+            canvas_enrollments.get_enrollments_for_regid(
                 get_regid_of_current_user(request),
                 {'type': ['StudentEnrollment'], 'state': ['active']}))
+        logger.debug({'canvas_act_enrollments':
+                     request.canvas_act_enrollments[0].json_data()})
     return request.canvas_act_enrollments
 
 
@@ -37,34 +41,50 @@ def set_section_canvas_course_urls(canvas_active_enrollments, schedule,
     """
     Set canvas_course_url in schedule.sections
     """
-    now = get_comparison_datetime(request)
-    section_labels = set()
+    canvas_sis_ids = {}
+    # MUWM-5362 {canvas_section_sis_id: primary_section_label}
     for section in schedule.sections:
-        section_labels.add(section.section_label())
+        section_label = section.section_label()
 
-    canvas_links = {}  # sis_course_id: canvas course_url
-    for enrollment in canvas_active_enrollments:
-        (sws_label, inst_regid) = sws_section_label(enrollment.sis_course_id)
-        if sws_label is not None and sws_label in section_labels:
-            sis_course_id = enrollment.sis_course_id
-            if sis_course_id not in canvas_links:
-                canvas_links[sis_course_id] = enrollment.course_url
-
-    for section in schedule.sections:
         try:
-            section.canvas_course_url = canvas_links.get(
-                section.canvas_course_sis_id())
+            cid = section.canvas_course_sis_id()
+            if cid not in canvas_sis_ids:
+                canvas_sis_ids[cid] = section.primary_section_label()
         except InvalidCanvasIndependentStudyCourse as ex:
             # REQ3132940 known SWS issue:
             # prior quarter's registration data has
             # no independent study instructor.
             # If independent_study_instructor being None occurs
             # in current or future quarter, likely is a data error.
-            if not section.term.is_past(now):
-                log_err(logger,
-                        "{} {}".format(section.section_label(), ex),
-                        traceback, request)
-            pass
+            log_err(
+                logger, f"canvas_course_sis_id of {section_label} {ex}",
+                traceback, request)
+            continue
+        try:
+            cid = section.canvas_section_sis_id()
+            canvas_sis_ids[cid] = section.primary_section_label()
+        except Exception as ex:
+            log_err(
+                logger, f"canvas_section_sis_id of {section_label} {ex}",
+                traceback, request)
+    logger.debug({'canvas_sis_ids': canvas_sis_ids})
+
+    canvas_links = {}  # primary_section_label: canvas course_url
+    for enrollment in canvas_active_enrollments:
+        psection_label = None
+        # MUWM-5362 check both course and section
+        if enrollment.sis_section_id in canvas_sis_ids:
+            psection_label = canvas_sis_ids[enrollment.sis_section_id]
+        else:
+            if enrollment.sis_course_id in canvas_sis_ids:
+                psection_label = canvas_sis_ids[enrollment.sis_course_id]
+        if psection_label and psection_label not in canvas_links:
+            canvas_links[psection_label] = enrollment.course_url
+    logger.debug({'canvas_links': canvas_links})
+
+    for section in schedule.sections:
+        section.canvas_course_url = canvas_links.get(
+            section.primary_section_label())
 
 
 def get_canvas_course_from_section(sws_section):
@@ -91,12 +111,11 @@ def get_canvas_course_url(sws_section, person):
 def sws_section_label(sis_id):
     canvas_section = CanvasSection(sis_section_id=sis_id)
     sws_label = canvas_section.sws_section_id()
-    if sws_label is None:
-        canvas_course = CanvasCourse(sis_course_id=sis_id)
-        sws_label = canvas_course.sws_course_id()
-        return (sws_label, canvas_course.sws_instructor_regid())
-    else:
+    if sws_label is not None:
         return (sws_label, canvas_section.sws_instructor_regid())
+    canvas_course = CanvasCourse(sis_course_id=sis_id)
+    sws_label = canvas_course.sws_course_id()
+    return (sws_label, canvas_course.sws_instructor_regid())
 
 
 def get_viewable_course_sections(canvas_course_id, canvas_user_id):
@@ -108,7 +127,7 @@ def get_viewable_course_sections(canvas_course_id, canvas_user_id):
     limit_privileges_to_course_section = False
     limit_sections = {}
 
-    enrollments = Enrollments().get_enrollments_for_course(
+    enrollments = canvas_enrollments.get_enrollments_for_course(
         canvas_course_id, params={'user_id': canvas_user_id})
 
     for enrollment in enrollments:

myuw/templates/restclients/customform/canvas/active_enrollments.html

@@ -0,0 +1,11 @@
+<h1>Canvas Student Active Enrollments</h1>
+<form method="post" action="{{form_action}}">
+  {% csrf_token %}
+  <p>
+    <label for="uwregid">UW NetID or RegID:</label>
+    <input id="uwregid" name="uwregid" size="32" type="text">
+  </p>
+  <p>
+    <input value="Submit" type="submit">
+  </p>
+</form>

myuw/templates/supporttools/custom_sidebar_links.html

@@ -47,6 +47,13 @@ <h3>Web Services</h3>
         </li>
         {% endif %}
 
+        {% url 'myuw_rest_search' 'canvas' 'active_enrollments.html' as canvas_url %}
+        {% if canvas_url %}
+        <li>
+            <a href="{{ canvas_url }}">Canvas Student</a>
+        </li>
+        {% endif %}
+
         {% url 'myuw_rest_search' 'hfs' 'accounts.html' as hfs_url %}
         {% if hfs_url %}
             <li>

myuw/test/dao/test_canvas.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from django.test import TestCase
+from restclients_core.exceptions import DataFailureException
 from myuw.dao.canvas import (
     get_canvas_active_enrollments, set_section_canvas_course_urls,
     get_canvas_course_from_section,
@@ -29,9 +30,9 @@ def test_get_canvas_active_enrollments(self):
 
         set_section_canvas_course_urls(canvas_active_enrollments,
                                        schedule, req)
-        section1 = schedule.sections[0]
+        section1 = schedule.sections[2]
         self.assertEqual(section1.section_label(),
-                         "2013,spring,PHYS,121/A")
+                         "2013,spring,PHYS,121/AQ")
         self.assertEqual(section1.canvas_course_url,
                          'https://test.edu/courses/249652')
 
@@ -60,15 +61,21 @@ def test_get_canvas_active_enrollments(self):
         self.assertEqual(section.section_label(), "2013,spring,TRAIN,101/A")
         self.assertIsNotNone(section.canvas_course_url)
 
+        req = get_request_with_user("jbothell")
+        schedule = get_schedule_by_term(req, get_current_quarter(req))
+        self.assertRaises(
+            DataFailureException, get_canvas_active_enrollments, req)
+
+    def test_InvalidCanvasIndependentStudyCourse_case(self):
         req = get_request_with_user("jeos",
                                     get_request_with_date("2013-10-01"))
         schedule = get_schedule_by_term(req, get_current_quarter(req))
         canvas_active_enrollments = get_canvas_active_enrollments(req)
         self.assertIsNotNone(req.canvas_act_enrollments)
         set_section_canvas_course_urls(canvas_active_enrollments,
                                        schedule, req)
-        with self.assertRaises(AttributeError):
-            a = schedule.sections[0].canvas_course_url
+        # InvalidCanvasIndependentStudyCourse
+        self.assertIsNone(schedule.sections[0].canvas_course_url)
 
     def test_get_canvas_course_url(self):
         person = Person()

myuw/views/rest_search.py

@@ -33,6 +33,11 @@ def get_proxy_url(self, request, service, url):
                     "uw/json_utf8_202007.ubs",
                     get_input_value(request.POST, "quarter"),
                     get_input_value(request.POST, "sln1"))
+        elif service == "canvas":
+            regid = get_regid(get_input_value(request.POST, "uwregid"))
+            url = (
+                f"api/v1/users/sis_user_id:{regid}/enrollments?" +
+                f"state[]=active&type[]=StudentEnrollment")
         elif service == "grad":
             params = self.format_params(request)
             params['id'] = get_student_system_key(params['id'])