tango-app-api-audit 3.4.9 → 3.4.11-alpha.0

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -527,6 +527,7 @@ export async function getAuditFile( req, res ) {
           img_name: indexes[1],
           img_id: image[0],
           selected: false,
+          isKids: false,
           dropped: false,
           count: 1,
           mappedid: [ mapimg ],
@@ -715,6 +716,7 @@ export async function getAuditImage( msg ) {
           img_name: indexes[1],
           img_id: image[0],
           selected: false,
+          isKids: false,
           dropped: false,
           count: 1,
           mappedid: [ mapimg ],
@@ -2345,12 +2347,21 @@ export async function userMetrics( req, res ) {
           beforeCount: 1,
           afterCount: 1,
           mappingPerc: {
-            $round: [
+            $cond: [
+              { $and: [
+                { $gt: [ '$beforeCount', 0 ] },
+                { $gt: [ '$afterCount', 0 ] },
+              ] },
               {
-                $multiply: [
-                  { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
+                $round: [
+                  {
+                    $multiply: [
+                      { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
+                    ],
+                  }, 2,
                 ],
-              }, 2,
+              },
+              0,
             ],
           },
           checkIntime: 1,
@@ -2535,7 +2546,7 @@ export async function userMetrics( req, res ) {
               'Check Intime': '$checkIntime',
               'Check OutTime': '$checkOutTime',
               'Working Hours': '$workingHours',
-              'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+              'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
             },
           },
       );
@@ -3879,7 +3890,7 @@ export async function auditImages( req, res ) {
 export async function getUserAuditCount( req, res ) {
   try {
     const userWallet = JSON.parse( process.env.USER_WALLET );
-    const previousDate = dayjs( new Date() ).subtract( 19, 'days' );
+    const previousDate = dayjs( new Date() ).subtract( 1, 'days' );
     const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
     const configTimeSpentSec = userWallet.minTimeSpentSec; // 18000;
     // const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
@@ -3921,32 +3932,34 @@ export async function getUserAuditCount( req, res ) {
           ],
         },
       },
-      {
-        $project: {
-
-          trafficUserCount: { $cond: [
-            { $eq: [ '$moduleType', 'traffic' ] }, '$userId', '$$REMOVE',
-          ] },
-          zoneUserCount: { $cond: [
-            { $eq: [ '$moduleType', 'zone' ] }, '$userId', '$$REMOVE',
-          ] },
-
-          trafficFilesCount: { $cond: [
-            { $eq: [ '$moduleType', 'traffic' ] }, '$beforeCount', '$$REMOVE',
-          ] },
-          zoneFilesCount: { $cond: [
-            { $eq: [ '$moduleType', 'zone' ] }, '$beforeCount', '$$REMOVE',
-          ] },
+      // {
+      //   $project: {
+
+      //     trafficUserCount: { $cond: [
+      //       { $eq: [ '$moduleType', 'traffic' ] }, '$userId', '$$REMOVE',
+      //     ] },
+      //     zoneUserCount: { $cond: [
+      //       { $eq: [ '$moduleType', 'zone' ] }, '$userId', '$$REMOVE',
+      //     ] },
+
+      //     trafficFilesCount: { $cond: [
+      //       { $eq: [ '$moduleType', 'traffic' ] }, '$beforeCount', '$$REMOVE',
+      //     ] },
+      //     zoneFilesCount: { $cond: [
+      //       { $eq: [ '$moduleType', 'zone' ] }, '$beforeCount', '$$REMOVE',
+      //     ] },
 
-        },
-      },
+      //   },
+      // },
       {
         $group: {
-          _id: '$moduleType',
-          trafficUserCount: { $addToSet: '$trafficUserCount' },
-          zoneUserCount: { $addToSet: '$zoneUserCount' },
-          trafficFilesCount: { $sum: '$trafficFilesCount' },
-          zoneFilesCount: { $sum: '$zoneFilesCount' },
+          _id: null,
+          // trafficUserCount: { $addToSet: '$trafficUserCount' },
+          // zoneUserCount: { $addToSet: '$zoneUserCount' },
+          // trafficFilesCount: { $sum: '$trafficFilesCount' },
+          // zoneFilesCount: { $sum: '$zoneFilesCount' },
+          userCount: { $addToSet: '$userId' },
+          filesCount: { $sum: '$beforeCount' },
         },
       },
     ];
@@ -3990,11 +4003,10 @@ export async function getUserAuditCount( req, res ) {
     if ( userCount?.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
-    const zoneMinimumTarget =userCount[0]?.zoneUserCount?.length !== 0 && userCount[0]?.zoneFilesCount !==0 ? Math.floor( userCount[0].zoneFilesCount/userCount[0].zoneUserCount.length ) : 0;
-    const trafficMinimumTarget =userCount[0]?.trafficUserCount?.length !== 0 && userCount[0]?.trafficFilesCount !==0 ? Math.floor( userCount[0].trafficFilesCount/userCount[0].trafficUserCount.length ) : 0;
-
-    const beforeCountTraffic = 544/trafficMinimumTarget;
-    const beforeCountZone = 544/zoneMinimumTarget; // 0.0035;
+    const minimumTarget =userCount[0]?.userCount?.length !== 0 && userCount[0]?.filesCount !==0 ? Math.floor( userCount[0].filesCount/userCount[0].userCount.length ) : 0;
+    // const trafficMinimumTarget =userCount[0]?.trafficUserCount?.length !== 0 && userCount[0]?.trafficFilesCount !==0 ? Math.floor( userCount[0].trafficFilesCount/userCount[0].trafficUserCount.length ) : 0;
+    const beforeCreditCal = 544/minimumTarget;
+    // const beforeCountZone = 544/zoneMinimumTarget; // 0.0035;
     const afterCountCredit = 136;
 
     const query = [
@@ -4010,8 +4022,7 @@ export async function getUserAuditCount( req, res ) {
         },
       },
       {
-        $set: { minimumTarget: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, trafficMinimumTarget, zoneMinimumTarget ] },
-          afterCountCredit: afterCountCredit },
+        $set: { minimumTarget: minimumTarget, afterCountCredit: afterCountCredit, beforeCreditCal: beforeCreditCal },
       },
       {
         $project: {
@@ -4025,7 +4036,7 @@ export async function getUserAuditCount( req, res ) {
           minimumTarget: 1,
           afterCountCredit: 1,
           totalEarn: { $ifNull: [ 0, 0 ] },
-          singleImageAmount: { $ifNull: [ 0, 0 ] },
+          singleImageAmount: { $ifNull: [ '$beforeCreditCal', 0 ] },
           totalReducedAmount: { $ifNull: [ 0, 0 ] },
           totalCredit: { $ifNull: [ 0, 0 ] },
           deductionBytimeSpent: { $ifNull: [ 0, 0 ] },
@@ -4034,7 +4045,7 @@ export async function getUserAuditCount( req, res ) {
       },
       {
         $group: {
-          _id: { user: '$userId', type: '$moduleType' },
+          _id: { user: '$userId' },
           totalCount: { $sum: 1 },
           moduleType: { $first: '$moduleType' },
           totalBeforeCount: { $sum: '$beforeCount' },
@@ -4064,8 +4075,8 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
-          singleImageAmount: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] },
-          beforeCountCredit: { $multiply: [ '$totalBeforeCount', { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] } ] },
+          singleImageAmount: 1,
+          beforeCountCredit: { $multiply: [ '$totalBeforeCount', '$singleImageAmount' ] },
           // afterCountCredit: { $cond: [ { $and: [
           //   { $gte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.4 ] }, { $lte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] },
           // ] }, 136,
@@ -4077,7 +4088,7 @@ export async function getUserAuditCount( req, res ) {
           // },
           // ] },
           afterCountCredit: afterCountCredit,
-          totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] } ] }, 136 ] },
+          totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', '$singleImageAmount' ] }, 136 ] },
           deductionBytimeSpent: 1,
           deductionByMinimumTarget: 1,
           mappingperc: { $multiply: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 100 ] },
@@ -4115,7 +4126,7 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
-          singleImageAmount: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] },
+          singleImageAmount: 1,
           beforeCountCredit: 1,
           afterCountCredit: 1,
           totalEarn: 1,

package/src/controllers/traxAudit.controllers.js

@@ -3077,7 +3077,7 @@ export async function userMetrics( req, res ) {
         'Check Intime': '$checkIntime',
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
-        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+        'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
       const YesNo = {
@@ -3089,7 +3089,7 @@ export async function userMetrics( req, res ) {
         'Check Intime': '$checkIntime',
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
-        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+        'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
       [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?