tango-app-api-audit 3.4.3-alpha.10 → 3.4.3-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.3-alpha.10",
+    "version": "3.4.3-alpha.12",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -64,6 +64,7 @@ import { aggregateStoreEmpDetection } from '../service/storeEmpDetection.service
 import { aggregateBinaryAudit } from '../service/binaryAudit.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
 import { createAuditUserWallet } from '../service/auditUserWallet.service.js';
+import { aggregateAuditUsers } from '../service/auditUsers.service.js';
 
 /*           < -- *** Configuration ***   -->      */
 
@@ -1102,9 +1103,9 @@ export async function workSpace( req, res ) {
     }
 
     if ( inputData.isExport ) {
-      const exportdata = [];
+      const exportData = [];
       temp.forEach( ( element ) => {
-        exportdata.push( {
+        exportData.push( {
           'Client Name': element.clientName,
           'Client Id': element.clientId,
           'Completed stores Count': element.completedStoresCount,
@@ -1115,7 +1116,7 @@ export async function workSpace( req, res ) {
           'Assigned': element.Assignedcount,
         } );
       } );
-      await download( exportdata, res );
+      await download( exportData, res );
       return;
     } else {
       return res.sendSuccess( {
@@ -2164,10 +2165,10 @@ export async function storeMetrics( req, res ) {
     }
     const result = await aggregateStoreAudit( query );
     if ( inputData.isExport ) {
-      const exportdata = [];
+      const exportData = [];
       result.forEach( ( element ) => {
         if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
+          exportData.push( {
             'File Date': element.fileDate,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
@@ -2184,7 +2185,7 @@ export async function storeMetrics( req, res ) {
             'Status': element.status,
           } );
         } else {
-          exportdata.push( {
+          exportData.push( {
             'File Date': element.fileDate,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
@@ -2201,7 +2202,7 @@ export async function storeMetrics( req, res ) {
           } );
         }
       } );
-      await download( exportdata, res );
+      await download( exportData, res );
       return;
     }
     return res.sendSuccess( { result: result, count: count.length } );
@@ -2620,10 +2621,10 @@ export async function pendingSummaryTable( req, res ) {
 
     const result = await aggregateUserAudit( query );
     if ( inputData.isExport ) {
-      const exportdata = [];
+      const exportData = [];
       result.forEach( ( element ) => {
         if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
+          exportData.push( {
             'Store ID': element.storeId,
             'zoneName': element.zoneName,
             'File Date': element.fileDate,
@@ -2636,7 +2637,7 @@ export async function pendingSummaryTable( req, res ) {
             'Status': element.auditStatus,
           } );
         } else {
-          exportdata.push( {
+          exportData.push( {
             'Store ID': element.storeId,
             'File Date': element.fileDate,
             'Product Type': element.moduleType,
@@ -2649,7 +2650,7 @@ export async function pendingSummaryTable( req, res ) {
           } );
         }
       } );
-      await download( exportdata, res );
+      await download( exportData, res );
       return;
     }
     return res.sendSuccess( { result: result, count: count.length } );
@@ -2938,6 +2939,7 @@ export async function overViewCard( req, res ) {
       inprogressCount: 0,
       completedCount: 0,
       pendingCount: 0,
+      notAssigned: 0,
     };
 
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -2968,7 +2970,7 @@ export async function overViewCard( req, res ) {
           },
           inprogressCount: {
             $cond: [
-              { $ne: [ '$status', 'completed' ] }, 1, 0,
+              { $in: [ '$status', [ 'inprogress', 'assigned', 'drafted' ] ] }, 1, 0,
             ],
           },
           completedCount: {
@@ -3195,7 +3197,10 @@ export async function summarySplit( req, res ) {
     ];
     const result = await aggregateStoreAudit( query );
     const totalCount = await aggregateAuditStoreData( totalQuery );
-    result[0].totalCount = totalCount[0]?.total;
+    if ( totalCount.length> 0 ) {
+      result[0].totalCount = totalCount[0]?.total;
+    }
+
     return res.sendSuccess( { result: result.length > 0 ? result[0] : temp } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -3336,38 +3341,32 @@ export async function overviewTable( req, res ) {
 
     const result = await aggregateStoreAudit( query );
     if ( inputData.isExport ) {
-      const exportdata = [];
+      const exportData = [];
       result.forEach( ( element ) => {
         if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
-            'Store ID': element.storeId,
+          exportData.push( {
+            'File Date': element.fileDate,
             'Brand ID': element.clientId,
+            'Store ID': element.storeId,
             'Zone Name': element.zoneName,
-            'File Date': element.fileDate,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
             'Before Count': element.beforeCount,
             'After Count': element.afterCount,
-            // 'User Name': element.userName,
-            // 'User Email': element.userEmail,
-            'Status': element.status,
+            'Audit Type': element.auditType,
+            'Status': toCamelCase( element.status ),
           } );
         } else {
-          exportdata.push( {
-            'Store ID': element.storeId,
-            'Brand ID': element.clientId,
+          exportData.push( {
             'File Date': element.fileDate,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
+            'Brand ID': element.clientId,
+            'Store ID': element.storeId,
             'Before Count': element.beforeCount,
             'After Count': element.afterCount,
-            // 'User Name': element.userName,
-            // 'User Email': element.userEmail,
-            'Status': element.status,
+            'Audit Type': element.auditType,
+            'Status': toCamelCase( element.status ),
           } );
         }
       } );
-      await download( exportdata, res );
+      await download( exportData, res );
       return;
     }
     return res.sendSuccess( { result: result, count: count.length } );
@@ -3378,6 +3377,18 @@ export async function overviewTable( req, res ) {
   }
 }
 
+export function toCamelCase( str ) {
+  logger.info( { str: str } );
+  return str
+      .split( '-' ) // Split the string by spaces
+      .map( ( word, index ) =>
+      // index === 0 ?
+      // word.toLowerCase() : // Lowercase the first word
+        word.charAt( 0 ).toUpperCase() + word.slice( 1 ).toLowerCase(), // Capitalize the first letter of subsequent words
+      )
+      .join( '' ); // Join the words without spaces
+}
+
 export async function totalNotAssignedCount( req, res ) {
   try {
     let notAssignedCount = {
@@ -3805,12 +3816,39 @@ export async function getUserAuditCount( req, res ) {
     const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
     const afterCountY = userWallet.afterCountCreditPerc; // 0.0035;
     const reduce = userWallet.reductionPerc; // 0.05;
+    const auditUserQuery=[
+      {
+        $match: {
+          $and: [
+            { type: { $eq: 'consultant' } },
+            { isActive: { $eq: true } },
+          ],
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          userList: { $push: '$userId' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          userList: 1,
+        },
+      },
+    ];
+    const auditUserList = await aggregateAuditUsers( auditUserQuery );
+    if ( auditUserList.length==0 ) {
+      return res.sendError( 'No users available', 204 );
+    }
     const userCountQuery= [
       {
         $match: {
           $and: [
             { fileDate: { $eq: fileDate } },
             { auditStatus: { $eq: 'completed' } },
+            { userId: { $in: auditUserList[0].userList } },
           ],
         },
       },
@@ -3893,6 +3931,7 @@ export async function getUserAuditCount( req, res ) {
             {
               auditStatus: { $eq: 'completed' },
             },
+            { userId: { $in: auditUserList[0].userList } },
           ],
         },
       },
@@ -3912,6 +3951,8 @@ export async function getUserAuditCount( req, res ) {
           totalEarn: { $ifNull: [ 0, 0 ] },
           totalReducedAmount: { $ifNull: [ 0, 0 ] },
           totalCredit: { $ifNull: [ 0, 0 ] },
+          deductionBytimeSpent: { $ifNull: [ 0, 0 ] },
+          deductionByMinimumTarget: { $ifNull: [ 0, 0 ] },
         },
       },
       {
@@ -3929,6 +3970,8 @@ export async function getUserAuditCount( req, res ) {
           totalEarn: { $first: '$totalEarn' },
           totalReducedAmount: { $first: '$totalReducedAmount' },
           totalCredit: { $first: '$totalCredit' },
+          deductionByMinimumTarget: { $first: '$deductionByMinimumTarget' },
+          deductionBytimeSpent: { $first: '$deductionBytimeSpent' },
         },
       },
       {
@@ -3945,6 +3988,9 @@ export async function getUserAuditCount( req, res ) {
           totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', beforeCountX ] }, { $multiply: [ '$totalAfterCount', afterCountY ] } ] },
           totalReducedAmount: 1,
           totalCredit: 1,
+          deductionBytimeSpent: 1,
+          deductionByMinimumTarget: 1,
+
 
         },
       },
@@ -3956,13 +4002,27 @@ export async function getUserAuditCount( req, res ) {
           totalBeforeCount: 1,
           totalAfterCount: 1,
           totalTimeSpent: 1,
+          hours: { $floor: { $divide: [ '$totalTimeSpent', 3600 ] } },
+          minutes: {
+            $floor: {
+              $divide: [
+                { $mod: [ '$totalTimeSpent', 3600 ] }, // Get remaining minutes after hours
+                60,
+              ] },
+          },
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
           totalEarn: 1,
-          totalReducedAmount: { $cond: [
+          deductionBytimeSpent: { $cond: [
             { $lt: [ '$totalTimeSpent', configTimeSpentSec ] },
-            { $add: [ '$totalReducedAmount', { $multiply: [ reduce, '$totalEarn' ] } ] }, '$totalReducedAmount',
+            { $multiply: [ reduce, '$totalEarn' ] }, '$deductionBytimeSpent',
+          ] },
+
+          deductionByMinimumTarget:
+          { $cond: [
+            { $lt: [ '$totalBeforeCount', '$minimumTarget' ] },
+            { $multiply: [ reduce, '$totalEarn' ] }, '$deductionByMinimumTarget',
           ] },
           totalCredit: { $subtract: [ '$totalEarn', '$totalReducedAmount' ] },
 
@@ -3976,18 +4036,33 @@ export async function getUserAuditCount( req, res ) {
           moduleType: 1,
           totalBeforeCount: 1,
           totalAfterCount: 1,
-          totalTimeSpent: 1,
+          totalTimeSpent: {
+            $cond: [ { $eq: [ '$hours', 0 ] },
+              { $concat: [
+                { $toString: '$minutes' }, ' minutes',
+              ] },
+              { $cond: [ { $eq: [ '$minutes', 0 ] },
+                { $concat: [
+                  { $toString: '$hours' }, ' hours',
+                ] },
+                {
+                  $concat: [
+                    { $toString: '$hours' }, ' hours and ',
+                    { $toString: '$minutes' }, ' minutes',
+                  ],
+                },
+              ] },
+            ],
+
+          },
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
           totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', beforeCountX ] }, { $multiply: [ '$totalAfterCount', afterCountY ] } ] },
-          totalReducedAmount:
-            { $cond: [
-              { $lt: [ '$totalBeforeCount', '$minimumTarget' ] },
-              { $add: [ '$totalReducedAmount', { $multiply: [ reduce, '$totalEarn' ] } ] }, '$totalReducedAmount',
-            ] },
-
+          deductionByMinimumTarget: 1,
+          deductionBytimeSpent: 1,
           totalCredit: { $subtract: [ '$totalEarn', '$totalReducedAmount' ] },
+          totalReducedAmount: { $round: [ { $add: [ '$deductionBytimeSpent', '$deductionByMinimumTarget' ] }, 2 ] },
         },
       },
       {
@@ -4019,10 +4094,12 @@ export async function getUserAuditCount( req, res ) {
           moduleType: 1,
           totalAfterCount: { $round: [ '$totalAfterCount', 2 ] },
           totalBeforeCount: { $round: [ '$totalBeforeCount', 2 ] },
-          timeSpent: { $round: [ '$totalTimeSpent', 2 ] },
+          timeSpent: '$totalTimeSpent',
           fileDate: 1,
           fileDateISO: 1,
-          totalReducedAmount: { $round: [ '$totalReducedAmount', 2 ] },
+          deductionByMinimumTarget: { $round: [ '$deductionByMinimumTarget', 2 ] },
+          deductionBytimeSpent: { $round: [ '$deductionBytimeSpent', 2 ] },
+          totalReducedAmount: 1,
           totalCredit: { $round: [ { $subtract: [ '$totalEarn', '$totalReducedAmount' ] }, 2 ] },
           totalEarn: { $round: [ '$totalEarn', 2 ] },
           minimumTarget: 1,

package/src/controllers/traxAudit.controllers.js

@@ -3312,6 +3312,63 @@ export async function summarySplit( req, res ) {
       { clientId: { $in: inputData.clientId } },
     ];
 
+
+    const binaryAuditQuery =[
+      {
+        $match: {
+          $and: filters,
+        },
+
+      },
+      {
+        $project: {
+          auditInprogress: {
+            $cond: [
+              { $and: [ { $eq: [ '$auditType', 'Audit' ] }, { $eq: [ '$auditStatus', 'inprogress' ] } ] }, 1, 0,
+            ],
+          },
+          reAuditInprogress: {
+            $cond: [
+              { $and: [ { $eq: [ '$auditType', 'ReAudit' ] }, { $eq: [ '$auditStatus', 'inprogress' ] } ] }, 1, 0,
+            ],
+          },
+
+          reAuditCompleted: {
+            $cond: [
+              { $and: [ { $eq: [ '$auditType', 'ReAudit' ] }, { $eq: [ '$auditStatus', 'completed' ] } ] }, 1, 0,
+            ],
+          },
+          auditCompleted: {
+            $cond: [
+              { $and: [ { $eq: [ '$auditType', 'Audit' ] }, { $eq: [ '$auditStatus', 'completed' ] } ] }, 1, 0,
+            ],
+          },
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          auditInprogress: { $sum: '$auditInprogress' },
+          reAuditInprogress: { $sum: '$reAuditInprogress' },
+          reAuditCompleted: { $sum: '$reAuditCompleted' },
+          auditCompleted: { $sum: '$auditCompleted' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          totalInprogress: 1,
+          auditInprogress: 1,
+          reAuditInprogress: 1,
+          reAuditCompleted: 1,
+          auditCompleted: 1,
+          totalCount: { $ifNull: [ 0, 0 ] },
+
+        },
+      },
+    ];
+
     const query =[
       {
         $match: {
@@ -3401,7 +3458,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3568,39 +3625,42 @@ export async function overviewTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         const temp ={
-          'Store ID': element.storeId,
-          'Brand ID': element.clientId,
           'File Date': element.fileDate,
-          'Result': element.answer,
-          'Product Type': element.value,
-          'Audit Type': element.auditType,
-          // 'User Name': element.userName,
-          // 'User Email': element.userEmail,
-          'Status': element.status,
-          'Audit Status': element.status,
+          'Brand ID': element.clientId,
+          'Store ID': element.storeId,
         };
 
         switch ( inputData.moduleType ) {
           case 'camera-angle-change':
             temp['stream Name'] = element.streamName;
             temp['User Comments'] = element.userComments;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = element.auditStatus;
             break;
           case 'unattended-customer':
             temp['Customer ID'] = element.tempId;
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = element.auditStatus;
             break;
           case 'left-in-middle':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = element.auditStatus;
             break;
           case 'mobile-detection':
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = element.status;
             break;
           case 'uniform-detection':
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = element.status;
             break;
         }
         exportdata.push( temp );

package/src/dtos/audit.dtos.js

@@ -266,7 +266,7 @@ export const reTriggerValid = {
 export const overViewCardSchema = joi.object( {
   fromDate: joi.string().required(),
   toDate: joi.string().required(),
-  clientId: joi.array().items( joi.string().required() ).required(),
+  clientId: joi.array().items( joi.string().required().allow( '' ) ).required(),
 } );
 
 export const overViewCardValid = {

package/src/service/auditUsers.service.js

@@ -0,0 +1,5 @@
+import auditUsersModel from 'tango-api-schema/schema/auditUsers.model.js';
+
+export function aggregateAuditUsers( query ) {
+  return auditUsersModel.aggregate( query );
+};