From 851d218540f0d7f400a2fb055651a3c2fbb1b340 Mon Sep 17 00:00:00 2001
From: elangptra <rvnlz17@gmail.com>
Date: Thu, 5 Dec 2024 14:10:35 +0700
Subject: [PATCH] refactor: student activities by class

---
 controllers/learningControllers/stdLearning.js | 8 ++++----
 routes/learning/stdLearning.js                 | 2 +-
 routes/monitoring/monitoring.js                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/controllers/learningControllers/stdLearning.js b/controllers/learningControllers/stdLearning.js
index d9c1056..79a2939 100644
--- a/controllers/learningControllers/stdLearning.js
+++ b/controllers/learningControllers/stdLearning.js
@@ -716,10 +716,10 @@ export const recentStudentActivities = async (req, res) => {
 
 export const recentStudentActivitiesByClassId = async (req, res) => {
   const { page = 1, limit = 5, search = "" } = req.query;
-  const { ID_CLASS } = req.body;
+  const { idClass } = req.params;
 
   try {
-    const classData = await models.Class.findByPk(ID_CLASS);
+    const classData = await models.Class.findByPk(idClass);
 
     if (!classData) {
       return response(404, null, "Class not found", res);
@@ -737,8 +737,8 @@ export const recentStudentActivitiesByClassId = async (req, res) => {
           NEXT_LEARNING: {
             [models.Sequelize.Op.ne]: null,
           },
-          ...(ID_CLASS && {
-            "$learningUser.students.ID_CLASS$": ID_CLASS,
+          ...(idClass && {
+            "$learningUser.students.ID_CLASS$": idClass,
           }),
           ...(search && {
             [models.Sequelize.Op.or]: [
diff --git a/routes/learning/stdLearning.js b/routes/learning/stdLearning.js
index 26564a2..3e976b2 100644
--- a/routes/learning/stdLearning.js
+++ b/routes/learning/stdLearning.js
@@ -9,7 +9,7 @@ router.get("/stdLearning", verifyLoginUser, getStdLearnings);
 
 router.get("/stdLearning/activities", verifyLoginUser, recentStudentActivities);
 
-router.get("/stdLearning/activities/class", verifyLoginUser, recentStudentActivitiesByClassId);
+router.get("/stdLearning/activities/class/:idClass", verifyLoginUser, recentStudentActivitiesByClassId);
 
 router.get("/stdLearning/:id", verifyLoginUser, getStdLearningById);
 
diff --git a/routes/monitoring/monitoring.js b/routes/monitoring/monitoring.js
index 2a6ae2f..7aea131 100644
--- a/routes/monitoring/monitoring.js
+++ b/routes/monitoring/monitoring.js
@@ -8,7 +8,7 @@ router.get("/monitoring", verifyLoginUser, getMonitorings);
 
 router.get("/monitoring/progress", verifyLoginUser, adminOrTeacherOnly, monitoringStudentsProgress);
 
-router.get("/monitoring/class", verifyLoginUser, getClassMonitoringDataByClassAndTopic);
+router.post("/monitoring/class", verifyLoginUser, getClassMonitoringDataByClassAndTopic);
 
 router.get("/monitoring/:id", verifyLoginUser, getMonitoringById);