Implement exact 10-interval bonus questions logic fetching only 15-point questions

Author: Jay-Naik2526

Treasure_Hunt_Backend/src/controllers/teamController.js

@@ -222,13 +222,23 @@ export const getCurrentQuestion = async (req, res) => {
     `;
     const tableExists = await pool.query(tableCheckQuery, [`user_answers_${username}`]);
 
-    // 3. Get answered count for question numbering
-    let answeredCount = 0;
+    // Check if requesting bonus question
+    const isBonusReq = req.query.is_bonus === 'true';
+    const pointCondition = isBonusReq ? 'qb.points = 15' : 'qb.points != 15';
+
+    // 3. Get answered count for normal vs bonus questions
+    let normalAnsweredCount = 0;
+    let bonusAnsweredCount = 0;
     if (tableExists.rows[0].exists) {
       const answeredResult = await pool.query(
-        `SELECT COUNT(*) FROM "user_answers_${username}"`
+        `SELECT 
+          SUM(CASE WHEN qb.points != 15 THEN 1 ELSE 0 END) as normal_count,
+          SUM(CASE WHEN qb.points = 15 THEN 1 ELSE 0 END) as bonus_count
+         FROM "user_answers_${username}" ua
+         JOIN question_bank qb ON ua.question_id = qb.id`
       );
-      answeredCount = parseInt(answeredResult.rows[0].count);
+      normalAnsweredCount = parseInt(answeredResult.rows[0].normal_count || 0);
+      bonusAnsweredCount = parseInt(answeredResult.rows[0].bonus_count || 0);
     }
 
     let questionResult;
@@ -238,6 +248,7 @@ export const getCurrentQuestion = async (req, res) => {
         `SELECT qa.id as assignment_id, qb.* FROM question_assignments qa
            JOIN question_bank qb ON qa.question_id = qb.id
            WHERE qa.user_id = $1
+           AND ${pointCondition}
            AND NOT EXISTS (
              SELECT 1 
              FROM "user_answers_${username}" ua 
@@ -252,6 +263,7 @@ export const getCurrentQuestion = async (req, res) => {
         `SELECT qa.id as assignment_id, qb.* FROM question_assignments qa
            JOIN question_bank qb ON qa.question_id = qb.id
            WHERE qa.user_id = $1
+           AND ${pointCondition}
            ORDER BY qa.id
            LIMIT 1`,
         [userId]
@@ -268,8 +280,9 @@ export const getCurrentQuestion = async (req, res) => {
 
     res.json({
       success: true,
-      question: questionResult.rows[0],
-      question_number: answeredCount + 1,
+      question: { ...questionResult.rows[0], is_bonus: isBonusReq },
+      question_number: isBonusReq ? bonusAnsweredCount + 1 : normalAnsweredCount + 1,
+      completed_bonus: bonusAnsweredCount,
       // Per-question time limit in seconds (5 minutes per question)
       time_limit: 300
     });

Treasure_Hunt_Frontend/src/pages/participant/Participant.jsx

@@ -106,6 +106,12 @@ const Participant = () => {
           if (response.question_number) setQuestionNumber(prev => Math.max(prev, response.question_number));
           setCompletedBonus(response.completed_bonus || 0);
         } else if (response.completed) {
+          if (isBonus) {
+            setError('No more bonus questions available on this path!');
+            setIsBonusMode(false);
+            fetchCurrentQuestion(false);
+            return;
+          }
           setCurrentQuestion({ completed: true });
         } else {
           setError('No question available');
@@ -204,8 +210,12 @@ const Participant = () => {
       if (image) formData.append('image', image);
       const response = await submitAnswer(currentQuestion.id, formData);
       if (response.success) {
-        if (currentQuestion.is_bonus) setCompletedBonus(prev => prev + 1);
-        setQuestionNumber(prev => prev + 1);
+        if (currentQuestion.is_bonus) {
+          setCompletedBonus(prev => prev + 1);
+          setIsBonusMode(false);
+        } else {
+          setQuestionNumber(prev => prev + 1);
+        }
         setSuccess('✨ Answer logged in the admin panel!');
         setTextAnswer('');
         setImage(null);

Treasure_Hunt_Frontend/src/pages/participant/components/BonusQuestionHandler.jsx

@@ -1,8 +1,10 @@
 import React from 'react';
 import { motion } from 'framer-motion';
 
-const BonusQuestionHandler = ({ questionNumber, onSwitchToBonus, onSwitchToNormal, isBonusMode }) => {
-  if (questionNumber !== 5 && questionNumber !== 10 && !isBonusMode) return null;
+const BonusQuestionHandler = ({ questionNumber, onSwitchToBonus, onSwitchToNormal, isBonusMode, completedBonus }) => {
+  const availableBonuses = Math.floor((questionNumber - 1) / 10);
+
+  if (completedBonus >= availableBonuses && !isBonusMode) return null;
 
   return (
     <div style={{ marginBottom: '1.5rem', width: '100%', textAlign: 'center', position: 'relative', zIndex: 1, padding: '0 0.5rem' }}>