tango-app-api-trax 3.2.1 → 3.3.1-beta-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.2.1",
+    "version": "3.3.1-beta-2",
     "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.16",
+        "tango-api-schema": "^2.2.24",
         "tango-app-api-middleware": "^3.1.50",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -1421,3 +1421,70 @@ export async function taskPushNotification( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function internalSendPushNotification( req, res ) {
+  try {
+    let requestHeader = req.headers;
+    if ( !( requestHeader.clientid ) ) {
+      return res.sendError( 'clientid is Required', 400 );
+    }
+    if ( !( requestHeader.email || requestHeader.storeid ) ) {
+      return res.sendError( 'Email or Storeid is Required', 400 );
+    }
+
+    let requestData = req.body;
+    if ( !requestData.title ) {
+      return res.sendError( 'Title is Required', 400 );
+    }
+
+    if ( !requestData.description ) {
+      return res.sendError( 'Description is Required', 400 );
+    }
+
+    let fcmToken;
+    // fcmToken = 'dwm2tz9WfUq1jdz1H8hfSf:APA91bF9BhTsG9ZDnutQfseGueXk7FZ4RhB8v3G_xJOZhkiZz8vsw3SUWk5su8ZN37lx3-H50eouBKinbwg4zE_br6f483jUswA_44f1XG8k7Sok995f77M';
+    if ( requestHeader.email && requestHeader.email !='' ) {
+      fcmToken = await getUserToken( requestHeader.clientid, requestHeader.email );
+    } else {
+      let storeData = await storeService.findOne( { clientId: requestHeader.clientid, storeId: requestHeader.storeid }, { spocDetails: 1 } );
+      if ( storeData && storeData.spocDetails.length > 0 && storeData.spocDetails[0].email ) {
+        fcmToken = await getUserToken( storeData.spocDetails[0].email );
+      }
+    }
+    // console.log( 'fcmToken =>', fcmToken );
+    if ( !fcmToken ) {
+      // return res.sendError( 'Token not found', 400 );
+      return res.sendSuccess( 'Notification Send Successfully' );
+    }
+    let responseData = await sendPushNotification( requestData.title, requestData.description, fcmToken );
+    // console.log( 'responseData =>', responseData );
+    if ( responseData ) {
+      return res.sendSuccess( 'Notification Send Successfully' );
+    } else {
+      // return res.sendError( 'Token not found', 400 );
+      return res.sendSuccess( 'Notification Send Successfully' );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'internalSendPushNotification' } );
+    if ( e.name === 'ValidationError' ) res.sendBadRequest( e );
+    else res.sendError( e, 500 );
+  }
+};
+
+async function getUserToken( clientId, userEmail ) {
+  try {
+    if ( clientId && clientId !='' && userEmail && userEmail !='' ) {
+      let userData = await userService.findOne( { clientId: clientId, email: userEmail }, { fcmToken: 1 } );
+      if ( userData && userData.fcmToken && userData.fcmToken !='' ) {
+        return userData.fcmToken;
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'getUserToken' } );
+    return false;
+  }
+}

package/src/controllers/mobileTrax.controller.js

