tango-app-api-trax 3.3.1-hotfix-11 → 3.4.0-alpha-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-hotfix-11",
+    "version": "3.4.0-alpha-1",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
         "tango-api-schema": "^2.2.70",
-        "tango-app-api-middleware": "^3.1.65",
+        "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/gallery.controller.js

@@ -282,7 +282,7 @@ export async function approveChecklist( req, res ) {
     if ( req.body?.storeId?.length ) {
       query['store_id'] = { $in: req.body.storeId };
     }
-    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1 } );
+    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1 } );
     if ( !checklistDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -317,6 +317,27 @@ export async function approveChecklist( req, res ) {
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
 
         console.log( searchResponse.ok );
+
+        let logData= {
+          'client_id': checklistDetails[0].client_id,
+          'createAt': new Date(),
+          'sourceCheckList_id': req.body.sourceCheckList_id,
+          'checkListName': checklistDetails[0].checkListName,
+          'fromCheckListName': checklistDetails[0].checkListName,
+          'type': 'checklist',
+          'action': 'approved',
+          'storeName': '',
+          'store_id': '',
+          'createdByEmail': req.user.email,
+          'createdBy': req.user._id,
+          'coverage': checklistDetails[0].coverage,
+          'logDetails': {
+            'approved': [ 'LKST011', 'LKST022', 'LKST3444', 'LKST455', 'LKST566', 'LKST666', 'LKST766', 'LKST866', 'LkST966' ],
+          },
+        };
+        let urlopensearch = JSON.parse( process.env.OPENSEARCH );
+        console.log( 'logData', logData );
+        await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
         if ( searchResponse.ok ) {
           let pendingstores = checklistDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {
@@ -350,7 +371,7 @@ export async function redoChecklist( req, res ) {
     }
 
 
-    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1 } );
+    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1, coverage: 1, userEmail: 1 } );
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -429,7 +450,7 @@ export async function redoChecklist( req, res ) {
         submitTime: checklistDetails.submitTime,
       };
       await checklistLogs.create( data );
