Skip to content

Commit

Permalink
MUWM-5272: return 404 if no data
Browse files Browse the repository at this point in the history
  • Loading branch information
fanglinfang committed Dec 16, 2023
1 parent 6c64adf commit 5d7b159
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion myuw/dao/textbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ def get_iacourse_status(request, term):
key = "{}{}".format(term.quarter, term.year)
if key in terms_iacourses:
return terms_iacourses.get(key)
return {}
return None
8 changes: 5 additions & 3 deletions myuw/test/api/test_textbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ def test_digital_material_api(self):
'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.assertEquals(response.status_code, 404)

self.set_user('jbothell')
response = self.get_response_by_reverse(
Expand All @@ -115,3 +113,7 @@ def test_get_payment_quarter(self):
request = get_request_with_date('2013-09-19')
q = get_payment_quarter(request)
self.assertEquals(q.quarter, "autumn")

request = get_request_with_date('2013-12-27')
q = get_payment_quarter(request)
self.assertEquals(q.quarter, "winter")
2 changes: 1 addition & 1 deletion myuw/test/dao/test_textbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ def test_get_iacourse_status(self):
'javerage', get_request_with_date("2013-12-31"))
term = get_current_quarter(req)
data = get_iacourse_status(req, term)
self.assertEqual(data, {})
self.assertIsNone(data)
4 changes: 3 additions & 1 deletion myuw/views/api/textbook.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from myuw.logger.logresp import log_api_call
from myuw.views import prefetch_resources
from myuw.views.api import ProtectedAPI
from myuw.views.error import handle_exception
from myuw.views.error import handle_exception, data_not_found

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -145,6 +145,8 @@ def get(self, request, *args, **kwargs):
try:
ret_obj = get_iacourse_status(
request, get_payment_quarter(request))
if ret_obj is None:
return data_not_found()
return self.json_response(ret_obj.json_data())
except Exception:
return handle_exception(logger, timer, traceback)
Expand Down
4 changes: 1 addition & 3 deletions myuw_vue/components/accounts/tuition-fees.vue
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,7 @@ export default {
return this.tuition.pce_accbalance;
},
hasIacData() {
return (
this.isIacReady && this.iacData &&
this.iacData.ia_courses && this.iacData.ia_courses);
return this.isIacReady && this.iacData;
},
dayOneAccessDueDateFromNow() {
return this.toFromNowDate(this.iacData.payment_due_day);
Expand Down

0 comments on commit 5d7b159

Please sign in to comment.