tango-app-api-trax 3.3.1-beta-10 → 3.3.1-beta-12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-10",
+    "version": "3.3.1-beta-12",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
         "tango-api-schema": "^2.2.41",
-        "tango-app-api-middleware": "^3.1.50",
+        "tango-app-api-middleware": "^3.1.55",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/mobileTrax.controller.js

@@ -113,7 +113,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'already check list started', 400 );
     }
 
-    logger.info( `v5 => Checklist Started => store Name: ${getBeforeChecklist[0].storeName}, User Email: ${getBeforeChecklist[0].userEmail}, Checklist Name: ${getBeforeChecklist[0].checkListName}` );
+    logger.info( `v5 => Checklist Started => store Name: ${getBeforeChecklist[0].storeName || ''}, User Email: ${getBeforeChecklist[0].userEmail}, Checklist Name: ${getBeforeChecklist[0].checkListName}` );
     let PCLQusestion = await PCLconfig.findOne( { _id: new ObjectId( getBeforeChecklist[0].checkListId ) } );
     let updateQuery = {};
     updateQuery._id = new ObjectId( requestData.processedcheckListId );
@@ -149,10 +149,14 @@ export async function startChecklist( req, res ) {
     }
 
     let updateData = {};
-    let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
     let currentDateTime;
-    if ( storeTimeZone?.storeProfile?.timeZone ) {
-      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+    if ( getBeforeChecklist[0].storeName && getBeforeChecklist[0].storeName!='' ) {
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+      if ( storeTimeZone?.storeProfile?.timeZone ) {
+        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      } else {
+        currentDateTime = dayjs();
+      }
     } else {
       currentDateTime = dayjs();
     }
@@ -171,6 +175,8 @@ export async function startChecklist( req, res ) {
       findQuery.push( {
         $project: {
           checkListName: { $ifNull: [ '$checkListName', '' ] },
+          coverage: { $ifNull: [ '$coverage', '' ] },
+          client_id: { $ifNull: [ '$client_id', '' ] },
           scheduleStartTime: { $ifNull: [ '$scheduleStartTime', '' ] },
           scheduleStartTime_iso: { $ifNull: [ '$scheduleStartTime_iso', '' ] },
           scheduleEndTime: { $ifNull: [ '$scheduleEndTime', '' ] },
@@ -185,7 +191,13 @@ export async function startChecklist( req, res ) {
             $cond: {
               if: { $eq: [ '$client_id', '11' ] },
               then: false,
-              else: { $ifNull: [ '$allowedStoreLocation', false ] },
+              else: {
+                '$cond': {
+                  'if': { '$eq': [ '$coverage', 'user' ] },
+                  'then': false,
+                  'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+                },
+              },
             },
           },
           questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
@@ -207,8 +219,8 @@ export async function startChecklist( req, res ) {
         } );
       } );
       let logInsertData = {
-        store_id: getBeforeChecklist[0].store_id,
-        storeName: getBeforeChecklist[0].storeName,
+        store_id: getBeforeChecklist[0]?.store_id || '',
+        storeName: getBeforeChecklist[0]?.storeName || '',
         action: 'started',
         checklistId: getBeforeChecklist[0].sourceCheckList_id,
         processedChecklistId: getBeforeChecklist[0]._id,
@@ -217,7 +229,6 @@ export async function startChecklist( req, res ) {
         client_id: req.user.clientId,
       };
       await checklistLogs.create( logInsertData );
-
       let getchecklist = getupdatedchecklist;
       let questions = [];
       // function processQuestion( question, section, questions, nested=false ) {
@@ -263,6 +274,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
+    console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -366,7 +378,13 @@ export async function startTask( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
@@ -1726,10 +1744,16 @@ export async function submitChecklist( req, res ) {
       updateQuery._id = new ObjectId( requestData.processedcheckListId );
       updateQuery.userId = req.user._id;
       updateQuery.date_string = requestData.date;
-      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+
       let currentDateTime;
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      let storeTimeZone;
+      if ( getchecklist[0].storeName && getchecklist[0].storeName !='' ) {
+        storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+        if ( storeTimeZone?.storeProfile?.timeZone ) {
+          currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        } else {
+          currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+        }
       } else {
         currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
       }
@@ -1775,8 +1799,8 @@ export async function submitChecklist( req, res ) {
         }
 
         let logInsertData = {
-          store_id: getchecklist[0].store_id,
-          storeName: getchecklist[0].storeName,
+          store_id: getchecklist[0].store_id || '',
+          storeName: getchecklist[0].storeName || '',
           action: requestData?.submittype === 'draft' ? 'saved' : 'submitted',
           checklistId: getchecklist[0].sourceCheckList_id,
           processedChecklistId: getchecklist[0]._id,
@@ -1785,7 +1809,7 @@ export async function submitChecklist( req, res ) {
           client_id: req.user.clientId,
           redoStatus: requestData?.redoStatus ? true : false,
         };
-
+        console.log( 'logInsertData=>', logInsertData );
         await checklistLogs.create( logInsertData );
         // let time = dayjs().format( 'HH:mm:ss' );
         // let [ hours, minutes ] = time.split( ':' ).map( Number );
@@ -2183,17 +2207,24 @@ export async function dashboard( req, res ) {
 export async function dashboardv1( req, res ) {
   try {
     // eslint-disable-next-line camelcase
-    const { store_id, date } = req.query;
+    // const { store_id, date } = req.query;
+    const { date } = req.query;
     const userId = req.user._id;
 
+    // //Get User Based Checklist //
+    const clientId = { client_id: req.user.clientId };
+    const storeMatch = { $or: [ { store_id: { $eq: req.query.store_id || '' } }, { store_id: { $eq: '' } } ] };
+    // //End: Get User Based Checklist////
+
     const baseMatch = {
       // eslint-disable-next-line camelcase
-      store_id,
+      // store_id,
       userId,
       date_string: date,
       timeFlagStatus: true,
+      ...clientId,
+      ...storeMatch,
     };
-
     const buildPipeline = ( matchExtraConditions = {} ) => [
       { $match: { ...baseMatch, ...matchExtraConditions } },
       {
@@ -2249,6 +2280,7 @@ export async function dashboardv1( req, res ) {
 
     return res.sendSuccess( totalResult );
   } catch ( e ) {
+    console.log( 'v1 =>', e );
     logger.error( { function: 'dashboardv1', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -2317,7 +2349,13 @@ export async function checklist( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2349,19 +2387,26 @@ export async function checklist( req, res ) {
 export async function checklistv1( req, res ) {
   try {
     // eslint-disable-next-line camelcase
-    const { store_id, date, checklistStatus, searchValue } = req.query;
+    // const { store_id, date, checklistStatus, searchValue } = req.query;
+    const { date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
 
+    // Get User Based Checklist //
+    const clientId = { client_id: req.user.clientId };
+    const storeMatch = { $or: [ { store_id: { $eq: req.query.store_id || '' } }, { store_id: { $eq: '' } } ] };
+    // End: Get User Based Checklist////
+
     const buildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
-        { store_id },
+        // { store_id },
         { userId },
         { date_string: date },
         { timeFlagStatus: true },
         ...matchExtraConditions,
+        clientId,
+        storeMatch,
       ];
-
       if ( checklistStatus ) {
         matchConditions.push( { checklistStatus } );
       }
@@ -2388,7 +2433,13 @@ export async function checklistv1( req, res ) {
               $cond: {
                 if: { $eq: [ '$client_id', '11' ] },
                 then: false,
-                else: { $ifNull: [ '$allowedStoreLocation', false ] },
+                else: {
+                  '$cond': {
+                    'if': { '$eq': [ '$coverage', 'user' ] },
+                    'then': false,
+                    'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+                  },
+                },
               },
             },
             reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2401,6 +2452,8 @@ export async function checklistv1( req, res ) {
             type: { $ifNull: [ '$checkListType', '' ] },
             priorityType: { $ifNull: [ '$priorityType', '' ] },
             ...projectExtraConditions,
+            client_id: { $ifNull: [ '$client_id', '' ] },
+            coverage: { $ifNull: [ '$coverage', '' ] },
           },
         },
       ];
@@ -2479,7 +2532,13 @@ export async function questionList( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
@@ -2798,7 +2857,13 @@ export async function taskQuestionList( req, res ) {
           $cond: {
             if: { $eq: [ '$client_id', '11' ] },
             then: false,
-            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            else: {
+              '$cond': {
+                'if': { '$eq': [ '$coverage', 'user' ] },
+                'then': false,
+                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+              },
+            },
           },
         },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },