tango-app-api-report 3.4.0-beta.2 → 3.4.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.4.0-beta.2",
+    "version": "3.4.0-beta.4",
     "description": "report",
     "main": "index.js",
     "type": "module",

package/src/controllers/report.controllers.js

@@ -1,5 +1,5 @@
 import { deleteOneReport, findOneReport, findReport, reportCreate, reportGet, reportGetSingle, reportUpdate } from '../service/report.service.js';
-import { convertTimestampToDateTime, fileUpload, getObject, getOpenSearchData, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { chunkArray, convertTimestampToDateTime, fileUpload, getObject, getOpenSearchData, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { findOneUser, getUserNameEmailById } from '../service/user.service.js';
 import { updateOneBasePriceModel } from '../service/basePrice.service.js';
 import { aggregateClient } from '../service/client.service.js';
@@ -86,12 +86,12 @@ export async function updateReport( req, res ) {
     } );
 
     const user = req.user;
-    const oldData={
+    const oldData = {
       ReportName: previousReport?.fileName,
       FileType: previousReport?.fileType,
       ReceiversEmail: previousReport?.email.join( ', ' ),
     };
-    const newData={
+    const newData = {
       ReportName: postReport?.fileName,
       FileType: postReport?.fileType,
       ReceiversEmail: postReport?.email.join( ', ' ),
@@ -130,7 +130,7 @@ export async function deleteReport( req, res ) {
       _id: inputData?.id,
     } );
     const client = previousReport?.clientId;
-    const changes =[ `The Report ${previousReport?.fileName}.${previousReport?.fileType} has been` ];
+    const changes = [ `The Report ${previousReport?.fileName}.${previousReport?.fileType} has been` ];
 
     await deleteOneReport( { _id: inputData?.id } );
 
@@ -160,7 +160,7 @@ export async function clientReportList( req, res ) {
   try {
     const inputData = req.body;
     const limit = inputData.limit || 10;
-    const offset = inputData.offset? ( inputData.offset - 1 ) * inputData.limit : 0;
+    const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
     const daysDifference = Math.ceil( ( new Date( inputData.toDate ) - new Date( inputData.fromDate ) ) / ( 24 * 60 * 60 * 1000 ) );
     const query = [
       {
@@ -181,7 +181,7 @@ export async function clientReportList( req, res ) {
           daysDifference: 1,
           datesArray: {
             $map: {
-              input: { $range: [ 0, { $toInt: daysDifference+1 } ] },
+              input: { $range: [ 0, { $toInt: daysDifference + 1 } ] },
               as: 'day',
               in: { $add: [ new Date( inputData.fromDate ), { $multiply: [ '$$day', 1000 * 60 * 60 * 24 ] } ] },
             },
@@ -223,7 +223,7 @@ export async function clientReportList( req, res ) {
     ];
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
-      const sortColumnName =inputData.sortColumnName == 'clientId'? 'tangoId': inputData.sortColumnName;
+      const sortColumnName = inputData.sortColumnName == 'clientId' ? 'tangoId' : inputData.sortColumnName;
       query.push(
           {
             $sort: { fileDate: -1 },
@@ -259,23 +259,102 @@ export async function clientReportList( req, res ) {
     }
 
 
-    const count = await aggregateClient( query );
+    let count = await aggregateClient( query );
+
+
     if ( count?.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
+    let paginatedData = count;
+    if ( inputData?.reportStatus==='' ) {
+      paginatedData = await paginate( count, offset, limit );
+    }
 
-    query.push(
-        { $skip: offset },
-        { $limit: limit },
-    );
-    const result = await aggregateClient( query );
-    res.sendSuccess( { result: result, count: count?.length } );
+    if ( inputData.reportStatus&&inputData.reportStatus!=='' ) {
+      paginatedData = await splitArray( paginatedData );
+      paginatedData= paginatedData.filter( ( ele ) => {
+        return ele.reportStatus===inputData.reportStatus;
+      } );
+
+      count = paginatedData;
+
+      paginatedData =await paginate( paginatedData, offset, limit );
+      res.sendSuccess( { result: paginatedData, count: count?.length } );
+    } else {
+      paginatedData=await mapFunction( paginatedData );
+      res.sendSuccess( { result: paginatedData, count: count?.length } );
+    }
   } catch ( error ) {
     logger.info( { error: error, message: req.body, function: 'clientReportList' } );
     return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
+export async function mapFunction( array ) {
+  for ( let [ client ] of array.entries() ) {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const reportLog = await getOpenSearchData( openSearch.auditLog,
+        {
+          'size': 100,
+          'query': {
+            'bool': {
+              'must': [
+                {
+                  'term': {
+                    'logType.keyword': 'report',
+                  },
+                },
+                {
+                  'term': {
+                    'logSubType.keyword': 'sendReport',
+                  },
+                },
+                {
+                  'term': {
+                    'logData.fileDate.keyword': dayjs( client.fileDate ).format( 'DD-MM-YYYY' ),
+                  },
+                },
+                {
+                  'term': {
+                    'logData.clientId.keyword': client.clientId,
+                  },
+                },
+
+              ],
+
+            },
+          },
+
+        } );
+    client.reportStatus='notsent';
+    if ( reportLog.body.hits.hits.length > 0 ) {
+      const sourcesArray = reportLog.body.hits.hits.map( ( hit ) => hit._source );
+      if ( sourcesArray.length>0 ) {
+        client.reportStatus='sent';
+      }
+    }
+  }
+
+  return array;
+}
+
+
+export async function splitArray( array ) {
+  const chunkedMappingData = await chunkArray( array, 10 );
+  const promises = chunkedMappingData.map( async ( chunk ) => {
+    return mapFunction( chunk );
+  } );
+  const mappedArrays = await Promise.all( promises );
+  return mappedArrays.flat();
+}
+
+export async function paginate( array, pageNumber, pageSize ) {
+  const startIndex = pageNumber * pageSize;
+  const endIndex = startIndex + pageSize;
+
+  return array.slice( startIndex, endIndex );
+}
+
 export async function generateReport( req, res ) {
   try {
     const sqs = JSON.parse( process.env.SQS );
@@ -395,7 +474,7 @@ export async function getReportList( req, res ) {
     if ( folderPath?.data?.length == 0 ) {
       return res.sendError( 'No Reports Found', 204 );
     }
-    let temp =[];
+    let temp = [];
     for ( const item of folderPath.data ) {
       temp.push( { Key: item.Key, LastModified: dayjs( item.LastModified ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm:ss' ) } );
     }
@@ -542,7 +621,7 @@ export async function getReportLog( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const logData =[];
+    const logData = [];
     const reportLog = await getOpenSearchData( openSearch.auditLog,
         {
           'size': 100,
@@ -594,10 +673,10 @@ export async function getReportLog( req, res ) {
 export async function updateBasePrice( req, res ) {
   try {
     const inputData = req.body;
-    let count=0;
+    let count = 0;
     let increment = 0;
-    for ( let i =0; i< inputData.length; i++ ) {
-      increment = increment+1;
+    for ( let i = 0; i < inputData.length; i++ ) {
+      increment = increment + 1;
       // await basePricingModel.create( {
       //   'clientId': inputData[i].clientId,
       //   'standard': [
@@ -619,7 +698,7 @@ export async function updateBasePrice( req, res ) {
         'clientId': inputData[i].clientId,
         'standard.productName': { $exists: true },
       };
-      const record={
+      const record = {
         'clientId': inputData[i].clientId,
         'standard.$[elem].basePrice': inputData[i].pricePerStore,
         'standard.$[elem].negotiatePrice': inputData[i].pricePerStore,
@@ -629,12 +708,11 @@ export async function updateBasePrice( req, res ) {
       };
       const result = await updateOneBasePriceModel( query, record );
       if ( result ) {
-        count= count+1;
+        count = count + 1;
       }
-      console.log( result, '.data' );
     }
     if ( increment == inputData.length ) {
-      res.sendSuccess( { result: `The given ${count } recoeds updated` } );
+      res.sendSuccess( { result: `The given ${count} recoeds updated` } );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateBasePrice' } );

package/src/dtos/report.dtos.js

@@ -73,9 +73,9 @@ export const clientListTableSchema = joi.object( {
   limit: joi.number().optional(),
   offset: joi.number().optional(),
   searchValue: joi.string().optional(),
-  filterByType: joi.array().optional(),
   sortColumnName: joi.string().optional(),
   sortBy: joi.number().optional(),
+  reportStatus: joi.string().optional().allow( '' ),
 } );
 
 export const clientListTableValid = {