tango-app-api-trax 3.4.0-flag-11 → 3.4.1-activitylog-1

package/src/controllers/mobileTrax.controller.js

@@ -27,7 +27,6 @@ dayjs.extend( timeZone );
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
 dayjs.extend( isSameOrBefore );
 
-
 export async function storeList( req, res ) {
   try {
     if ( !req.query?.date ) {
@@ -279,11 +278,10 @@ export async function startChecklist( req, res ) {
         createdBy: getBeforeChecklist[0]?.userName || '',
         coverage: getBeforeChecklist[0]?.coverage || '',
         logDetails: {},
+        userType: req.user.userType,
       };
       // let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
-      console.log( 'inserttraxlogs', inserttraxlogs );
-      let insertOS = await insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-      console.log( 'insertOS', insertOS );
+      insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       return res.sendSuccess( getchecklist );
     } else {
       return res.sendError( 'something went wrong please try again', 500 );
@@ -474,8 +472,7 @@ export async function startTask( req, res ) {
     };
     // let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
     console.log( 'inserttraxlogs', inserttraxlogs );
-    let insertOS = await insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-    console.log( 'insertOS', insertOS );
+    insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
     return res.sendSuccess( getUpdatedTask );
   } catch ( error ) {
     logger.error( { function: 'startTask', error, body: req.body } );
@@ -1797,6 +1794,7 @@ export async function submitChecklist( req, res ) {
       let flagCount = QuestionFlag( req, res );
       updateData.questionFlag = flagCount;
       updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+      updateData.deviceDetails = requestData?.deviceDetails || {};
       if ( requestData.submittype == 'draft' ) {
         logger.info( `v5 => Checklist Save => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Checklist Name: ${getchecklist[0].checkListName}` );
         updateData.questionAnswers = requestData.questionAnswers;
@@ -1848,7 +1846,7 @@ export async function submitChecklist( req, res ) {
           userName: getchecklist[0].userName || '',
           coverage: getchecklist[0].coverage || '',
         };
-        // console.log( 'logInsertData=>', logInsertData );s
+        console.log( 'logInsertData=>', logInsertData );
         await checklistLogs.create( logInsertData );
         // let time = dayjs().format( 'HH:mm:ss' );
         // let [ hours, minutes ] = time.split( ':' ).map( Number );
@@ -1883,7 +1881,6 @@ export async function submitChecklist( req, res ) {
         // await detectionService.create( detectionData );
         if ( requestData.submittype == 'submit' ) {
           updateOpenSearch( req.user, requestData );
-
           let openSearch = JSON.parse( process.env.OPENSEARCH );
           console.log( 'openSearch', openSearch );
           let inserttraxlogs = {
@@ -1902,13 +1899,12 @@ export async function submitChecklist( req, res ) {
             coverage: getchecklist[0].coverage,
             checkListType: getchecklist[0].checkListType,
             logDetails: {},
+            userType: req.user.userType,
           };
           console.log( 'inserttraxlogs', inserttraxlogs );
-          let insertOS = await insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-          console.log( 'insertOS', insertOS );
+          insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
         }
 
-
         return res.sendSuccess( 'Checklist Updated Successfully' );
       } else {
         return res.sendError( 'something went wrong please try again', 500 );
@@ -2073,7 +2069,6 @@ export async function submitTask( req, res ) {
 
       if ( submittype == 'submit' ) {
         updateOpenSearchTask( user, requestData );
-
         let openSearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'openSearch', openSearch );
         let inserttraxlogs = {
@@ -2092,10 +2087,10 @@ export async function submitTask( req, res ) {
           coverage: checklist.coverage,
           checkListType: checklist.checkListType,
           logDetails: {},
+          userType: req.user.userType,
         };
         console.log( 'inserttraxlogs', inserttraxlogs );
-        let insertOS = await insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-        console.log( 'insertOS', insertOS );
+        insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       }
 
       return res.sendSuccess( 'Task Updated Successfully' );
@@ -2552,7 +2547,7 @@ export async function checklistv1( req, res ) {
             ...projectExtraConditions,
             client_id: { $ifNull: [ '$client_id', '' ] },
             coverage: { $ifNull: [ '$coverage', '' ] },
-            taskType: { $ifNull: [ '$type', '' ] },
+            taskType: { $ifNull: [ '$planoType', '' ] },
           },
         },
       ];
@@ -2647,6 +2642,7 @@ export async function questionList( req, res ) {
         storeName: { $ifNull: [ '$storeName', '' ] },
         redoStatus: { $ifNull: [ '$redoStatus', false ] },
         rawImageUpload: { $ifNull: [ '$rawImageUpload', false ] },
+        rawVideoUpload: { $ifNull: [ '$rawVideoUpload', false ] },
       },
     } );
 
@@ -3336,7 +3332,7 @@ export const sendSignInOtpEmail = async ( emailVars ) => {
     const result = await sendEmailWithSES( emailVars.email, subject, html, attachments, ses.adminEmail );
     return result;
   } catch ( error ) {
-    logger.error( { error: error, function: 'sendSignInOtpEmail', body: req.body } );
+    logger.error( { error: error, function: 'sendSignInOtpEmail', body: emailVars } );
     return error;
   }
 };
@@ -3487,8 +3483,8 @@ export async function clientConfig( req, res ) {
   try {
     let requestData = req.body;
     if ( requestData.clientId && requestData.clientId !='' ) {
-      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1 } );
-      console.log( ' getClientData=>', getClientData );
+      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1, traxBlockMobileTimeUpdate: 1, traxSectionSave: 1 } );
+      // console.log( ' getClientData=>', getClientData );
       if ( getClientData ) {
         return res.sendSuccess( getClientData );
       } else {
@@ -3498,7 +3494,6 @@ export async function clientConfig( req, res ) {
       return res.sendError( 'clientId is Required', 400 );
     }
   } catch ( e ) {
-    console.log( 'e =>', e );
     logger.error( { error: e, function: 'clientConfig' } );
     return res.sendError( e, 500 );
   }
@@ -3516,11 +3511,19 @@ export async function updatePlanoStatus( req, res ) {
     if ( !processCheckDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    processCheckDetails.checklistStatus = req.body.status;
-    processCheckDetails.save();
+    let storeTimeZone = await storeService.findOne( { storeName: { $regex: processCheckDetails.storeName, $options: 'i' }, clientId: processCheckDetails.client_id }, { 'storeProfile.timeZone': 1 } );
+    let currentDateTime;
+    if ( storeTimeZone?.storeProfile?.timeZone ) {
+      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+    } else {
+      currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+    }
+    let submitTimeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    await processedchecklist.updateOne( { _id: req.body.id }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: submitTimeString } : { submitTime_string: submitTimeString } } );
     return res.sendSuccess( 'Status updated Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'updatePlanoStatus' } );
     return res.sendError( e, 500 );
   }
 }
+

package/src/controllers/teaxFlag.controller.js

@@ -2463,6 +2463,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             'Store Id': element?.storeId,
             'Store Spoc Email': element?.storeSpocEmail,
             'Detections': element?.detections,
+            'Detection Status': element?.detectionStatus,
           } );
         } );
         return await download( exportdata, res );
@@ -2487,7 +2488,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
       if ( reqestData.export ) {
         reqestData.limit = 10000;
         reqestData.offset = 0;
-        let LamdaURL = 'https://vpcejaftccr3jzqf5wrdkks7yy0krqix.lambda-url.ap-south-1.on.aws/';
+        let LamdaURL = 'https://bnauly42yuztzrgtttodzt3bcm0oqrsi.lambda-url.ap-south-1.on.aws/';
         let resultData = await LamdaServiceCall( LamdaURL, reqestData );
         if ( resultData ) {
           if ( resultData.status_code == '200' ) {
@@ -2503,6 +2504,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
                 'Store Id': element?.storeId,
                 // 'Store Spoc Email': element?.SpocEmail,
                 'Detections': element?.detections,
+                'Detection Status': element?.detectionStatus,
               } );
             } );
             return await download( exportdata, res );
@@ -2515,7 +2517,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
       }
       console.log( reqestData );
 
-      let LamdaURL = 'https://vpcejaftccr3jzqf5wrdkks7yy0krqix.lambda-url.ap-south-1.on.aws/';
+      let LamdaURL = 'https://bnauly42yuztzrgtttodzt3bcm0oqrsi.lambda-url.ap-south-1.on.aws/';
       let resultData = await LamdaServiceCall( LamdaURL, reqestData );
       // console.log( 'resultData =>', resultData );
       if ( resultData ) {
@@ -2665,7 +2667,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } },
           ],
         },
       ] } },
@@ -3163,3 +3165,59 @@ export const flagTablesV2 = async ( req, res ) => {
     return res.sendError( { error: error }, 500 );
   }
 };
+
+export const checklistCountByType = async ( req, res ) => {
+  try {
+    let { clientId, fromDate, toDate } = req.body;
+
+    fromDate = new Date( fromDate );
+    toDate = new Date( toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 999 );
+
+    let findQuery = [
+      {
+        $match: {
+          client_id: clientId,
+          date_iso: { $gte: fromDate, $lte: toDate },
+        },
+      },
+      {
+        $group: {
+          _id: '$checkListType',
+          count: { $sum: 1 },
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          aiChecklistCount: { $sum: { $cond: [ { $ne: [ '$_id', 'custom' ] }, '$count', 0 ] } },
+          customChecklistCount: { $sum: { $cond: [ { $eq: [ '$_id', 'custom' ] }, '$count', 0 ] } },
+        },
+      },
+      { $project: { _id: 0 } },
+    ];
+
+    let [ result ] = await processedchecklistconfigService.aggregate( findQuery );
+    result = result || { aiChecklistCount: 0, customChecklistCount: 0 };
+    // result.customChecklistCount = 0;
+    // result.aiChecklistCount = 0;
+    let showCards = 'allCards';
+    if ( result.customChecklistCount > 0 && result.aiChecklistCount > 0 ) {
+      showCards = 'allCards';
+    } else if ( result.customChecklistCount > 0 && result.aiChecklistCount <= 0 ) {
+      showCards = 'customCards';
+    } else if ( result.customChecklistCount <= 0 && result.aiChecklistCount > 0 ) {
+      showCards = 'aiCards';
+    }
+    result.showCards = showCards;
+    return res.sendSuccess( {
+      ...result,
+    } );
+  } catch ( error ) {
+    logger.error( { error, function: 'checklistCountByType' } );
+    return res.sendError( { error }, 500 );
+  }
+};
+