tango-app-api-trax 3.4.0-flag-10 → 3.4.0-soplink2-0

package/src/controllers/trax.controller.js

@@ -1,4 +1,4 @@
-import { signedUrl, fileUpload, chunkArray, logger, sendPushNotification, insertOpenSearchData } from 'tango-app-api-middleware';
+import { fileUpload, chunkArray, logger, sendPushNotification, insertOpenSearchData } from 'tango-app-api-middleware';
 import * as checklistService from '../services/checklist.service.js';
 import * as questionService from '../services/checklistQuestion.service.js';
 import * as assignedService from '../services/checklistAssign.service.js';
@@ -24,6 +24,7 @@ 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 ) => {
   try {
     let limit = parseInt( req.query.limit ) || 10;
@@ -246,14 +247,15 @@ export const create = async ( req, res ) => {
                   section.questions[qIdx].answers[index].nestedQuestion = [];
                 }
                 if ( answer.showLinked ) {
+                  // section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
                   if ( nestedIndex != -1 ) {
-                    if ( !section.questions[qIdx].answers[nestedIndex].nestedQuestion.includes( answer.linkedQuestion ) ) {
-                      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 {
-                    if ( !section.questions[qIdx].answers[index].nestedQuestion.includes( answer.linkedQuestion ) ) {
-                      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 ) {
@@ -270,6 +272,18 @@ export const create = async ( req, res ) => {
               }
             }
           }
+          let checkNestedLevel = false;
+          section.questions.forEach( ( qns ) => {
+            qns.answers.forEach( ( answ ) => {
+              if ( answ.nestedQuestion.length > 20 ) {
+                checkNestedLevel = true;
+              }
+            } );
+          } );
+
+          if ( checkNestedLevel ) {
+            return res.sendError( { message: 'Unable to create more than 20 linked questions.' }, 400 );
+          }
 
           let sectionList = {
             section: section.name,
@@ -301,6 +315,7 @@ export const create = async ( req, res ) => {
               return res.sendSuccess( { checklistId: checkListId, msg: 'CheckList Created Successfully' } );
             }
           } ).catch( ( e ) => {
+            console.log( e );
             return res.sendError( e, 500 );
           } );
         }
@@ -310,6 +325,7 @@ export const create = async ( req, res ) => {
         }
       }
     } ).catch( async ( e ) => {
+      console.log( e );
       await checklistService.deleteOne( { _id: checkListId } );
       return res.sendError( e, 500 );
     } );
