From 28e65653681c79adc4be0e910bb3e8594fb230fb Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Thu, 20 Dec 2018 15:47:58 -0500 Subject: [PATCH] Quick fix for cohort problem in enrollment API --- common/djangoapps/enrollment/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py index 919cbc1893..1e91fdfe08 100644 --- a/common/djangoapps/enrollment/views.py +++ b/common/djangoapps/enrollment/views.py @@ -779,7 +779,11 @@ class EnrollmentListView(APIView, ApiKeyPermissionMixIn): cohort_name = request.data.get('cohort') if cohort_name is not None: cohort = get_cohort_by_name(course_id, cohort_name) - add_user_to_cohort(cohort, user) + try: + add_user_to_cohort(cohort, user) + except ValueError: + # user already in cohort, probably because they were un-enrolled and re-enrolled + log.exception('Cohort re-addition') email_opt_in = request.data.get('email_opt_in', None) if email_opt_in is not None: org = course_id.org