tango-app-api-trax 1.0.0-task.126 → 1.0.0-task.127

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.126",
+    "version": "1.0.0-task.127",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/trax.controller.js

@@ -28,14 +28,13 @@ export const checklist = async ( req, res ) => {
     let offset = parseInt( req.query.offset - 1 ) || 0;
     let page = offset * limit;
     let query = [];
-    console.log( req.user.email, 'email' );
     query.push(
         {
           $match: {
             type: 'checklist',
             client_id: req.query.clientId,
             isdeleted: false,
-            ...( req.user.userType == 'client' && req.user.role != 'superadmin' ) ? { owner: { $in: [ req.user.email ] } } : {},
+            ...( req.user.userType == 'client' && req.user.role != 'superadmin' ) ? { 'owner.value': { $in: [ req.user.email ] } } : {},
           },
         },
     );

package/src/controllers/traxDashboard.controllers.js

@@ -2954,82 +2954,83 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
 
     rangeOneFindQuery.push( { $match: { $and: rangeOneFindAndQuery } } );
 
-    rangeOneFindQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        checkListType: 1,
-        questionCount: 1,
-      },
-    } );
 
-    rangeOneFindQuery.push( {
-      $group: {
-        _id: '',
-        totalChecklist: { $sum: 1 },
-        notSubmittedChecklist: {
-          $sum: { $cond: [ { $ne: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
-        },
-        openChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'open' ] }, 1, 0 ] },
-        },
-        inprogressChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'inprogress' ] }, 1, 0 ] },
+    let queryFormat = [
+      {
+        $project: {
+          sourceCheckList_id: 1,
+          checkListId: 1,
+          checklistStatus: 1,
+          timeFlag: 1,
+          questionFlag: 1,
+          checkListType: 1,
+          questionCount: 1,
         },
-        submittedChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
+      },
+      {
+        $group: {
+          _id: '',
+          totalChecklist: { $sum: 1 },
+          notSubmittedChecklist: {
+            $sum: { $cond: [ { $ne: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
+          },
+          openChecklist: {
+            $sum: { $cond: [ { $eq: [ '$checklistStatus', 'open' ] }, 1, 0 ] },
+          },
+          inprogressChecklist: {
+            $sum: { $cond: [ { $eq: [ '$checklistStatus', 'inprogress' ] }, 1, 0 ] },
+          },
+          submittedChecklist: {
+            $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
+          },
+          timeFlag: { $sum: '$timeFlag' },
+          questionFlagCount: { $sum: '$questionFlag' },
+          questionCount: { $sum: '$questionCount' },
         },
-        timeFlag: { $sum: '$timeFlag' },
-        questionFlagCount: { $sum: '$questionFlag' },
-        questionCount: { $sum: '$questionCount' },
       },
-    } );
-
-    rangeOneFindQuery.push( {
-      $project: {
-        totalChecklist: 1,
-        notSubmittedChecklist: 1,
-        openChecklist: 1,
-        inprogressChecklist: 1,
-        submittedChecklist: 1,
-        flaggedChecklist: { $add: [ '$timeFlag', '$questionFlagCount' ] },
-        completionScore: { $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ] },
-        // completionScore: { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] },
-        questionFlagCount: 1,
-        questionCount: 1,
-        timeFlag: 1,
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlagCount' ] },
+      {
+        $project: {
+          totalChecklist: 1,
+          notSubmittedChecklist: 1,
+          openChecklist: 1,
+          inprogressChecklist: 1,
+          submittedChecklist: 1,
+          flaggedChecklist: { $add: [ '$timeFlag', '$questionFlagCount' ] },
+          completionScore: { $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ] },
+          // completionScore: { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] },
+          questionFlagCount: 1,
+          questionCount: 1,
+          timeFlag: 1,
+          correctAnswers: { $subtract: [ '$questionCount', '$questionFlagCount' ] },
+        },
       },
-    } );
-
-    rangeOneFindQuery.push( {
-      $project: {
-        totalChecklist: 1,
-        notSubmittedChecklist: 1,
-        openChecklist: 1,
-        inprogressChecklist: 1,
-        submittedChecklist: 1,
-        flaggedChecklist: 1,
-        completionScore: 1,
-        questionFlagCount: 1,
-        questionCount: 1,
-        correctAnswers: 1,
-        timeFlag: 1,
-        questionCompletionScore: {
-          $cond: {
-            if: { $eq: [ '$questionCount', 0 ] },
-            then: 0,
-            else: {
-              $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 0 ],
-              // $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ],
+      {
+        $project: {
+          totalChecklist: 1,
+          notSubmittedChecklist: 1,
+          openChecklist: 1,
+          inprogressChecklist: 1,
+          submittedChecklist: 1,
+          flaggedChecklist: 1,
+          completionScore: 1,
+          questionFlagCount: 1,
+          questionCount: 1,
+          correctAnswers: 1,
+          timeFlag: 1,
+          questionCompletionScore: {
+            $cond: {
+              if: { $eq: [ '$questionCount', 0 ] },
+              then: 0,
+              else: {
+                $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 0 ],
+                // $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ],
+              },
             },
           },
         },
       },
-    } );
+    ];
+    rangeOneFindQuery.push( ...queryFormat );
     let rangeOneData = await processedchecklistService.aggregate( rangeOneFindQuery );
     console.log( 'rangeOneData =>', rangeOneData );
 
@@ -3042,7 +3043,7 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
         { date_iso: { $lte: rangeTwoToDate } },
         { checkListType: { $eq: 'custom' } },
     );
-    if ( requestData.groupByType == 'checklist' ) {
+    if ( requestData.groupByType == 'Checklist' ) {
       rangeTwoFindAndQuery.push( { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.groupByValue ) } );
     }
 
@@ -3056,82 +3057,7 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
 
     rangeTwoFindQuery.push( { $match: { $and: rangeTwoFindAndQuery } } );
 
-    rangeTwoFindQuery.push( {
-      $project: {
-        sourceCheckList_id: 1,
-        checkListId: 1,
-        checklistStatus: 1,
-        timeFlag: 1,
-        questionFlag: 1,
-        checkListType: 1,
-        questionCount: 1,
-      },
-    } );
-
-    rangeTwoFindQuery.push( {
-      $group: {
-        _id: '',
-        totalChecklist: { $sum: 1 },
-        notSubmittedChecklist: {
-          $sum: { $cond: [ { $ne: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
-        },
-        openChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'open' ] }, 1, 0 ] },
-        },
-        inprogressChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'inprogress' ] }, 1, 0 ] },
-        },
-        submittedChecklist: {
-          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] },
-        },
-        timeFlag: { $sum: '$timeFlag' },
-        questionFlagCount: { $sum: '$questionFlag' },
-        questionCount: { $sum: '$questionCount' },
-      },
-    } );
-
-    rangeTwoFindQuery.push( {
-      $project: {
-        totalChecklist: 1,
-        notSubmittedChecklist: 1,
-        openChecklist: 1,
-        inprogressChecklist: 1,
-        submittedChecklist: 1,
-        flaggedChecklist: { $add: [ '$timeFlag', '$questionFlagCount' ] },
-        completionScore: { $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ] },
-        // completionScore: { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] },
-        questionFlagCount: 1,
-        questionCount: 1,
-        timeFlag: 1,
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlagCount' ] },
-      },
-    } );
-
-    rangeTwoFindQuery.push( {
-      $project: {
-        totalChecklist: 1,
-        notSubmittedChecklist: 1,
-        openChecklist: 1,
-        inprogressChecklist: 1,
-        submittedChecklist: 1,
-        flaggedChecklist: 1,
-        completionScore: 1,
-        questionFlagCount: 1,
-        questionCount: 1,
-        correctAnswers: 1,
-        timeFlag: 1,
-        questionCompletionScore: {
-          $cond: {
-            if: { $eq: [ '$questionCount', 0 ] },
-            then: 0,
-            else: {
-              $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 0 ],
-              // $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ],
-            },
-          },
-        },
-      },
-    } );
+    rangeTwoFindQuery.push( ...queryFormat );
     let rangeTwoData = await processedchecklistService.aggregate( rangeTwoFindQuery );
     console.log( 'rangeTwoData =>', rangeTwoData );
 
