@neutron.co.id/pendidikan-operation 1.26.25-beta.1 → 1.26.26

package/build/actions/akademik/studentReport/syncStudentReport.action.cjs

@@ -239,7 +239,6 @@ const syncStudentReport = operation.Action.define({
         }
       })
     }, stream);
-    console.log("sessionHybrid", scheduleCount);
     const totalHybrid = sessionHybrid.payload?.data?.total || 0;
     if (sessionCount > 0) {
       await dbStudent.updateOne(
@@ -268,7 +267,7 @@ const syncStudentReport = operation.Action.define({
         }
       );
     }
-    const activityResult = await stream.actions.data.count.execute({
+    const activityResult = await stream.actions.data.getMany.execute({
       model: "neu:jadwal:classActivity",
       query: query.Query.define({
         filter: {
@@ -277,10 +276,24 @@ const syncStudentReport = operation.Action.define({
             $gte: input.startedAt,
             $lte: input.endedAt
           }
+        },
+        fields: {
+          id: 1,
+          studentId: 1,
+          classSession: {
+            id: 1,
+            title: 1,
+            type: 1,
+            branchIds: 1
+          }
         }
       })
     }, stream);
-    const totalActivities = activityResult.payload?.data?.total || 0;
+    const totalActivities = activityResult.payload.data?.filter((item) => {
+      const isOnline = item.classSession?.type === "online";
+      const hasMatchingBranch = input.branchIds?.some((branchId) => item.classSession?.branchIds?.includes(branchId));
+      return isOnline && hasMatchingBranch;
+    }).length || 0;
     if (sessionCount > 0) {
       await dbStudent.updateOne(
         { _id: input.studentId },

package/build/actions/akademik/studentReport/syncStudentReport.action.mjs

@@ -237,7 +237,6 @@ const syncStudentReport = Action.define({
         }
       })
     }, stream);
-    console.log("sessionHybrid", scheduleCount);
     const totalHybrid = sessionHybrid.payload?.data?.total || 0;
     if (sessionCount > 0) {
       await dbStudent.updateOne(
@@ -266,7 +265,7 @@ const syncStudentReport = Action.define({
         }
       );
     }
-    const activityResult = await stream.actions.data.count.execute({
+    const activityResult = await stream.actions.data.getMany.execute({
       model: "neu:jadwal:classActivity",
       query: Query.define({
         filter: {
@@ -275,10 +274,24 @@ const syncStudentReport = Action.define({
             $gte: input.startedAt,
             $lte: input.endedAt
           }
+        },
+        fields: {
+          id: 1,
+          studentId: 1,
+          classSession: {
+            id: 1,
+            title: 1,
+            type: 1,
+            branchIds: 1
+          }
         }
       })
     }, stream);
-    const totalActivities = activityResult.payload?.data?.total || 0;
+    const totalActivities = activityResult.payload.data?.filter((item) => {
+      const isOnline = item.classSession?.type === "online";
+      const hasMatchingBranch = input.branchIds?.some((branchId) => item.classSession?.branchIds?.includes(branchId));
+      return isOnline && hasMatchingBranch;
+    }).length || 0;
     if (sessionCount > 0) {
       await dbStudent.updateOne(
         { _id: input.studentId },

package/build/actions/tanya/action.reminderQuestions.cjs

@@ -6,16 +6,28 @@ const utils = require('@neon.id/utils');
 async function reminderQuestions(dbs, config) {
   const dbQuestion = dbs["neu-tanya"].models["neu:tanya:question"];
   const dbIdentitas = dbs["neo-identitas"].models["neo:identitas:identifier"];
+  const dbUser = dbs["neo1-identitas"].models["neo:identitas:user"];
   const dbTeacher = dbs["neu-akademik"].models["neu:akademik:teacher"];
   const dbSubject = dbs["neu-akademik"].models["neu:akademik:academicSubject"];
   const dbStudent = dbs["neu-akademik"].models["neu:akademik:student"];
   const waitingQuestions = await dbQuestion.find({
     status: "waiting",
     createdAt: {
-      $gte: /* @__PURE__ */ new Date("2025-06-12T00:00:00.000Z"),
+      $gte: /* @__PURE__ */ new Date("2025-06-11T00:00:00.000Z"),
       $lte: /* @__PURE__ */ new Date()
     }
   });
+  function formatTimeAgo(from, to) {
+    const diffMinutes = utils.DateUtil.diff(from, to, "minutes") ?? 0;
+    if (diffMinutes < 60)
+      return `${diffMinutes} menit`;
+    const diffHours = utils.DateUtil.diff(from, to, "hours") ?? 0;
+    if (diffHours < 24)
+      return `${diffHours} jam`;
+    const diffDays = utils.DateUtil.diff(from, to, "days");
+    return `${diffDays} hari`;
+  }
+  const questionMap = /* @__PURE__ */ new Map();
   for (const q of waitingQuestions) {
     const subject = await dbSubject.findOne({ _id: q.subjectId });
     const teachers = await dbTeacher.find({
@@ -24,44 +36,64 @@ async function reminderQuestions(dbs, config) {
     });
     const student = await dbStudent.findOne({ _id: q.studentId });
     for (const teacher of teachers) {
-      const identifier = await dbIdentitas.findOne({ userId: teacher.userId });
-      const email = identifier?.email || teacher.user?.email;
-      console.log("\u{1F680} ~ reminderQuestions ~ identifier:", identifier);
-      console.log(`[CRON] Question ${q.code} \u2192 ${teachers.length} teachers found`);
-      if (!email) {
-        console.warn(`[CRON] Skipping teacher ${teacher._id} karena tidak ada email dari userId: ${teacher.userId}`);
+      const userIdStr = teacher.userId?.toString();
+      if (!userIdStr)
         continue;
-      }
-      try {
-        await ofetch.ofetch(`${config.novuApi.url}/v1/events/trigger`, {
-          method: "POST",
-          headers: {
-            "Authorization": `ApiKey ${config.novuApi.token}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({
-            name: "question-respond-reminder",
-            to: {
-              subscriberId: teacher.userId || identifier?.userId,
-              email,
-              firstName: teacher.user?.name || identifier?.profile?.given_name,
-              lastName: ""
-            },
-            payload: {
-              questionId: q.id,
-              totalQuestions: waitingQuestions.length,
-              code: q.code,
-              studentName: student?.name,
-              subject: subject?.name,
-              date: utils.DateUtil.formatTz(q.askedAt, { pattern: "yyyy-MM-dd HH:mm" }),
-              studentTimeAgo: utils.DateUtil.diff(q.askedAt, /* @__PURE__ */ new Date(), "hours"),
-              url: `${config.appFrotendUrl}/tanya/teachers`
-            }
-          })
+      if (!questionMap.has(userIdStr)) {
+        const identifier = await dbIdentitas.findOne({ userId: teacher.userId });
+        const user = await dbUser.findOne({ _id: teacher.userId });
+        questionMap.set(userIdStr, {
+          teacher,
+          identifier,
+          user,
+          questions: []
         });
-      } catch (error) {
-        console.error(error);
       }
+      const entry = questionMap.get(userIdStr);
+      entry?.questions.push({
+        q,
+        subject,
+        student
+      });
+    }
+  }
+  for (const [_userId, { teacher, identifier, user, questions }] of questionMap.entries()) {
+    const email = identifier?.provider === "email" && identifier?.value || identifier?.email || identifier?.profile?.email || user?.email;
+    if (!email) {
+      console.warn(`[CRON] Skipping teacher ${teacher.name} karena tidak ada email`);
+      continue;
+    }
+    const firstQuestion = questions[0];
+    try {
+      await ofetch.ofetch(`${config.novuApi.url}/v1/events/trigger`, {
+        method: "POST",
+        headers: {
+          "Authorization": `ApiKey ${config.novuApi.token}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          name: "question-respond-reminder",
+          to: {
+            subscriberId: teacher.userId || identifier?.userId,
+            email,
+            firstName: teacher.user?.name || identifier?.profile?.given_name,
+            lastName: ""
+          },
+          payload: {
+            questionId: firstQuestion.q.id,
+            totalQuestions: questions.length,
+            code: firstQuestion.q.code,
+            studentName: firstQuestion.student?.name,
+            subject: firstQuestion.subject?.name,
+            date: utils.DateUtil.formatTz(firstQuestion.q.askedAt, { pattern: "yyyy-MM-dd HH:mm" }),
+            timeAgo: formatTimeAgo(firstQuestion.q.askedAt, /* @__PURE__ */ new Date()),
+            url: `${config.appFrontendUrl}/tanya/teachers`
+          }
+        })
+      });
+      console.log(`[CRON] \u2705 Reminder dikirim ke ${email} untuk ${questions.length} pertanyaan`);
+    } catch (error) {
+      console.error(error);
     }
   }
 }

package/build/actions/tanya/action.reminderQuestions.mjs

@@ -4,16 +4,28 @@ import { DateUtil } from '@neon.id/utils';
 async function reminderQuestions(dbs, config) {
   const dbQuestion = dbs["neu-tanya"].models["neu:tanya:question"];
   const dbIdentitas = dbs["neo-identitas"].models["neo:identitas:identifier"];
+  const dbUser = dbs["neo1-identitas"].models["neo:identitas:user"];
   const dbTeacher = dbs["neu-akademik"].models["neu:akademik:teacher"];
   const dbSubject = dbs["neu-akademik"].models["neu:akademik:academicSubject"];
   const dbStudent = dbs["neu-akademik"].models["neu:akademik:student"];
   const waitingQuestions = await dbQuestion.find({
     status: "waiting",
     createdAt: {
-      $gte: /* @__PURE__ */ new Date("2025-06-12T00:00:00.000Z"),
+      $gte: /* @__PURE__ */ new Date("2025-06-11T00:00:00.000Z"),
       $lte: /* @__PURE__ */ new Date()
     }
   });
+  function formatTimeAgo(from, to) {
+    const diffMinutes = DateUtil.diff(from, to, "minutes") ?? 0;
+    if (diffMinutes < 60)
+      return `${diffMinutes} menit`;
+    const diffHours = DateUtil.diff(from, to, "hours") ?? 0;
+    if (diffHours < 24)
+      return `${diffHours} jam`;
+    const diffDays = DateUtil.diff(from, to, "days");
+    return `${diffDays} hari`;
+  }
+  const questionMap = /* @__PURE__ */ new Map();
   for (const q of waitingQuestions) {
     const subject = await dbSubject.findOne({ _id: q.subjectId });
     const teachers = await dbTeacher.find({
@@ -22,44 +34,64 @@ async function reminderQuestions(dbs, config) {
     });
     const student = await dbStudent.findOne({ _id: q.studentId });
     for (const teacher of teachers) {
-      const identifier = await dbIdentitas.findOne({ userId: teacher.userId });
-      const email = identifier?.email || teacher.user?.email;
-      console.log("\u{1F680} ~ reminderQuestions ~ identifier:", identifier);
-      console.log(`[CRON] Question ${q.code} \u2192 ${teachers.length} teachers found`);
-      if (!email) {
-        console.warn(`[CRON] Skipping teacher ${teacher._id} karena tidak ada email dari userId: ${teacher.userId}`);
+      const userIdStr = teacher.userId?.toString();
+      if (!userIdStr)
         continue;
-      }
-      try {
-        await ofetch(`${config.novuApi.url}/v1/events/trigger`, {
-          method: "POST",
-          headers: {
-            "Authorization": `ApiKey ${config.novuApi.token}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({
-            name: "question-respond-reminder",
-            to: {
-              subscriberId: teacher.userId || identifier?.userId,
-              email,
-              firstName: teacher.user?.name || identifier?.profile?.given_name,
-              lastName: ""
-            },
-            payload: {
-              questionId: q.id,
-              totalQuestions: waitingQuestions.length,
-              code: q.code,
-              studentName: student?.name,
-              subject: subject?.name,
-              date: DateUtil.formatTz(q.askedAt, { pattern: "yyyy-MM-dd HH:mm" }),
-              studentTimeAgo: DateUtil.diff(q.askedAt, /* @__PURE__ */ new Date(), "hours"),
-              url: `${config.appFrotendUrl}/tanya/teachers`
-            }
-          })
+      if (!questionMap.has(userIdStr)) {
+        const identifier = await dbIdentitas.findOne({ userId: teacher.userId });
+        const user = await dbUser.findOne({ _id: teacher.userId });
+        questionMap.set(userIdStr, {
+          teacher,
+          identifier,
+          user,
+          questions: []
         });
-      } catch (error) {
-        console.error(error);
       }
+      const entry = questionMap.get(userIdStr);
+      entry?.questions.push({
+        q,
+        subject,
+        student
+      });
+    }
+  }
+  for (const [_userId, { teacher, identifier, user, questions }] of questionMap.entries()) {
+    const email = identifier?.provider === "email" && identifier?.value || identifier?.email || identifier?.profile?.email || user?.email;
+    if (!email) {
+      console.warn(`[CRON] Skipping teacher ${teacher.name} karena tidak ada email`);
+      continue;
+    }
+    const firstQuestion = questions[0];
+    try {
+      await ofetch(`${config.novuApi.url}/v1/events/trigger`, {
+        method: "POST",
+        headers: {
+          "Authorization": `ApiKey ${config.novuApi.token}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          name: "question-respond-reminder",
+          to: {
+            subscriberId: teacher.userId || identifier?.userId,
+            email,
+            firstName: teacher.user?.name || identifier?.profile?.given_name,
+            lastName: ""
+          },
+          payload: {
+            questionId: firstQuestion.q.id,
+            totalQuestions: questions.length,
+            code: firstQuestion.q.code,
+            studentName: firstQuestion.student?.name,
+            subject: firstQuestion.subject?.name,
+            date: DateUtil.formatTz(firstQuestion.q.askedAt, { pattern: "yyyy-MM-dd HH:mm" }),
+            timeAgo: formatTimeAgo(firstQuestion.q.askedAt, /* @__PURE__ */ new Date()),
+            url: `${config.appFrontendUrl}/tanya/teachers`
+          }
+        })
+      });
+      console.log(`[CRON] \u2705 Reminder dikirim ke ${email} untuk ${questions.length} pertanyaan`);
+    } catch (error) {
+      console.error(error);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neutron.co.id/pendidikan-operation",
-  "version": "1.26.25-beta.1",
+  "version": "1.26.26",
   "description": "Operation package of Neutron Pendidikan.",
   "license": "SEE LICENSE IN LICENSE",
   "contributors": [
@@ -41,7 +41,7 @@
     "@neon.id/z": "^1.16.0",
     "@neutron.co.id/akademik-models": "^1.19.16-beta.1",
     "@neutron.co.id/jadwal-models": "^1.19.11-beta.1",
-    "@neutron.co.id/pendidikan-types": "^1.22.18-beta.1",
+    "@neutron.co.id/pendidikan-types": "^1.22.20",
     "@neutron.co.id/penilaian-models": "^1.17.8",
     "@neutron.co.id/personalia-models": "^1.11.6",
     "@neutron.co.id/tanya-models": "^1.13.4-beta.1",
@@ -76,7 +76,7 @@
     "@neon.id/z": "^1.16.0",
     "@neutron.co.id/akademik-models": "^1.19.16-beta.1",
     "@neutron.co.id/jadwal-models": "^1.19.11-beta.1",
-    "@neutron.co.id/pendidikan-types": "^1.22.18-beta.1",
+    "@neutron.co.id/pendidikan-types": "^1.22.20",
     "@neutron.co.id/penilaian-models": "^1.17.8",
     "@neutron.co.id/personalia-models": "^1.11.6",
     "@neutron.co.id/tanya-models": "^1.13.4-beta.1"
@@ -84,5 +84,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "build": 113
+  "build": 115
 }