tango-app-api-audit 3.4.23 → 3.4.25

package/index.js

@@ -2,9 +2,11 @@
 
 import { auditRouter } from './src/routes/audit.routes.js';
 import { traxAuditRouter } from './src/routes/traxAudit.routes.js';
+import { auditWalletRouter } from './src/routes/auditWallet.routes.js';
 import { auditDocs } from './src/docs/audit.docs.js';
 import { traxAuditDocs } from './src/docs/traxAudit.docs.js';
+import { auditWalletDocs } from './src/docs/auditWallet.docs.js';
 
-export { auditRouter, auditDocs, traxAuditRouter, traxAuditDocs };
+export { auditRouter, auditDocs, traxAuditRouter, traxAuditDocs, auditWalletRouter, auditWalletDocs };
 
 

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -3950,7 +3950,7 @@ export async function getUserAuditCount( req, res ) {
     // if ( isFirstDay ) {
     //   await updateManyAuditUsers( {}, { lateLogin: 0 } );
     // }
-    for ( let i =1; i<7; i++ ) {
+    for ( let i =2; i<32; i++ ) {
       const userWallet = JSON.parse( process.env.USER_WALLET );
       const previousDate = dayjs( new Date() ).subtract( i, 'days' );
       const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
@@ -4345,7 +4345,7 @@ export async function getUserAuditCount( req, res ) {
       if ( result.length == 0 ) {
         return res.sendError( 'No Record Inserted', 500 );
       }
-      if ( i == 6 ) {
+      if ( i == 31 ) {
         return res.sendSuccess( { message: 'Inserted successfully!' } );
       }
     }
@@ -4735,6 +4735,9 @@ export async function auditViewLogs( req, res ) {
                 ],
               },
             },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
           };
           break;
         case 'left-in-middle':
@@ -4771,6 +4774,9 @@ export async function auditViewLogs( req, res ) {
                 ],
               },
             },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
           };
           break;
         case 'uniform-detection':
@@ -4803,6 +4809,9 @@ export async function auditViewLogs( req, res ) {
                 ],
               },
             },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
           };
           break;
         case 'hygiene':
@@ -4839,6 +4848,9 @@ export async function auditViewLogs( req, res ) {
                 ],
               },
             },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
           };
           break;
         case 'camera-angle-change':
@@ -4875,6 +4887,9 @@ export async function auditViewLogs( req, res ) {
                 ],
               },
             },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
           };
           break;
         default:
