tango-app-api-audit 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.117",
+        "tango-api-schema": "^2.0.122",
         "tango-app-api-middleware": "^3.1.24",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -1,4 +1,4 @@
-import { chunkArray, download, getJsonFileData, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
+import { chunkArray, download, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
 import { aggregateUserAudit, createUserAudit, findOneUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import { aggregateAssignAudit, updateOneAssignAudit } from '../service/assignAudit.service.js';
 import { findOneUser } from '../service/user.service.js';
@@ -9,10 +9,13 @@ import { listQueue, sqsReceive } from 'tango-app-api-middleware/src/utils/aws/sq
 import { aggregateStoreAudit, createStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
+import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
+import { findOneStore } from '../service/store.service.js';
 
 export async function getAuditFile( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
     const data = await getUTC( new Date(), new Date() );
     const start = data.start;
@@ -84,64 +87,76 @@ export async function getAuditFile( req, res ) {
         }
         break;
 
-        // case 'drafted':
-        //   logger.info( 'userDetails drafted', { inputData } );
-        //   const log = await findOneUser( {
-        //     userId: userDetails[0].userId,
-        //     fileDate: userDetails[0].fileDate,
-        //     storeId: userDetails[0].storeId,
-        //     totalCount: userDetails[0].beforeCount,
-        //   }, {}, { createdAt: -1 } );
-        //   if ( log.length == 0 ) {
-        //     await audit.updateOne( { _id: userDetails[0]._id }, { $set: { isDraft: false, auditStatus: 'skipped' } } );
-        //     logger.info( 'audit update in drafted', { _id: userDetails[0]._id, isDraft: false, auditStatus: 'skipped' } );
-        //     return res.sendError( 'User saved data has been deleted', 204 );
-        //   }
-        //   const file = {
-        //     auditId: userDetails[0]._id,
-        //     store_id: userDetails[0].storeId,
-        //     file_date: userDetails[0].fileDate,
-        //     type: userDetails[0].auditType,
-        //     queueName: log[0].queueName,
-        //     userId: log[0].userId,
-        //   };
-        //   const result = {
-        //     junk: log[0].junk,
-        //     junk_count: log[0].junkCount,
-        //     employee: log[0].employee,
-        //     employee_count: log[0].employeeCount,
-        //     customer: log[0].customer,
-        //     customer_count: log[0].customerCount,
-        //     retag_image: log[0].retagImage,
-        //     retag_count: log[0].retagCount,
-        //     total_count: log[0].totalCount,
-        //   };
-
-        //   const userdata = await findOneUser( { _id: log[0].userId } );
-        //   if ( !inputData.nextId || inputData.nextId === '' || inputData.nextId == null ) {
-        //     const logData = {
-        //       userId: log[0].userId,
-        //       userName: userdata.name,
-        //       logType: 'audit',
-        //       logSubType: 'auditStart',
-        //       logData: {
-        //         file_date: userDetails[0].fileDate,
-        //         auditType: userDetails[0].auditType,
-        //         storeId: userDetails[0].storeId,
-        //         clientName: log[0].queueName,
-        //         auditId:  userDetails[0]._id ,
-        //       },
-        //     };
-        //     logger.info( { logData: logData } );
-        //   //   await savelogs( logData );  Note : insert to os
-        //   }
-        //   return res.sendSuccess( {
-        //     result: result,
-        //     count: log[0].totalCount,
-        //     file: file,
-        //     isDraft: userDetails[0].isDraft,
-        //   } );
-        //   break;
+      case 'drafted':
+        logger.info( 'userDetails drafted', { inputData } );
+        const log = await findOneAuditLog( {
+          userId: userDetails[0].userId,
+          fileDate: userDetails[0].fileDate,
+          storeId: userDetails[0].storeId,
+          totalCount: userDetails[0].beforeCount,
+        }, {}, { createdAt: -1 } );
+        if ( !log ) {
+          await updateOneUserAudit( { _id: userDetails[0]._id }, { $set: { isDraft: false, auditStatus: 'skipped' } } );
+          logger.info( 'audit update in drafted', { _id: userDetails[0]._id, isDraft: false, auditStatus: 'skipped' } );
+          return res.sendError( 'User saved data has been deleted', 204 );
+        }
+        const file = {
+          auditId: userDetails[0]._id,
+          store_id: userDetails[0].storeId,
+          file_date: userDetails[0].fileDate,
+          type: userDetails[0].auditType,
+          queueName: log.queueName,
+          userId: log.userId,
+        };
+        const result = {
+          junk: log.junk,
+          junk_count: log.junkCount,
+          employee: log.employee,
+          employee_count: log.employeeCount,
+          customer: log.customer,
+          customer_count: log.customerCount,
+          retag_image: log.retagImage,
+          retag_count: log.retagCount,
+          total_count: log.totalCount,
+        };
+
+        const userdata = await findOneUser( { _id: log.userId } );
+        if ( !inputData.nextId || inputData.nextId === '' || inputData.nextId == null ) {
+          const logData = {
+            userId: log.userId,
+            userName: userdata.name,
+            logType: 'audit',
+            logSubType: 'auditStart',
+            logData: {
+              file_date: userDetails[0].fileDate,
+              auditType: userDetails[0].auditType,
+              storeId: userDetails[0].storeId,
+              clientName: log.queueName,
+              auditId: userDetails[0]._id,
+            },
+          };
+          logger.info( { logData: logData } );
+          await insertOpenSearchData( openSearch.activityLog, logData );
+        }
+        const storeQuery = {
+          storeId: userDetails[0].storeId,
+        };
+        const storeFields = {
+          storeId: 1,
+          storeName: 1,
+          address: '$storeProfile.address',
+        };
+        const storeDetails = await findOneStore( storeQuery, storeFields );
+        return res.sendSuccess( {
+          result: result,
+          storeId: storeDetails?.storeId,
+          storeName: storeDetails?.storeName,
+          address: storeDetails?.address || '',
+          count: log.totalCount,
+          file: file,
+          isDraft: userDetails[0].isDraft,
+        } );
+        break;
 
       default:
         msg = {
@@ -218,14 +233,25 @@ export async function getAuditFile( req, res ) {
             auditId: reauditInsert._id,
           },
         };
-        logger.info( { logData: logData } );
-        // await savelogs( logData );   need to change
+        await insertOpenSearchData( openSearch.activityLog, logData );
       }
 
+      const storeQuery = {
+        storeId: msg.store_id,
+      };
+      const storeFields = {
+        storeId: 1,
+        storeName: 1,
+        address: '$storeProfile.address',
+      };
+      const storeInfo = await findOneStore( storeQuery, storeFields );
       return res.sendSuccess(
           {
             result: reauditImg,
             count: reauditImg.length,
+            storeId: storeInfo?.storeId,
+            storeName: storeInfo?.storeName,
+            address: storeInfo?.address || '',
             file: {
               store_id: msg.store_id,
               file_date: msg.curr_date,
@@ -320,6 +346,14 @@ export async function getAuditFile( req, res ) {
       return res.sendError( 'Bucket is Empty', 204 );
     }
     const userdata = await findOneUser( { _id: insertData.userId } );
+    const storeQuery = {
+      storeId: storeId,
+    };
+    const storeFields = {
+      storeName: 1,
+      address: '$storeProfile.address',
+    };
+    const storeInfo = await findOneStore( storeQuery, storeFields );
     if ( inputData.nextId ) {
       const logData = {
         userId: insertData.userId,
@@ -334,13 +368,15 @@ export async function getAuditFile( req, res ) {
           auditId: insertData._id,
         },
       };
-      logger.info( logData );
-      // await savelogs( logData );
+      await insertOpenSearchData( openSearch.activityLog, logData );
     }
-
+    logger.info( { storeInfo: storeInfo } );
     return res.sendSuccess( {
       result: files,
       count: msg.total_count,
+      storeId: storeId,
+      storeName: storeInfo?.storeName,
+      address: storeInfo?.address,
       file: {
         queueName: inputData.queueName,
         store_id: storeId,
@@ -808,9 +844,8 @@ export async function saveDraft( req, res ) {
         },
       };
       await insertOpenSearchData( openSearch.activityLog, logData );
-      logger.info( { logData: logData } ); // need to insert to os
     }
-    await insertOpenSearchData( openSearch.auditLog, inputData );
+    await createAuditLog( inputData );
     await updateOneUserAudit( userQuery, userRecord );
     await updateOneStoreAudit( storeQuery, storeRecord );
     return res.sendSuccess( { result: 'The file has been drafted successfully' } );
@@ -823,46 +858,16 @@ export async function saveDraft( req, res ) {
 
 export async function getDraftedData( req, res ) {
   try {
-    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    logger.info( { inputData: inputData } );
-    const getLog = await getOpenSearchData( openSearch.auditLog,
-        {
-          'size': 1,
-          'query': {
-            'bool': {
-              'must': [
-                {
-                  'term': {
-                    'fileDate.keyword': inputData.fileDate,
-                  },
-                },
-                {
-                  'term': {
-                    'storeId.keyword': inputData.storeId,
-                  },
-                },
-                {
-                  'term': {
-                    'userId.keyword': req.user._id,
-                  },
-                },
-
-              ],
-
-            },
-          },
+    const userId = inputData.userId || req.user._id;
+    const query={
+      fileDate: inputData.fileDate,
+      storeId: inputData.storeId,
+      userId: userId,
 
-          'sort': [
-            {
-              'timestamp': {
-                'order': 'desc',
-              },
-            },
-          ],
+    };
+    const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
-        } );
-    const result = getLog?.body?.hits?.hits;
     if ( result.length ==0 ) {
       return res.sendError( 'No Data Found', 500 );
     }

package/src/dtos/audit.dtos.js

@@ -41,6 +41,7 @@ export const getDraftedDataSchema = joi.object(
     {
       storeId: joi.string().required(),
       fileDate: joi.string().required(),
+      userId: joi.string().optional(),
     },
 );
 

package/src/service/auditLog.service.js

@@ -0,0 +1,10 @@
+import auditLogsModel from 'tango-api-schema/schema/auditLogs.model.js';
+
+
+export function createAuditLog( record ) {
+  return auditLogsModel.create( record );
+}
+
+export function findOneAuditLog( query, fields={}, sort={ createdAt: -1 }, limit=10 ) {
+  return auditLogsModel.findOne( query, fields ).sort( sort ).limit( limit );
+}

package/src/service/store.service.js

@@ -0,0 +1,6 @@
+import storeModel from 'tango-api-schema/schema/store.model.js';
+
+
+export function findOneStore( query, fields ) {
+  return storeModel.findOne( query, fields );
+}