From a3b34c31367e599f8af33e96deeeef956ecbf2f8 Mon Sep 17 00:00:00 2001
From: elangptra <rvnlz17@gmail.com>
Date: Thu, 24 Oct 2024 09:46:11 +0700
Subject: [PATCH] refactor: stdLearning student activities bug fix

---
 .../learningControllers/stdLearning.js        | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/controllers/learningControllers/stdLearning.js b/controllers/learningControllers/stdLearning.js
index 490e39e..7d58292 100644
--- a/controllers/learningControllers/stdLearning.js
+++ b/controllers/learningControllers/stdLearning.js
@@ -251,9 +251,17 @@ export const learningHistory = async (req, res) => {
     const { ID } = req.user;
 
     const stdLearnings = await models.StdLearning.findAll({
-      where: { ID },
-      STUDENT_FINISH: {
-        [models.Sequelize.Op.ne]: null,
+      where: {
+        ID,
+        STUDENT_FINISH: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        SCORE: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        NEXT_LEARNING: {
+          [models.Sequelize.Op.ne]: null,
+        },
       },
       include: [
         {
@@ -351,9 +359,17 @@ export const learningHistoryBySectionId = async (req, res) => {
     const { sectionId } = req.params;
 
     const stdLearnings = await models.StdLearning.findAll({
-      where: { ID },
-      STUDENT_FINISH: {
-        [models.Sequelize.Op.ne]: null,
+      where: {
+        ID,
+        STUDENT_FINISH: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        SCORE: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        NEXT_LEARNING: {
+          [models.Sequelize.Op.ne]: null,
+        },
       },
       include: [
         {
@@ -456,9 +472,17 @@ export const learningHistoryByTopicId = async (req, res) => {
     }
 
     const stdLearnings = await models.StdLearning.findAll({
-      where: { ID },
-      STUDENT_FINISH: {
-        [models.Sequelize.Op.ne]: null,
+      where: {
+        ID,
+        STUDENT_FINISH: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        SCORE: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        NEXT_LEARNING: {
+          [models.Sequelize.Op.ne]: null,
+        },
       },
       include: [
         {
@@ -548,6 +572,17 @@ export const learningHistoryByTopicId = async (req, res) => {
 export const recentStudentActivities = async (req, res) => {
   try {
     const stdLearnings = await models.StdLearning.findAll({
+      where: {
+        STUDENT_FINISH: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        SCORE: {
+          [models.Sequelize.Op.ne]: null,
+        },
+        NEXT_LEARNING: {
+          [models.Sequelize.Op.ne]: null,
+        },
+      },
       include: [
         {
           model: models.User,