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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.3-alpha.10",
+    "version": "3.4.3-alpha.11",
     "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 ***   -->      */
 
@@ -3805,12 +3806,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 +3921,7 @@ export async function getUserAuditCount( req, res ) {
             {
               auditStatus: { $eq: 'completed' },
             },
+            { userId: { $in: auditUserList[0].userList } },
           ],
         },
       },
@@ -3912,6 +3941,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 +3960,8 @@ export async function getUserAuditCount( req, res ) {
           totalEarn: { $first: '$totalEarn' },
           totalReducedAmount: { $first: '$totalReducedAmount' },
           totalCredit: { $first: '$totalCredit' },
+          deductionByMinimumTarget: { $first: '$deductionByMinimumTarget' },
+          deductionBytimeSpent: { $first: '$deductionBytimeSpent' },
         },
       },
       {
@@ -3945,6 +3978,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 +3992,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 +4026,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 +4084,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 } );

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 );
+};