new commits

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

controllers/client/task.controller.js

@@ -22,6 +22,7 @@ const { userExclude } = require('../../models/task/task.attributes');
 const { clientExclude } = require('../../models/task/task_completion.attributes');
 const logActivity = require('../../utils/logActivity.util');
 const R = require('../../utils/response.util');
+const { hydrateReadTaskProgress } = require('../../services/task_reading_progress_sync.service');
 
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const isUUID = (v) => UUID_RE.test(v);
@@ -45,13 +46,32 @@ exports.getMyGroups = async (req, res) => {
                     attributes: [],
                     through: {
                         model: mdl_UserGroupMembers,
-                        attributes: ['joined_at'],
+                        attributes: [],
                         where: { deletedAt: null },
                     },
                 },
+                {
+                    model: TaskList,
+                    as: 'taskLists',
+                    attributes: [],
+                    through: { attributes: [] },
+                    required: false,
+                },
             ],
             where: { is_active: true },
-            attributes: ['group_id', 'name', 'group_code', 'description'],
+            attributes: [
+                'group_id',
+                'name',
+                'group_code',
+                'description',
+                [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('taskLists.task_list_id'))), 'task_list_count'],
+            ],
+            group: [
+                'UserGroup.group_id',
+                'UserGroup.name',
+                'UserGroup.group_code',
+                'UserGroup.description',
+            ],
             order: [['name', 'ASC']],
         });
 
@@ -175,6 +195,13 @@ exports.getGroupTaskList = async (req, res) => {
         const json = taskList.toJSON();
         const tasks = json.tasks ?? [];
         const taskIds = tasks.map((t) => t.task_id);
+        const readRequirements = tasks.flatMap((task) =>
+            (task.requirements ?? [])
+                .filter((req) => ['read_course', 'read_unit', 'read_lesson'].includes(req.type))
+                .map((req) => ({ ...req, task_id: task.task_id }))
+        );
+
+        await hydrateReadTaskProgress(userId, readRequirements);
 
         // ── Fetch user's completion signals for these tasks ────────────────────
         const [completions, linkVisits, progressRows] = await Promise.all([
@@ -316,6 +343,18 @@ exports.getGroupTaskLists = async (req, res) => {
         // ── Gather all task_ids across the group's task lists ──────────────────
         const allTasks = taskLists.flatMap((tl) => tl.tasks ?? []);
         const taskIds = allTasks.map((t) => t.task_id);
+        const readRequirements = allTasks.flatMap((task) =>
+            (task.requirements ?? [])
+                .filter((req) => ['read_course', 'read_unit', 'read_lesson'].includes(req.type))
+                .map((req) => ({
+                    task_id:        task.task_id,
+                    requirement_id: req.requirement_id,
+                    reference_id:   req.reference_id,
+                    type:           req.type,
+                }))
+        );
+
+        await hydrateReadTaskProgress(userId, readRequirements);
 
         // ── Fetch user's completion signals for these tasks ────────────────────
         const [completions, linkVisits, progressRows] = await Promise.all([
@@ -684,4 +723,4 @@ exports.getLatestCompletion = async (req, res) => {
         console.error('[CLIENT][GET LATEST COMPLETION]', err);
         return R.error(res, 'Could not retrieve latest completion.', 500);
     }
-};
+};