tango-app-api-audit 3.3.0-alpha.12 → 3.3.0-alpha.14

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.12",
+    "version": "3.3.0-alpha.14",
     "description": "audit & audit metrics apis",
-    "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/audit.controllers.js

@@ -738,21 +738,24 @@ export const mapFunction = async ( chunk, filter ) => {
 
 export async function workSpace( req, res ) {
   try {
-    const inputData = req.query;
+    const inputData = req.body;
     const limit = inputData.limit || 10;
     const offset = inputData.offset ?
       ( inputData.offset - 1 ) * limit :
       0;
     const dateRange = await getUTC( new Date(), new Date() );
-
+    const filter =[
+      { status: { $in: [ 'active', 'hold' ] } },
+      { 'auditConfigs.audit': { $eq: true } },
+    ];
+    if ( inputData?.clientId?.length > 0 ) {
+      filter.push( { clientId: { $in: inputData.clientId } } );
+    }
     const temp = [];
     const clientQuery = [
       {
         $match: {
-          $and: [
-            { status: { $in: [ 'active', 'hold' ] } },
-            { 'auditConfigs.audit': { $eq: true } },
-          ],
+          $and: filter,
         },
       },
       {
@@ -777,7 +780,7 @@ export async function workSpace( req, res ) {
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       const sortColumn = inputData.sortColumnName;
-      query.push( {
+      clientQuery.push( {
         $sort: { [sortColumn]: sortBy },
       },
       );
@@ -1475,7 +1478,9 @@ export async function userAuditHistory( req, res ) {
         auditStatus: { $in: inputData.filterByStatus },
       } );
     }
-
+    if ( inputData?.clientId?.length > 0 ) {
+      filter.push( { clientId: { $in: inputData.clientId } } );
+    }
     const query = [
       {
         $match: {
@@ -1639,18 +1644,18 @@ export async function userAuditHistory( req, res ) {
         chunk.forEach( ( element ) => {
           exportData.push( {
 
-            'Client ID': element.clientId,
-            'Client Name': element.clientName,
+            'Brand ID': element.clientId,
+            'Brand Name': element.clientName,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
             'Zone Name': element.zoneName,
             'Audit Type': element.auditType,
             'Module Type': element.moduleType,
             'Before Count': element.beforeCount,
-            'After Count': element.afterCount,
-            'Accuracy': element.accuracy,
+            'After Count': element.afterCount || '',
+            'Accuracy': element.accuracy || '',
             'Start Time': element.startTime,
-            'End Time': element.endTime,
+            'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
             'Audit Status': element.auditStatus,
             'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
@@ -1661,8 +1666,8 @@ export async function userAuditHistory( req, res ) {
       } );
       const mappedArrays = await Promise.all( promises );
       mappedArrays.flat();
-
-      await download( mappedArrays, res );
+      logger.info( { mappedArrays: mappedArrays[0] } );
+      await download( mappedArrays[0], res );
       return;
     }
 

package/src/docs/audit.docs.js

@@ -223,54 +223,17 @@ export const auditDocs = {
     },
   },
   '/v3/audit/work-space': {
-    get: {
+    post: {
       tags: [ 'Audit Mapping' ],
       description: 'queue wise info of audit files ',
       operationId: 'work-space',
-      parameters: [
-        {
-          in: 'query',
-          name: 'moduleType',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: true,
-        },
-        {
-          in: 'query',
-          name: 'searchValue',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'offset',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'limit',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'isExport',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'sortColumnName',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'sortBy',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( workSpaceSchema ).swagger,
+          },
         },
-      ],
+      },
       responses: {
         200: { description: 'Successful' },
         401: { description: 'Unauthorized User' },

package/src/dtos/audit.dtos.js

@@ -125,6 +125,7 @@ export const workSpaceSchema = joi.object(
     {
       searchValue: joi.string().optional().allow( '' ),
       moduleType: joi.string().required(),
+      clientId: joi.array().optional(),
       offset: joi.number().optional(),
       limit: joi.number().optional(),
       isExport: joi.boolean().optional(),
@@ -134,7 +135,7 @@ export const workSpaceSchema = joi.object(
 );
 
 export const workSpaceValid = {
-  query: workSpaceSchema,
+  body: workSpaceSchema,
 };
 
 /*           < -- *** Audit Metrics ***   -->      */
@@ -145,6 +146,7 @@ export const userAuditHistorySchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       dateType: joi.string().required(),
+      clientId: joi.array().optional(),
       filterByStoreId: joi.array().required(),
       filterByModuleType: joi.array().optional(),
       filterByAuditType: joi.array().optional(),

package/src/routes/audit.routes.js

@@ -17,7 +17,7 @@ auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ),
 auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
 auditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
-auditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
+auditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
 
 // Audit Metrics
 auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );

package/app.js

@@ -1,38 +0,0 @@
-import express from 'express';
-import { auditRouter } 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';
-
-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 );
-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.listen( PORT, () => {
-  logger.info( `server is running on port= ${PORT} ` );
-  connectdb();
-} );
-