tango-app-api-audit 1.0.60 → 1.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.60",
+    "version": "1.0.62",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -31,9 +31,9 @@ import {
 } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import {
   aggregateStoreAudit,
-  createStoreAudit,
-  findOneStoreAudit,
+  // findOneStoreAudit,
   updateOneStoreAudit,
+  updateStoreAudit,
 } from '../service/storeAudit.service.js';
 import _ from 'lodash';
 import {
@@ -410,6 +410,12 @@ export async function getAuditFile( req, res ) {
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
         };
+        const query ={
+          storeId: msg.store_id,
+          zoneName: msg.zone_id,
+          fileDate: msg.curr_date,
+          moduleType: inputData.moduleType,
+        };
         const storeRecord = {
           userId: req.user._id,
           storeId: msg.store_id,
@@ -425,7 +431,7 @@ export async function getAuditFile( req, res ) {
           moduleType: inputData.moduleType,
         };
         reauditInsert = await createUserAudit( record );
-        await createStoreAudit( storeRecord );
+        await updateStoreAudit( query, storeRecord );
       } else {
         reauditInsert = userDetails[0];
       }
@@ -539,6 +545,12 @@ export async function getAuditFile( req, res ) {
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
         };
+        const query ={
+          storeId: msg.store_id,
+          zoneName: msg.zone_id,
+          fileDate: msg.curr_date,
+          moduleType: inputData.moduleType,
+        };
         const storeRecord = {
           userId: req.user._id,
           storeId: msg.store_id,
@@ -555,7 +567,7 @@ export async function getAuditFile( req, res ) {
         };
 
         insertData = await createUserAudit( record );
-        await createStoreAudit( storeRecord );
+        await updateStoreAudit( query, storeRecord );
       } else {
         insertData = userDetails[0];
       }
@@ -1208,21 +1220,21 @@ export async function save( req, res ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const sqs = JSON.parse( process.env.SQS );
     const inputData = req.body;
-    let storeAuditData = await findOneStoreAudit( {
-      storeId: inputData.storeId,
-      fileDate: inputData.fileDate,
-      moduleType: inputData.moduleType,
-      zoneName: inputData.zoneName,
-      auditType: inputData.auditType,
-    } );
-    logger.info( { storeAuditData: storeAuditData } );
-    if ( storeAuditData==null ) {
-      logger.error( {
-        error: `No data found: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
-        type: 'DATABASE_RECORD_NOTFOUND',
-      } );
-      return res.sendError( storeAuditData, 204 );
-    }
+    // let storeAuditData = await findOneStoreAudit( {
+    //   storeId: inputData.storeId,
+    //   fileDate: inputData.fileDate,
+    //   moduleType: inputData.moduleType,
+    //   zoneName: inputData.zoneName,
+    //   auditType: inputData.auditType,
+    // } );
+    // logger.info( { storeAuditData: storeAuditData } );
+    // if ( storeAuditData==null ) {
+    //   logger.error( {
+    //     error: `No data found: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+    //     type: 'DATABASE_RECORD_NOTFOUND',
+    //   } );
+    //   return res.sendError( storeAuditData, 204 );
+    // }
     const params = {
       Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
     };
@@ -1406,7 +1418,7 @@ export async function save( req, res ) {
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'save' } );
-    return res.sendError( err );
+    return res.sendError( err, 500 );
   }
 }
 

package/src/service/storeAudit.service.js

@@ -4,6 +4,10 @@ export function updateOneStoreAudit( query, record ) {
   return storeAuditModel.updateOne( query, { $set: record } );
 }
 
+export function updateStoreAudit( query, record ) {
+  return storeAuditModel.update( query, { $set: record }, { upsert: true } );
+}
+
 export function createStoreAudit( record ) {
   return storeAuditModel.create( record );
 }