tango-app-api-report 3.4.0-beta.3 → 3.4.0-beta.5

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.4.0-beta.3",
+    "version": "3.4.0-beta.5",
     "description": "report",
-    "main": "app.js",
+    "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/report.controllers.js

@@ -266,10 +266,10 @@ export async function clientReportList( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
     let paginatedData = count;
+
     if ( inputData?.reportStatus==='' ) {
       paginatedData = await paginate( count, offset, limit );
     }
-
     if ( inputData.reportStatus&&inputData.reportStatus!=='' ) {
       paginatedData = await splitArray( paginatedData );
       paginatedData= paginatedData.filter( ( ele ) => {
@@ -291,7 +291,7 @@ export async function clientReportList( req, res ) {
 }
 
 export async function mapFunction( array ) {
-  for ( let [ client ] of array.entries() ) {
+  for ( let client of array ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const reportLog = await getOpenSearchData( openSearch.auditLog,
         {
@@ -326,8 +326,10 @@ export async function mapFunction( array ) {
           },
 
         } );
+
     client.reportStatus='notsent';
-    if ( reportLog.body.hits.hits.length > 0 ) {
+
+    if ( reportLog?.body?.hits?.hits?.length > 0 ) {
       const sourcesArray = reportLog.body.hits.hits.map( ( hit ) => hit._source );
       if ( sourcesArray.length>0 ) {
         client.reportStatus='sent';
@@ -349,9 +351,8 @@ export async function splitArray( array ) {
 }
 
 export async function paginate( array, pageNumber, pageSize ) {
-  const startIndex = pageNumber * pageSize;
+  const startIndex = pageNumber;
   const endIndex = startIndex + pageSize;
-
   return array.slice( startIndex, endIndex );
 }
 

package/app.js

@@ -1,42 +0,0 @@
-import express from 'express';
-import { reportRouter } from './index.js';
-
-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 cors from 'cors';
-
-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( responseMiddleware );
-app.use( errorMiddleware );
-app.use( cors() );
-
-if ( env.error ) {
-  logger.error( '.env not found' );
-  process.exit( 1 );
-}
-app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
-
-app.use( '/report', reportRouter );
-
-app.listen( PORT, () => {
-  logger.info( `server is running on port= ${PORT} ` );
-  connectdb();
-} );