tango-app-api-audit 3.4.68-beta.4 → 3.4.68-beta.6

package/.eslintrc.cjs

@@ -36,7 +36,7 @@ module.exports = {
     'no-unused-vars': 'error',
     'new-cap': [ 'error', { 'newIsCap': true, 'capIsNew': false } ],
     'prefer-const': 'off',
-    'no-console': 'error',
+  //  'no-console': 'error',
   },
 };
 

package/app.js

@@ -0,0 +1,47 @@
+import express from 'express';
+import dotenv from 'dotenv';
+import { logger } from 'tango-app-api-middleware';
+import { connectdb } from './config/database/database.js';
+import responseMiddleware from './config/response/response.js';
+import errorMiddleware from './config/response/error.js';
+import pkg from 'body-parser';
+import { swaggerConfig } from './config/swagger/swagger.js';
+import swagger from 'swagger-ui-express';
+import traxAuditRouter from './src/routes/traxAudit.routes.js';
+import auditWalletRouter from './src/routes/auditWallet.routes.js';
+import auditRouter from './src/routes/audit.routes.js';
+import cors from 'cors';
+import eyeTestAuditRouter from './src/routes/eyeTestAudit.routes.js';
+
+const { json, urlencoded } = pkg;
+const env=dotenv.config();
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+
+
+app.use( json( { limit: '500mb' } ) );
+app.use(
+    urlencoded( {
+      extended: true,
+    } ),
+);
+app.use( cors() );
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+
+if ( env.error ) {
+  logger.error( '.env not found' );
+  process.exit( 1 );
+}
+app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
+
+app.use( '/v3/audit', auditRouter );
+app.use( '/v3/trax-audit', traxAuditRouter );
+app.use( '/v3/audit-wallet', auditWalletRouter );
+app.use( '/v3/eye-test-audit', eyeTestAuditRouter );
+
+app.listen( PORT, () => {
+  logger.info( `server is running on port= ${PORT} ` );
+  connectdb();
+} );

package/package.json

@@ -1,42 +1,42 @@
-{
-    "name": "tango-app-api-audit",
-    "version": "3.4.68-beta.4",
-    "description": "audit & audit metrics apis",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "adm-zip": "^0.5.15",
-        "aws-sdk": "^2.1643.0",
-        "axios": "^1.7.9",
-        "dayjs": "^1.11.11",
-        "dotenv": "^16.4.5",
-        "express": "^4.19.2",
-        "form-data": "^4.0.1",
-        "handlebars": "^4.7.8",
-        "joi-to-swagger": "^6.2.0",
-        "lodash": "^4.17.21",
-        "mongodb": "^6.7.0",
-        "nodemon": "^3.1.3",
-        "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.95",
-        "tango-app-api-middleware": "^3.1.71",
-        "winston": "^3.13.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.57.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.2.0"
-    }
-}
+{
+    "name": "tango-app-api-audit",
+    "version": "3.4.68-beta.6",
+    "description": "audit & audit metrics apis",
+    "main": "app.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "adm-zip": "^0.5.15",
+        "aws-sdk": "^2.1643.0",
+        "axios": "^1.7.9",
+        "dayjs": "^1.11.11",
+        "dotenv": "^16.4.5",
+        "express": "^4.19.2",
+        "form-data": "^4.0.1",
+        "handlebars": "^4.7.8",
+        "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
+        "mongodb": "^6.7.0",
+        "nodemon": "^3.1.3",
+        "swagger-ui-express": "^5.0.1",
+        "tango-api-schema": "^2.2.95",
+        "tango-app-api-middleware": "^3.1.71",
+        "winston": "^3.13.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.57.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.2.0"
+    }
+}

package/src/controllers/eyeTestAudit.controllers.js

@@ -16,7 +16,7 @@ export async function getList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = `${inputData?.sortBy}.keyword`;
+    const sortBy = inputData?.sortBy ? `${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
     let filter= [
       {
@@ -147,7 +147,7 @@ export async function getList( req, res ) {
           'bool': search,
         },
         'sort': [
-          { createdAt: { order: 'desc' } },
+          { 'storeName.keyword': { order: 'desc' } },
         ],
       };
     }
@@ -164,7 +164,7 @@ export async function getList( req, res ) {
       const chunkedMappingData = await chunkArray( searchValue, 10 );
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
-        chunk.forEach( async ( element ) => {
+        for ( const element of chunk ) {
           const testDuration = element?._source?.testDuration;
           const minutes = Math.floor( testDuration / 60 );
           const seconds = testDuration % 60;
@@ -200,11 +200,11 @@ export async function getList( req, res ) {
               'Visitor Type': element?._source?.visitorsType,
               'Test Duration': duration || '',
               'Audit Status': element?._source?.auditStatus || '',
-              'Audited By': userName.userName || '',
+              'Audited By': userName?.userName || '',
 
             } );
           }
-        } );
+        }
         return exportData;
       } );
       const mappedArrays = await Promise.all( promises );
@@ -694,7 +694,11 @@ export async function getFileHistory( req, res ) {
                   'queueId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -710,7 +714,11 @@ export async function getFileHistory( req, res ) {
                   'engagementId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -722,13 +730,14 @@ export async function getFileHistory( req, res ) {
       let sourcesArray = resposnse.body.hits.hits.map( ( hit ) => hit );
       let outputData=[];
       for ( let data of sourcesArray ) {
+        // console.log( data._source.endTime );
         let findUser= await findOneUser( { _id: new mongoose.Types.ObjectId( data._source.userId ) } );
         outputData.push( {
           _id: data._id,
           userId: data._source.userId,
           userName: findUser.userName,
           Date: dayjs( data._source.endTime ).format( 'DD/MM/YYYY' ),
-          Time: dayjs( data._source.endTime ).format( 'HH:MM:ss' ),
+          Time: data._source.endTime?new Date( data._source.endTime ).toLocaleTimeString( 'en-IN', { hour12: false } ):'-',
         } );
       }