tango-app-api-trax 3.7.12-qid-1 → 3.7.12-qid-3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.12-qid-1",
+    "version": "3.7.12-qid-3",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.3.20",
+        "tango-api-schema": "^2.4.5",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/mobileTrax.controller.js

@@ -2947,7 +2947,7 @@ export async function checklistv1( req, res ) {
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
       processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
-      processedTask.aggregate( taskBuildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1, refTaskId: 1 } ) ),
+      processedTask.aggregate( taskBuildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1, refTaskId: 1, store_id: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];

package/src/controllers/teaxFlag.controller.js

@@ -547,7 +547,18 @@ export const flagCardsV1 = async ( req, res ) => {
           client_id: clientId,
           // $or: [ { store_id: { $in: storeId } }, { aiStoreList: { $in: storeId } } ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
-          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: storeId } } ],
+          // $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: storeId } } ],
+          // $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+          $or: clientId === '11' ?
+        [
+          { store_id: { $in: storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+        ] :
+        [
+          { store_id: { $in: storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+          { aiStoreList: { $in: storeId } },
+        ],
         },
       },
       {
@@ -2876,7 +2887,18 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
     const createFindQuery = ( fromDate, toDate ) => [
       { $match: { client_id: requestData.clientId,
         date_iso: { $gte: fromDate, $lte: toDate },
-        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ],
+        // $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ],
+        // $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+        $or: requestData.clientId === '11' ?
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+        ] :
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+          { aiStoreList: { $in: requestData.storeId } },
+        ],
       } },
       {
         $project: {
@@ -3006,8 +3028,18 @@ export const flagTablesV2 = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         { date_iso: { $gte: fromDate, $lte: toDate } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        // { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        // { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
     );
+    if ( requestData.clientId == '11' ) {
+      findAndQuery.push(
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+      );
+    } else {
+      findAndQuery.push(
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
+      );
+    }
 
     if ( requestData?.filter === 'all' ) {
       findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking' ] } } ] } );

package/src/controllers/trax.controller.js

@@ -248,19 +248,39 @@ export const create = async ( req, res ) => {
           //   // }
           // } );
 
-          if ( section.questions && section.questions.length > 0 ) {
           // Find max uniqueqno (ignore missing values)
-            let maxQID = Math.max( 0,
-                ...section.questions .filter( ( q ) => q.uniqueqno !== undefined ) .map( ( q ) => q.uniqueqno ),
-            );
-            // Loop through questions
-            for ( let [ index1, question ] of section.questions.entries() ) {
-              if ( !question.uniqueqno ) {
-                maxQID++; // increment
-                section.questions[index1].uniqueqno = maxQID; // assign new ID
+          // if ( section.questions && section.questions.length > 0 ) {
+          //   let maxQID = Math.max( 0,
+          //       ...section.questions .filter( ( q ) => q.uniqueqno !== undefined ) .map( ( q ) => q.uniqueqno ),
+          //   );
+          //   // Loop through questions
+          //   for ( let [ index1, question ] of section.questions.entries() ) {
+          //     if ( !question.uniqueqno ) {
+          //       maxQID++; // increment
+          //       section.questions[index1].uniqueqno = maxQID; // assign new ID
+          //     }
+          //     if ( !question.uniqueqid ) {
+          //       section.questions[index1].uniqueqid = req.body.clientId+'-'+ checkNumber+'-'+ section.sectionNumber+'-'+ maxQID; // assign new ID
+          //     }
+          //   }
+          // }
+
+          let maxQID = 0;
+          if ( section.questions && section.questions.length > 0 ) {
+          // let qids = section.questions
+          //     .filter( ( q ) => q.uniqueqno != null )
+          //     .map( ( q ) => Number( q.uniqueqno ) );
+          // console.log( 'Extracted QIDs =>', qids );
+          // let maxQID = Math.max( 0, ...qids );
+          // console.log( 'maxQID =>', maxQID );
+
+            for ( let [ index1, questions ] of section.questions.entries() ) {
+              if ( !questions.uniqueqno ) {
+                maxQID++;
+                section.questions[index1].uniqueqno = maxQID;
               }
-              if ( !question.uniqueqid ) {
-                section.questions[index1].uniqueqid = req.body.clientId+'-'+ checkNumber+'-'+ section.sectionNumber+'-'+ maxQID; // assign new ID
+              if ( !questions.uniqueqid ) {
+                section.questions[index1].uniqueqid = req.body.clientId + '-' + checkListDetails.checkListNumber + '-' + section.sectionNumber + '-' + maxQID;
               }
             }
           }
@@ -310,6 +330,7 @@ export const create = async ( req, res ) => {
             question: section.questions,
             checkList: inputBody.checklistName,
             sectionNumber: section.sectionNumber,
+            maxQuestionNumber: maxQID,
           };
           await questionService.create( sectionList ).then( async ( data ) => {
             if ( i == inputBody.sections.length - 1 ) {
@@ -492,6 +513,7 @@ export const getConfigDetails = async ( req, res ) => {
             oldName: item?.sectionOldName,
             questions: item.question,
             sectionNumber: item.sectionNumber,
+            maxQuestionNumber: item?.maxQuestionNumber,
           } );
         } );
         sectionList = sections;
@@ -959,39 +981,37 @@ export const update = async ( req, res ) => {
         //     }
         //   } );
         // } );
-        console.log( 'heelos =>' );
-        if ( section.questions && section.questions.length > 0 ) {
-          // Find max uniqueqno (cast to number, ignore null/undefined)
-          console.log( 'section.questions =>', section.questions );
-          console.log( 'section.questions =>', section.questions[0] );
-          let qids = section.questions
-              .filter( ( q ) => q.uniqueqno != null )
-              .map( ( q ) => Number( q.uniqueqno ) );
-
-          console.log( 'Extracted QIDs =>', qids );
 
-          let maxQID = Math.max( 0, ...qids );
-          console.log( 'maxQID =>', maxQID );
+        // Find max uniqueqno (cast to number, ignore null/undefined)
+        let maxQID = 0;
+        // console.log( 'section.sectionNumber =>', section.sectionNumber );
+        // console.log( 'maxQID =>', maxQID );
+        if ( section.questions && section.questions.length > 0 ) {
+          // let qids = section.questions
+          //     .filter( ( q ) => q.uniqueqno != null )
+          //     .map( ( q ) => Number( q.uniqueqno ) );
+          // console.log( 'Extracted QIDs =>', qids );
+          // let maxQID = Math.max( 0, ...qids );
+          // console.log( 'maxQID =>', maxQID );
+
+          if ( section.maxQuestionNumber > 0 ) {
+            maxQID = section.maxQuestionNumber || 0;
+          }
 
+          // else {
+          //   maxQID = 0;
+          // }
           for ( let [ index1, questions ] of section.questions.entries() ) {
-            if ( !questions.uniqueqno ) {
+            if ( questions?.uniqueqno == null || questions.uniqueqno === 0 ) {
               maxQID++;
               section.questions[index1].uniqueqno = maxQID;
             }
-            if ( !questions.uniqueqid ) {
-              section.questions[index1].uniqueqid =
-        req.body.clientId +
-        '-' +
-        checkListDetails.checkListNumber +
-        '-' +
-        section.sectionNumber +
-        '-' +
-        maxQID;
+            if ( questions?.uniqueqid == null || questions.uniqueqid === '' ) {
+              section.questions[index1].uniqueqid = req.body.clientId + '-' + checkListDetails.checkListNumber + '-' + section.sectionNumber + '-' + maxQID;
             }
           }
         }
 
-        console.log( 'else =>' );
         for ( let [ index, question ] of section.questions.entries() ) {
           await processNested( index, question );
         }
@@ -1038,6 +1058,7 @@ export const update = async ( req, res ) => {
           question: section.questions,
           checkList: inputBody.checklistName,
           sectionNumber: section.sectionNumber,
+          maxQuestionNumber: maxQID,
         } );
       }
     }