tango-app-api-trax 1.0.0-task.121 → 1.0.0-task.124

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.121",
+    "version": "1.0.0-task.124",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -19,18 +19,18 @@
         "dotenv": "^16.4.5",
         "express": "^4.21.1",
         "express-fileupload": "^1.5.1",
+        "firebase-admin": "^13.0.0",
+        "fs": "^0.0.1-security",
         "handlebars": "^4.7.8",
         "lodash": "^4.17.21",
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
-        "tango-api-schema": "^2.1.87",
+        "path": "^0.12.7",
+        "tango-api-schema": "^2.1.91",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
-        "winston": "^3.13.1",
-        "winston-daily-rotate-file": "^5.0.0",
         "url": "^0.11.4",
-        "path": "^0.12.7",
-        "firebase-admin": "^13.0.0",
-        "fs": "^0.0.1-security"
+        "winston": "^3.13.1",
+        "winston-daily-rotate-file": "^5.0.0"
     },
     "devDependencies": {
         "eslint": "^8.57.0",

package/src/controllers/gallery.controller.js

@@ -4,6 +4,8 @@ import { logger } from 'tango-app-api-middleware';
 import * as storeService from '../services/store.service.js';
 import * as groupService from '../services/group.service.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
+import * as processedChecklist from '../services/processedchecklist.services.js';
+import * as checklistLogs from '../services/checklistlog.service.js';
 // import axios from 'axios';
 async function LamdaServiceCall( url, data ) {
   try {
@@ -247,3 +249,129 @@ export const checklistDropdown = async ( req, res ) => {
     return res.sendError( { error: error }, 500 );
   }
 };
+
+
+export async function approveChecklist( req, res ) {
+  try {
+    let toDate = new Date( req.body.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, checklistStatus: 'submit', approvalEnable: true };
+    if ( req.body?.storeId?.length ) {
+      query['store_id'] = { $in: req.body.storeId };
+    }
+    let checklistDetails = await processedChecklist.find( query, { _id: 1 } );
+    if ( !checklistDetails.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let idList = checklistDetails.map( ( item ) => item._id );
+    let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
+    if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
+      let params = {
+        'payload': {
+          sourceCheckList_id: req.body.sourceCheckList_id,
+          fromDate: req.body.fromDate,
+          toDate: req.body.toDate,
+          store_id: req.body.storeId,
+        },
+        'upsert': {
+          approvalStatus: true,
+        },
+      };
+      const requestOptions = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify( params ),
+      };
+      let searchResponse = await fetch( 'https://wnx32v5mtyqx6kh3nt6xuosjqa0xvdfq.lambda-url.ap-south-1.on.aws', requestOptions );
+      console.log( searchResponse );
+
+      if ( searchResponse.ok ) {
+        return res.sendSuccess( 'Checklist Approved successfully' );
+      } else {
+        return res.sendError( 'Something went wrong', 500 );
+      }
+    }
+  } catch ( e ) {
+    logger.error( { function: 'approveChecklist', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function redoChecklist( req, res ) {
+  try {
+    if ( !req.body.payload._id ) {
+      return res.sendError( 'Id is Required', 400 );
+    }
+    if ( !req.body.payload.section_id ) {
+      return res.sendError( 'Section id is Required', 400 );
+    }
+    if ( !req.body.payload.qno ) {
+      return res.sendError( 'Question number is Required', 400 );
+    }
+
+    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1 } );
+    if ( !checklistDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let question = checklistDetails.questionAnswers;
+    let sectionIndex = question.findIndex( ( sec ) => sec.section_id == req.body.payload.section_id );
+    if ( sectionIndex == -1 ) {
+      return res.sendError( 'section is not found', 400 );
+    }
+    let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true };
+    let userAnswer = data.userAnswer;
+    question[sectionIndex].questions[req.body.payload.qno - 1] = data;
+    question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
+    checklistDetails.questionAnswers = question;
+    let updateData = {
+      checklistStatus: 'open',
+      redoStatus: true,
+      questionAnswers: question,
+    };
+
+    let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
+    if ( response.modifiedCount || response.matchedCount ) {
+      data = {
+        checklistId: checklistDetails.sourceCheckList_id,
+        checkListName: checklistDetails.checkListName,
+        sectionId: req.body.payload.section_id,
+        sectionName: question[sectionIndex].sectionName,
+        questionName: question[sectionIndex].questions[req.body.payload.qno - 1].qname,
+        action: 'redo',
+        store_id: checklistDetails.store_id,
+        storeName: checklistDetails.storeName,
+        client_id: checklistDetails.client_id,
+        processedChecklistId: checklistDetails._id,
+        type: checklistDetails.checkListType,
+        userAnswer: userAnswer,
+      };
+      await checklistLogs.create( data );
+      const requestOptions = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify( req.body ),
+      };
+      let searchResponse = await fetch( 'https://7et6pebvmii725tcntww4w56yq0rjpqw.lambda-url.ap-south-1.on.aws/', requestOptions );
+      console.log( searchResponse );
+
+      if ( searchResponse.ok ) {
+        return res.sendSuccess( 'Question redo successfully' );
+      } else {
+        return res.sendError( 'Something went wrong', 500 );
+      }
+    } else {
+      return res.sendError( 'Something went wrong', 500 );
+    }
+  } catch ( e ) {
+    logger.error( { function: 'redoChecklist', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+

package/src/controllers/mobileTrax.controller.js

@@ -154,7 +154,7 @@ export async function startChecklist( req, res ) {
       }
       updateData.checklistStatus = 'inprogress';
       updateData.startMobileTime = requestData?.currentTime;
-      updateData.questionAnswers = PCLQusestion.questionAnswers || [];
+      updateData.questionAnswers = getBeforeChecklist.redoStatus ? getBeforeChecklist.questionAnswers : PCLQusestion.questionAnswers;
       // const newDateTime = currentDateTime.add(5, 'hours').add(30, 'minutes');
       // updateData.startTime_string = newDateTime.format('hh:mm A, DD MMM');
       updateData.startTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
@@ -304,7 +304,7 @@ export async function startTask( req, res ) {
     const updateData = {
       checklistStatus: 'inprogress',
       startMobileTime: requestData?.currentTime,
-      questionAnswers: processedTaskConfig.questionAnswers || [],
+      questionAnswers: task.redoStatus ? task.questionAnswers : processedTaskConfig.questionAnswers,
       startTime_string: currentDateTime.format( 'hh:mm A, DD MMM YYYY' ),
       startTime: dayjs
           .utc( currentDateTime.format( 'hh:mm A, DD MMM YYYY' ), 'hh:mm A, DD MMM YYYY' )
@@ -579,6 +579,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
                 let qaans = qaAnswers[j].answers;
@@ -618,6 +619,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
                 let qaans = qaAnswers[j].answers;
@@ -661,6 +663,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
                 let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
@@ -709,6 +712,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else {
                 let des = [];
@@ -752,6 +756,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               }
             }
@@ -849,6 +854,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
                 let qaans = qaAnswers[j].answers;
@@ -888,6 +894,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
                 let qaans = qaAnswers[j].answers;
@@ -931,6 +938,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
                 let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
@@ -979,6 +987,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               } else {
                 let des = [];
@@ -1022,6 +1031,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer,
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
                 structure.descriptivetype = qaAnswers[j].descriptivetype,
+                structure.redo = qaAnswers[j]?.redo,
                 newArray.push( structure );
               }
             }
@@ -1120,6 +1130,13 @@ export async function submitChecklist( req, res ) {
         updateData.updatedAt = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
         updateData.submitMobileTime = requestData?.currentTime;
       }
+      updateData.questionAnswers.forEach( ( section ) => {
+        section.questions.forEach( ( question ) => {
+          if ( question.redo === true ) {
+            question.redo = false;
+          }
+        } );
+      } );
       let updatechecklist = await processedchecklist.updateOne( updateQuery, updateData );
       if ( updatechecklist ) {
         if ( checklistDetails && checklistDetails.allowedMultiSubmit && requestData.submittype == 'submit' ) {
@@ -1196,6 +1213,7 @@ export async function submitTask( req, res ) {
     const { body: requestData, user } = req;
     const { processedcheckListId, date, submittype, currentTime, questionAnswers } = requestData;
 
+
     const findQuery = [
       {
         $match: {
@@ -1234,6 +1252,14 @@ export async function submitTask( req, res ) {
       date_string: date,
     };
 
+    questionAnswers.forEach( ( section ) => {
+      section.questions.forEach( ( question ) => {
+        if ( question.redo === true ) {
+          question.redo = false;
+        }
+      } );
+    } );
+
     const updateData = {
       questionAnswers,
       updatedAt: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
@@ -1919,40 +1945,50 @@ export async function taskQuestionList( req, res ) {
     const getSignedUrl = async ( filePath ) =>
       filePath && filePath !== '' ?
         await signedUrl( { file_path: decodeURIComponent( filePath ), Bucket: sopBucket } ) :
-        null;
+        '';
 
     for ( const section of checklist.questionAnswers || [] ) {
       for ( const question of section.questions || [] ) {
         const { answerType, answers = [], userAnswer = [] } = question;
         const multiAnswer = [];
 
-        question.questionReferenceImage = await getSignedUrl( question.questionReferenceImage );
+        if ( typeof question.questionReferenceImage == 'string' && question.questionReferenceImage ) {
+          question.questionReferenceImage = await getSignedUrl( question.questionReferenceImage );
+        } else {
+          if ( question.questionReferenceImage.length ) {
+            let image = [];
+            for ( let img of question.questionReferenceImage ) {
+              image.push( await getSignedUrl( img ) );
+            }
+            question.questionReferenceImage = image;
+          }
+        }
 
         for ( const [ ansIndex, answer ] of answers.entries() ) {
           answer.index = ansIndex;
 
-          answer.referenceImage = await getSignedUrl( answer.referenceImage );
+          answer.referenceImage = answer?.referenceImage ? await getSignedUrl( answer.referenceImage ) : '';
 
-          if ( [ 'Capture Image', 'Capture Video' ].includes( answer.validationType ) ) {
+          if ( [ 'Capture Image', 'Capture Video' ].includes( answer.validationType ) && answer.validationAnswer ) {
             answer.validationAnswer = await getSignedUrl( answer.validationAnswer );
           }
 
-          if ( answerType === 'multiplechoicemultiple' ) {
+          if ( answerType === 'multiplechoicemultiple'&& answer.validationAnswer ) {
             const validationAnswer = await getSignedUrl( answer.validationAnswer );
             multiAnswer.push( { answer: answer.answer, no: ansIndex, validationAnswer } );
           }
         }
 
         for ( const [ userAnsIndex, userAns ] of userAnswer.entries() ) {
-          if ( [ 'Capture Image', 'Capture Video' ].includes( userAns.validationType ) ) {
+          if ( [ 'Capture Image', 'Capture Video' ].includes( userAns.validationType ) && userAns.validationAnswer ) {
             userAns.validationAnswer = await getSignedUrl( userAns.validationAnswer );
           }
 
-          if ( [ 'image', 'descriptiveImage', 'video' ].includes( answerType ) ) {
+          if ( [ 'image', 'descriptiveImage', 'video' ].includes( answerType ) && userAns.answer ) {
             userAns.answer = await getSignedUrl( userAns.answer );
           }
 
-          userAns.referenceImage = await getSignedUrl( userAns.referenceImage );
+          userAns.referenceImage = userAns.referenceImage ? await getSignedUrl( userAns.referenceImage ) : '';
 
           if ( answerType === 'multiplechoicemultiple' ) {
             const ansIndex = multiAnswer.findIndex( ( item ) => item.answer === userAns.answer );

package/src/controllers/trax.controller.js

@@ -826,7 +826,6 @@ export const runAIInsert = async ( req, res ) => {
     InsertTicket.reason = 'Run AI Request';
     InsertTicket.from_email = req.user.email;
     InsertTicket.to_email = 'praveenraju@tangotech.co.in';
-    // InsertTicket.brandId = req.user.brandId;
     InsertTicket.client_id = req.body.clientId;
 
     let ticket = await reisedTicketService.create( req.body );
@@ -1229,7 +1228,6 @@ export const updatePublish = async ( req, res ) => {
 
           let checklistLogQuery = {};
           checklistLogQuery.checkListName = getCheckDetails.checkListName;
-          checklistLogQuery.brandId = getCheckDetails.brandId;
           checklistLogQuery.createdAt = { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) };
           await checklistLogs.deleteMany( checklistLogQuery );
 
@@ -1800,7 +1798,6 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
       insertdata.allowedOverTime = getCLconfig.allowedOverTime;
       insertdata.allowedStoreLocation = getCLconfig.allowedStoreLocation;
       insertdata.client_id = getCLconfig.client_id;
-      insertdata.brandId = getCLconfig.brandId;
       insertdata.createdBy = new ObjectId( getCLconfig.createdBy );
       insertdata.createdByName = getCLconfig.createdByName;
       insertdata.checkListType = getCLconfig.checkListType;
@@ -1835,7 +1832,6 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
         insertdataquery.date_string = insertdata.date_string;
         insertdataquery.date_iso = insertdata.date_iso;
         insertdataquery.client_id = insertdata.client_id;
-        insertdataquery.brandId = insertdata.brandId;
         insertdataquery.sourceCheckList_id = insertdata.sourceCheckList_id;
         let updatedchecklist;
         let checklistDetails = await processedchecklistConfig.findOne( insertdataquery );
@@ -1879,7 +1875,6 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
             'checkFlag': { $first: '$checkFlag' },
             'checkListId': { $first: '$checkListId' },
             'checkListName': { $first: '$checkListName' },
-            'brandId': { $first: '$brandId' },
             'country': { $first: '$country' },
             'createdAt': { $first: '$createdAt' },
             'updatedAt': { $first: '$updatedAt' },
@@ -1999,7 +1994,6 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       assigndeletequery.date_string = insertdata.date_string;
       assigndeletequery.date_iso = insertdata.date_iso;
       assigndeletequery.client_id = insertdata.client_id;
-      assigndeletequery.brandId = insertdata.brandId;
       assigndeletequery.checkListId = updatedchecklist._id;
       assigndeletequery.checklistStatus = { $nin: [ 'submit' ] };
       if ( getCLconfig?.allowedMultiSubmit && processId ) {