MUWM-5272: return None if the term has no data

myuw/dao/textbook.py

@@ -27,11 +27,13 @@ def get_order_url_by_schedule(schedule):
 
 def get_iacourse_status(request, term):
     """
-    returns a TermIACourse object
+    MUWM-5272
+    returns a TermIACourse object if has data, otherwith return None
     """
     terms_iacourses = bookstore.get_iacourse_status(
         get_regid_of_current_user(request)
     )
     key = "{}{}".format(term.quarter, term.year)
-    if terms_iacourses:
+    if key in terms_iacourses:
         return terms_iacourses.get(key)
+    return None

myuw/test/api/test_textbook.py

@@ -85,6 +85,14 @@ def test_digital_material_api(self):
         self.assertEquals(data["year"], 2013)
         self.assertEquals(data["balance"], 0)
 
+        response = self.get_response_by_reverse(
+            'myuw_iacourse_digital_material_api',
+            kwargs={'year': 2013,
+                    'quarter': 'winter'})
+        self.assertEquals(response.status_code, 200)
+        data = json.loads(response.content)
+        self.assertIsNone(data)
+
         self.set_user('jbothell')
         response = self.get_response_by_reverse(
             'myuw_iacourse_digital_material_api',

myuw/test/dao/test_textbook.py

@@ -72,3 +72,9 @@ def test_get_iacourse_status(self):
         term = get_current_quarter(req)
         data = get_iacourse_status(req, term)
         self.assertIsNotNone(data.json_data())
+
+        req = get_request_with_user(
+            'javerage', get_request_with_date("2013-12-31"))
+        term = get_current_quarter(req)
+        data = get_iacourse_status(req, term)
+        self.assertIsNone(data.json_data())

myuw/views/api/textbook.py

@@ -145,9 +145,7 @@ def get(self, request, *args, **kwargs):
         try:
             ret_obj = get_iacourse_status(
                 request, get_payment_quarter(request))
-            if ret_obj:
-                return self.json_response(ret_obj.json_data())
-            return {}
+            return self.json_response(ret_obj.json_data())
         except Exception:
             return handle_exception(logger, timer, traceback)
         finally: