From 9dd0601a227904242ad372ffc41c88e258e6695a Mon Sep 17 00:00:00 2001
From: ectasy663 <namansingh4680@gmail.com>
Date: Fri, 25 Sep 2026 17:24:05 +0530
Subject: [PATCH] Fix test filtering by exam_pattern, fix Admin UI test upload
 mapping Mock/DPS

---
 backend/main.py              |  9 +++++++--
 src/app/admin/tests/page.tsx | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/backend/main.py b/backend/main.py
index 810e71e..c7516a3 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -446,9 +446,14 @@ def list_active_tests(exam_pattern: Optional[str] = None, type: Optional[str] =
         if exam_pattern == 'JEE_NEET':
             pass
         elif exam_pattern == 'JEE':
-            query = query.where(models.Test.exam_pattern.in_(['JEE_Main', 'JEE_Advanced']))
+            query = query.where(models.Test.exam_pattern.in_([models.ExamEnum.JEE_MAIN, models.ExamEnum.JEE_ADVANCED]))
         else:
-            query = query.where(models.Test.exam_pattern == exam_pattern)
+            try:
+                # Find matching enum by value string (e.g. "JEE_Main")
+                enum_val = models.ExamEnum(exam_pattern)
+                query = query.where(models.Test.exam_pattern == enum_val)
+            except ValueError:
+                pass
     if type:
         query = query.where(models.Test.type == type)
     else:
diff --git a/src/app/admin/tests/page.tsx b/src/app/admin/tests/page.tsx
index 7ef496e..a3a5961 100644
--- a/src/app/admin/tests/page.tsx
+++ b/src/app/admin/tests/page.tsx
@@ -42,7 +42,7 @@ export default function AdminTestsPage() {
   
   // Upload Form State
   const [title, setTitle] = useState("")
-  const [testType, setTestType] = useState("CBT")
+  const [testType, setTestType] = useState("Mock")
   const [examPattern, setExamPattern] = useState("JEE_Main")
   const [timeLimit, setTimeLimit] = useState("180")
   const [scheduledDate, setScheduledDate] = useState<Date | null>(null)
@@ -290,13 +290,13 @@ export default function AdminTestsPage() {
                   value={testType}
                   onChange={(e) => setTestType(e.target.value)}
                 >
-                  <option value="CBT">🎯 CBT Test (JSON) — appears in Mock Tests section</option>
-                  <option value="PREP_PILOT">🤖 Prep Pilot Test (as CBT JSON) — appears in AI Coach</option>
+                  <option value="Mock">🎯 CBT Test (JSON) — appears in Mock Tests section</option>
+                  <option value="DPS">🤖 Prep Pilot Test (as CBT JSON) — appears in AI Coach</option>
                   <option value="DPP_PDF">📋 DPP PDF (Minio Upload) — Class/Plan aligned</option>
                 </select>
                 <p className="text-[11px] text-muted-foreground">
-                  {testType === 'CBT' && '✅ Purely for CBT. Appears under Dashboard → Mock Tests.'}
-                  {testType === 'PREP_PILOT' && '✅ Purely for CBT. Appears under AI Coach → PrepPilot AI.'}
+                  {testType === 'Mock' && '✅ Purely for CBT. Appears under Dashboard → Mock Tests.'}
+                  {testType === 'DPS' && '✅ Purely for CBT. Appears under AI Coach → PrepPilot AI.'}
                   {testType === 'DPP_PDF' && '✅ Uploads a PDF to Minio storage for Class/Plan aligned DPP.'}
                 </p>
               </div>