tango-app-api-audit 3.4.32 → 3.4.33

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.32",
+    "version": "3.4.33",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.12",
+        "tango-api-schema": "^2.2.19",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -63,7 +63,7 @@ import {
 import { aggregateStoreEmpDetection } from '../service/storeEmpDetection.service.js';
 import { aggregateBinaryAudit } from '../service/binaryAudit.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
-import { createAuditUserWallet, findOneAuditUserWallet } from '../service/auditUserWallet.service.js';
+import { bulkWriteAuditUserWallet, createAuditUserWallet, findOneAuditUserWallet } from '../service/auditUserWallet.service.js';
 import { updateOneAuditUsers } from '../service/auditUsers.service.js';
 // import { aggregateAuditUsers } from '../service/auditUsers.service.js';
 
@@ -3942,6 +3942,12 @@ export async function getUserAuditCount( req, res ) {
     const userWallet = JSON.parse( process.env.USER_WALLET );
     const today = new Date();
 
+    // Subtract one day to get the previous day
+    const previousDay = new Date( today );
+    previousDay.setDate( today.getDate() - 1 );
+    const lateLogin = previousDay;
+    lateLogin.setHours( 21, 30, 0, 0 );
+
     // Get yesterday's date
     const yesterday = new Date( today.getFullYear(), today.getMonth(), today.getDate() - 1 );
 
@@ -3950,45 +3956,144 @@ export async function getUserAuditCount( req, res ) {
 
     // Calculate the difference in days
     const differenceInDays = ( yesterday.getDate() - firstDateOfMonth.getDate() );
+    logger.info( { differenceInDays: differenceInDays } );
 
-    for ( let i =1; i<=differenceInDays; i++ ) {
-      const previousDate = dayjs( new Date() ).subtract( i, 'days' );
-      const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
-      const reduce = userWallet.reductionPerc; // 0.05;
+    const auditUserQuery=[
+      {
+        $match: {
+          $and: [
+            { tangoUserType: { $eq: 'audit' } },
+            { isActive: { $eq: true } },
+          ],
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          userList: { $push: '$_id' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          userList: 1,
+        },
+      },
+    ];
+    const auditUserList = await aggregateUser( auditUserQuery );
+    if ( auditUserList.length==0 ) {
+      return res.sendError( 'No users available', 204 );
+    }
 
-      // Subtract one day to get the previous day
-      const previousDay = new Date( today );
-      previousDay.setDate( today.getDate() - i );
-      const lateLogin = previousDay;
-      logger.info( { lateLogin1: lateLogin } );
-      lateLogin.setHours( 21, 30, 0, 0 );
-      logger.info( { lateLogin: lateLogin } );
-      const auditUserQuery=[
-        {
-          $match: {
-            $and: [
-              { tangoUserType: { $eq: 'audit' } },
-              { isActive: { $eq: true } },
+    const lateLoginQuery =[
+      {
+        $match: {
+          $and: [
+            { fileDate: { $eq: dayjs( yesterday ).format( 'DD-MM-YYYY' ) } },
+            {
+              auditStatus: { $eq: 'completed' },
+            },
+            { userId: { $in: auditUserList[0].userList } },
+          ],
+        },
+      },
+      {
+        $sort: {
+          startTime: 1,
+        },
+      },
+      {
+        $group: {
+          _id: '$userId',
+          userId: { $first: '$userId' },
+          startTime: { $first: '$startTime' },
+          fileDate: { $first: '$fileDate' },
+        },
+      },
+      {
+        $lookup: {
+          from: 'users',
+          let: { userId: '$userId' }, // Assuming userId is the linking field
+          pipeline: [
+            {
+              $match: {
+                $expr: { $eq: [ '$_id', '$$userId' ] },
+              },
+            },
+            {
+              $project: {
+                _id: 0, // Exclude _id if not needed
+                email: 1,
+                userName: 1,
+              },
+            },
+          ],
+          as: 'users',
+        },
+      },
+      { $unwind: { path: '$users', preserveNullAndEmptyArrays: true } },
+
+      {
+        $project: {
+          startTime: 1,
+          userId: 1,
+          userEmail: '$users.email',
+          fileDate: 1,
+          parsedDate: {
+            $dateFromString: {
+              dateString: '$fileDate',
+              format: '%d-%m-%Y',
+            },
+          },
+          deductionByLateLogin: {
+            $cond: [
+              { $gt: [ '$startTime', lateLogin ] }, true, false,
             ],
           },
         },
-        {
-          $group: {
-            _id: null,
-            userList: { $push: '$userId' },
+      }, {
+        $group: {
+          _id: null,
+          updatedData: {
+            $push: {
+              $cond: [
+                { $eq: [ '$deductionByLateLogin', true ] }, { userId: '$userId', userEmail: '$userEmail', fileDate: '$fileDate', week: { $week: '$parsedDate' },
+                  month: { $month: '$parsedDate' } }, '$$REMOVE',
+              ],
+            },
           },
         },
-        {
-          $project: {
-            _id: 0,
-            userList: 1,
-          },
+      },
+      {
+        $project: {
+          _id: 0,
+          updatedData: 1,
         },
-      ];
-      const auditUserList = await aggregateUser( auditUserQuery );
-      if ( auditUserList.length==0 ) {
-        return res.sendError( 'No users available', 204 );
-      }
+      },
+    ];
+    const getLateLogin = await aggregateUserAuditCount( lateLoginQuery );
+    for ( let i=0; getLateLogin[0]?.updatedData?.length>0 && i<getLateLogin[0]?.updatedData?.length; i++ ) {
+      const query = {
+        email: getLateLogin[0]?.updatedData[i]?.userEmail,
+        week: getLateLogin[0]?.updatedData[i]?.week,
+      };
+      const record ={
+        email: getLateLogin[0]?.updatedData[i]?.userEmail,
+        userId: getLateLogin[0]?.updatedData[i]?.userId,
+        month: getLateLogin[0]?.updatedData[i]?.month,
+        week: getLateLogin[0]?.updatedData[i]?.week,
+        fileDate: [ getLateLogin[0]?.updatedData[i]?.fileDate ],
+        lateLogin: 1,
+
+      };
+      await updateOneAuditUsers( query, record );
+    }
+
+    for ( let i =1; i<=differenceInDays+1; i++ ) {
+      const previousDate = dayjs( new Date() ).subtract( i, 'days' );
+      const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
+      const reduce = userWallet.reductionPerc; // 0.05;
+
       const userCountQuery= [
         {
           $match: {
@@ -4009,11 +4114,11 @@ export async function getUserAuditCount( req, res ) {
       ];
 
       const userCount = await aggregateUserAuditCount( userCountQuery );
-
       if ( userCount?.length == 0 ) {
         return res.sendError( 'No Data Found', 204 );
       }
       const minimumTarget =userCount[0]?.userCount?.length !== 0 && userCount[0]?.filesCount !==0 ? Math.floor( userCount[0].filesCount/userCount[0].userCount.length ) : 0;
+      logger.info( { bc: userWallet?.beforeCountCredit, ac: userWallet?.afterCountCredit } );
       const beforeCreditCal = userWallet?.beforeCountCredit/minimumTarget;
       const afterCountCredit = userWallet?.afterCountCredit;
       const filter = [
@@ -4024,90 +4129,6 @@ export async function getUserAuditCount( req, res ) {
         { userId: { $in: auditUserList[0].userList } },
       ];
 
-      const lateLoginQuery =[
-        {
-          $match: {
-            $and: filter,
-          },
-        },
-        {
-          $lookup: {
-            from: 'users',
-            let: { userId: '$userId' }, // Assuming userId is the linking field
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: [ '$_id', '$$userId' ] },
-                },
-              },
-              {
-                $project: {
-                  _id: 0, // Exclude _id if not needed
-                  email: 1,
-                  userName: 1,
-                },
-              },
-            ],
-            as: 'users',
-          },
-        },
-        { $unwind: { path: '$users', preserveNullAndEmptyArrays: true } },
-        {
-          $project: {
-            startTime: 1,
-            userId: 1,
-            userEmail: '$user.email',
-            fileDate: 1,
-            parsedDate: {
-              $dateFromString: {
-                dateString: '$fileDate',
-                format: '%d-%m-%Y',
-              },
-            },
-            deductionByLateLogin: {
-              $cond: [
-                { $gt: [ '$startTime', lateLogin ] }, true, false,
-              ],
-            },
-          },
-        }, {
-          $group: {
-            _id: null,
-            updatedData: {
-              $push: {
-                $cond: [
-                  { $eq: [ '$deductionByLateLogin', true ] }, { userId: '$userId', userEmail: '$userEmail', fileDate: 'fileDate', week: { $week: '$parsedDate' },
-                    month: { $month: '$parsedDate' } }, '$$REMOVE',
-                ],
-              },
-            },
-          },
-        },
-        {
-          $project: {
-            _id: 0,
-            updatedData: 1,
-          },
-        },
-      ];
-      const getLateLogin = await aggregateUserAuditCount( lateLoginQuery );
-
-      for ( let i=0; getLateLogin[0]?.updatedData?.length>0 && 1<getLateLogin[0]?.updatedData?.length; i++ ) {
-        const query = {
-          email: getLateLogin[0]?.updatedData[i]?.userEmail,
-          week: getLateLogin[0]?.updatedData[i]?.week,
-        };
-        const record ={
-          email: getLateLogin[0]?.updatedData[i]?.userEmail,
-          userId: getLateLogin[0]?.updatedData[i]?.userId,
-          month: getLateLogin[0]?.updatedData[i]?.month,
-          week: getLateLogin[0]?.updatedData[i]?.week,
-          fileDate: getLateLogin[0]?.updatedData[i]?.fileDate,
-          lateLogin: 1,
-
-        };
-        await updateOneAuditUsers( query, record );
-      }
       const query = [
         {
           $match: {
@@ -4135,6 +4156,12 @@ export async function getUserAuditCount( req, res ) {
             deductionByMinimumTarget: { $ifNull: [ 0, 0 ] },
             deductionByLateLogin: { $ifNull: [ 0, 0 ] },
             startTime: 1,
+            parsedDate: {
+              $dateFromString: {
+                dateString: '$fileDate',
+                format: '%d-%m-%Y',
+              },
+            },
           },
         },
         {
@@ -4150,6 +4177,7 @@ export async function getUserAuditCount( req, res ) {
             totalTimeSpent: { $sum: '$timeSpent' },
             fileDate: { $first: '$fileDate' },
             fileDateISO: { $first: '$fileDateISO' },
+            week: { $first: '$parsedDate' },
             userId: { $first: '$userId' },
             minimumTarget: { $first: '$minimumTarget' },
             afterCountCredit: { $first: '$afterCountCredit' },
@@ -4162,6 +4190,33 @@ export async function getUserAuditCount( req, res ) {
             deductionByLateLogin: { $first: '$deductionByLateLogin' },
           },
         },
+        {
+          $lookup: {
+            from: 'auditUsers',
+            let: { userId: '$userId', week: { $week: '$parsedDate' } }, // Assuming userId is the linking field
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: [
+                      { $eq: [ '$userId', '$$userId' ] },
+                      { $eq: [ '$week', '$$week' ] },
+                    ],
+                  },
+                },
+              },
+              {
+                $project: {
+                  _id: 0, // Exclude _id if not needed
+                  fileDate: 1,
+                  lateLogin: { $size: '$fileDate' },
+                },
+              },
+            ],
+            as: 'auditUsers',
+          },
+        },
+        { $unwind: { path: '$auditUsers', preserveNullAndEmptyArrays: true } },
         {
           $project: {
             totalCount: 1,
@@ -4226,8 +4281,11 @@ export async function getUserAuditCount( req, res ) {
           ] },
             deductionByLateLogin: {
               $cond: [
-                { $gt: [ '$startTime', lateLogin ] },
-                { $multiply: [ reduce, '$totalEarn' ] }, '$deductionByLateLogin',
+                { $and: [
+                  { $gt: [ '$auditUsers.lateLogin', 2 ] },
+                  { $eq: [ '$fileDate', dayjs( yesterday ).format( 'DD-MM-YYYY' ) ] },
+                ] },
+                { $multiply: [ reduce, '$totalEarn' ] }, 0,
               ],
             },
             mappingperc: 1,
@@ -4339,15 +4397,27 @@ export async function getUserAuditCount( req, res ) {
           },
         },
       ];
+
       const consolidatedData = await aggregateUserAuditCount( query );
       if ( consolidatedData.length == 0 ) {
         return res.sendError( 'No Data found', 204 );
       }
-      const result = await createAuditUserWallet( consolidatedData );
+
+      const operations = consolidatedData.map( ( record ) => ( {
+        updateOne: {
+          filter: { userEmail: record.userEmail, fileDate: record.fileDate }, // Match criteria
+          update: {
+            $set: record,
+          },
+          upsert: true, // Perform upsert
+        },
+      } ) );
+
+      const result = await bulkWriteAuditUserWallet( operations );
       if ( result.length == 0 ) {
         return res.sendError( 'No Record Inserted', 500 );
       }
-      if ( i == differenceInDays ) {
+      if ( i == differenceInDays+1 ) {
         return res.sendSuccess( { message: 'Inserted successfully!' } );
       }
     }
@@ -4957,5 +5027,3 @@ export async function convertTimestampToDateTime( timestamp ) {
   const seconds = ( '0' + adjustedDate.getSeconds() ).slice( -2 );
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
-
-

package/src/service/auditUserWallet.service.js

@@ -5,6 +5,10 @@ export function createAuditUserWallet( record ) {
   return auditUserWalletModel.create( record );
 };
 
+export function bulkWriteAuditUserWallet( record ) {
+  return auditUserWalletModel.bulkWrite( record );
+};
+
 export function findOneAuditUserWallet( record, fields, sort = { createdAt: -1 } ) {
   return auditUserWalletModel.findOne( record, fields ).sort( sort );
 };

package/src/service/auditUsers.service.js

@@ -10,7 +10,7 @@ export function findOneAuditUsers( query, fields ) {
 
 export function updateOneAuditUsers( query, record ) {
   return auditUsersModel.updateOne( query,
-      { $inc: lateLogin,
+      { $addToSet: record.fileDate,
         $setOnInsert: record }, { upsert: true } );
 };