tango-app-api-trax 3.5.0-alpha-2 → 3.5.1-alpha-0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.0-alpha-2",
+    "version": "3.5.1-alpha-0",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/download.controller.js

@@ -43,7 +43,7 @@ export const downloadInsert = async ( req, res ) => {
         }
       }
     }
-    console.log( requestData );
+    // console.log( requestData );
 
     if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id != '' ) {
       let getChecklistQuery = [];
@@ -64,7 +64,7 @@ export const downloadInsert = async ( req, res ) => {
           },
         } );
       } else {
-        console.log( requestData );
+        // console.log( requestData );
         getChecklistQuery.push( {
           $match: {
             $and: [
@@ -82,7 +82,7 @@ export const downloadInsert = async ( req, res ) => {
       getChecklistQuery.push( { $count: 'totalCount' } );
 
       let getChecklistCount = await processedchecklistService.aggregate( getChecklistQuery );
-      console.log( getChecklistCount );
+      // console.log( getChecklistCount );
       if ( requestData.insertType === 'task' ) {
         getChecklistCount = await processedTaskService.aggregate( getChecklistQuery );
       }
@@ -146,7 +146,7 @@ export const downloadInsert = async ( req, res ) => {
       'filtertype': requestData.filtertype || 'Clusters',
       'checkListType': requestData.checkListType,
     };
-    console.log( insertData );
+    // console.log( insertData );
     let resultData = await downloadService.insert( insertData );
     if ( resultData ) {
       let sqsMessageRequestData = {
@@ -201,7 +201,7 @@ export const downloadInsertAI = async ( req, res ) => {
       name = requestData?.checklistName;
     }
     let findchecklist = await processedcheklistconfigService.findOne( { 'checkListType': requestData.checkListType, 'client_id': requestData.clientId } ).sort( { _id: -1 } );
-    console.log( findchecklist );
+    // console.log( findchecklist );
     name = name + '-' + requestData.fileType;
     let insertData = {
       'date_string': requestData.fromDate || '',
@@ -232,10 +232,10 @@ export const downloadInsertAI = async ( req, res ) => {
       'checkListName': findchecklist.checkListName,
       'checkListDescription': findchecklist.checkListDescription,
     };
-    console.log( requestData );
-    console.log( insertData );
+    // console.log( requestData );
+    // console.log( insertData );
     let resultData = await downloadService.insert( insertData );
-    console.log( resultData );
+    // console.log( resultData );
     if ( resultData ) {
       let sqsMessageRequestData = {
         'zipId': resultData._id,
@@ -588,7 +588,7 @@ export const getAiChecklistDataFromZipId = async ( req, res ) => {
         brandInfo.brandLogo = getzipdata.client_id + '/logo/' + getClientData.profileDetails.logo;
       }
       getzipdata.brandInfo = brandInfo;
-      console.log( getzipdata );
+      // console.log( getzipdata );
       return res.sendSuccess( getzipdata );
     } else {
       return res.sendError( { error: 'No Data Found' }, 204 );

package/src/controllers/gallery.controller.js

@@ -355,7 +355,7 @@ export async function approveChecklist( req, res ) {
         console.log( 'logData', logData );
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         insertOpenSearchData( urlopensearch.traxActivityLog, logData );
-        console.log( searchResponse.ok );
+        // console.log( searchResponse.ok );
         if ( searchResponse.ok ) {
           let pendingstores = checklistDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {
@@ -439,7 +439,7 @@ export async function redoChecklist( req, res ) {
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
-    console.log( response );
+    // console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
       let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
@@ -479,7 +479,7 @@ export async function redoChecklist( req, res ) {
       };
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoChecklist, requestOptions );
-      console.log( searchResponse.ok );
+      // console.log( searchResponse.ok );
       let logData= {
         'client_id': checklistDetails.client_id,
         'createAt': new Date(),
@@ -581,7 +581,7 @@ export async function redomultiChecklist( req, res ) {
       };
 
       let response = await processedChecklist.updateOne( { _id: originalData.checklistId }, updateData );
-      console.log( response );
+      // console.log( response );
       if ( response.modifiedCount || response.matchedCount ) {
         let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
         let currentDateTime;
@@ -616,7 +616,7 @@ export async function redomultiChecklist( req, res ) {
         req.body.payload._id=originalData.checklistId;
         req.body.payload.section_id=originalData.section_id;
         req.body.payload.uniqueNo=originalData.uniqueNo;
-        console.log( req.body );
+        // console.log( req.body );
 
 
         const requestOptions = {

package/src/controllers/internalTrax.controller.js

@@ -2013,15 +2013,15 @@ export async function getPDFCSVChecklistDetails( req, res ) {
 
 export async function AiPushNotificationAlert( req, res ) {
   try {
-    console.log( req.body );
+    // console.log( req.body );
     let findAichecklist = await PCLconfig.findOne( { checkListType: req.body.checkListType, client_id: req.body.clientId, date_string: req.body.Date }, { aiConfig: 1 } );
     if ( findAichecklist.aiConfig&&findAichecklist.aiConfig.alerts&&findAichecklist.aiConfig.alerts.users&&findAichecklist.aiConfig.alerts.users.length>0 ) {
-      console.log( findAichecklist.aiConfig.alerts.users );
+      // console.log( findAichecklist.aiConfig.alerts.users );
       for ( let user of findAichecklist.aiConfig.alerts.users ) {
         let findOneUser = await userService.findOne( { email: user }, { fcmToken: 1 } );
-        console.log( findOneUser );
+        // console.log( findOneUser );
         if ( findOneUser&&findOneUser.fcmToken&&findOneUser.fcmToken!='' ) {
-          console.log( findOneUser.fcmToken );
+          // console.log( findOneUser.fcmToken );
           try {
             await sendPushNotification( req.body.title, req.body.description, findOneUser.fcmToken );
           } catch ( e ) {

package/src/controllers/mobileTrax.controller.js

@@ -591,47 +591,47 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
       return res.sendError( 'Please Fill all Required Fields', 400 );
     }
 
-    if ( requestData.submittype == 'submit' ) {
-      let reqAnswers = requestData.questionAnswers;
-      logger.error( { functionName: 'payload', message: reqAnswers } );
-      let CLQAnswers = getChecklistQA.questionAnswers;
-      logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
-      let validationCount= 0;
-      let errorCount = 0;
-      CLQAnswers.forEach( ( section ) => {
-        let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
-        if ( requestSection.length ) {
-          requestSection.forEach( ( item ) => item.section_id = section.section_id );
-          section.questions.forEach( ( question ) => {
-            // question.answers.forEach( ( answer ) => {
-            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
-            if ( sectionQuestion.length ) {
-              if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
+    // if ( requestData.submittype == 'submit' ) {
+    let reqAnswers = requestData.questionAnswers;
+    logger.error( { functionName: 'payload', message: reqAnswers } );
+    let CLQAnswers = getChecklistQA.questionAnswers;
+    logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
+    let validationCount= 0;
+    let errorCount = 0;
+    CLQAnswers.forEach( ( section ) => {
+      let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
+      if ( requestSection.length ) {
+        requestSection.forEach( ( item ) => item.section_id = section.section_id );
+        section.questions.forEach( ( question ) => {
+          // question.answers.forEach( ( answer ) => {
+          let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
+          if ( sectionQuestion.length ) {
+            if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
+              validationCount++;
+            } else {
+              if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
                 validationCount++;
-              } else {
-                if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
-                  validationCount++;
-                }
               }
-            } else {
-              errorCount++;
             }
-            // } );
-          } );
-        } else {
-          errorCount++;
-        }
-      } );
-      if ( validationCount ) {
-        return res.sendError( 'Please Fill all Required Fields', 400 );
-      } else if ( errorCount ) {
-        return res.sendError( 'Checklist got edited.please contact admin', 400 );
+          } else {
+            errorCount++;
+          }
+          // } );
+        } );
       } else {
-        next();
+        errorCount++;
       }
+    } );
+    if ( validationCount && requestData.submittype == 'submit' ) {
+      return res.sendError( 'Please Fill all Required Fields', 400 );
+    } else if ( errorCount ) {
+      return res.sendError( 'Checklist got edited.please contact admin', 400 );
     } else {
       next();
     }
+    // } else {
+    //   next();
+    // }
   } catch ( e ) {
     logger.error( { function: 'sopMobilechecklistQuestionValidator', error: e, body: req.body } );
     return res.sendError( e, 500 );

package/src/controllers/teaxFlag.controller.js

@@ -2493,7 +2493,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
         if ( resultData ) {
           if ( resultData.status_code == '200' ) {
             const exportdata = [];
-            console.log( resultData );
+            // console.log( resultData );
             if ( reqestData.ChecklistType==='scrum'||reqestData.ChecklistType==='cleaning' ) {
               reqestData.ChecklistType = 'scrumdetection';
             }
@@ -2515,7 +2515,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
           return res.sendError( 'No Content', 204 );
         }
       }
-      console.log( reqestData );
+      // console.log( reqestData );
 
       let LamdaURL = 'https://bnauly42yuztzrgtttodzt3bcm0oqrsi.lambda-url.ap-south-1.on.aws/';
       let resultData = await LamdaServiceCall( LamdaURL, reqestData );

package/src/controllers/trax.controller.js

@@ -3720,7 +3720,18 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           date_iso: insertdata.date_iso,
           client_id: insertdata.client_id,
           checkListId: updatedchecklist._id,
-          checklistStatus: 'inprogress',
+          // checklistStatus: 'inprogress',
+          $or: [
+            {
+              $and: [
+                { checklistStatus: 'open' },
+                { redoStatus: 'true' },
+              ],
+            },
+            {
+              checklistStatus: 'inprogress',
+            },
+          ],
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
@@ -3739,7 +3750,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }
 
         if ( deletedList.length ) {
-          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList } } );
+          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList }, redoStatus: false } );
         }
         await processedchecklist.insertMany( assignUserList );
         actionType = 'insertAssignUsers';