If cohort info throws exception send modified response

stevebrownlee · Oct 16, 2023 · 4bd4fc2 · 4bd4fc2
1 parent 50ad63c
commit 4bd4fc2
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/LearningAPI/models/people/nssuser.py b/LearningAPI/models/people/nssuser.py
@@ -1,6 +1,7 @@
 """NssUser database model"""
 import statistics
 import datetime
+import logging
 
 from django.db import models
 from django.conf import settings
@@ -145,14 +146,26 @@ def current_cohort(self):
                 "name": "Unassigned"
             }
 
-        return {
-            "name": assignment.cohort.name,
-            "id": assignment.cohort.id,
-            "client_course": assignment.cohort.info.client_course_url,
-            "server_course": assignment.cohort.info.server_course_url,
-            "zoom_url": assignment.cohort.info.zoom_url,
-            "start": assignment.cohort.start_date,
-            "end": assignment.cohort.end_date,
-            "github_org": assignment.cohort.info.student_organization_url,
-            "courses": assignment.cohort.courses.order_by('index').values('course__name', 'course__id', 'active'),
-        }
+        try:
+            return {
+                "name": assignment.cohort.name,
+                "id": assignment.cohort.id,
+                "client_course": assignment.cohort.info.client_course_url,
+                "server_course": assignment.cohort.info.server_course_url,
+                "zoom_url": assignment.cohort.info.zoom_url,
+                "start": assignment.cohort.start_date,
+                "end": assignment.cohort.end_date,
+                "github_org": assignment.cohort.info.student_organization_url,
+                "courses": assignment.cohort.courses.order_by('index').values('course__name', 'course__id', 'active'),
+            }
+        except Exception as ex:
+            logger = logging.getLogger("LearningPlatform")
+            logger.exception(getattr(ex, 'message', repr(ex)))
+
+            return {
+                "name": assignment.cohort.name,
+                "id": assignment.cohort.id,
+                "start": assignment.cohort.start_date,
+                "end": assignment.cohort.end_date,
+                "courses": assignment.cohort.courses.order_by('index').values('course__name', 'course__id', 'active'),
+            }