-
+      console.log( req.body );
       const requestOptions = {
         method: 'POST',
         headers: {
@@ -440,7 +461,26 @@ export async function redoChecklist( req, res ) {
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoChecklist, requestOptions );
       console.log( searchResponse.ok );
-
+      let logData= {
+        'client_id': checklistDetails.client_id,
+        'createAt': new Date(),
+        'sourceCheckList_id': checklistDetails.sourceCheckList_id,
+        'checkListName': checklistDetails.checkListName,
+        'fromCheckListName': checklistDetails.checkListName,
+        'type': 'checklist',
+        'action': 'redo',
+        'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
+        'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
+        'userName': checklistDetails.userName,
+        'userEmail': checklistDetails.userEmail,
+        'createdByEmail': req.user.email,
+        'createdBy': req.user.userName,
+        'coverage': checklistDetails.coverage,
+        'logDetails': {},
+      };
+      let urlopensearch = JSON.parse( process.env.OPENSEARCH );
+      console.log( 'logData', logData );
+      await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -454,6 +494,148 @@ export async function redoChecklist( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+export async function redomultiChecklist( req, res ) {
+  try {
+    let inputData = req.body.payload.coverage==='user'?req.body.payload.userEmail:req.body.payload.storeName;
+
+
+    for ( let originalData of inputData ) {
+      if ( !originalData.checklistId ) {
+        return res.sendError( 'Id is Required', 400 );
+      }
+      if ( !originalData.section_id ) {
+        return res.sendError( 'Section id is Required', 400 );
+      }
+      if ( !req.body.payload.qno ) {
+        return res.sendError( 'Question number is Required', 400 );
+      }
+
+
+      let checklistDetails = await processedChecklist.findOne( { _id: originalData.checklistId }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1 } );
+      if ( !checklistDetails ) {
+        return res.sendError( 'No data found', 204 );
+      }
+      let question = checklistDetails.questionAnswers;
+
+
+      let sectionIndex = question.findIndex( ( sec ) => sec.sectionName == req.body.payload.sectionName );
+      if ( sectionIndex == -1 ) {
+        return res.sendError( 'section is not found', 400 );
+      }
+
+      let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
+
+      let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
+      // if ( checklistDetails.client_id == '458' ) {
+      data.answers.forEach( ( item ) => {
+        if ( item.showLinked ) {
+          item.nestedQuestion.forEach( ( ele ) => {
+            let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+            let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
+            question[sectionIndex].questions[eleIndex] = element;
+            question[sectionIndex].questions[eleIndex].userAnswer = [];
+            question[sectionIndex].questions[eleIndex].remarks = '';
+          } );
+        }
+      } );
+      // data.answers.forEach( ( item ) => {
+      //   if ( item.showLinked ) {
+      //     item.nestedQuestion = [];
+      //     item.showLinked = false;
+      //     item.linkedQuestion = 0;
+      //   }
+      // } );
+      // }
+      let userAnswer = data.userAnswer;
+
+      question[sectionIndex].questions[findQuestion] = data;
+      question[sectionIndex].questions[findQuestion].userAnswer = [];
+      question[sectionIndex].questions[findQuestion].remarks = '';
+      checklistDetails.questionAnswers = question;
+      let updateData = {
+        checklistStatus: 'open',
+        redoStatus: true,
+        reinitiateStatus: true,
+        questionAnswers: question,
+      };
+
+      let response = await processedChecklist.updateOne( { _id: originalData.checklistId }, updateData );
+      console.log( response );
+      if ( response.modifiedCount || response.matchedCount ) {
+        let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+        let currentDateTime;
+        if ( storeTimeZone?.storeProfile?.timeZone ) {
+          currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        } else {
+          currentDateTime = dayjs();
+        }
+        data = {
+          checklistId: checklistDetails.sourceCheckList_id,
+          checkListName: checklistDetails.checkListName,
+          checklistDescription: req.body.payload.checklistDescription,
+          sectionId: originalData.section_id,
+          sectionName: question[sectionIndex].sectionName,
+          questionName: question[sectionIndex].questions[findQuestion].qname,
+          action: 'redo',
+          store_id: checklistDetails?.store_id?checklistDetails?.store_id:'',
+          storeName: checklistDetails?.storeName?checklistDetails?.storeName:'',
+          client_id: checklistDetails.client_id,
+          processedChecklistId: checklistDetails._id,
+          type: checklistDetails.checkListType,
+          userAnswer: userAnswer,
+          initiatedBy: req.user.userName,
+          initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+          answerType: question[sectionIndex].questions[findQuestion].answerType,
+          submitedBy: checklistDetails.userName,
+          submitTime: checklistDetails.submitTime,
+        };
+        await checklistLogs.create( data );
+
+
+        req.body.payload._id=originalData.checklistId;
+        req.body.payload.section_id=originalData.section_id;
+        req.body.payload.uniqueNo=originalData.uniqueNo;
+        console.log( req.body );
+
+
+        const requestOptions = {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify( req.body ),
+        };
+        let url = JSON.parse( process.env.LAMBDAURL );
+        let searchResponse = await fetch( url.redoChecklist, requestOptions );
+        console.log( searchResponse.ok );
+        let logData= {
+          'client_id': checklistDetails.client_id,
+          'createAt': new Date(),
+          'sourceCheckList_id': checklistDetails.sourceCheckList_id,
+          'checkListName': checklistDetails.checkListName,
+          'fromCheckListName': checklistDetails.checkListName,
+          'type': 'checklist',
+          'action': 'redo',
+          'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
+          'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
+          'userName': checklistDetails.userName,
+          'userEmail': checklistDetails.userEmail,
+          'createdByEmail': req.user.email,
+          'createdBy': req.user.userName,
+          'coverage': checklistDetails.coverage,
+          'logDetails': {},
+        };
+        let urlopensearch = JSON.parse( process.env.OPENSEARCH );
+        console.log( 'logData', logData );
+        await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
+      }
+    }
+    return res.sendSuccess( 'Question redo successfully' );
+  } catch ( e ) {
+    logger.error( { function: 'redomultiChecklist', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
 
 
 export async function getLogs( req, res ) {

package/src/controllers/internalTrax.controller.js

@@ -1644,51 +1644,3 @@ async function getUserToken( clientId, userEmail ) {
     return false;
   }
 }
-
-export async function internalAISendPushNotification( req, res ) {
-  try {
-    let requestData = req.body;
-    if ( !requestData.clientId ) {
-      return res.sendError( 'clientId is Required', 400 );
-    }
-    if ( !( requestData?.email || requestData?.storeId ) ) {
-      return res.sendError( 'Email or StoreId is Required', 400 );
-    }
-
-    if ( !requestData.title ) {
-      return res.sendError( 'Title is Required', 400 );
-    }
-
-    if ( !requestData.description ) {
-      return res.sendError( 'Description is Required', 400 );
-    }
-
-    let fcmToken;
-    if ( requestData.email && requestData.email !='' ) {
-      fcmToken = await getUserToken( requestData.clientId, requestData.email );
-    } else {
-      let storeData = await storeService.findOne( { clientId: requestData.clientId, storeId: requestData.storeId }, { spocDetails: 1 } );
-      if ( storeData && storeData.spocDetails.length > 0 && storeData.spocDetails[0].email ) {
-        fcmToken = await getUserToken( storeData.spocDetails[0].email );
-      }
-    }
-    if ( !fcmToken ) {
-      return res.sendSuccess( 'Notification Send Successfully' );
-    }
-    let custom = {
-      type: req.body?.type,
-      storeId: req.body?.storeId,
-      date: req.body?.date,
-    };
-    let responseData = await sendPushNotification( requestData.title, requestData.description, fcmToken, custom );
-    if ( responseData ) {
-      return res.sendSuccess( 'Notification Send Successfully' );
-    } else {
-      return res.sendSuccess( 'Notification Send Successfully' );
-    }
-  } catch ( e ) {
-    logger.error( { error: e, function: 'internalAISendPushNotification' } );
-    if ( e.name === 'ValidationError' ) res.sendBadRequest( e );
-    else res.sendError( e, 500 );
-  }
-};

package/src/controllers/mobileTrax.controller.js

@@ -2462,7 +2462,7 @@ export async function checklistv1( req, res ) {
             ...projectExtraConditions,
             client_id: { $ifNull: [ '$client_id', '' ] },
             coverage: { $ifNull: [ '$coverage', '' ] },
-            taskType: { $ifNull: [ '$planoType', '' ] },
+            taskType: { $ifNull: [ '$type', '' ] },
           },
         },
       ];
@@ -3426,19 +3426,11 @@ export async function updatePlanoStatus( req, res ) {
     if ( !processCheckDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let storeTimeZone = await storeService.findOne( { storeName: { $regex: processCheckDetails.storeName, $options: 'i' }, clientId: processCheckDetails.client_id }, { 'storeProfile.timeZone': 1 } );
-    let currentDateTime;
-    if ( storeTimeZone?.storeProfile?.timeZone ) {
-      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-    } else {
-      currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
-    }
-    let submitTimeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
-    await processedchecklist.updateOne( { _id: req.body.id }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: submitTimeString } : { submitTime_string: submitTimeString } } );
+    processCheckDetails.checklistStatus = req.body.status;
+    processCheckDetails.save();
     return res.sendSuccess( 'Status updated Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'updatePlanoStatus' } );
     return res.sendError( e, 500 );
   }
 }
-