tango-app-api-trax 3.2.1-beta-1 → 3.2.1-beta-3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.2.1-beta-1",
+    "version": "3.2.1-beta-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.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: requestHeader.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

@@ -127,7 +127,7 @@ export async function startChecklist( req, res ) {
             let Multianswer = [];
             if ( question.answers.length > 0 ) {
               question.answers.forEach( ( answer, ansIndex ) => {
-                Multianswer.push( { 'answer': null, 'index': ansIndex, 'validationAnswer': null } );
+                Multianswer.push( { 'answer': null, 'no': ansIndex, 'validationAnswer': null } );
                 answer.index = ansIndex;
               } );
               question.Multianswer = Multianswer;
@@ -136,7 +136,7 @@ export async function startChecklist( req, res ) {
             let Multianswer = [];
             if ( question.answers.length > 0 ) {
               question.answers.forEach( ( answer, ansIndex ) => {
-                Multianswer.push( { 'answer': null, 'index': ansIndex, 'validationAnswer': null } );
+                Multianswer.push( { 'answer': null, 'no': ansIndex, 'validationAnswer': null } );
                 answer.index = ansIndex;
               } );
               question.Multianswer = Multianswer;
@@ -1792,7 +1792,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 +1958,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 {
@@ -2478,7 +2482,7 @@ export async function questionList( req, res ) {
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
                 checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
               }
-              Multianswer.push( { 'answer': answer.answer, 'index': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
             if ( answer.referenceImage != '' ) {
@@ -2508,7 +2512,7 @@ export async function questionList( req, res ) {
               if ( question.answerType == 'multipleImage' ) {
                 if ( userAns && userAns.answer && userAns.answer !='' ) {
                   let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                  Multianswer.push( { 'answer': manswer, 'index': userAnsIndex, 'validationAnswer': '' } );
+                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
                 } else {
 
                 }
@@ -2531,7 +2535,7 @@ export async function questionList( req, res ) {
             if ( Multianswer.length ) {
               question.Multianswer = Multianswer;
             } else {
-              Multianswer.push( { 'answer': null, 'index': 0, 'validationAnswer': null } );
+              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
               question.Multianswer = Multianswer;
             }
           }
@@ -2812,7 +2816,7 @@ export async function taskQuestionList( req, res ) {
               if ( answer.validationAnswer && answer.validationAnswer != '' ) {
                 checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
               }
-              Multianswer.push( { 'answer': answer.answer, 'index': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
             if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
@@ -2852,7 +2856,7 @@ export async function taskQuestionList( req, res ) {
               if ( question.answerType == 'multipleImage' ) {
                 if ( userAns && userAns.answer && userAns.answer != '' ) {
                   let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                  Multianswer.push( { 'answer': manswer, 'index': userAnsIndex, 'validationAnswer': '' } );
+                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
                 } else {
 
                 }
@@ -2875,7 +2879,7 @@ export async function taskQuestionList( req, res ) {
             if ( Multianswer.length ) {
               question.Multianswer = Multianswer;
             } else {
-              Multianswer.push( { 'answer': null, 'index': 0, 'validationAnswer': null } );
+              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
               question.Multianswer = Multianswer;
             }
           }
@@ -3282,3 +3286,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

@@ -2237,15 +2237,27 @@ 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' ] },
           };
-          await processedchecklist.deleteMany( deleteQuery );
-          await processedchecklist.insertMany( allQuestion );
+          await processedchecklist.deleteMany( deleteInprogressQuery );
+          deleteInprogressQuery.checklistStatus = 'inprogress';
+          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 ) => {

package/src/routes/internalTraxApi.router.js

@@ -19,6 +19,7 @@ internalTraxRouter
     .get( '/checklist', isAllowedInternalAPIHandler, internalController.internalAPIChecklist )
     .post( '/getPDFCSVChecklistDetails', isAllowedInternalAPIHandler, internalController.getPDFCSVChecklistDetails )
     .get( '/getOTP', isAllowedInternalAPIHandler, internalController.getOTP )
-    .get( '/getDownloads', isAllowedInternalAPIHandler, internalController.getDownloads );
+    .get( '/getDownloads', isAllowedInternalAPIHandler, internalController.getDownloads )
+    .post( '/sendPushNotification', isAllowedInternalAPIHandler, internalController.internalSendPushNotification );
 
 

package/src/routes/mobileTrax.routes.js

@@ -24,5 +24,6 @@ mobileRouter
     .post( '/appVersion', mobileController.updateappVersion )
     .post( '/verifylocation', isAllowedSessionHandler, mobileController.getStoreLocation, mobileController.location )
     .post( '/login', mobileController.login )
-    .post( '/checkUpdateVersion', mobileController.checkVersion );
+    .post( '/checkUpdateVersion', mobileController.checkVersion )
+    .post( '/checkClientConfig', isAllowedSessionHandler, mobileController.clientConfig );