tango-app-api-trax 3.7.5-halfshutter-2 → 3.7.12-qid-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.5-halfshutter-2",
+    "version": "3.7.12-qid-2",
     "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.4.4",
+        "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

@@ -1088,6 +1088,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
               let data = { ...requestSection[0] };
               data.answerType = question.answerType;
               data.qno = question.qno;
+              data.uniqueqno = question.uniqueqno;
+              data.uniqueqid = question.uniqueqid;
               data.qname = question.qname;
               data.oldQname = question?.oldQname || question.qname;
               data.answer = 'null';
@@ -1110,6 +1112,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
             data.sectionName = section.sectionName;
             data.answerType = ele.answerType;
             data.qno = ele.qno;
+            data.uniqueqno = ele.uniqueqno;
+            data.uniqueqid = ele.uniqueqid;
             data.qname = ele.qname;
             data.oldQname = ele?.oldQname || ele.qname;
             data.answer = 'null';
@@ -1171,6 +1175,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
                 structure.qname = qaAnswers[j].qname;
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
@@ -1225,6 +1231,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
                 structure.qname = qaAnswers[j].qname;
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
@@ -1283,6 +1291,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
@@ -1348,6 +1358,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 // }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
                 structure.qname = qaAnswers[j].qname;
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
@@ -1413,6 +1425,8 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
                 structure.qname = qaAnswers[j].qname;
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;

package/src/controllers/trax.controller.js

@@ -169,12 +169,17 @@ export const create = async ( req, res ) => {
     //     }
     // }
 
-    let getchecklistNumber = await checklistService.findOne( { client_id: req.body.clientId, type: 'checklist' }, { checkListNumber: 1 } );
-    if ( getchecklistNumber ) {
-      checkNumber = getchecklistNumber.checkListNumber + 1;
-    } else {
-      checkNumber = 1;
-    }
+    // let getchecklistNumber = await checklistService.findOne( { client_id: req.body.clientId, type: 'checklist' }, { checkListNumber: 1 } );
+    // if ( getchecklistNumber ) {
+    //   checkNumber = getchecklistNumber.checkListNumber + 1;
+    // } else {
+    //   checkNumber = 1;
+    // }
+    let result = await checklistService.aggregate( [
+      { $match: { client_id: req.body.clientId, type: 'checklist' } },
+      { $group: { _id: null, maxCheckListNumber: { $max: '$checkListNumber' } } },
+    ] );
+    checkNumber = result.length > 0 ? result[0].maxCheckListNumber+1 : 0;
 
     let runAIQuestionCount = 0;
 
@@ -243,6 +248,43 @@ export const create = async ( req, res ) => {
           //   // }
           // } );
 
+          // Find max uniqueqno (ignore missing values)
+          // 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 ( !questions.uniqueqid ) {
+                section.questions[index1].uniqueqid = req.body.clientId + '-' + checkListDetails.checkListNumber + '-' + section.sectionNumber + '-' + maxQID;
+              }
+            }
+          }
+
           for ( let [ index, question ] of section.questions.entries() ) {
             await processNested( index, question );
           }
@@ -288,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 ) {
@@ -355,6 +398,7 @@ export const create = async ( req, res ) => {
                           runAIFeatures: ans.runAIFeatures,
                           multiReferenceImage: ans.multiReferenceImage,
                           runAIDescription: ans.runAIDescription,
+                          uniqueqid: question.uniqueqid || '',
                         } );
                       }
                     } );
@@ -469,6 +513,7 @@ export const getConfigDetails = async ( req, res ) => {
             oldName: item?.sectionOldName,
             questions: item.question,
             sectionNumber: item.sectionNumber,
+            maxQuestionNumber: item?.maxQuestionNumber,
           } );
         } );
         sectionList = sections;
@@ -546,12 +591,7 @@ export const zoneList = async ( req, res ) => {
   try {
     let inputBody = req.query;
 
-    const allowedChecklists = [
-      'Outside Business Hours Queue Tracking',
-      'Store Half Shutter Detection',
-    ];
-
-    if ( inputBody.checkListName && allowedChecklists.includes( inputBody.checkListName ) ) {
+    if ( inputBody.checkListName && inputBody.checkListName == 'Outside Business Hours Queue Tracking' ) {
       let query = [
         {
           $match: {
@@ -788,6 +828,7 @@ export const duplicateChecklist = async ( req, res ) => {
     dupDetails.createdAt = new Date();
     dupDetails.updatedAt = new Date();
     dupDetails.publishDate = '';
+    dupDetails.checkListNumber = dupDetails.checkListNumber+1;
     delete dupDetails._id;
     let logInsertData = {
       action: 'duplicateChecklist',
@@ -941,6 +982,31 @@ export const update = async ( req, res ) => {
         //   } );
         // } );
 
+        // Find max uniqueqno (cast to number, ignore null/undefined)
+        let 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 = section.questions.length || 0;
+          }
+          for ( let [ index1, questions ] of section.questions.entries() ) {
+            if ( questions?.uniqueqno == null || questions.uniqueqno === 0 ) {
+              maxQID++;
+              section.questions[index1].uniqueqno = maxQID;
+            }
+            if ( questions?.uniqueqid == null || questions.uniqueqid === '' ) {
+              section.questions[index1].uniqueqid = req.body.clientId + '-' + checkListDetails.checkListNumber + '-' + section.sectionNumber + '-' + maxQID;
+            }
+          }
+        }
+
         for ( let [ index, question ] of section.questions.entries() ) {
           await processNested( index, question );
         }
@@ -987,6 +1053,7 @@ export const update = async ( req, res ) => {
           question: section.questions,
           checkList: inputBody.checklistName,
           sectionNumber: section.sectionNumber,
+          maxQuestionNumber: maxQID,
         } );
       }
     }
@@ -1152,6 +1219,7 @@ export const update = async ( req, res ) => {
                 runAIFeatures: ans.runAIFeatures,
                 multiReferenceImage: ans.multiReferenceImage,
                 runAIDescription: ans.runAIDescription,
+                uniqueqid: question.uniqueqid || '',
               } );
             }
           } );
@@ -3950,7 +4018,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -3963,7 +4031,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );
@@ -4723,6 +4791,7 @@ export async function updateRunAIRequest( req, res ) {
       sectionNo: inputBody.sectionNo || '',
       qname: inputBody.qname,
       answer: inputBody.answer,
+      uniqueqid: inputBody.uniqueqid,
     };
     let checkRunAIRequest = await runAIRequestServices.findOne( checkRunAIRequestQuery );