tango-app-api-audit 3.3.0-beta.2 → 3.3.0

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

@@ -1,40 +1,40 @@
-{
-    "name": "tango-app-api-audit",
-    "version": "3.3.0-beta.2",
-    "description": "audit & audit metrics apis",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "adm-zip": "^0.5.15",
-        "aws-sdk": "^2.1643.0",
-        "dayjs": "^1.11.11",
-        "dotenv": "^16.4.5",
-        "express": "^4.19.2",
-        "handlebars": "^4.7.8",
-        "joi-to-swagger": "^6.2.0",
-        "lodash": "^4.17.21",
-        "mongodb": "^6.7.0",
-        "nodemon": "^3.1.3",
-        "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.159",
-        "tango-app-api-middleware": "^3.1.32",
-        "winston": "^3.13.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.57.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.2.0"
-    }
-}
+{
+    "name": "tango-app-api-audit",
+    "version": "3.3.0",
+    "description": "audit & audit metrics apis",
+    "main": "index.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "adm-zip": "^0.5.15",
+        "aws-sdk": "^2.1643.0",
+        "dayjs": "^1.11.11",
+        "dotenv": "^16.4.5",
+        "express": "^4.19.2",
+        "handlebars": "^4.7.8",
+        "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
+        "mongodb": "^6.7.0",
+        "nodemon": "^3.1.3",
+        "swagger-ui-express": "^5.0.1",
+        "tango-api-schema": "^2.0.159",
+        "tango-app-api-middleware": "^3.1.32",
+        "winston": "^3.13.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.57.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.2.0"
+    }
+}

package/src/controllers/audit.controllers.js

@@ -1647,14 +1647,14 @@ export async function userAuditHistory( req, res ) {
         const exportData = [];
         chunk.forEach( ( element ) => {
           exportData.push( {
-
+            'File Date': element.fileDate,
             'Brand ID': element.clientId,
             'Brand Name': element.clientName,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
-            'Zone Name': element.zoneName,
+            'Zone Name': element.moduleType == 'zone'? element.zoneName : '',
             'Audit Type': element.auditType,
-            'Module Type': element.moduleType,
+            'Product Type': element.moduleType,
             'Before Count': element.beforeCount,
             'After Count': element.afterCount || '',
             'Accuracy': element.accuracy || '',
@@ -1662,7 +1662,7 @@ export async function userAuditHistory( req, res ) {
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
             'Audit Status': element.auditStatus,
-            'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
 
           } );
         } );
@@ -1788,7 +1788,7 @@ export async function clientMetrics( req, res ) {
                 completedStores: 1,
                 inprogressStores: 1,
                 notAssignedStores: 1,
-                fileCount: 1,
+                fileCount: { $ifNull: [ '$fileCount', 0 ] },
                 completionPercentage: { $ifNull: [
                   {
                     $round: [ {
@@ -1828,8 +1828,8 @@ export async function clientMetrics( req, res ) {
           // notAssignedStores: '$storeAudit.notAssignedStores',
           inprogressStoresCount: '$storeAudit.inprogressStores',
           // fileCount: '$storeAudit.fileCount',
-          notAssignedCount: 1,
-          clientStatus: { $cond: [ { $eq: [ '$storeAudit.fileCount', 0 ] }, 'not-taken', { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$storeAudit.notAssignedStores', 0 ] } ] }, 'pending', 'completed' ] } ] },
+          notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$storeAudit.fileCount', 0 ] }, { $ifNull: [ '$storeAudit.notAssignedStores', 0 ] } ] } ] },
+          clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$storeAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$storeAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$storeAudit.notAssignedStores', 0 ] } ] }
           completedStores: '$storeAudit.completedStores',
           completionPercentage: '$storeAudit.completionPercentage',
 
@@ -1885,7 +1885,7 @@ export async function clientMetrics( req, res ) {
               'File Date': '$fileDate',
               'Client Name': '$clientName',
               'Client Id': '$clientId',
-              'Module Type': '$moduleType',
+              'Product Type': '$moduleType',
               'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
@@ -2127,6 +2127,7 @@ export async function storeMetrics( req, res ) {
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -2159,19 +2160,36 @@ export async function storeMetrics( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'File Date': element.fileDate,
-          'Store ID': element.storeId,
-          'Store Name': element.storeName,
-          'Client Id': element.clientId,
-          'Client Name': element.clientName,
-          'User Name': element.userName,
-          'User Email': element.userEmail,
-          'Audit Type': element.auditType,
-          'Accuracy': element.accuracy,
-          'Time Spent': element.timeSpent,
-          'Status': element.status,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'File Date': element.fileDate,
+            'Store ID': element.storeId,
+            'Store Name': element.storeName,
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
+            'Zone Name': element.zoneName,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Audit Type': element.auditType,
+            'Accuracy': element.accuracy,
+            'Time Spent': element.timeSpent,
+            'Status': element.status,
+          } );
+        } else {
+          exportdata.push( {
+            'File Date': element.fileDate,
+            'Store ID': element.storeId,
+            'Store Name': element.storeName,
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Audit Type': element.auditType,
+            'Accuracy': element.accuracy,
+            'Time Spent': element.timeSpent,
+            'Status': element.status,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -2597,18 +2615,32 @@ export async function pendingSummaryTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'Store ID': element.storeId,
-          'zoneName': element.zoneName,
-          'File Date': element.fileDate,
-          'Module Type': element.moduleType,
-          'Audit Type': element.auditType,
-          'Before Count': element.beforeCount,
-          'Start Time': element.startTime,
-          'User Name': element.userName,
-          'User Email': element.userEmail,
-          'Status': element.auditStatus,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'zoneName': element.zoneName,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'Start Time': element.startTime,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Status': element.auditStatus,
+          } );
+        } else {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'Start Time': element.startTime,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Status': element.auditStatus,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -2883,7 +2915,7 @@ export async function reTrigger( req, res ) {
         await insertOpenSearchData( openSearch.auditLog, logData );
     }
 
-    return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
+    return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
   } catch ( error ) {
     const err = error.message;
     logger.error( { error: error, message: req.body, function: 'reTrigger' } );
@@ -3239,19 +3271,34 @@ export async function overviewTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'Store ID': element.storeId,
-          'Client ID': element.clientId,
-          'zoneName': element.zoneName,
-          'File Date': element.fileDate,
-          'Module Type': element.moduleType,
-          'Audit Type': element.auditType,
-          'Before Count': element.beforeCount,
-          'After Count': element.afterCount,
-          // 'User Name': element.userName,
-          // 'User Email': element.userEmail,
-          'Status': element.status,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
+            'Zone Name': element.zoneName,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            // 'User Name': element.userName,
+            // 'User Email': element.userEmail,
+            'Status': element.status,
+          } );
+        } else {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            // 'User Name': element.userName,
+            // 'User Email': element.userEmail,
+            'Status': element.status,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;

package/src/service/auditStoreData.service.js

@@ -1,10 +1,10 @@
-import auditStoreDataModel from 'tango-api-schema/schema/auditStoreData.model.js';
-
-
-export function aggregateAuditStoreData( query ) {
-  return auditStoreDataModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
-}
-
-export function findOneStoreData( query, fields, sort ) {
-  return auditStoreDataModel.findOne( query, fields ).sort( sort );
-}
+import auditStoreDataModel from 'tango-api-schema/schema/auditStoreData.model.js';
+
+
+export function aggregateAuditStoreData( query ) {
+  return auditStoreDataModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
+}
+
+export function findOneStoreData( query, fields, sort ) {
+  return auditStoreDataModel.findOne( query, fields ).sort( sort );
+}