tango-app-api-trax 3.5.0-hotfix-2 → 3.5.0-hotfix-3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.0-hotfix-2",
+    "version": "3.5.0-hotfix-3",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.119",
+        "tango-api-schema": "^2.2.120",
         "tango-app-api-middleware": "^3.1.77",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -1068,10 +1068,10 @@ export async function userList( req, res ) {
         },
       }, clientId: req.body.clientId } );
       req.body.teams = findTeams.map( ( data ) => data.teamName );
-       if ( req.body.teams.length===0 ) {
+      if ( req.body.teams.length===0 ) {
         query.push( {
           $match: {
-            userEmail: { $in: [req.user.email] },
+            userEmail: { $in: [ req.user.email ] },
           },
         } );
       }

package/src/controllers/teaxFlag.controller.js

@@ -4,6 +4,7 @@ import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
 import * as checklistconfigService from '../services/checklist.service.js';
+import * as clientService from '../services/clients.services.js';
 
 
 import utc from 'dayjs/plugin/utc.js';
@@ -2096,6 +2097,12 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       },
     };
 
+    let traxMonthlyComparison = false;
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
+
     // Get User Based Checklist //
     // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     // let getUserEmails = await getChecklistUsers( loginUser );
@@ -2295,6 +2302,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
 
       let result = {
         'customCards': flagComparisonCards,
+        'traxMonthlyComparison': traxMonthlyComparison,
       };
 
       return res.sendSuccess( result );
@@ -2324,7 +2332,6 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       ];
       const from = await aggregate( fromPipeline );
       requestData.range1StoreCount = from[0]?.storeCount | 0;
-
       const toPipeline = [
         {
           $match:
@@ -2357,6 +2364,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       // console.log( 'resultData =>', resultData );
       if ( resultData ) {
         if ( resultData.status_code == '200' ) {
+          resultData.traxMonthlyComparison = traxMonthlyComparison;
           return res.sendSuccess( resultData );
         } else {
           return res.sendError( 'No Content', 204 );
@@ -2889,6 +2897,14 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       getDetectionCount( rangeTwoFromDate, rangeTwoToDate ),
     ] );
 
+    // console.log( 'rangeOneFromDate =>', rangeOneFromDate );
+    // console.log( 'rangeOneToDate =>', rangeOneToDate );
+    // console.log( 'rangeOneData =>', rangeOneData );
+
+    // console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
+    // console.log( 'rangeTwoToDate =>', rangeTwoToDate );
+    // console.log( 'rangeTwoData =>', rangeTwoData );
+
     const flagComparisonCards = {
       totalComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
       questionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
@@ -2904,7 +2920,11 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       flagComparisonCards.delayInSubmissionComparisonFlag = calculateComparison( rangeOneData[0].delayInSubmission, rangeTwoData[0].delayInSubmission );
       flagComparisonCards.detectionComparisonFlag = calculateComparison( rangeOneDetectionCount, rangeTwoDetectionCount );
     }
-
+    flagComparisonCards.traxMonthlyComparison = false;
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      flagComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
     return res.sendSuccess( { flagComparisonCards } );
   } catch ( error ) {
     console.log( 'error =>', error );

package/src/controllers/traxDashboard.controllers.js

@@ -9,7 +9,7 @@ import utc from 'dayjs/plugin/utc.js';
 dayjs.extend( utc );
 // import admin from 'firebase-admin';
 import { sendPushNotification } from 'tango-app-api-middleware';
-
+import * as clientService from '../services/clients.services.js';
 
 export const welcome = async ( req, res ) => {
   try {
@@ -1165,7 +1165,7 @@ export const userDropdown = async ( req, res ) => {
   }
 };
 
-export const checklistInfo = async ( req, res ) => {
+export const checklistInfoOld = async ( req, res ) => {
   try {
     let requestData = req.body;
     let fromDate = new Date( requestData.fromDate );
@@ -1445,6 +1445,297 @@ export const checklistInfo = async ( req, res ) => {
   }
 };
 
+export const checklistInfo = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let fromDate = new Date( requestData.fromDate );
+    let toDate = new Date( requestData.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let result = {};
+
+    // Get User Based Checklist //
+    // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    // let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
+    let findQuery = [];
+    let findAndQuery = [];
+    findAndQuery.push(
+        { client_id: requestData.clientId },
+        { date_iso: { $gte: fromDate } },
+        { date_iso: { $lte: toDate } },
+        { checkListType: { $eq: 'custom' } },
+        // { store_id: { $in: requestData.storeId } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+    );
+
+    if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
+      if ( requestData.checklistStatus == 'redo' ) {
+        findAndQuery.push( { redoStatus: true } );
+      } else {
+        findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
+      }
+    }
+
+    if ( requestData.groupByType == 'Checklist' ) {
+      findAndQuery.push( { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.groupByValue ) } );
+    }
+
+    if ( requestData.groupByType == 'User' ) {
+      findAndQuery.push( { userEmail: requestData.groupByValue } );
+    }
+
+    if ( requestData.groupByType == 'Store' ) {
+      findAndQuery.push( { store_id: requestData.groupByValue } );
+    }
+
+    findQuery.push( { $match: { $and: findAndQuery } } );
+
+    if ( requestData.searchValue && requestData.searchValue != '' ) {
+      if ( requestData.groupByType == 'Checklist' ) {
+        // findQuery.push( { $match: { $or: [ { storeName: { $regex: requestData.searchValue, $options: 'i' } } ] } } );
+        let storeList = requestData.searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
+        let query;
+        if ( storeList.length > 1 ) {
+          findQuery.push( { $addFields: { store: { $toLower: '$storeName' } } } );
+          query = { store: { $in: storeList } };
+        } else {
+          query = { $or: [
+            { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } },
+            { userEmail: { $regex: requestData.searchValue.trim(), $options: 'i' } },
+            { userName: { $regex: requestData.searchValue.trim(), $options: 'i' } },
+          ] };
+        }
+        findQuery.push( { $match: { $or: [ query ] } } );
+      } else {
+        // findQuery.push( { $match: { $or: [ { checkListName: { $regex: requestData.searchValue, $options: 'i' } } ] } } );
+        let checkListSearch = requestData.searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
+        let query;
+        if ( checkListSearch.length > 1 ) {
+          findQuery.push( { $addFields: { cheklistlowercase: { $toLower: '$checkListName' } } } );
+          query = { cheklistlowercase: { $in: checkListSearch } };
+        } else {
+          query = { checkListName: { $regex: requestData.searchValue.trim(), $options: 'i' } };
+        }
+        findQuery.push( { $match: { $or: [ query ] } } );
+      }
+    }
+
+    findQuery.push( { $sort: { _id: -1 } } );
+
+    // findQuery.push( {
+    //   $group: {
+    //     _id: { store: '$store_id', email: '$userEmail', checklistId: '$sourceCheckList_id' },
+    //     checkListName: { $first: '$checkListName' },
+    //     coverage: { $first: '$coverage' },
+    //     createdByName: { $first: '$createdByName' },
+    //     userName: { $first: '$userName' },
+    //     checklistStatus: { $last: '$checklistStatus' },
+    //     userEmail: { $first: '$userEmail' },
+    //     submitTime_string: { $push: '$submitTime_string' },
+    //     storeName: { $first: '$storeName' },
+    //     checkListType: { $first: '$checkListType' },
+    //     scheduleRepeatedType: { $first: '$scheduleRepeatedType' },
+    //     timeFlag: { $sum: '$timeFlag' },
+    //     questionFlag: { $sum: '$questionFlag' },
+    //     date_iso: { $first: '$date_iso' },
+    //     store_id: { $first: '$store_id' },
+    //     date_string: { $first: '$date_string' },
+    //     sourceCheckList_id: { $first: '$sourceCheckList_id' },
+    //     reinitiateStatus: { $first: '$reinitiateStatus' },
+    //     redoStatus: { $first: '$redoStatus' },
+    //     submitCount: { $sum: {
+    //       $cond: {
+    //         if: { $eq: [ '$checklistStatus', 'submit' ] },
+    //         then: 1,
+    //         else: 0,
+    //       },
+    //     } },
+    //     approvalByEmail: { $first: '$approvalByEmail' },
+    //     approvalTime_string: { $push: '$approvalTime_string' },
+    //     idList: { $push: '$_id' },
+    //   },
+    // } );
+
+    findQuery.push( {
+      $project: {
+        _id: 0,
+        idList: 1,
+        checkListName: 1,
+        coverage: 1,
+        createdByName: 1,
+        userName: 1,
+        checklistStatus: 1,
+        // userEmail: '$_id.email',
+        // submitTime_string: { $arrayElemAt: [ '$submitTime_string', 0 ] },
+        userEmail: 1,
+        submitTime_string: 1,
+        storeName: 1,
+        checkListType: 1,
+        scheduleRepeatedType: 1,
+        timeFlag: 1,
+        questionFlag: 1,
+        date_iso: 1,
+        // store_id: '$_id.store',
+        store_id: 1,
+        timeFlag: 1,
+        date_string: 1,
+        sourceCheckList_id: 1,
+        reinitiateStatus: 1,
+        redoStatus: 1,
+        // submitCount: 1,
+        submitCount: { $sum: {
+          $cond: {
+            if: { $eq: [ '$checklistStatus', 'submit' ] },
+            then: 1,
+            else: 0,
+          },
+        } },
+        approvalByEmail: 1,
+        approvalTime_string: 1,
+      },
+    } );
+
+    findQuery.push( {
+      $project: {
+        idList: 1,
+        checkListName: 1,
+        coverage: 1,
+        checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
+        createdByName: 1,
+        userName: 1,
+        checklistStatus: {
+          $cond: {
+            if: { $eq: [ '$checklistStatus', 'submit' ] },
+            then: 'Submitted',
+            else: {
+              $cond: {
+                if: { $eq: [ '$checklistStatus', 'open' ] },
+                then: 'Open',
+                else: 'In Progress',
+              },
+            },
+          },
+        },
+        userEmail: 1,
+        // submitTime_string: 1,
+        submitTime_string: {
+          $cond: {
+            if: { $eq: [ '$checklistStatus', 'submit' ] },
+            then: '$submitTime_string',
+            else: '',
+          },
+        },
+        storeName: 1,
+        checkListType: 1,
+        scheduleRepeatedType: 1,
+        flaggedChecklist: { $add: [ '$timeFlag', '$questionFlag' ] },
+        timeFlag: 1,
+        questionFlag: 1,
+        date_iso: 1,
+        store_id: 1,
+        timeFlag: 1,
+        date_string: 1,
+        checklistDate: '$date_string',
+        sourceCheckList_id: 1,
+        reinitiateStatus: 1,
+        redoStatus: 1,
+        submitCount: 1,
+        approvalByEmail: 1,
+        approvalTime_string: 1,
+      },
+    } );
+
+    // let getTotalCount = await processedchecklistService.aggregate( findQuery );
+    // if ( !getTotalCount.length ) {
+    //   return res.sendError( { error: 'No Data Found' }, 204 );
+    // }
+
+    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
+      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
+    }
+    let limit = parseInt( requestData?.limit ) || 10;
+    let skip = limit * ( requestData?.offset ) || 0;
+
+    findQuery.push(
+        {
+          $facet: {
+            data: [
+              { $skip: skip }, { $limit: limit },
+            ],
+            count: [
+              { $count: 'total' },
+            ],
+          },
+        },
+    );
+
+
+    let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
+    if ( !getChecklistPerformanceData[0].data.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    result = {
+      totalCount: getChecklistPerformanceData?.[0]?.count?.[0]?.total || 0,
+      checklistInfo: getChecklistPerformanceData?.[0]?.data || [],
+    };
+
+    result.checklistInfo.forEach( ( item ) => {
+      item.date_string = dayjs( item.date_string, 'YYYY-MM-DD' ).format( 'DD MMM YYYY' );
+    } );
+    if ( requestData.export ) {
+      const exportdata = [];
+      result.checklistInfo.forEach( ( element ) => {
+        if ( requestData.groupByType==='Checklist' ) {
+          exportdata.push( {
+            'Date': element.date_string || '--',
+            'Store Name': element.storeName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted By': element.userName || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
+          } );
+        } else if ( requestData.groupByType==='Store' ) {
+          exportdata.push( {
+            'CheckList Name': element.checkListName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted By': element.userName || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
+
+          } );
+        } else {
+          exportdata.push( {
+            'Date': element.date_string || '--',
+            'CheckList Name': element.checkListName || '--',
+            'Store Name': element.storeName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
+          } );
+        }
+      } );
+      return await download( exportdata, res );
+    }
+    return res.sendSuccess( result );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, message: req.query, function: 'checklistInfo' } );
+    return res.sendError( { error: error }, 500 );
+  }
+};
+
 export const infoCardsOld = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -2681,6 +2972,13 @@ export const overallComparisonCardsV1 = async ( req, res ) => {
       overallComparisonCards.complianceRate.comparisonData = Math.abs( overallComparisonCards.complianceRate.comparisonData );
     }
 
+    overallComparisonCards.traxMonthlyComparison = false;
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    // console.log( 'traxMonthlyComparisonData', traxMonthlyComparisonData );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      overallComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
+
     let result = {
       'overallComparisonCards': overallComparisonCards,
     };
@@ -3066,8 +3364,14 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
       'flags': flags,
       'completionScore': completionScore,
       'complianceRate': complianceRate,
+      'traxMonthlyComparison': false,
     };
 
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      infoComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
+
     // Get User Based Checklist //
     // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     // let getUserEmails = await getChecklistUsers( loginUser );
@@ -3220,7 +3524,11 @@ export const infoComparisonCardsV1 = async ( req, res ) => {
     let rangeTwoData = await processedchecklistService.aggregate( rangeTwoFindQuery );
 
     if ( !rangeOneData.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
+      // return res.sendError( { error: 'No Data Found' }, 204 );
+      let result = {
+        'infoComparisonCards': infoComparisonCards,
+      };
+      return res.sendSuccess( result );
     }
 
     if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {