tango-app-api-audit 3.4.29 → 3.4.31

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -3954,7 +3954,7 @@ export async function getUserAuditCount( req, res ) {
       const userWallet = JSON.parse( process.env.USER_WALLET );
       const previousDate = dayjs( new Date() ).subtract( i, 'days' );
       const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
-      const configTimeSpentSec = userWallet.minTimeSpentSec; // 21600 seconds / 6 hours;
+      // const configTimeSpentSec = userWallet.minTimeSpentSec; // 21600 seconds / 6 hours;
       // const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
       // const afterCountY = userWallet.afterCountCreditPerc; // 0.0035;
       const reduce = userWallet.reductionPerc; // 0.05;
@@ -4110,7 +4110,7 @@ export async function getUserAuditCount( req, res ) {
             singleImageAmount: { $ifNull: [ '$beforeCreditCal', 0 ] },
             totalReducedAmount: { $ifNull: [ 0, 0 ] },
             totalCredit: { $ifNull: [ 0, 0 ] },
-            deductionBytimeSpent: { $ifNull: [ 0, 0 ] },
+            // deductionBytimeSpent: { $ifNull: [ 0, 0 ] },
             deductionByMinimumTarget: { $ifNull: [ 0, 0 ] },
             deductionByLateLogin: { $ifNull: [ 0, 0 ] },
             startTime: 1,
@@ -4136,7 +4136,7 @@ export async function getUserAuditCount( req, res ) {
             totalReducedAmount: { $first: '$totalReducedAmount' },
             totalCredit: { $first: '$totalCredit' },
             deductionByMinimumTarget: { $first: '$deductionByMinimumTarget' },
-            deductionBytimeSpent: { $first: '$deductionBytimeSpent' },
+            // deductionBytimeSpent: { $first: '$deductionBytimeSpent' },
             singleImageAmount: { $first: '$singleImageAmount' },
             startTime: { $first: '$startTime' },
             deductionByLateLogin: { $first: '$deductionByLateLogin' },
@@ -4167,7 +4167,7 @@ export async function getUserAuditCount( req, res ) {
             // ] },
             afterCountCredit: afterCountCredit,
             totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', '$singleImageAmount' ] }, 136 ] },
-            deductionBytimeSpent: 1,
+            // deductionBytimeSpent: 1,
             deductionByMinimumTarget: 1,
             mappingperc: { $multiply: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 100 ] },
             deductionByMapping: { $cond: [ { $and: [
@@ -4210,10 +4210,10 @@ export async function getUserAuditCount( req, res ) {
             beforeCountCredit: 1,
             afterCountCredit: 1,
             totalEarn: 1,
-            deductionBytimeSpent: { $cond: [
-              { $lt: [ '$totalTimeSpent', configTimeSpentSec ] },
-              { $multiply: [ reduce, '$totalEarn' ] }, '$deductionBytimeSpent',
-            ] },
+            // deductionBytimeSpent: { $cond: [
+            //   { $lt: [ '$totalTimeSpent', configTimeSpentSec ] },
+            //   { $multiply: [ reduce, '$totalEarn' ] }, '$deductionBytimeSpent',
+            // ] },
 
             deductionByMinimumTarget:
           { $cond: [
@@ -4269,11 +4269,11 @@ export async function getUserAuditCount( req, res ) {
             totalEarn: 1,
             deductionByMinimumTarget: 1,
             singleImageAmount: 1,
-            deductionBytimeSpent: 1,
+            // deductionBytimeSpent: 1,
             mappingperc: 1,
             deductionByMapping: 1,
             totalCredit: { $subtract: [ '$totalEarn', '$totalReducedAmount' ] },
-            totalReducedAmount: { $round: [ { $add: [ '$deductionBytimeSpent', '$deductionByMinimumTarget', '$deductionByMapping', '$deductionByLateLogin' ] }, 2 ] },
+            totalReducedAmount: { $round: [ { $add: [ '$deductionByMinimumTarget', '$deductionByMapping', '$deductionByLateLogin' ] }, 2 ] },
             deductionByLateLogin: 1,
             startTime: {
               $dateToString: {
@@ -4324,7 +4324,7 @@ export async function getUserAuditCount( req, res ) {
             minimumTarget: 1,
             singleImageAmount: 1,
             deductionByMinimumTarget: { $round: [ '$deductionByMinimumTarget', 2 ] },
-            deductionBytimeSpent: { $round: [ '$deductionBytimeSpent', 2 ] },
+            // deductionBytimeSpent: { $round: [ '$deductionBytimeSpent', 2 ] },
             mappingperc: 1,
             deductionByMapping: 1,
             totalReducedAmount: 1,

package/src/controllers/auditWallet.controllers.js

@@ -355,7 +355,7 @@ export async function auditWalletSummary( req, res ) {
           'Total BC': '$totalBeforeCount',
           'Total AC': '$totalAfterCount',
           'Total Earn': '$totalEarn',
-          'Deduction By MinimumTarget': '$deductionByMinimumTarget',
+          'Deduction By Minimum Target': '$deductionByMinimumTarget',
           // 'Mapping Percentage': '$mappingperc',
           'Deduction By Mapping': '$deductionByMapping',
           'Deduction By Late Login': '$deductionByLateLogin',
@@ -420,4 +420,16 @@ export async function auditWalletSummary( req, res ) {
   }
 }
 
+export async function generateReport( req, res ) {
+  try {
+    const inputData = req.query;
+    logger.info( { inputData: inputData } );
+    return res.sendSuccess( { result: 'Generate Reort SuccessFully' } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'generateReport' } );
+    return res.sendError( err, 500 );
+  }
+}
+
 

package/src/docs/auditWallet.docs.js

@@ -193,4 +193,32 @@ export const auditWalletDocs = {
       },
     },
   },
+  '/v3/audit-wallet/generate-report': {
+    get: {
+      tags: [ 'Audit Wallet' ],
+      description: 'Generate user wallet report ',
+      operationId: 'generate-report',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( consolidatedCardSASchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( consolidatedCardSASchema ).swagger,
+          require: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
 };

package/src/dtos/auditWallet.dtos.js

@@ -49,3 +49,13 @@ export const auditWalletSummarySchema = joi.object( {
 export const auditWalletSummaryValid = {
   query: auditWalletSummarySchema,
 };
+
+
+export const generateReportSchema = joi.object( {
+  fromDate: joi.string().required(),
+  toDate: joi.string().required(),
+} );
+
+export const generateReportValid = {
+  query: generateReportSchema,
+};

package/src/routes/auditWallet.routes.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
-import { auditUserDetailsValid, auditUserSummaryValid, auditWalletSummaryValid, consolidatedCardSAValid } from '../dtos/auditWallet.dtos.js';
+import { auditUserDetailsValid, auditUserSummaryValid, auditWalletSummaryValid, consolidatedCardSAValid, generateReportValid } from '../dtos/auditWallet.dtos.js';
 import { dateValidation, ValidateConsolidatedCard, roleVerification, ValidateWalletSummary } from '../validation/auditWallet.validation.js';
 import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditUserSummary, auditWalletSummary, consolidatedCard, getAuditUserDetails } from '../controllers/auditWallet.controllers.js';
+import { auditUserSummary, auditWalletSummary, consolidatedCard, generateReport, getAuditUserDetails } from '../controllers/auditWallet.controllers.js';
 
 export const auditWalletRouter = Router();
 
@@ -13,6 +13,7 @@ auditWalletRouter.get( '/audit-user-summary', isAllowedSessionHandler, accessVer
 auditWalletRouter.get( '/get-audit-user-details', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), roleVerification, validate( auditUserDetailsValid ), getAuditUserDetails );
 auditWalletRouter.get( '/consolidated-card', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), ValidateConsolidatedCard, validate( consolidatedCardSAValid ), consolidatedCard );
 auditWalletRouter.get( '/audit-wallet-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), ValidateWalletSummary, validate( auditWalletSummaryValid ), auditWalletSummary );
+auditWalletRouter.get( '/generate-report', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), roleVerification, validate( generateReportValid ), generateReport );
 
 export default auditWalletRouter;