@@ -373,23 +389,23 @@ export const getConfigDetails = async ( req, res ) => {
       let questionDetails = await questionService.find( query );
       if ( questionDetails.length ) {
         let sections = [];
-        let bucket = JSON.parse( process.env.BUCKET );
+        // let bucket = JSON.parse( process.env.BUCKET );
         questionDetails.forEach( ( item ) => {
           item.question.forEach( async ( question ) => {
             if ( question.questionReferenceImage && question.questionReferenceImage !='' ) {
-              let inputData = {
-                Bucket: bucket.sop,
-                file_path: decodeURIComponent( question.questionReferenceImage ),
-              };
-              question.questionReferenceImage = await signedUrl( inputData );
+              // let inputData = {
+              //   Bucket: bucket.sop,
+              //   file_path: decodeURIComponent( question.questionReferenceImage ),
+              // };
+              question.questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+question.questionReferenceImage;
             }
             question.answers.forEach( async ( answer ) => {
               if ( answer.referenceImage != '' ) {
-                let inputData = {
-                  Bucket: bucket.sop,
-                  file_path: decodeURIComponent( answer.referenceImage ),
-                };
-                answer.referenceImage = await signedUrl( inputData );
+                // let inputData = {
+                //   Bucket: bucket.sop,
+                //   file_path: decodeURIComponent( answer.referenceImage ),
+                // };
+                answer.referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+answer.referenceImage;
               }
             } );
           } );
@@ -793,14 +809,15 @@ export const update = async ( req, res ) => {
                 section.questions[qIdx].answers[index].nestedQuestion = [];
               }
               if ( answer.showLinked ) {
+                // section.questions[qIdx].answers[nestedIndex].nestedQuestion.push( answer.linkedQuestion );
                 if ( nestedIndex != -1 ) {
-                  if ( !section.questions[qIdx].answers[nestedIndex].nestedQuestion.includes( answer.linkedQuestion ) ) {
-                    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 {
-                  if ( !section.questions[qIdx].answers[index].nestedQuestion.includes( answer.linkedQuestion ) ) {
-                    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 ) {
@@ -818,6 +835,21 @@ export const update = async ( req, res ) => {
           }
         }
 
+        let checkNestedLevel = false;
+        section.questions.forEach( ( qns ) => {
+          qns.answers.forEach( ( answ ) => {
+            if ( answ.nestedQuestion.length > 20 ) {
+              checkNestedLevel = true;
+            }
+          } );
+        } );
+
+        console.log( checkNestedLevel, 'lebej' );
+
+        if ( checkNestedLevel ) {
+          return res.sendError( { message: 'Unable to create more than 20 linked questions' }, 400 );
+        }
+
         sectionList.push( {
           section: section.name,
           sectionOldName: section.oldName,
@@ -875,7 +907,7 @@ export const update = async ( req, res ) => {
           } );
           let compare = findDifferences( qn, question );
           if ( Object.keys( compare ).length && ( compare?.answerType || compare?.answers || compare?.linkType ) ) {
-            questionList.questionEdit.push( { sectionName: ele.section, questions: [ { previous: qn, new: question } ] } );
+            questionList.questionEdit.push( { sectionName: ele.section, questions: [ { previous: qn }, { new: question } ] } );
           }
         } else {
           let sectionIndex = questionList.questionDelete.findIndex( ( sec ) => sec.sectionName === ele.section );
@@ -971,11 +1003,11 @@ export const uploadImage = async ( req, res ) => {
     };
     imgUrl = await fileUpload( params );
 
-    let inputData = {
-      Bucket: bucket.sop,
-      file_path: imgUrl.Key,
-    };
-    imgUrl = await signedUrl( inputData );
+    // let inputData = {
+    //   Bucket: bucket.sop,
+    //   file_path: imgUrl.Key,
+    // };
+    imgUrl = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+imgUrl.Key;
     if ( !imgUrl ) {
       return res.sendError( { message: 'Something went Wrong' }, 500 );
     }
@@ -3402,7 +3434,6 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }
         if ( getsubmitDetails ) {
           getsubmitDetails = [ getsubmitDetails ];
-          console.log( submittedDetails, getsubmitDetails );
         }
         function findDifferences( obj1, obj2 ) {
           return Object.keys( obj1 ).reduce( ( diff, key ) => {
@@ -3433,11 +3464,14 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                   let findQuestion = getsubmitDetails[0].questionAnswers[index].questions.findIndex( ( ele ) => ele.qname.trim() == qns?.oldQname?.trim() || ele.qname.trim() == qns.qname.trim() );
                   if ( findQuestion != -1 ) {
                     let data = JSON.parse( JSON.stringify( getsubmitDetails[0].questionAnswers[index].questions[findQuestion] ) );
-                    getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qno = qns.qno;
+                    if ( getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qno != qns.qno ) {
+                      question.push( { question: qns, type: 'noChange' } );
+                    }
                     delete data.userAnswer;
                     delete data.parentanswer;
                     delete data.remarks;
                     delete data.linkquestionenabled;
+                    delete data.uniqueNo;
                     if ( data.descriptivetype == null ) {
                       delete data.descriptivetype;
                     }
@@ -3449,29 +3483,136 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                       delete ans.index;
                       delete ans.validationAnswer;
                       delete ans.answeroptionNumber;
+                      ans.nestedQuestion = ans?.oldNestedQuestion ? ans.oldNestedQuestion : ans.nestedQuestion;
+                      ans.linkedQuestion = ans?.oldLinkedQuestion ? ans.oldLinkedQuestion : ans.linkedQuestion;
+                      delete ans.oldNestedQuestion;
+                      delete ans.oldLinkedQuestion;
                     } );
                     const compare = findDifferences( data, qns );
                     if ( compare?.answerType || compare?.answers || compare?.linkType ) {
                       logger.info( 'compare =>', compare );
+                      logger.info( 'compareSection =>', { section: section.sectionName } );
+                      logger.info( 'qno =>', { qno: data.qno } );
                       modifiedCount++;
-                      question.push( qns );
+                      question.push( { question: qns, type: 'qnEdit' } );
                     } else {
-                      getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qname = qns.qname;
-                      question.push( getsubmitDetails[0].questionAnswers[index].questions[findQuestion] );
+                      if ( getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qname != qns.qname ) {
+                        question.push( { type: 'nameChange', question: qns } );
+                      }
+                      // getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qname = qns.qname;
                     }
                   } else {
                     modifiedCount++;
-                    question.push( qns );
+                    question.push( { question: qns, type: 'add' } );
                   }
                 } );
-                getsubmitDetails[0].questionAnswers[index].questions = question;
-                sectionList.push( getsubmitDetails[0].questionAnswers[index] );
+                // getsubmitDetails[0].questionAnswers[index].questions = question;
+                if ( question.length ) {
+                  sectionList.push( { sectionName: section.sectionName, oldName: section.sectionOldName, question: question, type: 'edit' } );
+                }
               } else {
                 modifiedCount++;
-                sectionList.push( section );
+                sectionList.push( { section: section, type: 'add' } );
               }
             }
-            getsubmitDetails[0].questionAnswers = sectionList;
+            let removed = [];
+            getsubmitDetails[0].questionAnswers.forEach( ( section, sectionIdx ) => {
+              let sectionIndex = questionList.findIndex( ( sec ) => section.sectionName == sec?.sectionOldName || section.sectionName == sec.sectionName );
+              if ( sectionIndex == -1 ) {
+                removed.push( { section: section.sectionName, type: 'delete' } );
+              } else {
+                let question = [];
+                section.questions.forEach( ( qn ) => {
+                  let questionIndex = questionList[sectionIndex].questions.findIndex( ( ele ) => qn.qname.trim() == ele?.oldQname?.trim() || qn.qname.trim() == ele.qname.trim() );
+                  if ( questionIndex == -1 ) {
+                    question.push( qn.qname );
+                  }
+                } );
+                if ( question.length ) {
+                  removed.push( { section: section.sectionName, question: question, type: 'qnDelete' } );
+                }
+              }
+            } );
+            removed.forEach( ( ele ) => {
+              if ( ele?.type == 'delete' ) {
+                getsubmitDetails[0].questionAnswers = getsubmitDetails[0].questionAnswers.filter( ( section ) => section.sectionName != ele.section );
+              } else {
+                let sectionIndex = getsubmitDetails[0].questionAnswers.findIndex( ( section ) => section.sectionName == ele?.section );
+                getsubmitDetails[0].questionAnswers[sectionIndex].questions = getsubmitDetails[0].questionAnswers[sectionIndex].questions.filter( ( qns ) => !qns.qname.includes( ele.question ) );
+              }
+            } );
+
+            // getsubmitDetails[0].questionAnswers = sectionList;
+            logger.info( 'removedSections =>', { data: JSON.stringify( removed ) } );
+            logger.info( 'modifiedSections =>', { data: JSON.stringify( sectionList ) } );
+            sectionList.forEach( ( sec ) => {
+              if ( sec.type == 'add' ) {
+                getsubmitDetails[0].questionAnswers.push( sec.section );
+              } else {
+                sec.question.forEach( ( qn ) => {
+                  let sectionDetails = getsubmitDetails[0].questionAnswers.findIndex( ( section ) => section.sectionName == sec?.oldName || section.sectionName == sec.sectionName );
+                  if ( qn.type == 'add' ) {
+                    getsubmitDetails[0].questionAnswers[sectionDetails].questions.push( qn.question );
+                  } else {
+                    let questions = getsubmitDetails[0].questionAnswers[sectionDetails].questions.reduce( ( acc, ele, idx ) => {
+                      if ( ele.qname.trim() == qn?.question?.oldQname?.trim() || ele.qname.trim() == qn.question.qname.trim() ) {
+                        acc.push( idx );
+                      }
+                      return acc;
+                    }, [] );
+                    if ( questions.length && [ 'qnEdit', 'nameChange', 'noChange' ].includes( qn.type ) ) {
+                      if ( qn.type == 'qnEdit' ) {
+                        let checkLinkType = getsubmitDetails[0].questionAnswers[sectionDetails].questions[questions[0]].linkType;
+                        if ( checkLinkType && !qn.question.linkType ) {
+                          questions.forEach( ( qnIdx, index ) => {
+                            if ( index != 0 ) {
+                              getsubmitDetails[0].questionAnswers[sectionDetails].questions.splice( qnIdx, 1 );
+                            }
+                          } );
+                          questions = [ questions[0] ];
+                        }
+                      }
+                      questions.forEach( ( qnIdx ) => {
+                        if ( qn.type == 'qnEdit' ) {
+                          getsubmitDetails[0].questionAnswers[sectionDetails].questions[qnIdx].answers.forEach( ( ele ) => {
+                            console.log( ele?.nestedQuestion );
+                            if ( ele?.nestedQuestion.length ) {
+                              ele?.nestedQuestion.forEach( ( nested ) => {
+                                let findIndex = getsubmitDetails[0].questionAnswers[sectionDetails].questions.findIndex( ( qn ) => qn.uniqueNo == nested );
+                                if ( findIndex != -1 ) {
+                                  delete getsubmitDetails[0].questionAnswers[sectionDetails].questions[findIndex].userAnswer;
+                                  let questionDetails = getsubmitDetails[0].questionAnswers[sectionDetails].questions[findIndex];
+                                  let checkQuestionExists = getsubmitDetails[0].questionAnswers[sectionDetails].questions.filter( ( qnDetails ) => qnDetails.qname == questionDetails.qname );
+                                  if ( checkQuestionExists.length > 1 ) {
+                                    getsubmitDetails[0].questionAnswers[sectionDetails].questions.splice( findIndex, 1 );
+                                  } else {
+                                    delete getsubmitDetails[0].questionAnswers[sectionDetails].questions[findIndex].uniqueNo;
+                                    getsubmitDetails[0].questionAnswers[sectionDetails].questions[findIndex].linkquestionenabled = false;
+                                    getsubmitDetails[0].questionAnswers[sectionDetails].questions[findIndex].answers.forEach( ( ele ) => {
+                                      if ( ele?.oldNestedQuestion?.length ) {
+                                        ele.nestedQuestion = ele.oldNestedQuestion;
+                                        ele.linkedQuestion = ele.oldLinkedQuestion;
+                                      }
+                                    } );
+                                  }
+                                }
+                              } );
+                            }
+                          } );
+                          getsubmitDetails[0].questionAnswers[sectionDetails].questions[qnIdx] = qn.question;
+                        } else {
+                          if ( qn.type == 'nameChange' ) {
+                            getsubmitDetails[0].questionAnswers[sectionDetails].questions[qnIdx].qname = qn.question.qname;
+                          } else {
+                            getsubmitDetails[0].questionAnswers[sectionDetails].questions[qnIdx].qno = qn.question.qno;
+                          }
+                        }
+                      } );
+                    }
+                  }
+                } );
+              }
+            } );
             if ( modifiedCount ) {
               getsubmitDetails[0].checklistStatus = 'inprogress';
               getsubmitDetails[0].date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
@@ -3480,6 +3621,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
               getsubmitDetails[0].approvalStatus = false;
             }
             let data = { ...getsubmitDetails[0]._doc };
+            logger.info( 'modifiedData =>', { data: JSON.stringify( data ) } );
             await processedchecklist.updateOne( { _id: getsubmitDetails[0]._id }, data );
             if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
               let user = {
@@ -3879,7 +4021,12 @@ export const selectAssign = async ( req, res ) => {
       // //Select Store and cluster
       if ( requestData.assignType == 'store' ) {
         let storeQuery = [
-          { $match: { clientId: requestData.clientId, status: 'active' } },
+          {
+            $match: {
+              ...( req.user.userType==='client'&&req.user.role!='superadmin' ) ? { storeId: { $in: requestData?.assignedStores } } :{ clientId: requestData.clientId },
+              status: 'active',
+            },
+          },
           {
             $project: {
               storeName: 1,

package/src/controllers/traxDashboard.controllers.js

@@ -3809,7 +3809,8 @@ export async function sendAlert( req, res ) {
             }
             const fcmToken = item.token;
             try {
-              await sendPushNotification( title, description, fcmToken );
+              let response = await sendPushNotification( title, description, fcmToken );
+              console.log( response, 'response' );
             } catch ( e ) {
               logger.error( { message: 'send alert', error: e, details: data } );
             }

package/src/routes/mobileTrax.routes.js

@@ -9,15 +9,18 @@ mobileRouter
     .get( '/storeList', isAllowedSessionHandler, mobileController.storeList )
     .get( '/storeListv1', isAllowedSessionHandler, mobileController.storeListv1 )
     .post( '/startCheckList', isAllowedSessionHandler, validate( startValidation ), mobileController.startChecklist )
+    .post( '/startCheckListv1', isAllowedSessionHandler, validate( startValidation ), mobileController.startChecklistv1 )
     .post( '/startTask', isAllowedSessionHandler, validate( startValidation ), mobileController.startTask )
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
     .post( '/submitCheckListv5', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv1, mobileController.submitChecklist )
+    .post( '/submitCheckListv6', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv2, mobileController.submitChecklist )
     .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )
     .get( '/dashboardv1', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboardv1 )
     .get( '/checklist', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklist )
     .get( '/checklistv1', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklistv1 )
     .get( '/checklistQuestionList', isAllowedSessionHandler, mobileController.questionList )
+    .get( '/checklistQuestionListv1', isAllowedSessionHandler, mobileController.questionListv1 )
     .get( '/taskQuestionList', isAllowedSessionHandler, mobileController.taskQuestionList )
     .post( '/uploadAnswerImage', isAllowedSessionHandler, mobileController.uploadAnswerImage )
     .get( '/appVersion', mobileController.appVersion )

package/src/routes/trax.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { isAllowedSessionHandler, validate, accessVerification, isAllowedClient } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, validate, accessVerification, isAllowedClient, getAssinedStore } from 'tango-app-api-middleware';
 import { checklistValidation, checklistDetailsValidation, runaiValidation, checklistPageSchema, duplicateValidation, updateChecklistValidation, uploadUserValidation, aichecklistValidation, publishValidation, selectAssign } from '../dtos/validation.dtos.js';
 import * as traxController from '../controllers/trax.controller.js';
 
@@ -25,7 +25,7 @@ traxRouter
     .get( '/zoneList', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), traxController.zoneList )
     .get( '/aichecklist', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( aichecklistValidation ), traxController.aiChecklist )
     .get( '/predefinedChecklist', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( aichecklistValidation ), traxController.preDefinedChecklist )
-    .post( '/selectAssign', validate( selectAssign ), traxController.selectAssign )
+    .post( '/selectAssign', isAllowedSessionHandler, validate( selectAssign ), getAssinedStore, traxController.selectAssign )
     .post( '/assign', isAllowedSessionHandler, traxController.checklistAssign )
     // .post( '/assignUpload', isAllowedSessionHandler, traxController.assignChecklistUser )
     .post( '/updateAssign', isAllowedSessionHandler, traxController.updateAssign );