tango-app-api-audit 1.0.29 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.29",
+    "version": "1.0.31",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.0.138",
-        "tango-app-api-middleware": "^3.1.26",
+        "tango-app-api-middleware": "^3.1.27",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/auditMetrics.controllers.js

@@ -8,7 +8,8 @@ import dayjs from 'dayjs';
 import { createAssignAudit } from '../service/assignAudit.service.js';
 import { countDocumentsStore } from '../service/store.service.js';
 import { findOneClient } from '../service/client.service.js';
-import { getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
+import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
+import { getReauditImg } from './audit.controllers.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 export async function userAuditHistory( req, res ) {
@@ -1302,24 +1303,56 @@ export async function auditImages( req, res ) {
   try {
     const inputData = req.query;
     let auditImageDownload = '';
-    switch ( inputData.auditType ) {
+    switch ( inputData.imageType ) {
       case 'BC':
         const auditImageBC = await getAuditImageData( inputData );
+        if ( auditImageBC?.errorCode ) {
+          const error = auditImageBC?.errorMsg;
+          const code = auditImageBC?.errorCode;
+          return res.sendError( { error: error }, code );
+        }
 
         if ( inputData.export==true ) {
           auditImageDownload= await zipDownloadImage( auditImageBC );
           // Set response headers for the zip file
           res.set( 'Content-Type', 'application/zip' );
-          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.auditType}.zip` );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
 
           // Send the zip file as the API response
           return res.send( auditImageDownload );
         }
-        return res.sendSuccess( { result: auditImageBC } );
+        res.sendSuccess( { result: auditImageBC } );
 
         break;
 
+      case 'AC':
+
+        const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
+
+        if ( filterData?.errorCode || auditImageAC?.errorCode ) {
+          const error = filterData?.errorMsg || auditImageAC.errorMsg;
+          const code = filterData?.errorCode || auditImageAC.errorCode;
+          return res.sendError( { error: error }, code );
+        }
+
+        const reauditImg = await getReauditImg( filterData, auditImageAC );
+
+        logger.info( { filterData: filterData } );
+        logger.info( { auditImageAC: auditImageAC } );
+        logger.info( { reauditImg: reauditImg } );
+        if ( inputData.export==true ) {
+          auditImageDownload= await zipDownloadImage( reauditImg );
+          // Set response headers for the zip file
+          res.set( 'Content-Type', 'application/zip' );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
+
+          // Send the zip file as the API response
+          return res.send( auditImageDownload );
+        }
+        res.sendSuccess( { result: reauditImg } );
+        break;
       default:
+        res.sendError( 'No Data Found', 204 );
         break;
     }
 

package/src/controllers/store.controllers.js

@@ -1,42 +1,42 @@
-import { logger } from 'tango-app-api-middleware';
-import { aggregateStore } from '../service/store.service.js';
-
-export async function auditStoreList( req, res ) {
-  try {
-    const inputData = req.body;
-    const query =[
-      {
-        $match: {
-          clientId: { $in: inputData.clientId },
-        },
-      },
-      {
-        $project: {
-          _id: 0,
-          clientId: 1,
-          storeId: 1,
-          storeName: 1,
-        },
-      },
-    ];
-
-    const count = await aggregateStore( query );
-    if ( count.length == 0 ) {
-      return res.sendSuccess( { result: [], count: 0 } );
-    }
-    if ( inputData.limit ) {
-      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
-      query.push(
-          { $skip: offset },
-          { $limit: limit },
-      );
-    }
-    const result = await aggregateStore( query );
-
-    return res.sendSuccess( { result: result, count: count.length } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, messgae: req.body, function: 'auditStoreList' } );
-    return res.sendError( err, 500 );
-  }
-}
+import { logger } from 'tango-app-api-middleware';
+import { aggregateStore } from '../service/store.service.js';
+
+export async function auditStoreList( req, res ) {
+  try {
+    const inputData = req.body;
+    const query =[
+      {
+        $match: {
+          clientId: { $in: inputData.clientId },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientId: 1,
+          storeId: 1,
+          storeName: 1,
+        },
+      },
+    ];
+
+    const count = await aggregateStore( query );
+    if ( count.length == 0 ) {
+      return res.sendSuccess( { result: [], count: 0 } );
+    }
+    if ( inputData.limit ) {
+      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
+      query.push(
+          { $skip: offset },
+          { $limit: limit },
+      );
+    }
+    const result = await aggregateStore( query );
+
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, messgae: req.body, function: 'auditStoreList' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/controllers/user.controllers.js

@@ -1,41 +1,41 @@
-import { logger } from 'tango-app-api-middleware';
-import { aggregateUser } from '../service/user.service.js';
-
-export async function auditUserList( req, res ) {
-  try {
-    const inputData = req.query;
-    const query =[
-      {
-        $match: {
-          userType: { $eq: 'tango' },
-        },
-      },
-      {
-        $project: {
-          userName: 1,
-          userId: '$_id',
-          _id: 0,
-        },
-      },
-    ];
-
-    const count = await aggregateUser( query );
-    if ( count.length == 0 ) {
-      return res.sendSuccess( { result: [], count: 0 } );
-    }
-    if ( inputData.limit ) {
-      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
-      query.push(
-          { $skip: offset },
-          { $limit: limit },
-      );
-    }
-    const result = await aggregateUser( query );
-
-    return res.sendSuccess( { result: result, count: count.length } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, messgae: req.query, function: 'auditUserList' } );
-    return res.sendError( err, 500 );
-  }
-}
+import { logger } from 'tango-app-api-middleware';
+import { aggregateUser } from '../service/user.service.js';
+
+export async function auditUserList( req, res ) {
+  try {
+    const inputData = req.query;
+    const query =[
+      {
+        $match: {
+          userType: { $eq: 'tango' },
+        },
+      },
+      {
+        $project: {
+          userName: 1,
+          userId: '$_id',
+          _id: 0,
+        },
+      },
+    ];
+
+    const count = await aggregateUser( query );
+    if ( count.length == 0 ) {
+      return res.sendSuccess( { result: [], count: 0 } );
+    }
+    if ( inputData.limit ) {
+      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
+      query.push(
+          { $skip: offset },
+          { $limit: limit },
+      );
+    }
+    const result = await aggregateUser( query );
+
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, messgae: req.query, function: 'auditUserList' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/docs/auditMetrics.docs.js

@@ -243,7 +243,7 @@ export const auditMetricsDocs = {
         },
         {
           in: 'query',
-          name: 'auditType',
+          name: 'imageType',
           scema: j2s( auditImageValidSchema ).swagger,
           require: true,
         },
@@ -251,7 +251,7 @@ export const auditMetricsDocs = {
           in: 'query',
           name: 'export',
           scema: j2s( auditImageValidSchema ).swagger,
-          require: false,
+          require: true,
         },
       ],
       responses: {

package/src/docs/store.docs.js

@@ -1,27 +1,27 @@
-import j2s from 'joi-to-swagger';
-import { auditStoreSchema } from '../dtos/store.dtos.js';
-
-export const storeDocs = {
-  '/v3/audit/store/audit-stores': {
-    post: {
-      tags: [ 'Audit/Stores' ],
-      description: `sGet list of stores`,
-      operationId: 'audit-stores',
-      parameters: {},
-      requestBody: {
-        content: {
-          'application/json': {
-            schema: j2s( auditStoreSchema ).swagger,
-          },
-        },
-      },
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
-};
+import j2s from 'joi-to-swagger';
+import { auditStoreSchema } from '../dtos/store.dtos.js';
+
+export const storeDocs = {
+  '/v3/audit/store/audit-stores': {
+    post: {
+      tags: [ 'Audit/Stores' ],
+      description: `sGet list of stores`,
+      operationId: 'audit-stores',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( auditStoreSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+};

package/src/docs/user.docs.js

@@ -1,33 +1,33 @@
-import j2s from 'joi-to-swagger';
-import { userSchema } from '../dtos/user.dtos.js';
-
-export const userDocs = {
-  '/v3/audit/user/tango-users': {
-    get: {
-      tags: [ 'Audit/User' ],
-      description: 'Get user list',
-      operationId: 'tango-users',
-      parameters: [
-        {
-          in: 'query',
-          name: 'limit',
-          scema: j2s( userSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'offset',
-          scema: j2s( userSchema ).swagger,
-          require: false,
-        },
-      ],
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
-};
+import j2s from 'joi-to-swagger';
+import { userSchema } from '../dtos/user.dtos.js';
+
+export const userDocs = {
+  '/v3/audit/user/tango-users': {
+    get: {
+      tags: [ 'Audit/User' ],
+      description: 'Get user list',
+      operationId: 'tango-users',
+      parameters: [
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( userSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( userSchema ).swagger,
+          require: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+};

package/src/dtos/auditMetrics.dtos.js

@@ -171,8 +171,8 @@ export const auditImageValidSchema = joi.object(
     {
       fileDate: joi.string().required(),
       storeId: joi.string().required(),
-      auditType: joi.string().required(),
-      export: joi.boolean().optional(),
+      imageType: joi.string().required(),
+      export: joi.boolean().required(),
     },
 );
 

package/src/dtos/store.dtos.js

@@ -1,14 +1,14 @@
-import joi from 'joi';
-
-
-export const auditStoreSchema = joi.object(
-    {
-      clientId: joi.array().required(),
-      limit: joi.number().optional(),
-      offset: joi.number().optional(),
-    },
-);
-
-export const auditStoreValid = {
-  body: auditStoreSchema,
-};
+import joi from 'joi';
+
+
+export const auditStoreSchema = joi.object(
+    {
+      clientId: joi.array().required(),
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+    },
+);
+
+export const auditStoreValid = {
+  body: auditStoreSchema,
+};

package/src/dtos/user.dtos.js

@@ -1,14 +1,14 @@
-import joi from 'joi';
-
-
-export const userSchema = joi.object(
-    {
-
-      limit: joi.number().optional(),
-      offset: joi.number().optional(),
-    },
-);
-
-export const userValid = {
-  query: userSchema,
-};
+import joi from 'joi';
+
+
+export const userSchema = joi.object(
+    {
+
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+    },
+);
+
+export const userValid = {
+  query: userSchema,
+};

package/src/routes/store.routes.js

@@ -1,10 +1,10 @@
-import { Router } from 'express';
-import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditStoreList } from '../controllers/store.controllers.js';
-import { auditStoreValid } from '../dtos/store.dtos.js';
-
-export const storeRouter = Router();
-
-storeRouter.post( '/audit-stores', isAllowedSessionHandler, validate( auditStoreValid ), auditStoreList );
-
-export default storeRouter;
+import { Router } from 'express';
+import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { auditStoreList } from '../controllers/store.controllers.js';
+import { auditStoreValid } from '../dtos/store.dtos.js';
+
+export const storeRouter = Router();
+
+storeRouter.post( '/audit-stores', isAllowedSessionHandler, validate( auditStoreValid ), auditStoreList );
+
+export default storeRouter;

package/src/routes/user.routes.js

@@ -1,9 +1,9 @@
-import { Router } from 'express';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
-import { auditUserList } from '../controllers/user.controllers.js';
-
-export const userRouter = Router();
-
-userRouter.get( '/tango-users', isAllowedSessionHandler, auditUserList );
-
-export default userRouter;
+import { Router } from 'express';
+import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { auditUserList } from '../controllers/user.controllers.js';
+
+export const userRouter = Router();
+
+userRouter.get( '/tango-users', isAllowedSessionHandler, auditUserList );
+
+export default userRouter;

package/src/validation/audit.validation.js

@@ -1,4 +1,4 @@
-import { checkFileExist, chunkArray, getObject, getQueueUrl, listFileWithoutLimit, logger, signedUrl } from 'tango-app-api-middleware';
+import { checkFileExist, chunkArray, getJsonFileData, getObject, getQueueUrl, listFileWithoutLimit, logger, signedUrl } from 'tango-app-api-middleware';
 import { findOneUserAudit } from '../service/userAudit.service.js';
 import { findOneStoreAudit } from '../service/storeAudit.service.js';
 import AdmZip from 'adm-zip';
@@ -165,7 +165,6 @@ export async function isAuditInputFolderExist( req, res, next ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.method === 'POST' ? req.body : req.query;
-    console.log( inputData );
     const params={
       Bucket: bucket.auditInput,
       Key: `${inputData.fileDate}/${inputData.storeId}`,
@@ -235,6 +234,7 @@ export async function getAuditImageData( data ) {
             imgPath: data,
             imgName: indexes[1],
             imgId: image[0],
+            img_name: indexes[1],
             // imgFile: auditImages[i],
           } );
         }
@@ -256,6 +256,7 @@ export async function getAuditImageData( data ) {
             imgName: indexes[1],
             imgId: image[0],
             imgFile: auditImages[i],
+            img_name: indexes[1],
           } );
         }
         return files;
@@ -272,7 +273,6 @@ export async function zipDownloadImage( data ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const zip = new AdmZip();
     const split = await chunkArray( data, 10 );
-
     const promises = await split.map( async ( chunk ) => {
       for ( let i = 0; i< chunk.length; i++ ) {
         const params ={
@@ -280,7 +280,7 @@ export async function zipDownloadImage( data ) {
           Key: chunk[i].imgFile.Key,
         };
         const fileBuffer = await getObject( params );
-        zip.addFile( chunk[i].imgFile.Key, fileBuffer );
+        zip.addFile( chunk[i].imgFile.Key, fileBuffer.Body );
       }
       return zip;
     } );
@@ -293,3 +293,39 @@ export async function zipDownloadImage( data ) {
     return err;
   }
 }
+
+export async function getAuditFilterData( data ) {
+  try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const storeId = data.storeId;
+    const fileDate = data.fileDate;
+    const params = {
+      Bucket: `${bucket.auditOutput}`,
+      Key: `${storeId}/${fileDate}/${bucket.masterJsonFile}`,
+    };
+    const mappingFile = await getJsonFileData( params );
+    if ( mappingFile.statusCode ) {
+      return mappingFile;
+    } else {
+      const mappingData = await JSON.parse( mappingFile.toString( 'utf-8' ) );
+      const filterData = await mappingData.person_data.filter(
+          ( item ) =>
+            item.temp_ids < 20000 &&
+          item.temp_ids > 0 &&
+          item.person_status === '',
+      );
+      const finalResult = await filterData.map( ( i ) => {
+        return { ...i, img: i.index.concat( '_', i.temp_ids ) };
+      } );
+      return finalResult;
+    }
+  } catch ( error ) {
+    logger.error( {
+      error: error,
+      type: 'MAPPING JSON getFilterData',
+      function: 'getFilterData',
+    } );
+    return error;
+  }
+}
+