tango-app-api-trax 3.4.1-alpha-10 → 3.4.1-alpha-11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.4.1-alpha-10",
+    "version": "3.4.1-alpha-11",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -206,20 +206,7 @@ export async function startChecklist( req, res ) {
       } );
       let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
       // let bucket = JSON.parse( process.env.BUCKET );
-      getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
-        section.questions.forEach( async ( question ) => {
-          if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
-            question.questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + question.questionReferenceImage;
-            // question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
-          }
-          question.answers.forEach( async ( answer ) => {
-            if ( answer.referenceImage != '' ) {
-              answer.referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.referenceImage;
-              // answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
-            }
-          } );
-        } );
-      } );
+
       let logInsertData = {
         store_id: getBeforeChecklist[0]?.store_id || '',
         storeName: getBeforeChecklist[0]?.storeName || '',
@@ -268,6 +255,7 @@ export async function startChecklist( req, res ) {
               question.answers.forEach( ( answer ) => {
                 if ( answer.linkedQuestion ) {
                   let nesedQuestion = [];
+                  answer.oldNestedQuestion = JSON.parse( JSON.stringify( answer.nestedQuestion ) );
                   answer.nestedQuestion.forEach( ( qn, qidx ) => {
                     let getQn = questionList.get( qn );
                     if ( getQn ) {
@@ -276,6 +264,7 @@ export async function startChecklist( req, res ) {
                       getQn = { ...getQn, uniqueNo: randomNo };
                       nesedQuestion.push( getQn );
                       if ( answer.linkedQuestion == getQn.qno ) {
+                        answer.oldLinkedQuestion = answer.linkedQuestion;
                         answer.linkedQuestion = randomNo;
                       }
                       answer.nestedQuestion[qidx] = randomNo;
@@ -285,10 +274,12 @@ export async function startChecklist( req, res ) {
                     let nestedLinkqn = [];
                     ele.answers.forEach( ( ans ) => {
                       if ( ans.linkedQuestion ) {
+                        ans.oldNestedQuestion = JSON.parse( JSON.stringify( ans.nestedQuestion ) );
                         ans.nestedQuestion.forEach( ( nested, idx ) => {
                           let findRandom = nesedQuestion.find( ( qn ) => qn.qno == nested && !nestedLinkqn.includes( qn.uniqueNo ) && !qn.updated );
                           if ( findRandom ) {
                             if ( ans.linkedQuestion == findRandom.qno ) {
+                              ans.oldLinkedQuestion = ans.linkedQuestion;
                               ans.linkedQuestion = findRandom.uniqueNo;
                             }
                             ans.nestedQuestion[idx] = findRandom.uniqueNo;
@@ -310,6 +301,20 @@ export async function startChecklist( req, res ) {
         }
       }
       await processedchecklist.updateOne( updateQuery, { questionAnswers: getchecklist[0].questionAnswers } );
+      getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
+        section.questions.forEach( async ( question ) => {
+          if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
+            question.questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + question.questionReferenceImage;
+            // question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
+          }
+          question.answers.forEach( async ( answer ) => {
+            if ( answer.referenceImage != '' ) {
+              answer.referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.referenceImage;
+              // answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
+            }
+          } );
+        } );
+      } );
       return res.sendSuccess( getchecklist );
     } else {
       return res.sendError( 'something went wrong please try again', 500 );
@@ -2756,14 +2761,16 @@ export async function questionList( req, res ) {
           questions = [];
           for ( let question of section.questions ) {
             let linkedQuestions;
+            let uniqueShow = false;
             if ( !question.linkType ) {
               if ( !question?.uniqueNo ) {
+                uniqueShow = true;
                 question.uniqueNo = parseInt( getOtp() );
               }
               questions.push( question );
               linkedQuestions = [];
               let questionList;
-              if ( !question?.uniqueNo ) {
+              if ( uniqueShow ) {
                 questionList = new Map( section.questions.map( ( ele ) => [ ele.qno, ele ] ) );
               } else {
                 let uniqueList = question.answers.flatMap( ( ele ) => ele.nestedQuestion );
@@ -2796,7 +2803,7 @@ export async function questionList( req, res ) {
                     ele.answers.forEach( ( ans ) => {
                       if ( ans.linkedQuestion ) {
                         ans.nestedQuestion.forEach( ( nested, idx ) => {
-                          let findRandom = nesedQuestion.find( ( qn ) => ( !question?.uniqueNo ? qn.qno == nested : qn.uniqueNo == nested ) && !nestedLinkqn.includes( qn.uniqueNo ) && !qn.updated );
+                          let findRandom = nesedQuestion.find( ( qn ) => ( uniqueShow ? qn.qno == nested : qn.uniqueNo == nested ) && !nestedLinkqn.includes( qn.uniqueNo ) && !qn.updated );
                           if ( findRandom ) {
                             if ( ans.linkedQuestion == findRandom.qno ) {
                               ans.linkedQuestion = findRandom.uniqueNo;

package/src/controllers/trax.controller.js

@@ -1,4 +1,4 @@
-import { signedUrl, fileUpload, chunkArray, logger, sendPushNotification } from 'tango-app-api-middleware';
+import { fileUpload, chunkArray, logger, sendPushNotification } 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';
@@ -361,23 +361,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;
               }
             } );
           } );
@@ -862,11 +862,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 );
     }
@@ -1468,10 +1468,12 @@ export const updateConfigurev1 =async ( req, res ) => {
     if ( !checklistDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-
-    let currentDate = dayjs().tz( inputBody.timeZone ).format();
-    console.log( dayjs().tz( 'Asia/Kolkata' ).format() );
-    console.log( currentDate, 'date' );
+    let currentDate;
+    if ( inputBody.timeZone ) {
+      currentDate = dayjs().tz( inputBody.timeZone ).format();
+    } else {
+      currentDate = dayjs().format();
+    }
     let updatedscheduleEndTimeISO = dayjs.utc( inputBody?.checkListDetails?.scheduleEndTime, 'hh:mm A' ).format( 'HH:mm:ss' );
     let newUpdatedDate = dayjs.utc( updatedscheduleEndTimeISO, 'HH:mm:ss' ).format();
 
@@ -3182,6 +3184,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                     delete data.parentanswer;
                     delete data.remarks;
                     delete data.linkquestionenabled;
+                    let uniqueNo = data.uniqueNo;
+                    delete data.uniqueNo;
                     if ( data.descriptivetype == null ) {
                       delete data.descriptivetype;
                     }
@@ -3193,14 +3197,20 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                       delete ans.index;
                       delete ans.validationAnswer;
                       delete ans.answeroptionNumber;
+                      ans.nestedQuestion = ans?.oldNestedQuestion ? ans.oldNestedQuestion : [];
+                      ans.linkedQuestion = ans?.oldLinkedQuestion ? ans.oldLinkedQuestion : 0;
+                      delete ans.oldNestedQuestion;
+                      delete ans.oldLinkedQuestion;
                     } );
                     const compare = findDifferences( data, qns );
                     if ( compare?.answerType || compare?.answers || compare?.linkType ) {
                       logger.info( 'compare =>', compare );
+                      logger.info( 'qno =>', data.qno );
                       modifiedCount++;
                       question.push( qns );
                     } else {
                       getsubmitDetails[0].questionAnswers[index].questions[findQuestion].qname = qns.qname;
+                      getsubmitDetails[0].questionAnswers[index].questions[findQuestion].uniqueNo = uniqueNo;
                       question.push( getsubmitDetails[0].questionAnswers[index].questions[findQuestion] );
                     }
                   } else {
@@ -3623,7 +3633,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/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 );