tango-app-api-audit 3.4.3-alpha.15 → 3.4.3-alpha.17

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -1218,6 +1218,7 @@ export async function getDraftedData( req, res ) {
       userId: userId,
       moduleType: inputData.moduleType,
       zoneName: inputData.zoneName,
+      auditId: inputData.auditId,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
@@ -1659,21 +1660,22 @@ export async function userAuditHistory( req, res ) {
         chunk.forEach( ( element ) => {
           exportData.push( {
             'File Date': element.fileDate,
-            'Brand ID': element.clientId,
             'Brand Name': element.clientName,
-            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
             'Store Name': element.storeName,
+            'Store ID': element.storeId,
             'Zone Name': element.moduleType == 'zone' ? element.zoneName : '',
             'Audit Type': element.auditType,
             'Product Type': element.moduleType,
             'Before Count': element.beforeCount,
             'After Count': element.afterCount || '',
             'Accuracy': element.accuracy || '',
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
-            'Audit Status': element.auditStatus,
-            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+            'Status': element.auditStatus,
+
 
           } );
         } );
@@ -3810,7 +3812,7 @@ export async function auditImages( req, res ) {
 export async function getUserAuditCount( req, res ) {
   try {
     const userWallet = JSON.parse( process.env.USER_WALLET );
-    const previousDate = dayjs( new Date() ).subtract( 1, 'days' );
+    const previousDate = dayjs( new Date() ).subtract( 16, 'days' );
     const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
     const configTimeSpentSec = userWallet.minTimeSpentSec; // 18000;
     const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
@@ -4039,16 +4041,16 @@ export async function getUserAuditCount( req, res ) {
           totalTimeSpent: {
             $cond: [ { $eq: [ '$hours', 0 ] },
               { $concat: [
-                { $toString: '$minutes' }, ' minutes',
+                '00:', { $toString: '$minutes' }, ':00',
               ] },
               { $cond: [ { $eq: [ '$minutes', 0 ] },
                 { $concat: [
-                  { $toString: '$hours' }, ' hours',
+                  { $toString: '$hours' }, ':00:00',
                 ] },
                 {
                   $concat: [
-                    { $toString: '$hours' }, ' hours and ',
-                    { $toString: '$minutes' }, ' minutes',
+                    { $toString: '$hours' }, ':',
+                    { $toString: '$minutes' }, ':00',
                   ],
                 },
               ] },
@@ -4429,24 +4431,25 @@ export async function auditViewLogs( req, res ) {
   try {
     const inputData = req.query;
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
-    let downTimeQuery = {
+    const logData =[];
+    let logsQuery = {
       'size': 100,
       'query': {
         'bool': {
           'must': [
             {
               'term': {
-                'doc.logData.fileDate.keyword': dayjs( inputData.fileDate ).format( 'DD-MM-YYYY' ),
+                'logData.fileDate.keyword': inputData.fileDate,
               },
             },
             {
               'term': {
-                'doc.logData.storeId.keyword': inputData.storeId,
+                'logData.storeId.keyword': inputData.storeId,
               },
             },
             {
               'term': {
-                'doc.logData.moduleType.keyword': inputData.moduleType,
+                'logData.moduleType.keyword': inputData.moduleType,
               },
             },
           ],
@@ -4454,10 +4457,17 @@ export async function auditViewLogs( req, res ) {
         },
       },
     };
-    const downtime = await getOpenSearchData( parsedOpenSearch.auditLog, downTimeQuery );
-    return res.sendSuccess( downtime );
-  } catch ( err ) {
-
+    const logs = await getOpenSearchData( parsedOpenSearch.auditLog, logsQuery );
+    if ( logs.body.hits.hits.length > 0 ) {
+      logData.push( logs.body.hits.hits[0]._source );
+      return res.sendSuccess( logData );
+    } else {
+      return res.sendError( 'No Record Inserted', 500 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'auditViewLogs' } );
+    return res.sendError( err, 500 );
   }
 }
 

package/src/controllers/traxAudit.controllers.js

@@ -1714,18 +1714,17 @@ export async function userAuditHistory( req, res ) {
           const temp ={
 
             'File Date': element.fileDate,
-            'Brand ID': element.clientId,
             'Brand Name': element.clientName,
-            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
             'Store Name': element.storeName,
+            'Store ID': element.storeId,
             'Audit Type': element.auditType,
             'Product Type': element.value,
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
             'Status': toCamelCase( element.auditStatus ),
-            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
-            'Result': element.answer,
 
 
           };
@@ -4212,6 +4211,7 @@ export async function getDraftedData( req, res ) {
       storeId: inputData.storeId,
       userId: userId,
       moduleType: inputData.moduleType,
+      auditId: inputData.auditId,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 

package/src/docs/audit.docs.js

@@ -184,6 +184,12 @@ export const auditDocs = {
           scema: j2s( getDraftedDataSchema ).swagger,
           require: true,
         },
+        {
+          in: 'query',
+          name: 'auditId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
         {
           in: 'query',
           name: 'userId',

package/src/docs/traxAudit.docs.js

@@ -387,6 +387,12 @@ export const traxAuditDocs = {
           scema: j2s( getDraftedDataSchema ).swagger,
           require: true,
         },
+        {
+          in: 'query',
+          name: 'auditId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
         {
           in: 'query',
           name: 'userId',

package/src/dtos/audit.dtos.js

@@ -76,6 +76,7 @@ export const getDraftedDataSchema = joi.object( {
   userId: joi.string().optional(),
   moduleType: joi.string().required(),
   zoneName: joi.string().required(),
+  auditId: joi.string().required(),
 } );
 
 export const getDraftedDataValid = {

package/src/dtos/traxAudit.dtos.js

@@ -68,6 +68,7 @@ export const getDraftedDataSchema = joi.object(
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
       moduleType: joi.string().required(),
+      auditId: joi.string().required(),
     },
 );