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

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.1",
-    "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.157",
-        "tango-app-api-middleware": "^3.3.0-alpha.0",
-        "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-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"
+    }
+}

package/src/controllers/audit.controllers.js

@@ -496,7 +496,6 @@ export async function getAuditFile( req, res ) {
     const list = await listFileByPath( fetchData );
     const folderPath = list.data;
     const nextQuery = list.pageToken;
-    logger.info( { nextQuery: folderPath } );
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
@@ -762,6 +761,11 @@ export async function workSpace( req, res ) {
         $project: {
           clientName: 1,
           clientId: 1,
+          queueName: {
+            $cond: [
+              { $eq: [ inputData.moduleType, 'zone' ] }, '$auditConfigs.zoneQueueName', '$auditConfigs.trafficQueueName',
+            ],
+          },
         },
       },
     ];
@@ -818,7 +822,7 @@ export async function workSpace( req, res ) {
           clientId: { $last: '$clientId' },
           clientName: { $last: '$clientName' },
           installedStore: { $last: '$installedStore' },
-          queueName: { $last: '$queueName' },
+          // queueName: { $last: '$queueName' },
           totalCount: { $sum: 1 },
         },
       },
@@ -1994,13 +1998,12 @@ export async function storeMetrics( req, res ) {
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
-          accuracy: { $round: [
-            { $divide: [
-              { $multiply: [ { $ifNull: [ '$afterCount', 0 ] }, '$beforeCount' ] }, 100,
-            ] }, 2,
+          accuracy: { $cond: [ { $eq: [ '$status', 'completed' ] }, { $round: [
+            {
+              $multiply: [ { $divide: [ '$afterCount', '$beforeCount' ] }, 100 ],
+            }, 1,
           ],
-
-          },
+          }, null ] },
           timeSpent: 1,
           status: 1,
         },
@@ -2075,13 +2078,12 @@ export async function storeMetrics( req, res ) {
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
-          accuracy: { $round: [
-            { $divide: [
-              { $multiply: [ { $ifNull: [ '$afterCount', 0 ] }, '$beforeCount' ] }, 100,
-            ] }, 1,
+          accuracy: { $cond: [ { $eq: [ '$status', 'completed' ] }, { $round: [
+            {
+              $multiply: [ { $divide: [ '$afterCount', '$beforeCount' ] }, 100 ],
+            }, 1,
           ],
-
-          },
+          }, null ] },
           timeSpent: {
 
             $cond: [
@@ -2625,7 +2627,7 @@ export async function overAllAuditSummary( req, res ) {
     let temp = {
       installedStores: 0,
       auditStores: 0,
-      inprogreseStores: 0,
+      inprogressStores: 0,
       completedStores: 0,
       auditInprogress: 0,
       reAuditInprogress: 0,
@@ -2722,7 +2724,7 @@ export async function overAllAuditSummary( req, res ) {
     ];
     const storeAudit = await aggregateStoreAudit( storeAuditQuery );
     if ( storeAudit.length > 0 ) {
-      temp.inprogreseStores= storeAudit[0].inprogreseStores;
+      temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
       temp.auditInprogress = storeAudit[0].auditInprogress;
       temp.reAuditInprogress = storeAudit[0].reAuditInprogress;
@@ -3275,7 +3277,7 @@ export async function totalNotAssignedCount( req, res ) {
         { createdAt: -1 },
     );
     const latestDate = getStoreData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
-    const query =[
+    const query = [
       {
         $match: {
           fileDate: { $eq: latestDate },
@@ -3364,7 +3366,7 @@ export async function totalNotAssignedCount( req, res ) {
     } else {
       notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount;
       notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount;
-      notAssignedCount.totalTrafficCount;
+      notAssignedCount.totalTrafficCount= getTotalcount[0].totalTrafficCount;
     }
     return res.sendSuccess( { result: notAssignedCount } );
   } catch ( error ) {

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