tango-app-api-trax 3.4.0-beta-0 → 3.4.0-beta-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.4.0-beta-0",
+    "version": "3.4.0-beta-2",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.73",
-        "tango-app-api-middleware": "^3.1.66",
+        "tango-api-schema": "^2.2.78",
+        "tango-app-api-middleware": "^3.1.69",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/activityLog.controller.js

@@ -1,6 +1,7 @@
 // import mongoose from 'mongoose';
 import { insertOpenSearchData, updateOpenSearchData, getOpenSearchData } from 'tango-app-api-middleware';
 import * as checklistService from '../services/checklist.service.js';
+import * as taskconfigService from '../services/taskConfig.service.js';
 
 export const insertLog = async ( req, res ) => {
   try {
@@ -130,23 +131,37 @@ export const listLog = async ( req, res ) => {
     if ( requestBody.type ) {
       mustConditions.push( { term: { type: requestBody.type } } );
     }
-
-    if ( requestBody.action ) {
+    if ( requestBody.action && requestBody.action.length > 0 ) {
       mustConditions.push( { terms: { action: requestBody.action } } );
     }
 
     if ( req.user.userType == 'client' && req.user.role == 'user' ) {
       return res.sendError( 'no data found', 204 );
     }
+    let sourceCheckListIds;
+    if ( req.user.userType === 'client' && req.user.role == 'admin' ) {
+      if ( requestBody.type === 'checklist' ) {
+        const sourceCheckListResult = await checklistService.aggregate( [
+          // { $match: { 'owner.value': req.user.email } },
+          { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
+          { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
+          { $project: { _id: 0, checklistIds: 1 } },
+        ] );
+        sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
+        console.log( 'sourceCheckListIds', sourceCheckListIds );
+      }
+      if ( requestBody.type === 'task' ) {
+        const sourceCheckListResult = await taskconfigService.aggregate( [
+          // { $match: { 'owner.value': req.user.email } },
+          { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
+          { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
+          { $project: { _id: 0, checklistIds: 1 } },
+        ] );
+
+        sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
+      }
+
 
-    if ( req.user.userType == 'client' && req.user.role == 'admin' ) {
-      const sourceCheckListResult = await checklistService.aggregate( [
-        { $match: { 'owner.value': req.user.email } },
-        { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
-        { $project: { _id: 0, checklistIds: 1 } },
-      ] );
-      const sourceCheckListIds = sourceCheckListResult.length > 0 ? sourceCheckListResult[0].checklistIds : [];
-      console.log( 'sourceCheckListIds', sourceCheckListIds );
       // mustConditions.push( { terms: { $or: [ { store_id: { $in: requestBody.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestBody.userEmailes } }, { sourceCheckList_id: { $in: sourceCheckListIds } } ] } } );
       mustConditions.push( {
         'bool': {
@@ -210,7 +225,9 @@ export const listLog = async ( req, res ) => {
         },
       ],
     };
+    // console.log( 'Executing OpenSearch Query:', JSON.stringify( query, null, 2 ) );
     let result = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, query );
+    // console.log( 'OpenSearch Raw Response', JSON.stringify( result, null, 2 ) );
     if ( !result || !result.body.hits.hits.length ) {
       return res.sendError( 'no data found', 204 );
     }

package/src/controllers/gallery.controller.js

@@ -291,7 +291,7 @@ export async function approveChecklist( req, res ) {
       let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = checklistDetails.filter( ( data ) => data.checklistStatus == 'submit' );
-        let storeNames =  inputstores.map((data)=>data.storeName)
+        let storeNames = inputstores.map( ( data ) => data.storeName );
 
 
         let params = {
@@ -333,7 +333,7 @@ export async function approveChecklist( req, res ) {
           'createdBy': req.user._id,
           'coverage': checklistDetails[0].coverage,
           'logDetails': {
-            'approved': storeNames
+            'approved': storeNames,
           },
         };
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
@@ -450,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: {

package/src/controllers/internalTrax.controller.js

@@ -18,7 +18,7 @@ import timeZone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
 import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
-import { sendPushNotification } from 'tango-app-api-middleware';
+import { sendPushNotification, sendAiPushNotification } from 'tango-app-api-middleware';
 // import * as planoService from '../services/planogram.service.js';
 import * as clusterServices from '../services/cluster.service.js';
 import * as teamsServices from '../services/teams.service.js';
@@ -1663,24 +1663,28 @@ export async function internalAISendPushNotification( req, res ) {
       return res.sendError( 'Description is Required', 400 );
     }
 
-    let fcmToken;
+    let userData;
     if ( requestData.email && requestData.email !='' ) {
-      fcmToken = await getUserToken( requestData.clientId, requestData.email );
+      // fcmToken = await getUserToken( requestData.clientId, requestData.email );
+      userData = await userService.findOne( { clientId: requestData.clientId, email: requestData.email }, { fcmToken: 1, loginFrom: 1 } );
     } 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 );
+        // fcmToken = await getUserToken( storeData.spocDetails[0].email );
+        userData = await userService.findOne( { clientId: requestData.clientId, email: requestData.email }, { fcmToken: 1, loginFrom: 1 } );
       }
     }
-    if ( !fcmToken ) {
+    if ( !userData ) {
       return res.sendSuccess( 'Notification Send Successfully' );
     }
     let custom = {
+      title: requestData.title,
+      description: requestData.description,
       type: req.body?.type,
       storeId: req.body?.storeId,
       date: req.body?.date,
     };
-    let responseData = await sendPushNotification( requestData.title, requestData.description, fcmToken, custom );
+    let responseData = await sendAiPushNotification( userData.fcmToken, custom, userData.loginFrom );
     if ( responseData ) {
       return res.sendSuccess( 'Notification Send Successfully' );
     } else {

package/src/controllers/mobileTrax.controller.js

@@ -222,7 +222,7 @@ export async function startChecklistv1( req, res ) {
         coverage: getBeforeChecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
-      let getchecklist = getupdatedchecklist;
+      let getchecklist = JSON.parse( JSON.stringify( getupdatedchecklist ) );
       let questions = [];
       // function processQuestion( question, section, questions, nested=false ) {
       //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
@@ -246,13 +246,15 @@ export async function startChecklistv1( req, res ) {
       for ( let [ index, data ] of getchecklist.entries() ) {
         for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
           questions = [];
+          let count = 0;
           for ( let [ questionIndex, question ] of section.questions.entries() ) {
             let linkedQuestions;
             let uniqueShow = false;
             if ( !question.linkType ) {
               if ( !question?.uniqueNo ) {
+                count = count + 1;
                 uniqueShow = true;
-                question.uniqueNo = parseInt( getOtp() ) + Date.now() + questionIndex;
+                question.uniqueNo = parseInt( getOtp() ) + Date.now() + questionIndex + count;
               }
               questions.push( question );
               linkedQuestions = [];
@@ -269,11 +271,12 @@ export async function startChecklistv1( req, res ) {
                   let nesedQuestion = [];
                   answer.oldNestedQuestion = !uniqueShow ? JSON.parse( JSON.stringify( answer.oldNestedQuestion ) ) : JSON.parse( JSON.stringify( answer.nestedQuestion ) );
                   answer.nestedQuestion.forEach( ( qn, qidx ) => {
+                    count = count + 1;
                     let getQn = questionList.get( qn );
                     if ( getQn ) {
                       let randomNo;
                       if ( !getQn?.uniqueNo || uniqueShow ) {
-                        randomNo = parseInt( getOtp() ) + Date.now() + qidx;
+                        randomNo = parseInt( getOtp() ) + Date.now() + qidx + count;
                       } else {
                         randomNo = getQn?.uniqueNo;
                       }
@@ -320,7 +323,7 @@ export async function startChecklistv1( req, res ) {
       if ( !getchecklist[0].redoStatus ) {
         await processedchecklist.updateOne( updateQuery, { questionAnswers: getchecklist[0].questionAnswers } );
       }
-      getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
+      getchecklist[0].questionAnswers.forEach( ( section ) => {
         section.questions.forEach( async ( question ) => {
           if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
             question.questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + question.questionReferenceImage;
@@ -3317,90 +3320,6 @@ export async function questionListv1( req, res ) {
     } else {
       logger.info( `v5 => Checklist Continue => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Checklist Name: ${getchecklist[0].checkListName}` );
       // let bucket = JSON.parse( process.env.BUCKET );
-      for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
-        for ( let [ questionIndex, question ] of section.questions.entries() ) {
-          let Multianswer = [];
-          if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage && getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage !='' ) {
-            // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await signedUrl( { file_path: decodeURIComponent( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage ), Bucket: bucket.sop } );
-            getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage;
-          }
-          for ( let [ ansIndex, answer ] of question.answers.entries() ) {
-            if ( question.answerType == 'multiplechoicemultiple' ) {
-              let checkvalidation = null;
-              if ( answer.validationAnswer && answer.validationAnswer !='' ) {
-                if ( answer.validationType != 'Descriptive Answer' ) {
-                  // checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
-                  checkvalidation = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.validationAnswer;
-                } else {
-                  checkvalidation = answer.validationAnswer;
-                }
-              }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
-            }
-            if ( answer.referenceImage != '' ) {
-              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( answer.referenceImage ), Bucket: bucket.sop } );
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.referenceImage;
-            }
-            if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
-              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.validationAnswer;
-            }
-          }
-          if ( question?.userAnswer ) {
-            for ( let [ userAnsIndex, userAns ] of question.userAnswer.entries() ) {
-              if ( ( userAns.validationType == 'Capture Image' || userAns.validationType == 'Capture Video' ) && userAns.validationAnswer && userAns.validationAnswer != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( userAns.validationAnswer ), Bucket: bucket.sop } );
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.validationAnswer;
-              }
-              if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.answer;
-              }
-              if ( userAns.referenceImage != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( userAns.referenceImage ), Bucket: bucket.sop } );
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.referenceImage;
-              }
-              if ( question.answerType == 'multiplechoicemultiple' ) {
-                let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
-                if ( ansIndex ) {
-                  Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
-                }
-              }
-              if ( question.answerType == 'multipleImage' ) {
-                if ( userAns && userAns.answer && userAns.answer !='' ) {
-                  // let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                  let manswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.answer;
-                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
-                } else {
-
-                }
-              }
-            }
-          }
-          if ( question.answerType == 'multiplechoicemultiple' ) {
-            Multianswer.forEach( ( item ) => {
-              if ( item.validationAnswer == null ) {
-                item.answer = null;
-              }
-            } );
-            if ( Multianswer.length ) {
-              question.Multianswer = Multianswer;
-            } else {
-              question.Multianswer = Multianswer;
-            }
-          }
-          if ( question.answerType == 'multipleImage' ) {
-            if ( Multianswer.length ) {
-              question.Multianswer = Multianswer;
-            } else {
-              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
-              question.Multianswer = Multianswer;
-            }
-          }
-        }
-      }
-
       let questions = [];
       // function processQuestion( question, section, questions, nested=false ) {
       //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
@@ -3433,13 +3352,15 @@ export async function questionListv1( req, res ) {
       for ( let [ index, data ] of getchecklist.entries() ) {
         for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
           questions = [];
+          let count = 0;
           for ( let [ questionIndex, question ] of section.questions.entries() ) {
             let linkedQuestions;
             let uniqueShow = false;
             if ( !question.linkType ) {
               if ( !question?.uniqueNo ) {
+                count = count + 1;
                 uniqueShow = true;
-                question.uniqueNo = parseInt( getOtp() ) + Date.now() + questionIndex;
+                question.uniqueNo = parseInt( getOtp() ) + Date.now() + questionIndex + count;
               }
               questions.push( question );
               linkedQuestions = [];
@@ -3456,11 +3377,12 @@ export async function questionListv1( req, res ) {
                   let nesedQuestion = [];
                   answer.oldNestedQuestion = !uniqueShow ? JSON.parse( JSON.stringify( answer.oldNestedQuestion ) ) : JSON.parse( JSON.stringify( answer.nestedQuestion ) );
                   answer.nestedQuestion.forEach( ( qn, qidx ) => {
+                    count = count + 1;
                     let getQn = questionList.get( qn );
                     if ( getQn ) {
                       let randomNo;
                       if ( !getQn?.uniqueNo || uniqueShow ) {
-                        randomNo = parseInt( getOtp() ) + Date.now() + qidx;
+                        randomNo = parseInt( getOtp() ) + Date.now() + qidx + count;
                       } else {
                         randomNo = getQn?.uniqueNo;
                       }
@@ -3507,10 +3429,94 @@ export async function questionListv1( req, res ) {
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
       }
-      if ( !getchecklist[0].redoStatus ) {
+      if ( !getchecklist[0].redoStatus && getchecklist[0].checklistStatus != 'submit' ) {
         await processedchecklist.updateOne( { _id: requestData.processedcheckListId }, { questionAnswers: getchecklist[0].questionAnswers } );
       }
 
+      for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
+        for ( let [ questionIndex, question ] of section.questions.entries() ) {
+          let Multianswer = [];
+          if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage && getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage !='' ) {
+            // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await signedUrl( { file_path: decodeURIComponent( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage ), Bucket: bucket.sop } );
+            getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage;
+          }
+          for ( let [ ansIndex, answer ] of question.answers.entries() ) {
+            if ( question.answerType == 'multiplechoicemultiple' ) {
+              let checkvalidation = null;
+              if ( answer.validationAnswer && answer.validationAnswer !='' ) {
+                if ( answer.validationType != 'Descriptive Answer' ) {
+                  // checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                  checkvalidation = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.validationAnswer;
+                } else {
+                  checkvalidation = answer.validationAnswer;
+                }
+              }
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
+            }
+            if ( answer.referenceImage != '' ) {
+              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( answer.referenceImage ), Bucket: bucket.sop } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.referenceImage;
+            }
+            if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
+              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.validationAnswer;
+            }
+          }
+          if ( question?.userAnswer ) {
+            for ( let [ userAnsIndex, userAns ] of question.userAnswer.entries() ) {
+              if ( ( userAns.validationType == 'Capture Image' || userAns.validationType == 'Capture Video' ) && userAns.validationAnswer && userAns.validationAnswer != '' ) {
+                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( userAns.validationAnswer ), Bucket: bucket.sop } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.validationAnswer;
+              }
+              if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
+                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.answer;
+              }
+              if ( userAns.referenceImage != '' ) {
+                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( userAns.referenceImage ), Bucket: bucket.sop } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.referenceImage;
+              }
+              if ( question.answerType == 'multiplechoicemultiple' ) {
+                let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
+                if ( ansIndex ) {
+                  Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
+                }
+              }
+              if ( question.answerType == 'multipleImage' ) {
+                if ( userAns && userAns.answer && userAns.answer !='' ) {
+                  // let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
+                  let manswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.answer;
+                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
+                } else {
+
+                }
+              }
+            }
+          }
+          if ( question.answerType == 'multiplechoicemultiple' ) {
+            Multianswer.forEach( ( item ) => {
+              if ( item.validationAnswer == null ) {
+                item.answer = null;
+              }
+            } );
+            if ( Multianswer.length ) {
+              question.Multianswer = Multianswer;
+            } else {
+              question.Multianswer = Multianswer;
+            }
+          }
+          if ( question.answerType == 'multipleImage' ) {
+            if ( Multianswer.length ) {
+              question.Multianswer = Multianswer;
+            } else {
+              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
+              question.Multianswer = Multianswer;
+            }
+          }
+        }
+      }
+
       return res.sendSuccess( getchecklist );
     }
   } catch ( e ) {

package/src/controllers/trax.controller.js

@@ -190,7 +190,7 @@ export const create = async ( req, res ) => {
       checkListDescription: inputBody.checklistDescription,
       createdBy: req.user._id,
       createdByName: req.user.userName,
-      questionCount: questionCount,
+      // questionCount: questionCount,
       client_id: req.body?.clientId,
       owner: req.user.userType == 'client' ? [ { name: req.user.userName, value: req.user.email } ] : [],
       // configStartDate:new Date(),
@@ -282,7 +282,8 @@ export const create = async ( req, res ) => {
           } );
 
           if ( checkNestedLevel ) {
-            return res.sendError( { message: 'Unable to create more than 20 linked questions.' }, 400 );
+            await checklistService.deleteOne( { _id: checkListId } );
+            return res.sendError( { message: `This ${section.name} contains more than 20 nested linked questions` }, 400 );
           }
 
           let sectionList = {
@@ -296,6 +297,7 @@ export const create = async ( req, res ) => {
           };
           await questionService.create( sectionList ).then( async ( data ) => {
             if ( i == inputBody.sections.length - 1 ) {
+              await checklistService.updateOne( { _id: checkListId }, { questionCount: questionCount } );
               let logObj = {
                 client_id: inputBody.clientId,
                 createAt: new Date(),
@@ -325,7 +327,6 @@ export const create = async ( req, res ) => {
         }
       }
     } ).catch( async ( e ) => {
-      console.log( e );
       await checklistService.deleteOne( { _id: checkListId } );
       return res.sendError( e, 500 );
     } );
@@ -637,6 +638,22 @@ export const deleteChecklist = async ( req, res ) => {
     await processedchecklist.deleteMany( { date_string: { $ne: date }, date_iso: { $gt: date }, sourceCheckList_id: req.params.checklistId, checklistStatus: { $ne: 'submit' } } );
     logger.info( { function: 'deleteChecklist', query: { date_string: { $ne: date }, date_iso: { $gt: date }, sourceCheckList_id: req.params.checklistId, checklistStatus: { $ne: 'submit' } } } );
     checklistDetails.save().then( () => {
+      let logObj = {
+        client_id: checklistDetails.client_id,
+        createAt: new Date(),
+        sourceCheckList_id: checklistDetails._id,
+        checkListName: checklistDetails.checkListName,
+        fromCheckListName: '',
+        type: 'checklist',
+        action: 'deleted',
+        storeName: '',
+        store_id: '',
+        createdByEmail: req.user.email,
+        createdBy: req.user.userName,
+        coverage: checklistDetails.coverage,
+        logDetails: {},
+      };
+      insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       return res.sendSuccess( { message: 'Checklist Deleted Successfully' } );
     } ).catch( ( e ) => {
       return res.sendError( e, 500 );
@@ -710,6 +727,22 @@ export const duplicateChecklist = async ( req, res ) => {
           sections.push( sectionDetails );
         }
         await questionService.insertMany( sections );
+        let logObj = {
+          client_id: checkDetails.client_id,
+          createAt: new Date(),
+          sourceCheckList_id: checkDetails._id,
+          checkListName: checkDetails.checkListName,
+          fromCheckListName: '',
+          type: 'checklist',
+          action: 'duplicated',
+          storeName: '',
+          store_id: '',
+          createdByEmail: req.user.email,
+          createdBy: req.user.userName,
+          coverage: checkDetails.coverage,
+          logDetails: {},
+        };
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
         return res.sendSuccess( { message: 'CheckList Duplicated Successfully' } );
       } else {
         return res.sendSuccess( { message: 'duplicated Successfully' } );
@@ -764,7 +797,7 @@ export const update = async ( req, res ) => {
       questionCount: questionCount,
     };
 
-    checkListDetails.updateOne( { _id: req.params.checklistId }, params );
+    await checklistService.updateOne( { _id: req.params.checklistId }, params );
     let checkListId = req.params.checklistId;
     let logInsertData = {
       action: 'checklistUpdate',
@@ -844,10 +877,8 @@ export const update = async ( req, res ) => {
           } );
         } );
 
-        console.log( checkNestedLevel, 'lebej' );
-
         if ( checkNestedLevel ) {
-          return res.sendError( { message: 'Unable to create more than 20 linked questions' }, 400 );
+          return res.sendError( { message: `This ${section.name} contains more than 20 nested linked questions` }, 400 );
         }
 
         sectionList.push( {
@@ -1579,6 +1610,10 @@ export const updateConfigurev1 =async ( req, res ) => {
       }
     }
 
+    if ( !inputBody.checkListDetails.sections[0].questions.length && inputBody.submitType == 'publish' ) {
+      return res.sendError( 'Please add a question', 400 );
+    }
+
     if ( !inputBody.checkListDetails.assignedUsers.length && inputBody.submitType == 'publish' ) {
       return res.sendError( 'Please Assigned a user', 400 );
     }
@@ -1613,8 +1648,9 @@ export const updateConfigurev1 =async ( req, res ) => {
     if ( inputBody.timeZone ) {
       currentDate = dayjs().tz( inputBody.timeZone ).format();
     } else {
-      currentDate = dayjs().format();
+      currentDate = dayjs().format( 'HH:mm:ss' );
     }
+    currentDate = dayjs.utc( currentDate, 'HH:mm:ss' ).format();
     let updatedscheduleEndTimeISO = dayjs.utc( inputBody?.checkListDetails?.scheduleEndTime, 'hh:mm A' ).format( 'HH:mm:ss' );
     let newUpdatedDate = dayjs.utc( updatedscheduleEndTimeISO, 'HH:mm:ss' ).format();
 
@@ -1778,7 +1814,7 @@ export const updateConfigurev1 =async ( req, res ) => {
         checkListName: configDetails.checkListName,
         fromCheckListName: '',
         type: 'checklist',
-        action: 'updated',
+        action: inputBody.checkListDetails.publish ? 'updated' : 'draft',
         storeName: '',
         store_id: '',
         createdByEmail: req.user.email,
@@ -2290,7 +2326,6 @@ export const validateUserv1 = async ( req, res ) => {
       }, {} );
 
       const duplicateUsers = Object.keys( duplicateUser ).filter( ( storeName ) => duplicateUser[storeName].count > 1 );
-      console.log( duplicateUsers, 'user' );
       if ( duplicateUsers.length ) {
         return res.sendError( { validate: false, duplicates: duplicateUsers, message: 'Email is Duplicated' }, 400 );
       }
@@ -2329,7 +2364,7 @@ export const validateUserv1 = async ( req, res ) => {
       {
         $project: {
           newEmail: { $toLower: '$email' },
-          isActive: 1,
+          // isActive: 1,
           clientId: 1,
           email: 1,
         },
@@ -2337,7 +2372,7 @@ export const validateUserv1 = async ( req, res ) => {
       {
         $match: {
           newEmail: { $in: userEmailList },
-          isActive: true,
+          // isActive: true,
           clientId: { $ne: req.body.clientId },
         },
       },
@@ -4247,7 +4282,7 @@ export async function updateAssign( req, res ) {
       },
     ];
     let assignUserDetails = await userService.aggregate( query );
-    await Promise.all( req.body.assignedList.map( async ( assign ) => {
+    for ( let assign of req.body.assignedList ) {
       let userDetails = assignUserDetails.find( ( ele ) => ele.email.toLowerCase() == assign.userEmail.toLowerCase() );
       if ( !userDetails ) {
         let userData = {
@@ -4257,7 +4292,7 @@ export async function updateAssign( req, res ) {
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
-        userDetails = userDetails;
+        assignUserDetails.push( userDetails );
       }
       let data = {
         ...assign,
@@ -4271,7 +4306,7 @@ export async function updateAssign( req, res ) {
       };
       delete data._id;
       assignedUserList.push( data );
-    } ) );
+    }
     let assignGroupDetails = [];
     if ( req.body.coverage == 'store' ) {
       assignGroupDetails = await clusterServices.findcluster( { _id: { $in: req.body.assignedGroup } } );