good morning

Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>

controllers/client/courses.controller.js

@@ -1273,52 +1273,6 @@ exports.getUnitByUuid = async (req, res) => {
   }
 };
 
-// "Quiz (self-enrich for pass_quiz task requirement blocks)" — mirrors
-// getUnitByUuid/getLessonByUuid's uuid-lookup pattern. A quiz is always
-// unit-scoped (unit_quizzes.unit_id unique) so access resolves through its
-// one parent unit, same rule canAccessUnit already implements.
-exports.getQuizByUuid = async (req, res) => {
-  try {
-    const { uuid } = req.params;
-    const quiz = await UnitQuiz.findOne({
-      where: { uuid, ...notDeleted },
-      attributes: ["quiz_id", "uuid", "title", "is_required", "passing_score"],
-      include: [{
-        model: Unit, as: "unit",
-        attributes: ["unit_id", "uuid", "title"],
-        include: [{
-          model: Course, as: "courses",
-          where: notDeleted, required: false,
-          attributes: ["course_id", "title", "subscription"],
-          through: { attributes: [] },
-        }],
-      }],
-    });
-    if (!quiz) return R.error(res, "Quiz not found.", 404);
-
-    if (!await canAccessUnit(req.user.user_id, quiz.unit.unit_id)) {
-      const first = quiz.unit.courses?.[0] ?? null;
-      return res.status(403).json({
-        status: "error",
-        message: "You do not have access to this quiz.",
-        course: first ? { title: first.title, subscription: first.subscription } : null,
-      });
-    }
-
-    const passedAttempt = await QuizAttempt.findOne({
-      where: { quiz_id: quiz.quiz_id, user_id: req.user.user_id, passed: true },
-    });
-
-    const plain = quiz.toJSON();
-    plain.unit.course = plain.unit.courses?.[0] ?? null; // back-compat singular field
-    plain.has_passed = !!passedAttempt;
-    return R.success(res, "Quiz retrieved.", plain);
-  } catch (err) {
-    console.error("[CLIENT][QUIZ][BY UUID]", err);
-    return R.error(res, "Could not retrieve quiz.", 500);
-  }
-};
-
 // "Units → Lessons (returns all data)" — a Unit resolves all of its lesson
 // content in one call, with or without a parent course.
 exports.getLessonsByUnitUuid = async (req, res) => {

controllers/client/task.controller.js

@@ -17,7 +17,6 @@ const { TaskCompletion, TaskCompletionFile } = require('../../models/task/task_c
 const { TaskLinkVisit, TaskProgress } = require('../../models/task/task_progress.mdl');
 const { mdl_UserGroups, mdl_UserGroupMembers } = require('../../models/users/user_groups.mdl');
 const mdl_Users = require('../../models/users/users.mdl');
-const { QuizAttempt } = require('../../models/courses/courses.associations');
 
 const { userExclude } = require('../../models/task/task.attributes');
 const { clientExclude } = require('../../models/task/task_completion.attributes');
@@ -135,15 +134,9 @@ const isMember = async (userId, groupId) => {
 
 // ─── Helper: per-user completion signals for a batch of tasks ─────────────────
 // Shared by getGroupTaskList/getGroupTaskLists. upload_file/submit_text share
-// one TaskCompletion per task (resubmit-anytime — latest by submitted_at wins);
-// pass_quiz is computed live from QuizAttempt, same as unit-quiz has_passed
-// (courses.controller.js) rather than a separately-synced TaskProgress row.
-const getTaskCompletionSignals = async (userId, taskIds, requirements) => {
-    const quizIds = [...new Set(
-        requirements.filter((r) => r.type === 'pass_quiz' && r.reference_id).map((r) => r.reference_id)
-    )];
-
-    const [completions, linkVisits, progressRows, passedAttempts] = await Promise.all([
+// one TaskCompletion per task (resubmit-anytime — latest by submitted_at wins).
+const getTaskCompletionSignals = async (userId, taskIds) => {
+    const [completions, linkVisits, progressRows] = await Promise.all([
         taskIds.length
             ? TaskCompletion.findAll({
                 where: { task_id: { [Op.in]: taskIds }, user_id: userId },
@@ -163,12 +156,6 @@ const getTaskCompletionSignals = async (userId, taskIds, requirements) => {
                 attributes: ['task_id', 'requirement_id', 'reference_id'],
             })
             : [],
-        quizIds.length
-            ? QuizAttempt.findAll({
-                where: { quiz_id: { [Op.in]: quizIds }, user_id: userId, passed: true },
-                attributes: ['quiz_id'],
-            })
-            : [],
     ]);
 
     // First row per task_id wins — completions are ordered submitted_at DESC.
@@ -181,7 +168,6 @@ const getTaskCompletionSignals = async (userId, taskIds, requirements) => {
         latestCompletionByTask,
         visitedRequirementIds: new Set(linkVisits.map((v) => v.requirement_id)),
         completedProgressKeys: new Set(progressRows.map((p) => `${p.requirement_id}:${p.reference_id}`)),
-        passedQuizIds: new Set(passedAttempts.map((a) => String(a.quiz_id))),
     };
 };
 
@@ -200,8 +186,6 @@ const isRequirementDone = (r, signals) => {
         case 'read_unit':
         case 'read_lesson':
             return signals.completedProgressKeys.has(`${r.requirement_id}:${r.reference_id}`);
-        case 'pass_quiz':
-            return signals.passedQuizIds.has(String(r.reference_id));
         default:
             return true; // unknown requirement types don't block completion
     }
@@ -241,7 +225,7 @@ const checkTaskCompletion = async (userId, taskId) => {
     const reqs = await TaskRequirement.findAll({ where: { task_id: taskId } });
     if (!reqs.length) return false;
     const plainReqs = reqs.map((r) => r.toJSON());
-    const signals = await getTaskCompletionSignals(userId, [taskId], plainReqs);
+    const signals = await getTaskCompletionSignals(userId, [taskId]);
     return plainReqs.every((r) => isRequirementDone(r, signals));
 };
 
@@ -359,8 +343,7 @@ exports.getGroupTaskList = async (req, res) => {
         await hydrateReadTaskProgress(userId, readRequirements);
 
         // ── Fetch user's completion signals for these tasks ────────────────────
-        const allRequirements = tasks.flatMap((task) => task.requirements ?? []);
-        const signals = await getTaskCompletionSignals(userId, taskIds, allRequirements);
+        const signals = await getTaskCompletionSignals(userId, taskIds);
 
         const now = Date.now();
 
@@ -490,8 +473,7 @@ exports.getGroupTaskLists = async (req, res) => {
         await hydrateReadTaskProgress(userId, readRequirements);
 
         // ── Fetch user's completion signals for these tasks ────────────────────
-        const allRequirements = allTasks.flatMap((task) => task.requirements ?? []);
-        const signals = await getTaskCompletionSignals(userId, taskIds, allRequirements);
+        const signals = await getTaskCompletionSignals(userId, taskIds);
 
         const now = Date.now();
 

controllers/client/task_progress.controller.js

@@ -31,7 +31,6 @@ const { mdl_UserGroupMembers }                 = require('../../models/users/use
 const { Course }                                = require('../../models/courses/courses.mdl');
 const CourseAssessment                          = require('../../models/courses/course_assessment.mdl');
 const QuizAttempt                               = require('../../models/courses/quiz_attempt.mdl');
-const UnitQuiz                                  = require('../../models/courses/unit_quiz.mdl');
 const logActivity                              = require('../../utils/logActivity.util');
 const R = require('../../utils/response.util');
 const { hydrateReadTaskProgress }              = require('../../services/task_reading_progress_sync.service');
@@ -141,35 +140,6 @@ exports.getTaskProgress = async (req, res) => {
 
         await hydrateReadTaskProgress(req.user.user_id, readRequirements);
 
-        // pass_quiz completion is computed live from QuizAttempt (same source
-        // has_passed already uses for unit quizzes) rather than a synced
-        // TaskProgress row — reference_id on the requirement is the quiz's
-        // uuid, so resolve to quiz_id first.
-        const quizRequirements = await TaskRequirement.findAll({
-            where: { task_id: taskId, type: 'pass_quiz' },
-            attributes: ['requirement_id', 'reference_id'],
-        });
-        const quizPassedRows = [];
-        if (quizRequirements.length) {
-            const quizUuids = [...new Set(quizRequirements.map((r) => r.reference_id).filter(Boolean))];
-            const quizzes = await UnitQuiz.findAll({ where: { uuid: quizUuids }, attributes: ['quiz_id', 'uuid'] });
-            const quizIdByUuid = new Map(quizzes.map((q) => [q.uuid, q.quiz_id]));
-            const quizIds = quizzes.map((q) => q.quiz_id);
-            const passedAttempts = quizIds.length
-                ? await QuizAttempt.findAll({ where: { quiz_id: { [Op.in]: quizIds }, user_id: req.user.user_id, passed: true }, attributes: ['quiz_id'] })
-                : [];
-            const passedQuizIds = new Set(passedAttempts.map((a) => String(a.quiz_id)));
-            for (const r of quizRequirements) {
-                const quizId = quizIdByUuid.get(r.reference_id);
-                quizPassedRows.push({
-                    requirement_id: r.requirement_id,
-                    reference_id:   r.reference_id,
-                    completed:      quizId ? passedQuizIds.has(String(quizId)) : false,
-                    completed_at:   null,
-                });
-            }
-        }
-
         const [linkVisits, progress] = await Promise.all([
             TaskLinkVisit.findAll({
                 where: { task_id: taskId, user_id: req.user.user_id },
@@ -183,7 +153,7 @@ exports.getTaskProgress = async (req, res) => {
 
         return R.success(res, 'Task progress retrieved.', {
             link_visits: linkVisits,
-            progress: [...progress, ...quizPassedRows],
+            progress,
         });
     } catch (err) {
         console.error('[CLIENT][GET TASK PROGRESS]', err);