Merge pull request #827 from uw-it-aca/hotfix/MUWM-3783-MUWM-3921

Resolve MUWM-3921

Author: fanglinfang

myuw/dao/calendar_mapping.py

@@ -1,6 +1,6 @@
 import csv
 import os
-from myuw.dao.enrollment import get_current_quarter_enrollment
+from myuw.dao.student_profile import get_cur_future_enrollments
 from myuw.dao.gws import is_grad_student
 
 
@@ -33,15 +33,17 @@ def _get_enrollments(request):
     majors = []
     minors = []
     try:
-        enrollment = get_current_quarter_enrollment(request)
-
-        if len(enrollment.majors) > 0:
-            for major in enrollment.majors:
-                majors.append(major.major_name)
-
-        if len(enrollment.minors) > 0:
-            for minor in enrollment.minors:
-                minors.append(minor.short_name)
+        terms, enrollments = get_cur_future_enrollments(request)
+        for enrollment in enrollments.values():
+            if len(enrollment.majors) > 0:
+                for major in enrollment.majors:
+                    if major.major_name and major.major_name not in majors:
+                        majors.append(major.major_name)
+
+            if len(enrollment.minors) > 0:
+                for minor in enrollment.minors:
+                    if minor.short_name and minor.short_name not in minors:
+                        minors.append(minor.short_name)
     except Exception:
         pass
     return {'is_grad': is_grad_student(),

myuw/dao/student_profile.py

@@ -5,13 +5,10 @@
 
 import logging
 from uw_sws.person import get_person_by_regid
+from myuw.dao import get_netid_of_current_user
 from myuw.dao.pws import get_regid_of_current_user
-from myuw.dao.enrollment import (get_current_quarter_enrollment,
-                                 get_main_campus,
-                                 get_enrollments_of_terms)
-from myuw.dao.term import (get_current_quarter,
-                           get_next_quarter,
-                           get_current_and_next_quarters)
+from myuw.dao.enrollment import get_main_campus, get_enrollments_of_terms
+from myuw.dao.term import get_current_and_next_quarters
 from myuw.dao.gws import is_grad_student
 
 
@@ -49,21 +46,22 @@ def get_student_profile(request):
     return response
 
 
+def get_cur_future_enrollments(request):
+    try:
+        terms = get_current_and_next_quarters(request, 4)
+        return terms, get_enrollments_of_terms(terms)
+    except Exception as ex:
+        logger.error(
+            "%s get_enrollments: %s" % (get_netid_of_current_user(), ex))
+        return None
+
+
 def get_academic_info(request, response):
     """
     Iterates through the student enrollments and populates the profile
     fields based upon data available
     """
-
-    terms = get_current_and_next_quarters(request, 4)
-
-    try:
-        enrollments = get_enrollments_of_terms(terms)
-    except Exception as ex:
-        logger.error(
-            "%s get_academic_info: %s" %
-            (netid, ex))
-        return
+    terms, enrollments = get_cur_future_enrollments(request)
 
     if terms[0] in enrollments:
         enrollment = enrollments[terms[0]]

myuw/test/dao/calendar_mapping.py

@@ -3,12 +3,10 @@
     get_calendars_for_minors, get_calendars_for_majors, \
     get_calendars_for_gradmajors, _get_enrollments, \
     _get_calendars, _get_calendar_ids_from_text
-from myuw.test import get_request
+from myuw.test import get_request_with_user, get_request_with_date
 
 
 class TestCalendarMapping(TestCase):
-    def setUp(self):
-        get_request()
 
     def test_get_by_major(self):
         enrollments = {'majors': ['NON MATRICULATED'],
@@ -67,3 +65,16 @@ def test_ids_from_text(self):
         ids = _get_calendar_ids_from_text(text)
         self.assertEqual(len(ids), 1)
         self.assertEqual(ids[0], "sea_art")
+
+    def test_get_cur_future_enrollments(self):
+        req = get_request_with_user('javerage',
+                                    get_request_with_date("2013-04-10"))
+        enrollments = _get_enrollments(req)
+        self.assertEqual(len(enrollments['majors']), 3)
+        self.assertEqual(enrollments['majors'][0],
+                         'ENGLISH')
+        self.assertEqual(enrollments['majors'][1],
+                         'ACMS (SOC & BEH SCI)')
+        self.assertEqual(enrollments['majors'][2],
+                         'COMPUTER SCIENCE')
+        self.assertEqual(len(enrollments['minors']), 2)

myuw/test/dao/test_student_profile.py

@@ -1,14 +1,8 @@
 from django.test import TestCase
-from restclients_core.exceptions import DataFailureException
-from myuw.dao.term import get_current_quarter,\
-    get_next_quarter, get_term_before, get_term_after,\
-    get_current_and_next_quarters
-from myuw.dao.enrollment import get_enrollment_for_term,\
-    get_enrollments_of_terms, get_current_quarter_enrollment,\
-    get_enrollments_of_terms
+from myuw.dao.student_profile import _get_degrees_for_terms,\
+    get_cur_future_enrollments
 from myuw.test import fdao_sws_override, fdao_pws_override,\
     get_request_with_date, get_request_with_user
-from myuw.dao.student_profile import _get_degrees_for_terms
 
 
 @fdao_pws_override
@@ -17,9 +11,7 @@ class TestStudentProfile(TestCase):
     def test_get_majors_for_terms(self):
         req = get_request_with_user('eight',
                                     get_request_with_date("2013-04-01"))
-        terms = get_current_and_next_quarters(req, 4)
-        enrollments = get_enrollments_of_terms(terms)
-
+        terms, enrollments = get_cur_future_enrollments(req)
         majors = _get_degrees_for_terms(terms, enrollments, "majors")
 
         self.assertEquals(len(majors[0]['majors']), 2)
@@ -29,9 +21,7 @@ def test_get_majors_for_terms(self):
     def test_get_minors_for_terms(self):
         req = get_request_with_user('jbothell',
                                     get_request_with_date("2013-04-01"))
-        terms = get_current_and_next_quarters(req, 4)
-        enrollments = get_enrollments_of_terms(terms)
-
+        terms, enrollments = get_cur_future_enrollments(req)
         minors = _get_degrees_for_terms(terms, enrollments, "minors")
 
         self.assertEquals(len(minors[0]['minors']), 1)
@@ -41,8 +31,7 @@ def test_get_minors_for_terms(self):
     def test_no_change(self):
         req = get_request_with_user('javg005',
                                     get_request_with_date("2013-04-01"))
-        terms = get_current_and_next_quarters(req, 4)
-        enrollments = get_enrollments_of_terms(terms)
+        terms, enrollments = get_cur_future_enrollments(req)
 
         majors = _get_degrees_for_terms(terms, enrollments, "majors")
         minors = _get_degrees_for_terms(terms, enrollments, "minors")
@@ -56,9 +45,7 @@ def test_no_change(self):
     def test_major_drop_empty(self):
         req = get_request_with_user('jeos',
                                     get_request_with_date("2013-01-10"))
-        terms = get_current_and_next_quarters(req, 4)
-        enrollments = get_enrollments_of_terms(terms)
-
+        terms, enrollments = get_cur_future_enrollments(req)
         majors = _get_degrees_for_terms(terms, enrollments, "majors")
         minors = _get_degrees_for_terms(terms, enrollments, "minors")
         self.assertEquals(len(minors), 4)

setup.py

@@ -48,7 +48,7 @@
         'UW-RestClients-Bookstore<1.0',
         'UW-RestClients-Mailman<1.0',
         'UW-RestClients-MyPlan<1.0',
-        'UW-RestClients-Trumba<1.0',
+        'UW-RestClients-Trumba<1.0,>=0.3',
         'UW-RestClients-Django-Utils<1.0',
         'Django-SupportTools',
         'django_mobileesp',