@@ -4886,7 +4901,7 @@ export async function auditViewLogs( req, res ) {
     logger.info( { logs: logs.body.hits, inputData: inputData, auditLog: parsedOpenSearch.auditLog } );
     if ( logs.body.hits.hits.length > 0 ) {
       const sourcesArray = logs.body.hits.hits.map( ( hit ) => hit._source );
-      for ( const i of sourcesArray ) { // Loop through sourcesArray, not result._doc.camera
+      for ( const i of sourcesArray ) { // Loop through sourcesArray
         if ( i.logSubType == 'auditDone' ) {
           const convertedTime = await convertTimestampToDateTime( i.logData.endTime );
           logData.push( {

package/src/controllers/auditWallet.controllers.js

@@ -0,0 +1,45 @@
+export async function auditUserSummary( req, res ) {
+  try {
+    const inputData =req.query;
+    return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'auditUserSummary' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function getAuditUserDetails( req, res ) {
+  try {
+    const inputData =req.query;
+    return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'consolidatedCard' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function consolidatedCard( req, res ) {
+  try {
+    const inputData =req.query;
+    return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'consolidatedCard' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function auditWalletSummary( req, res ) {
+  try {
+    const inputData =req.query;
+    return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'consolidatedCard' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+

package/src/controllers/traxAudit.controllers.js

@@ -1,4 +1,4 @@
-import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive } from 'tango-app-api-middleware';
+import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData } from 'tango-app-api-middleware';
 import { aggregateBinaryAudit, createBinaryAudit, updateOneBinaryAuditModel } from '../service/binaryAudit.service.js';
 import { countDocumentsStore, findOneStore } from '../service/store.service.js';
 import { findOneUser } from '../service/user.service.js';
@@ -2715,6 +2715,7 @@ export async function pendingSummaryTable( req, res ) {
           storeId: 1,
           streamName: 1,
           tempId: 1,
+          zoneName: 1,
           question: 1,
           questionType: 1,
           answer: 1,
@@ -2769,6 +2770,7 @@ export async function pendingSummaryTable( req, res ) {
           storeId: 1,
           streamName: 1,
           tempId: 1,
+          zoneName: 1,
           question: 1,
           questionType: 1,
           answer: 1,
@@ -3977,7 +3979,43 @@ export async function save( req, res ) {
         folderPath: getFilePath?.sqs?.Body?.folderPath,
         createdAt: new Date(),
       };
-      await insertOpenSearchData( openSearch.traxDetectionOutput, output );
+      let filter= [
+        {
+          'term': {
+            'storeId.keyword': inputData.storeId,
+          },
+        },
+        {
+          'term': {
+            'fileDate.keyword': inputData.fileDate,
+          },
+        },
+      ];
+
+      inputData.moduleType === 'hygiene'?
+      filter.push( {
+        'term': {
+          'zoneName.keyword': inputData.zoneName,
+        },
+      } ) : null;
+
+      let searchQuery={
+        'size': 1,
+        'query': {
+          'bool': {
+            'must': filter,
+          },
+        },
+      };
+
+      const searchData= await getOpenSearchData( openSearch.nob, searchQuery );
+      logger.info( { length: searchData?.body?.hits?.hits?.length, _id: searchData?.body?.hits?.hits[0]?._id, output: output } );
+      if ( searchData?.body?.hits?.hits?.length >0 ) {
+        await updateOpenSearchData( openSearch.traxDetectionOutput, searchData?.body?.hits?.hits[0]?._id, { doc: output } );
+      } else {
+        await insertOpenSearchData( openSearch.traxDetectionOutput, output );
+      }
+
       const logData = {
         userId: req.user._id,
         userName: req.user.userName,

package/src/docs/auditWallet.docs.js

@@ -0,0 +1,197 @@
+import j2s from 'joi-to-swagger';
+import { auditUserDetailsSchema, auditUserSummarySchema, auditWalletSummarySchema, consolidatedCardSASchema } from '../dtos/auditWallet.dtos.js';
+
+export const auditWalletDocs = {
+
+  '/v3/audit-wallet/audit-user-summary': {
+    get: {
+      tags: [ 'Audit Wallet' ],
+      description: 'Consolidated wallet details of each audit users for a superadmin view',
+      operationId: 'audit-user-summary',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'searchValue',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'isExport',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'sortColumnName',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'sortBy',
+          scema: j2s( auditUserSummarySchema ).swagger,
+          require: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+  '/v3/audit-wallet/get-audit-user-details': {
+    get: {
+      tags: [ 'Audit Wallet' ],
+      description: 'get a user personal info and assigned client count',
+      operationId: 'get-audit-user-details',
+      parameters: [
+        {
+          in: 'query',
+          name: 'userId',
+          scema: j2s( auditUserDetailsSchema ).swagger,
+          require: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+  '/v3/audit-wallet/consolidated-card': {
+    get: {
+      tags: [ 'Audit Wallet' ],
+      description: 'get consolidated of wallet details card of a audit user',
+      operationId: 'consolidated-card',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( consolidatedCardSASchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( consolidatedCardSASchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'userId',
+          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' },
+      },
+    },
+  },
+
+  '/v3/audit-wallet/audit-wallet-summary': {
+    get: {
+      tags: [ 'Audit Wallet' ],
+      description: 'Get a file via queue message',
+      operationId: 'audit-wallet-summary',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'searchValue',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'isExport',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'sortColumnName',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'sortBy',
+          scema: j2s( auditWalletSummarySchema ).swagger,
+          require: true,
+        },
+      ],
+      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

@@ -0,0 +1,50 @@
+import joi from 'joi';
+
+
+export const auditUserSummarySchema = joi.object( {
+  fromDate: joi.string().optional(),
+  toDate: joi.string().optional(),
+  searchValue: joi.string().optional().allow( '' ),
+  limit: joi.number().optional(),
+  offset: joi.number().optional(),
+  isExport: joi.boolean().optional(),
+  sortColumnName: joi.string().optional(),
+  sortBy: joi.number().optional(),
+} );
+
+export const auditUserSummaryValid = {
+  query: auditUserSummarySchema,
+};
+
+export const consolidatedCardSASchema = joi.object( {
+  fromDate: joi.string().required(),
+  toDate: joi.string().required(),
+  userId: joi.string().required(),
+} );
+
+export const consolidatedCardSAValid = {
+  query: consolidatedCardSASchema,
+};
+
+export const auditUserDetailsSchema = joi.object( {
+  userId: joi.string().required(),
+} );
+
+export const auditUserDetailsValid = {
+  query: auditUserDetailsSchema,
+};
+
+export const auditWalletSummarySchema = joi.object( {
+  fromDate: joi.string().optional(),
+  toDate: joi.string().optional(),
+  searchValue: joi.string().optional().allow( '' ),
+  limit: joi.number().optional(),
+  offset: joi.number().optional(),
+  isExport: joi.boolean().optional(),
+  sortColumnName: joi.string().optional(),
+  sortBy: joi.number().optional(),
+} );
+
+export const auditWalletSummaryValid = {
+  query: auditWalletSummarySchema,
+};

package/src/routes/auditWallet.routes.js

@@ -0,0 +1,18 @@
+import { Router } from 'express';
+import { auditUserDetailsValid, auditUserSummaryValid, auditWalletSummaryValid } from '../dtos/auditWallet.dtos.js';
+import { roleValidate, roleVerification } from '../validation/auditWallet.validation.js';
+import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { auditUserSummary, auditWalletSummary, consolidatedCard, getAuditUserDetails } from '../controllers/auditWallet.controllers.js';
+
+export const auditWalletRouter = Router();
+
+// superadmin - view
+auditWalletRouter.get( '/audit-user-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), roleVerification, validate( auditUserSummaryValid ), auditUserSummary );
+
+// single user view
+auditWalletRouter.get( '/get-audit-user-details', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( auditUserDetailsValid ), getAuditUserDetails );
+auditWalletRouter.get( '/consolidated-card', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), roleValidate, consolidatedCard );
+auditWalletRouter.get( '/audit-wallet-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( auditWalletSummaryValid ), auditWalletSummary );
+
+export default auditWalletRouter;
+

package/src/validation/auditWallet.validation.js

@@ -0,0 +1,36 @@
+import { validate } from 'tango-app-api-middleware';
+import { consolidatedCardSAValid } from '../dtos/auditWallet.dtos.js';
+
+export async function roleVerification( req, res, next ) {
+  try {
+    if ( [ 'superadmin' ].includes( req?.user?.role ) ) {
+      return next();
+    } else {
+      return res.sendError( 'access forbidden', 403 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'roleVerification' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function roleValidate( req, res, next ) {
+  try {
+    if ( [ 'superadmin' ].includes( req?.user?.role ) ) {
+      validate( consolidatedCardSAValid );
+      return next();
+    } else {
+      const yesterday = dayjs( new Date() ).subtract( 1, 'days' );
+      const yesterdayFT = new Date( dayjs( yesterday ).format( 'YYYY-MM-DD' ) );
+      req.query = req.user._id;
+      req.fromDate = yesterdayFT;
+      req.toDate = yesterdayFT;
+      return next();
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'roleValidate' } );
+    return res.sendError( err, 500 );
+  }
+}