tango-app-api-trax 3.3.1-beta-7 → 3.3.1-beta-9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-7",
+    "version": "3.3.1-beta-9",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.35",
+        "tango-api-schema": "^2.2.41",
         "tango-app-api-middleware": "^3.1.50",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -354,14 +354,14 @@ export async function redoChecklist( req, res ) {
       return res.sendError( 'section is not found', 400 );
     }
 
-    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
+    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele?.parentQuestion ? ele.qno == req.body.payload.qno && ele.parentQuestion == req.body.payload.parentQuestion : ele.qno == req.body.payload.qno );
 
     let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
     // if ( checklistDetails.client_id == '458' ) {
     data.answers.forEach( ( item ) => {
       if ( item.showLinked ) {
         item.nestedQuestion.forEach( ( ele ) => {
-          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn?.parentQuestion ? qn.qno == parseInt( ele ) && qn?.parentQuestion == req.body.payload?.parentQuestion : qn.qno == parseInt( ele ) );
           let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
           question[sectionIndex].questions[eleIndex] = element;
           question[sectionIndex].questions[eleIndex].userAnswer = [];

package/src/controllers/mobileTrax.controller.js

@@ -149,7 +149,7 @@ export async function startChecklist( req, res ) {
     }
 
     let updateData = {};
-    let storeTimeZone = await storeService.findOne( { storeName: getBeforeChecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+    let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
     let currentDateTime;
     if ( storeTimeZone?.storeProfile?.timeZone ) {
       currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
@@ -244,6 +244,7 @@ export async function startChecklist( req, res ) {
           questions = [];
           for ( let question of section.questions ) {
             if ( !question.linkType ) {
+              question.parentQuestion = question.qno;
               questions.push( question );
               let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
               let linkedQuestion = section.questions.filter( ( qn ) => linkedAnswer.has( qn.qno ) );
@@ -984,7 +985,6 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
     if ( requestData?.editSubmit && requestData?.editSubmit == 'true' ) {
       let sampleData = reqAnswers[0];
       CLQAnswers.forEach( ( section ) => {
-        console.log( section, '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 );
@@ -995,6 +995,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
               data.answerType = question.answerType;
               data.qno = question.qno;
               data.qname = question.qname;
+              data.oldQname = question?.oldQname || question.qname;
               data.answer = 'null';
               data.remarks = '';
               data.validationAnswer = '';
@@ -1016,6 +1017,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
             data.answerType = ele.answerType;
             data.qno = ele.qno;
             data.qname = ele.qname;
+            data.oldQname = ele?.oldQname || ele.qname;
             data.answer = 'null';
             data.remarks = '';
             data.validationAnswer = '';
@@ -1049,7 +1051,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
         let requestSection = reqAnswers.filter( ( item ) => item.section_id == section.id );
         for ( let i = 0; i < requestSection.length; i++ ) {
           for ( let j = 0; j < qaAnswers.length; j++ ) {
-            if ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) {
+            if ( ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) && ( !qaAnswers[j]?.parentQuestion || ( qaAnswers[j]?.parentQuestion && requestSection[i]?.parentQuestion == qaAnswers[j]?.parentQuestion ) ) ) {
               if ( qaAnswers[j].answerType == 'yes/no' ) {
                 let qaans = qaAnswers[j].answers;
                 let yn = [];
@@ -1089,13 +1091,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1141,13 +1144,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1197,13 +1201,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1258,13 +1263,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1317,13 +1323,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
                   structure.task = true;
                 }
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1719,12 +1726,12 @@ export async function submitChecklist( req, res ) {
       updateQuery._id = new ObjectId( requestData.processedcheckListId );
       updateQuery.userId = req.user._id;
       updateQuery.date_string = requestData.date;
-      let storeTimeZone = await storeService.findOne( { storeName: getchecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
       if ( storeTimeZone?.storeProfile?.timeZone ) {
         currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
       } else {
-        currentDateTime = dayjs();
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
       }
       let updateData = {};
       let flagCount = QuestionFlag( req, res );
@@ -2599,6 +2606,7 @@ export async function questionList( req, res ) {
           questions = [];
           for ( let question of section.questions ) {
             if ( !question.linkType ) {
+              question.parentQuestion = question.qno;
               questions.push( question );
               let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
               let linkedQuestion = section.questions.filter( ( qn ) => qn?.parentQuestion ? qn?.parentQuestion == question.qno && linkedAnswer.has( qn.qno ) : linkedAnswer.has( qn.qno ) );

package/src/controllers/teaxFlag.controller.js

@@ -564,7 +564,10 @@ export const flagCardsV1 = async ( req, res ) => {
       {
         $match: {
           client_id: clientId,
-          store_id: { $in: storeId },
+          $or: [
+            { store_id: { $in: storeId } },
+            { aiStoreList: { $in: storeId } },
+          ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
         },
       },
@@ -634,7 +637,7 @@ export const flagCardsV1 = async ( req, res ) => {
           flagCards.detectionFlag.count += resultData[item];
         }
       } );
-      flagCards.totalFlag = flagCards.detectionFlag.count;
+      flagCards.totalFlag += flagCards.detectionFlag.count;
     }
 
     return res.sendSuccess( { flagCards } );
@@ -697,7 +700,12 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
     }
 
     const createFindQuery = ( fromDate, toDate ) => [
-      { $match: { client_id: requestData.clientId, store_id: { $in: requestData.storeId }, date_iso: { $gte: fromDate, $lte: toDate } } },
+      { $match: { client_id: requestData.clientId,
+        $or: [
+          { store_id: { $in: requestData.storeId } },
+          { aiStoreList: { $in: requestData.storeId } },
+        ],
+        date_iso: { $gte: fromDate, $lte: toDate } } },
       {
         $project: {
           timeFlag: 1,

package/src/controllers/trax.controller.js

@@ -874,6 +874,11 @@ export const assignedUserDetails = async ( req, res ) => {
         query.push( { $match: { storeName: { $regex: req.query.search.trim(), $options: 'i' } } } );
       }
     }
+    if ( req.query.sortColumn && req.query.sortBy ) {
+      query.push( { $sort: { [req.query.sortColumn]: parseInt( req.query.sortBy ) } } );
+    } else {
+      query.push( { $sort: { _id: -1 } } );
+    }
 
     query.push( {
       $facet: {
@@ -893,19 +898,28 @@ export const assignedUserDetails = async ( req, res ) => {
     }
 
     let userDetails = [];
+    let storeList = [];
+    let userList = [];
     checklistDetails[0].data.forEach( ( item ) => {
+      if ( item?.store_id ) {
+        storeList.push( item.assignId );
+      } else {
+        userList.push( item.assignId );
+      }
       userDetails.push( {
         id: item._id,
         userName: item.userName,
         userEmail: item.userEmail,
-        store_id: item.store_id,
-        storeName: item.storeName,
+        store_id: item?.store_id,
+        storeName: item?.storeName,
         userPhone: item.userPhone,
         city: item.city,
         checkFlag: item.checkFlag,
+        clusterName: item?.clusterName,
+        teamName: item?.teamName,
       } );
     } );
-    return res.sendSuccess( { users: userDetails, count: checklistDetails[0].count[0].total } );
+    return res.sendSuccess( { users: userDetails, count: checklistDetails[0].count[0].total, storeList, userList } );
   } catch ( e ) {
     logger.error( 'assignedUserDetails =>', e );
     return res.sendError( e, 500 );
@@ -2711,3 +2725,192 @@ export const checklistV2 = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+export async function checklistAssign( req, res ) {
+  try {
+    if ( !req.body.checklistId ) {
+      return res.sendError( 'Checklist id is required', 400 );
+    }
+    if ( !req.body.coverage ) {
+      return res.sendError( 'Coverage is required', 400 );
+    }
+    if ( !req.body.id ) {
+      return res.sendError( 'Store/user id is required', 400 );
+    }
+
+    let checklistDetails = await checklistService.findOne( { _id: req.body.checklistId } );
+    if ( !checklistDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    checklistDetails.coverage = req.body.coverage;
+    checklistDetails.save();
+    let idList;
+    if ( req.body.coverage == 'store' ) {
+      let clusterDetails = await clusterServices.findOneCluster( { _id: req.body.id }, { stores: 1, clusterName: 1 } );
+      if ( clusterDetails ) {
+        idList = clusterDetails.stores.map( ( item ) => item.store );
+      } else {
+        idList = [ new ObjectId( req.body.id ) ];
+      }
+      let getStoreDetails = await storeService.find( { _id: { $in: idList } } );
+      if ( !getStoreDetails.length ) {
+        return res.sendError( 'No data found', 204 );
+      }
+      let assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
+        let userDetails = await userService.findOne( { userEmail: store?.spocDetails?.email, clientId: store.clientId } );
+        if ( !userDetails ) {
+          let data = {
+            clientId: store.clientId,
+            userName: store.spocDetails?.[0]?.name,
+            mobileNumber: store.spocDetails?.[0]?.phone || '',
+            email: store.spocDetails[0].email,
+            password: '5dqFKAJj29PsV6P+kL+3Dw==',
+            role: 'user',
+            userType: 'client',
+            rolespermission: [
+              {
+                featureName: 'Global',
+                modules: [
+                  {
+                    name: 'Store',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'User',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'Camera',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'Configuration',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'Subscription',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'Billing',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                ],
+              },
+              {
+                featurName: 'TangoEye',
+                modules: [
+                  {
+                    name: 'ZoneTag',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                ],
+              },
+              {
+                featurName: 'TangoTrax',
+                modules: [
+                  {
+                    name: 'checklist',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                  {
+                    name: 'Task',
+                    isAdd: false,
+                    isEdit: false,
+
+                  },
+                ],
+              },
+            ],
+          };
+          userDetails = await userService.create( data );
+        }
+        let data = {
+          store_id: store.storeId,
+          storeName: store.storeName,
+          userId: userDetails._id,
+          userName: userDetails.userName,
+          userEmail: userDetails.email,
+          userPhone: userDetails?.mobileNumber,
+          city: store?.storeProfile?.city,
+          country: store?.storeprofile?.country,
+          checkFlag: true,
+          checkListId: req.body.checklistId,
+          checkListName: checklistDetails.checkListName,
+          client_id: store.clientId,
+          clusterName: clusterDetails?.clusterName,
+          assignId: req.body.id,
+        };
+        return data;
+      } ) );
+      await assignedService.insertMany( assignList );
+    } else {
+      let teamDetails = await teamsServices.findOneTeams( { _id: req.body.id }, { users: 1, teamName: 1 } );
+      if ( teamDetails ) {
+        idList = teamDetails.users.map( ( item ) => item.userId );
+      } else {
+        idList = [ new ObjectId( req.body.id ) ];
+      }
+      let userDetails = await userService.find( { _id: { $in: idList } } );
+      if ( !userDetails.length ) {
+        return res.sendError( 'No data found', 204 );
+      }
+      let assignList = [];
+      userDetails.forEach( ( user ) => {
+        assignList.push( {
+          userId: user._id,
+          userName: user.userName,
+          userEmail: user.email,
+          userPhone: user?.mobileNumber,
+          checkFlag: true,
+          checkListId: req.body.checklistId,
+          checkListName: checklistDetails.checkListName,
+          client_id: user.clientId,
+          teamName: teamDetails?.teamName,
+          assignId: req.body.id,
+        } );
+      } );
+      await assignedService.insertMany( assignList );
+    }
+    return res.sendSuccess( 'Details updated successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'checklistAssign', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function removeAssign( req, res ) {
+  try {
+    if ( !req.body.id ) {
+      return res.sendError( 'Id is required', 400 );
+    }
+    if ( !req.body.checkListId ) {
+      return res.sendError( 'Checklist id is required', 400 );
+    }
+    let checklistDetails = await checklistService.findOne( { _id: req.body.checkListId } );
+    if ( !checklistDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    await assignedService.deleteMany( { assignId: req.body.id } );
+    return res.sendSuccess( 'Details removed successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'removeAssign', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/trax.routes.js

@@ -23,6 +23,8 @@ traxRouter
     .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 )
-    .get( '/checklistV2', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( checklistPageSchema ), traxController.checklistV2 );
+    .get( '/checklistV2', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( checklistPageSchema ), traxController.checklistV2 )
+    .post( '/assign', isAllowedSessionHandler, traxController.checklistAssign )
+    .post( '/remove', isAllowedSessionHandler, traxController.removeAssign );
 
 // isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ),