tango-app-api-trax 1.0.0-alpha.98 → 1.0.0-task.118

package/src/controllers/teaxFlag.controller.js

@@ -614,9 +614,7 @@ export const flagCardsV1 = async ( req, res ) => {
     const resultData = await LamdaServiceCall( lambdaURL, detectionPayload );
 
     if ( resultData && resultData.status_code === '200' ) {
-      delete resultData.status_code;
-      const detectionFlags = Object.values( resultData ).reduce( ( acc, val ) => acc + val, 0 );
-      flagCards.detectionFlag.count = Math.round( detectionFlags );
+      flagCards.detectionFlag.count = resultData.totalDetection;
       flagCards.totalFlag += flagCards.detectionFlag.count;
     }
 
@@ -701,8 +699,12 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
         return { comparisonData: 0, ComparisonFlag: false };
       }
 
-      let comparisonData = Math.abs( ( ( rangeOneVal - rangeTwoVal ) / rangeOneVal ) * 100 );
-      comparisonData = comparisonData % 1 === 0 ? comparisonData.toFixed( 0 ) : comparisonData.toFixed( 2 );
+      let comparisonData = Math.abs( ( ( rangeOneVal - rangeTwoVal ) / rangeTwoVal ) * 100 );
+      if ( comparisonData === Infinity ) comparisonData = 0;
+      comparisonData = comparisonData % 1 === 0 ? comparisonData.toFixed( 0 ) : comparisonData.toFixed( 1 );
+
+      comparisonData = parseInt( comparisonData );
+
 
       const ComparisonFlag = rangeOneVal > rangeTwoVal;
 
@@ -712,17 +714,24 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
     const getDetectionCount = async ( fromDate, toDate ) => {
       const detectionPayload = {
         fromDate: dayjs( fromDate ).format( 'YYYY-MM-DD' ),
-        toDate: dayjs( toDate ).format( 'YYYY-MM-DD' ),
+        toDate: dayjs( toDate ).startOf( 'day' ).format( 'YYYY-MM-DD' ),
         storeId: requestData.storeId,
         clientId: requestData.clientId,
       };
 
+      console.log( dayjs( fromDate ).format( 'YYYY-MM-DD' ), 'from date' );
+
+      console.log( dayjs( toDate ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'current' );
+
+      console.log( dayjs( toDate ).format( 'YYYY-MM-DD' ), 'previous' );
+
+      console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
+
       const LamdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
       const resultData = await LamdaServiceCall( LamdaURL, detectionPayload );
 
       if ( resultData?.status_code === '200' ) {
-        delete resultData.status_code;
-        return Object.values( resultData ).reduce( ( acc, curr ) => acc + curr, 0 );
+        return resultData.totalDetection;
       }
       return 0;
     };
@@ -808,6 +817,7 @@ export const flagTablesV1 = async ( req, res ) => {
         checkListType: 1,
         scheduleRepeatedType: 1,
         store_id: 1,
+        aiStoreList: 1,
       },
     } );
 
@@ -818,7 +828,8 @@ export const flagTablesV1 = async ( req, res ) => {
         checkListChar: { $last: { $substr: [ '$checkListName', 0, 2 ] } },
         sourceCheckList_id: { $last: '$sourceCheckList_id' },
         checkListType: { $last: '$checkListType' },
-        assignedStores: { $max: '$storeCount' },
+        storeCount: { $sum: 1 },
+        storeCountAi: { $max: '$storeCount' },
         flaggedStores: {
           $addToSet: {
             $cond: [
@@ -874,22 +885,33 @@ export const flagTablesV1 = async ( req, res ) => {
           //   $cond: [ { $gt: [ '$questionCount', 0 ] }, 1, 0 ],
           // },
         },
+        aiStoreList: { $max: '$aiStoreList' },
+        submittedQuestionCount: {
+          $sum: {
+            $cond: [
+              { $eq: [ '$checklistStatus', 'submit' ] },
+              '$questionCount', // Sum this field if status is 'submit'
+              0, // Otherwise, add 0
+            ],
+          },
+        },
       },
     } );
 
     findQuery.push( {
       $project: {
+        assignedStores: '$storeCount',
+        assignedStoresAi: '$storeCountAi',
         checkListName: 1,
         checkListChar: 1,
         sourceCheckList_id: 1,
         checkListType: 1,
         flagType: 1,
-        assignedStores: 1,
         uniqueFlaggedStores: 1,
         flaggedStores: { $size: '$flaggedStores' },
         flagCount: 1,
         questionCount: 1,
-        correctAnswers: { $subtract: [ '$questionCount', '$questionFlag' ] },
+        correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlag' ] },
         // customType: {
         //   $cond: { if: { $gte: [ '$questionFlag', 1 ] }, then: 'question', else: {
         //     $cond: { if: { $gte: [ '$timeFlag', 1 ] }, then: 'time', else: '' },
@@ -899,6 +921,7 @@ export const flagTablesV1 = async ( req, res ) => {
         customQuestionFlagCount: '$questionFlag',
         customTimeFlagCount: '$timeFlag',
         // correctAnswers: '$questionFlag',
+        aiStoreList: 1,
       },
     } );
 
@@ -910,6 +933,7 @@ export const flagTablesV1 = async ( req, res ) => {
         checkListType: 1,
         flagType: 1,
         assignedStores: 1,
+        assignedStoresAi: 1,
         flaggedStores: 1,
         flagCount: 1,
         uniqueFlaggedStores: 1,
@@ -925,6 +949,8 @@ export const flagTablesV1 = async ( req, res ) => {
         // customType: 1,
         customQuestionFlagCount: 1,
         customTimeFlagCount: 1,
+        aiStoreList: 1,
+
       },
     } );
 
@@ -967,7 +993,8 @@ export const flagTablesV1 = async ( req, res ) => {
               if ( getChecklistPerformanceData[index].checkListType !== 'custom' ) {
                 getChecklistPerformanceData[index].flagCount = resultData?.[getChecklistPerformanceData[index]?.checkListType] || 0;
                 getChecklistPerformanceData[index].flaggedStores = resultData?.[`${getChecklistPerformanceData[index]?.checkListType}_flaggedstores`] || 0;
-                getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].flaggedStores / resultData?.[getChecklistPerformanceData[index]?.checkListType] ) * 100;
+                getChecklistPerformanceData[index].assignedStores = getChecklistPerformanceData[index]?.aiStoreList?.filter( ( element ) => requestData.storeId.includes( element ) )?.length || 0;
+                getChecklistPerformanceData[index].complianceRate = ( 100- ( getChecklistPerformanceData[index].flaggedStores / getChecklistPerformanceData[index].assignedStores ) * 100 );
                 getChecklistPerformanceData[index].complianceRate = Math.min( 100, Math.max( 0, getChecklistPerformanceData[index].complianceRate ) );
                 getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].complianceRate % 1 === 0 ) ? getChecklistPerformanceData[index].complianceRate.toFixed( 0 ) : getChecklistPerformanceData[index].complianceRate.toFixed( 2 );
               }
@@ -2179,19 +2206,19 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
 
 
       if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {
-        flagComparisonCards.totalAssignedStores.comparisonData = ( ( ( rangeOneData[0].totalAssignedStores - rangeTwoData[0].totalAssignedStores )/rangeOneData[0].totalAssignedStores )*100 ).toFixed( 2 );
+        flagComparisonCards.totalAssignedStores.comparisonData = ( ( ( rangeOneData[0].totalAssignedStores - rangeTwoData[0].totalAssignedStores )/rangeOneData[0].totalAssignedStores )*100 ).toFixed( 1 );
         if ( flagComparisonCards.totalAssignedStores.comparisonData > 0 ) {
           flagComparisonCards.totalAssignedStores.ComparisonFlag = true;
         } else {
           flagComparisonCards.totalAssignedStores.ComparisonFlag = false;
         }
-        flagComparisonCards.flagIncidents.comparisonData = ( ( ( rangeOneData[0].flagIncidents - rangeTwoData[0].flagIncidents )/rangeOneData[0].flagIncidents )*100 ).toFixed( 2 );
+        flagComparisonCards.flagIncidents.comparisonData = ( ( ( rangeOneData[0].flagIncidents - rangeTwoData[0].flagIncidents )/rangeOneData[0].flagIncidents )*100 ).toFixed( 1 );
         if ( flagComparisonCards.flagIncidents.comparisonData > 0 ) {
           flagComparisonCards.flagIncidents.ComparisonFlag = true;
         } else {
           flagComparisonCards.flagIncidents.ComparisonFlag = false;
         }
-        flagComparisonCards.complianceRate.comparisonData = ( ( ( rangeOneData[0].complianceRate - rangeTwoData[0].complianceRate )/rangeOneData[0].complianceRate )*100 ).toFixed( 2 );
+        flagComparisonCards.complianceRate.comparisonData = ( ( ( rangeOneData[0].complianceRate - rangeTwoData[0].complianceRate )/rangeOneData[0].complianceRate )*100 ).toFixed( 1 );
         if ( flagComparisonCards.complianceRate.comparisonData > 0 ) {
           flagComparisonCards.complianceRate.ComparisonFlag = true;
         } else {
@@ -2417,7 +2444,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
                 'Date': element?.date,
                 'Store Name': element?.storeName,
                 'Store Id': element?.storeId,
-                'Store Spoc Email': element?.SpocEmail,
+                // 'Store Spoc Email': element?.SpocEmail,
                 'Detections': element?.detections,
               } );
             } );

package/src/controllers/trax.controller.js

@@ -213,7 +213,7 @@ export const create = async ( req, res ) => {
           let section = inputBody.sections[i];
           section.questions.forEach( ( section ) => {
             if ( section.questionReferenceImage && section.questionReferenceImage !='' ) {
-              let imgUrl = section.questionReferenceImage.split( '?' )[0];
+              let imgUrl = decodeURIComponent( section.questionReferenceImage.split( '?' )[0] );
               let url = imgUrl.split( '/' );
               url.splice( 0, 3 );
               section.questionReferenceImage = url.join( '/' );
@@ -221,7 +221,7 @@ export const create = async ( req, res ) => {
             // if (['image', 'descriptiveImage'].includes(section.answerType) ) {
             section.answers.forEach( ( answer ) => {
               if ( answer.referenceImage != '' ) {
-                let imgUrl = answer.referenceImage.split( '?' )[0];
+                let imgUrl = decodeURIComponent( answer.referenceImage.split( '?' )[0] );
                 let url = imgUrl.split( '/' );
                 url.splice( 0, 3 );
                 answer.referenceImage = url.join( '/' );
@@ -768,9 +768,15 @@ export const assignedUserDetails = async ( req, res ) => {
     let skip = limit * page;
 
     let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ) } } ];
-
-    if ( req.query.search && req.query.search != '' ) {
-      query.push( { $match: { storeName: { $regex: req.query.search, $options: 'i' } } } );
+    if ( req.query.search.trim() && req.query.search.trim() != '' ) {
+      let searchValue = req.query.search;
+      searchValue = searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
+      if ( searchValue.length > 1 ) {
+        query.push( { $addFields: { storeLower: { $toLower: '$storeName' } } } );
+        query.push( { $match: { storeLower: { $in: searchValue } } } );
+      } else {
+        query.push( { $match: { storeName: { $regex: req.query.search.trim(), $options: 'i' } } } );
+      }
     }
 
     let checklistCount = await assignedService.aggregate( query );
@@ -1275,10 +1281,16 @@ export const validateUser = async ( req, res ) => {
     }
 
     if ( !req.body?.addUser ) {
-      let userChunk =await chunkArray( users, 10 );
+      if ( req.body.hasOwnProperty( 'delete' ) ) {
+        let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName } );
+        if ( checkExists ) {
+          return res.sendError( 'User already Exists', 400 );
+        }
+      }
+      // let userChunk =await chunkArray( users, 10 );
 
-      await Promise.all( userChunk.map( async ( chunk ) => {
-        await processUser( chunk );
+      await Promise.all( users.map( async ( chunk ) => {
+        await processUser( [ chunk ] );
       } ) );
 
       if ( userEmail.length || storeId.length || domainExists.length ) {
@@ -1380,7 +1392,7 @@ export const validateUser = async ( req, res ) => {
       if ( req.body.hasOwnProperty( 'delete' ) ) {
         let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName } );
         if ( checkExists ) {
-          return res.sendSuccess( 'User already Exists' );
+          return res.sendError( 'User already Exists', 400 );
         }
       }
 
@@ -1391,7 +1403,7 @@ export const validateUser = async ( req, res ) => {
     }
   } catch ( e ) {
     logger.error( 'validateUser 2=>', e );
-    return res.sendSuccess( e );
+    return res.sendError( e, 500 );
   }
 };