tango-app-api-audit 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.12",
+    "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.121",
+        "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

@@ -10,6 +10,7 @@ import { aggregateStoreAudit, createStoreAudit, updateOneStoreAudit } from '../s
 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 {
@@ -94,7 +95,7 @@ export async function getAuditFile( req, res ) {
           storeId: userDetails[0].storeId,
           totalCount: userDetails[0].beforeCount,
         }, {}, { createdAt: -1 } );
-        if ( log.length == 0 ) {
+        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 );
@@ -104,25 +105,25 @@ export async function getAuditFile( req, res ) {
           store_id: userDetails[0].storeId,
           file_date: userDetails[0].fileDate,
           type: userDetails[0].auditType,
-          queueName: log[0].queueName,
-          userId: log[0].userId,
+          queueName: log.queueName,
+          userId: log.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,
+          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[0].userId } );
+        const userdata = await findOneUser( { _id: log.userId } );
         if ( !inputData.nextId || inputData.nextId === '' || inputData.nextId == null ) {
           const logData = {
-            userId: log[0].userId,
+            userId: log.userId,
             userName: userdata.name,
             logType: 'audit',
             logSubType: 'auditStart',
@@ -130,17 +131,28 @@ export async function getAuditFile( req, res ) {
               file_date: userDetails[0].fileDate,
               auditType: userDetails[0].auditType,
               storeId: userDetails[0].storeId,
-              clientName: log[0].queueName,
+              clientName: log.queueName,
               auditId: userDetails[0]._id,
             },
           };
           logger.info( { logData: logData } );
           await insertOpenSearchData( openSearch.activityLog, logData );
-          //   await savelogs( logData );  Note : insert to os
         }
+        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,
-          count: log[0].totalCount,
+          storeId: storeDetails?.storeId,
+          storeName: storeDetails?.storeName,
+          address: storeDetails?.address || '',
+          count: log.totalCount,
           file: file,
           isDraft: userDetails[0].isDraft,
         } );
@@ -221,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,
@@ -323,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,
@@ -337,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,

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 );
+}