@@ -3171,11 +3097,11 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
         infoComparisonCards.complianceRate.ComparisonFlag = false;
       }
 
-      infoComparisonCards.totalInstances.comparisonData = Math.abs( infoComparisonCards.totalInstances.comparisonData );
-      infoComparisonCards.completedInstances.comparisonData = Math.abs( infoComparisonCards.completedInstances.comparisonData );
-      infoComparisonCards.flags.comparisonData = Math.abs( infoComparisonCards.flags.comparisonData );
-      infoComparisonCards.completionScore.comparisonData = Math.abs( infoComparisonCards.completionScore.comparisonData );
-      infoComparisonCards.complianceRate.comparisonData = Math.abs( infoComparisonCards.complianceRate.comparisonData );
+      infoComparisonCards.totalInstances.comparisonData = Math.abs( infoComparisonCards.totalInstances.comparisonData ) || 0;
+      infoComparisonCards.completedInstances.comparisonData = Math.abs( infoComparisonCards.completedInstances.comparisonData ) || 0;
+      infoComparisonCards.flags.comparisonData = Math.abs( infoComparisonCards.flags.comparisonData ) || 0;
+      infoComparisonCards.completionScore.comparisonData = Math.abs( infoComparisonCards.completionScore.comparisonData ) || 0;
+      infoComparisonCards.complianceRate.comparisonData = Math.abs( infoComparisonCards.complianceRate.comparisonData ) || 0;
     }
     console.log( 'infoComparisonCards =>', infoComparisonCards );
     let result = {