Bubble up 404s from the forum service on user retirement

2018-05-15 17:49:06 -04:00
parent f040897812
commit 23023203e5
1 changed files with 6 additions and 0 deletions
--- a/lms/djangoapps/discussion_api/views.py
+++ b/lms/djangoapps/discussion_api/views.py
@@ -560,6 +560,12 @@ class RetireUserView(APIView):
            cc_user.retire(username)
        except UserRetirementStatus.DoesNotExist:
            return Response(status=status.HTTP_404_NOT_FOUND)
+        except comment_client.CommentClientRequestError as exc:
+            # 404s from client service for users that don't exist there are expected
+            # we can just pass those up.
+            if exc.status_code == 404:
+                return Response(status=status.HTTP_404_NOT_FOUND)
+            raise
        except Exception as exc:  # pylint: disable=broad-except
            return Response(text_type(exc), status=status.HTTP_500_INTERNAL_SERVER_ERROR)