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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.122",
+    "version": "1.0.0-task.124",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -253,22 +253,48 @@ export const checklistDropdown = async ( req, res ) => {
 
 export async function approveChecklist( req, res ) {
   try {
-    if ( !req.body.id ) {
-      return res.sendError( 'id is required', 400 );
+    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.findOne( { _id: req.body.id }, { approvalEnable: 1, approvalStatus: 1 } );
-    if ( !checklistDetails ) {
+    let checklistDetails = await processedChecklist.find( query, { _id: 1 } );
+    if ( !checklistDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    if ( !checklistDetails.approvalEnable ) {
-      return res.sendError( 'Checklist has no approver', 400 );
+    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 );
+      }
     }
-    checklistDetails.approvalStatus = true;
-    checklistDetails.save().then( () => {
-      return res.sendSuccess( 'Checklist Approved Successfully' );
-    } ).catch( ( e ) => {
-      return res.sendError( e, 500 );
-    } );
   } catch ( e ) {
     logger.error( { function: 'approveChecklist', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/mobileTrax.controller.js

@@ -1952,33 +1952,43 @@ export async function taskQuestionList( req, res ) {
         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 ) {

package/src/routes/gallery.routes.js

@@ -22,5 +22,5 @@ galleryRouter
 
 
 galleryRouter
-    .post( '/upateApprove', isAllowedSessionHandler, approveChecklist )
+    .post( '/updateApprove', isAllowedSessionHandler, approveChecklist )
     .post( '/redo', isAllowedSessionHandler, redoChecklist );