tango-app-api-trax 3.3.1-airtelai-6 → 3.3.1-airtelai-7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-airtelai-6",
+    "version": "3.3.1-airtelai-7",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -304,7 +304,7 @@ async function insertData( requestData ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall','drinking','bagdetection' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -597,7 +597,7 @@ async function insertData( requestData ) {
                         // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall','drinking','bagdetection' ].includes( getCLconfig.checkListType ) ) {
+                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
                         let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );

package/src/controllers/mobileTrax.controller.js

@@ -2021,21 +2021,26 @@ export async function submitTask( req, res ) {
 export async function submiteyeTestTask( req, res ) {
   try {
     const { body: requestData, user } = req;
-    const { processedcheckListId, date, submittype, currentTime, questionAnswers,streamId,qrCode } = requestData;
-    console.log(requestData)
-    if(!streamId){
-      return res.sendError("streamId is required",500)
+    const { processedcheckListId, date, submittype, currentTime, questionAnswers, streamId, qrCode } = requestData;
+    console.log( requestData );
+    if ( !streamId ) {
+      return res.sendError( 'streamId is required', 400 );
     }
-
-    let findQrExists =  await cameraService.findOne({streamName:streamId,qrCode:qrCode})
-    console.log(findQrExists)
-    if(findQrExists){
-      return res.sendError("Qr code already Exists",500)
+    if ( !qrCode||qrCode=='' ) {
+      return res.sendError( 'qrCode is required', 400 );
+    }
+    let findoldQrExists = await cameraService.findOne( { qrCode: qrCode } );
+    if ( findoldQrExists ) {
+      return res.sendError( 'Qr code already Exists', 400 );
+    }
+    let findQrExists = await cameraService.findOne( { streamName: streamId, qrCode: qrCode } );
+    console.log( findQrExists );
+    if ( findQrExists ) {
+      return res.sendError( 'Qr code already Exists', 400 );
     }
 
-    await cameraService.updateOne({streamName:streamId},{qrCode:qrCode})
-
-
+    await cameraService.updateOne( { streamName: streamId }, { qrCode: qrCode } );
+    return res.sendSuccess( 'Qr code added successfully' );
 
     const findQuery = [
       {

package/src/controllers/trax.controller.js

@@ -3463,7 +3463,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' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];

package/src/routes/mobileTrax.routes.js

@@ -13,7 +13,7 @@ mobileRouter
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
     .post( '/submitCheckListv5', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv1, mobileController.submitChecklist )
     .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
-    .post( '/submiteyeTestTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submiteyeTestTask )
+    .post( '/submiteyeTestTask', isAllowedSessionHandler, mobileController.submiteyeTestTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )
     .get( '/dashboardv1', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboardv1 )
     .get( '/checklist', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklist )