Merge pull request #1990 from OneCommunityGlobal/Amalesh-togglebio

Amalesh - Toggle Request Bio permission on Weekly Summaries Report

Author: one-community

package-lock.json

@@ -91,6 +91,7 @@
     "cors": "^2.8.4",
     "cron": "^1.8.2",
     "date-fns": "^2.30.0",
+    "date-fns-tz": "^2.0.1",
     "dotenv": "^5.0.1",
     "dropbox": "^10.34.0",
     "express": "^4.22.1",
@@ -132,7 +133,8 @@
     "twilio": "^5.5.2",
     "uuid": "^3.4.0",
     "ws": "^8.17.1",
-    "xmlrpc": "^1.3.2"
+    "xmlrpc": "^1.3.2",
+    "zod": "^4.3.6"
   },
   "nodemonConfig": {
     "watch": [

package.json

@@ -1,5 +1,7 @@
 /* istanbul ignore file */
+// eslint-disable-next-line import/no-unresolved
 const PDFDocument = require('pdfkit');
+// eslint-disable-next-line import/no-unresolved
 const { Parser } = require('json2csv');
 const mongoose = require('mongoose');
 const EducationTask = require('../../models/educationTask');

src/controllers/educationPortal/downloadReportController.js

@@ -1,10 +1,11 @@
 /* eslint-disable no-console */
 const crypto = require('crypto');
+// eslint-disable-next-line import/no-unresolved
 const xmlrpc = require('xmlrpc');
 const mongoose = require('mongoose');
-// eslint-disable-next-line import/no-extraneous-dependencies
+// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
 const cloudinary = require('cloudinary').v2;
-// eslint-disable-next-line import/no-extraneous-dependencies
+// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
 const streamifier = require('streamifier');
 const LiveJournalPost = require('../models/liveJournalPost');
 

src/controllers/liveJournalPostController.js

@@ -1558,13 +1558,26 @@ const timeEntrycontroller = function (TimeEntry) {
    * recalculate the hoursByCategory for all users and update the field
    */
   const recalculateHoursByCategoryAllUsers = async function (taskId) {
-    if (mongoose.connection.readyState === 0) {
+    // Check if MongoDB connection is ready before attempting to start a session
+    // readyState: 0 = disconnected, 1 = connected, 2 = connecting, 3 = disconnecting
+    if (mongoose.connection.readyState !== 1) {
+      const recalculationTask = recalculationTaskQueue.find((task) => task.taskId === taskId);
+      if (recalculationTask) {
+        recalculationTask.status = 'Failed';
+        recalculationTask.completionTime = new Date().toISOString();
+      }
+
+      logger.logInfo(
+        `Recalculation task ${taskId} skipped: MongoDB connection not ready (state: ${mongoose.connection.readyState})`,
+      );
       return;
     }
-    const session = await mongoose.startSession();
-    session.startTransaction();
 
+    let sesh;
     try {
+      sesh = await mongoose.startSession();
+      sesh.startTransaction();
+
       const userprofiles = await UserProfile.find({}, '_id').lean();
 
       const recalculationPromises = userprofiles.map(async (userprofile) => {
@@ -1574,15 +1587,17 @@ const timeEntrycontroller = function (TimeEntry) {
       });
       await Promise.all(recalculationPromises);
 
-      await session.commitTransaction();
+      await sesh.commitTransaction();
 
       const recalculationTask = recalculationTaskQueue.find((task) => task.taskId === taskId);
       if (recalculationTask) {
         recalculationTask.status = 'Completed';
         recalculationTask.completionTime = new Date().toISOString();
       }
     } catch (err) {
-      await session.abortTransaction();
+      if (sesh) {
+        await sesh.abortTransaction();
+      }
       const recalculationTask = recalculationTaskQueue.find((task) => task.taskId === taskId);
       if (recalculationTask) {
         recalculationTask.status = 'Failed';
@@ -1591,7 +1606,9 @@ const timeEntrycontroller = function (TimeEntry) {
 
       logger.logException(err);
     } finally {
-      session.endSession();
+      if (sesh) {
+        sesh.endSession();
+      }
     }
   };
 

src/controllers/timeEntryController.js

@@ -1,5 +1,4 @@
 const mongoose = require('mongoose');
-
 const { mockRes, assertResMock } = require('../test');
 
 const oid = () => new mongoose.Types.ObjectId().toString();

src/controllers/timeEntryController.test.js

@@ -224,7 +224,7 @@ const userProfileSchema = new Schema({
   // differentiate between paused and separated accounts for better reporting and handling in the future
   inactiveReason: {
     type: String,
-    enum: ['Paused', 'Separated', 'ScheduledSeparation'],
+    enum: ['Paused', 'Separated', 'ScheduledSeparation', null],
     default: undefined,
   },
   resetPwd: { type: String },