From 2930ff5ec1653362bee81b6bfac973e9b3d97521 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 4 Aug 2022 10:01:46 +0100
Subject: [PATCH] .

---
 rad/urls.py  |  2 +-
 rad/views.py | 23 +++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/rad/urls.py b/rad/urls.py
index f7ad7707..962f2708 100644
--- a/rad/urls.py
+++ b/rad/urls.py
@@ -90,7 +90,7 @@ urlpatterns = [
     ),
     path(
         "exam/json/unbased/<int:cid>/<str:passcode>",
-        views.active_exams,
+        views.active_exams_unbased,
         name="active_exams_cid_unbased",
     ),
     path("exam/json/unbased", views.active_exams_unbased, name="active_exams_unbased"),
diff --git a/rad/views.py b/rad/views.py
index 375d6b9a..c3400a67 100644
--- a/rad/views.py
+++ b/rad/views.py
@@ -239,7 +239,7 @@ def cid_scores(request, pk, passcode):
     )
 
 
-def active_exams(request, cid=None, passcode=None):
+def active_exams(request, cid=None, passcode=None, based=True):
     active_exams = {}
 
     if cid is not None:
@@ -272,25 +272,8 @@ def active_exams(request, cid=None, passcode=None):
     return JsonResponse(active_exams)
 
 
-def active_exams_unbased(request):
-    anatomy_exams = AnatomyExamViews.active_exams(request, False, False)
-    rapid_exams = RapidsExamsViews.active_exams(request, False, False)
-    long_exams = LongsExamViews.active_exams(request, False, False)
-
-    exams = []
-    exams.extend(anatomy_exams)
-    exams.extend(rapid_exams)
-    exams.extend(long_exams)
-
-    active_exams = {"exams": exams}
-
-    if request.user:
-        active_exams["user"] = request.user.username
-        active_exams["user_id"] = request.user.pk
-    else:
-        active_exams["user"] = False
-
-    return JsonResponse(active_exams)
+def active_exams_unbased(request, cid=None, passcode=None):
+    return active_exams(request, cid, passcode, based=False)
 
 
 @csrf_exempt