@@ -220,30 +220,35 @@ export async function startChecklist( req, res ) {
 
       let getchecklist = getupdatedchecklist;
       let questions = [];
-      function processQuestion( question, section, questions, nested=false ) {
-        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
-        if ( findExists && nested ) {
-          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
-          questions.splice( findIndex, 1 );
-          questions.push( question );
-        }
-        if ( !findExists ) {
-          questions.push( question );
-          for ( let answer of question.answers ) {
-            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-              if ( linkedQuestion ) {
-                processQuestion( linkedQuestion, section, questions, true );
-              }
-            }
-          }
-        }
-      }
+      // function processQuestion( question, section, questions, nested=false ) {
+      //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
+      //   if ( findExists && nested ) {
+      //     let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
+      //     questions.splice( findIndex, 1 );
+      //     questions.push( question );
+      //   }
+      //   if ( !findExists ) {
+      //     questions.push( question );
+      //     for ( let answer of question.answers ) {
+      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
+      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
+      //         if ( linkedQuestion ) {
+      //           processQuestion( linkedQuestion, section, questions, true );
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
       for ( let [ index, data ] of getchecklist.entries() ) {
         for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
           questions = [];
           for ( let question of section.questions ) {
-            processQuestion( question, section, questions );
+            if ( !question.linkType ) {
+              questions.push( question );
+              let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
+              let linkedQuestion = section.questions.filter( ( qn ) => linkedAnswer.has( qn.qno ) );
+              questions.push( ...linkedQuestion );
+            }
           }
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
@@ -1792,7 +1797,9 @@ export async function submitChecklist( req, res ) {
         //   createdAt: createdAtDate,
         // };
         // await detectionService.create( detectionData );
-        updateOpenSearch( req.user, requestData );
+        if ( requestData.submittype == 'submit' ) {
+          updateOpenSearch( req.user, requestData );
+        }
 
         return res.sendSuccess( 'Checklist Updated Successfully' );
       } else {
@@ -1956,7 +1963,9 @@ export async function submitTask( req, res ) {
       };
       await checklistLogs.create( logInsertData );
 
-      updateOpenSearchTask( user, requestData );
+      if ( submittype == 'submit' ) {
+        updateOpenSearchTask( user, requestData );
+      }
 
       return res.sendSuccess( 'Task Updated Successfully' );
     } else {
@@ -2476,7 +2485,11 @@ export async function questionList( req, res ) {
             if ( question.answerType == 'multiplechoicemultiple' ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
-                checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                if ( answer.validationType != 'Descriptive Answer' ) {
+                  checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                } else {
+                  checkvalidation = answer.validationAnswer;
+                }
               }
               Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
@@ -2539,38 +2552,43 @@ export async function questionList( req, res ) {
       }
 
       let questions = [];
-      function processQuestion( question, section, questions, nested=false ) {
-        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
-        if ( findExists && nested ) {
-          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
-          questions.splice( findIndex, 1 );
-          questions.push( question );
-          for ( let answer of question.answers ) {
-            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-              if ( linkedQuestion ) {
-                processQuestion( linkedQuestion, section, questions, true );
-              }
-            }
-          }
-        }
-        if ( !findExists ) {
-          questions.push( question );
-          for ( let answer of question.answers ) {
-            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-              if ( linkedQuestion ) {
-                processQuestion( linkedQuestion, section, questions, true );
-              }
-            }
-          }
-        }
-      }
+      // function processQuestion( question, section, questions, nested=false ) {
+      //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
+      //   if ( findExists && nested ) {
+      //     // let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
+      //     // questions.splice( findIndex, 1 );
+      //     questions.push( question );
+      //     for ( let answer of question.answers ) {
+      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
+      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
+      //         if ( linkedQuestion ) {
+      //           processQuestion( linkedQuestion, section, questions, true );
+      //         }
+      //       }
+      //     }
+      //   }
+      //   if ( !findExists ) {
+      //     questions.push( question );
+      //     for ( let answer of question.answers ) {
+      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
+      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
+      //         if ( linkedQuestion ) {
+      //           processQuestion( linkedQuestion, section, questions, true );
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
       for ( let [ index, data ] of getchecklist.entries() ) {
         for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
           questions = [];
           for ( let question of section.questions ) {
-            processQuestion( question, section, questions );
+            if ( !question.linkType ) {
+              questions.push( question );
+              let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
+              let linkedQuestion = section.questions.filter( ( qn ) => linkedAnswer.has( qn.qno ) );
+              questions.push( ...linkedQuestion );
+            }
           }
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
@@ -3282,3 +3300,24 @@ export async function checkVersion( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function clientConfig( req, res ) {
+  try {
+    let requestData = req.body;
+    if ( requestData.clientId && requestData.clientId !='' ) {
+      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1 } );
+      console.log( ' getClientData=>', getClientData );
+      if ( getClientData ) {
+        return res.sendSuccess( getClientData );
+      } else {
+        return res.sendError( 'Invalid clientId', 400 );
+      }
+    } else {
+      return res.sendError( 'clientId is Required', 400 );
+    }
+  } catch ( e ) {
+    console.log( 'e =>', e );
+    logger.error( { error: e, function: 'clientConfig' } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/trax.controller.js

@@ -21,6 +21,8 @@ import utc from 'dayjs/plugin/utc.js';
 import isEqual from 'lodash/isEqual.js';
 dayjs.extend( utc );
 dayjs.extend( customParseFormat );
+import * as clusterServices from '../services/cluster.service.js';
+import * as teamsServices from '../services/teams.service.js';
 
 
 export const checklist = async ( req, res ) => {
@@ -246,9 +248,13 @@ export const create = async ( req, res ) => {
                 }
                 if ( answer.showLinked ) {
                   if ( nestedIndex != -1 ) {
-                    section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
+                    if ( !section.questions[qIdx].answers[nestedIndex].nestedQuestion.includes( answer.linkedQuestion ) ) {
+                      section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
+                    }
                   } else {
-                    section.questions[qIdx].answers[index].nestedQuestion.push( answer.linkedQuestion );
+                    if ( !section.questions[qIdx].answers[index].nestedQuestion.includes( answer.linkedQuestion ) ) {
+                      section.questions[qIdx].answers[index].nestedQuestion.push( answer.linkedQuestion );
+                    }
                   }
                   let nestedLinkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
                   if ( nestedLinkedQuestion ) {
@@ -751,9 +757,13 @@ export const update = async ( req, res ) => {
                 }
                 if ( answer.showLinked ) {
                   if ( nestedIndex != -1 ) {
-                    section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
+                    if ( !section.questions[qIdx].answers[nestedIndex].nestedQuestion.includes( answer.linkedQuestion ) ) {
+                      section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
+                    }
                   } else {
-                    section.questions[qIdx].answers[index].nestedQuestion.push( answer.linkedQuestion );
+                    if ( !section.questions[qIdx].answers[index].nestedQuestion.includes( answer.linkedQuestion ) ) {
+                      section.questions[qIdx].answers[index].nestedQuestion.push( answer.linkedQuestion );
+                    }
                   }
                   let nestedLinkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
                   if ( nestedLinkedQuestion ) {
@@ -2177,18 +2187,17 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
               getsubmitDetails[0].date_iso = new Date( date );
               getsubmitDetails[0].redoStatus = false;
               getsubmitDetails[0].approvalStatus = false;
-            } else {
-              if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
-                console.log( editSubmit );
-                let user = {
-                  _id: getsubmitDetails[0].userId,
-                  clientId: getsubmitDetails[0].client_id,
-                };
-                updateOpenSearch( user, { processedcheckListId: getsubmitDetails[0]._id, date: getsubmitDetails[0].date_string } );
-              }
             }
             let data = { ...getsubmitDetails[0]._doc };
             await processedchecklist.updateOne( { _id: getsubmitDetails[0]._id }, data );
+            if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
+              console.log( editSubmit );
+              let user = {
+                _id: getsubmitDetails[0].userId,
+                clientId: getsubmitDetails[0].client_id,
+              };
+              updateOpenSearch( user, { processedcheckListId: getsubmitDetails[0]._id, date: getsubmitDetails[0].date_string } );
+            }
           }
           if ( getsubmitDetails[0]?.checklistStatus == 'submit' ) {
             userIdList.push( element4._id );
@@ -2237,15 +2246,29 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
             await processedchecklist.insertMany( submitUser );
           }
         } else {
-          let deleteQuery = {
+          let deleteInprogressQuery = {
             date_string: insertdata.date_string,
             date_iso: insertdata.date_iso,
             client_id: insertdata.client_id,
             checkListId: updatedchecklist._id,
-            checklistStatus: { $nin: [ 'submit' ] },
+            checklistStatus: { $nin: [ 'submit', 'inprogress' ] },
+            redoStatus: false,
           };
-          await processedchecklist.deleteMany( deleteQuery );
-          await processedchecklist.insertMany( allQuestion );
+          await processedchecklist.deleteMany( deleteInprogressQuery );
+          deleteInprogressQuery.checklistStatus = 'inprogress';
+          deleteInprogressQuery.redoStatus = false;
+          let getInprogressData = await processedchecklist.find( deleteInprogressQuery, { userId: 1, store_id: 1 } );
+          if ( getInprogressData ) {
+            allQuestion = allQuestion.filter( ( item ) => {
+              let inprogressData = getInprogressData.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
+              if ( !inprogressData ) {
+                return item;
+              }
+            } );
+          }
+          if ( allQuestion.length ) {
+            await processedchecklist.insertMany( allQuestion );
+          }
         }
       } else {
         let unAssignedList = allQuestion.reduce( ( acc, item ) => {
@@ -2534,3 +2557,55 @@ export const preDefinedChecklist = async ( req, res ) => {
   }
 };
 
+export const selectAssign = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let resuldData;
+    if ( requestData.coverage == 'store' ) {
+      // //Select Store and cluster
+      let storeQuery = [
+        { $match: { clientId: requestData.clientId } },
+        { $project: { 'storeName': 1, 'storeId': 1, 'type': 'store' } },
+      ];
+      let clusterQuery = [
+        { $match: { clientId: requestData.clientId } },
+        { $project: { 'clusterName': 1, 'type': 'cluster' } },
+      ];
+
+      const [ getStores, getClusters ] = await Promise.all( [
+        storeService.aggregate( storeQuery ),
+        clusterServices.aggregateCluster( clusterQuery ),
+      ] );
+      // console.log( 'getStores =>', getStores );
+      // console.log( 'getClusters =>', getClusters );
+      resuldData = [ ...getStores, ...getClusters ];
+      console.log( 'resuldData =>', resuldData );
+    } else if ( requestData.coverage == 'user' ) {
+      // //Select User and Teams
+      let userQuery = [
+        { $match: { clientId: requestData.clientId } },
+        { $project: { 'userEmail': 1, 'userName': 1, 'type': 'user' } },
+      ];
+      // let getUsers = await userService.aggregate( userQuery );
+      // console.log( 'getUsers =>', getUsers );
+      let teamQuery = [
+        { $match: { clientId: requestData.clientId } },
+        { $project: { 'teamName': 1, 'type': 'team' } },
+      ];
+      // let getTeams = await teamsServices.aggregateTeams( teamQuery );
+      // console.log( 'getTeams =>', getTeams );
+      const [ getUsers, getTeams ] = await Promise.all( [
+        userService.aggregate( userQuery ),
+        teamsServices.aggregateTeams( teamQuery ),
+      ] );
+      resuldData = [ ...getUsers, ...getTeams ];
+      console.log( 'resuldData =>', resuldData );
+    }
+    return res.sendSuccess( { 'totalCount': resuldData.length, 'data': resuldData } );
+  } catch ( e ) {
+    console.log( 'e =>', e );
+    logger.error( 'selectAssign =>', e );
+    return res.sendError( e, 500 );
+  }
+};
+

package/src/dtos/validation.dtos.js

@@ -144,4 +144,13 @@ export const startValidation = {
   body: startSchema,
 };
 
+export const selectAssignSchema = joi.object( {
+  clientId: joi.string().required(),
+  coverage: joi.string().required(),
+} );
+
+export const selectAssign = {
+  body: selectAssignSchema,
+};
+