tango-app-api-audit 3.5.42 → 3.5.43

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,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.5.42",
+    "version": "3.5.43",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/eyeTestAudit.controllers.js

@@ -1210,12 +1210,19 @@ export async function summaryList( req, res ) {
           [inputData?.sortBy]: sortOrder,
         };
       }
+      let clusterFilter = [
+        { 'Teamlead.email': { $in: inputData.RMList } },
+        { clientId: { $eq: inputData?.clientId } },
+      ];
+      if ( inputData?.cluster && inputData?.cluster?.length> 0 ) {
+        clusterFilter.push( {
+          clusterName: { $in: inputData?.cluster },
+        } );
+      }
       const clusterQuery =[
         { $match: {
-          $and: [
-            { 'Teamlead.email': { $in: inputData.RMList } },
-            { clientId: { $eq: inputData?.clientId } },
-          ],
+          $and: clusterFilter,
+
         },
         },
         { $unwind: { path: '$Teamlead', preserveNullAndEmptyArrays: true } },
@@ -1350,6 +1357,23 @@ export async function summaryList( req, res ) {
           $sort: sort,
         },
       ];
+      if ( inputData.searchValue && inputData.searchValue !== '' ) {
+        clusterQuery.push( {
+          $match: {
+            $or: [
+              { clusterName: { $regex: inputData.searchValue, $options: 'i' } },
+            ],
+          },
+        } );
+
+        RMQuery.push( {
+          $match: {
+            $or: [
+              { RMName: { $regex: inputData.searchValue, $options: 'i' } },
+            ],
+          },
+        } );
+      }
       const getcount = await aggregateClusters( inputData.keyType === 'rm'?RMQuery: clusterQuery );
       const count = getcount?.length || 0;
       if ( count == 0 ) {
@@ -1431,8 +1455,8 @@ export async function summaryList( req, res ) {
             if ( inputData?.keyType == 'rm' ) {
               exportData.push( {
                 'RM Name': element?.RMName,
-                'Cluster Count': element?.clusterCount,
-                'Store Count': element?.storesCount,
+                'Clusters Count': element?.clusterCount,
+                'Stores Count': element?.storesCount,
                 'Total Tango AI Files': element.totalFiles,
                 'Trust Audit Completed': element.completedFiles,
                 'Tango Score': element?.complianceScore,
@@ -1443,7 +1467,7 @@ export async function summaryList( req, res ) {
             } else {
               exportData.push( {
                 'Cluster Name': element?.clusterName,
-                'Store Count': element?.storesCount,
+                'Stores Count': element?.storesCount,
                 'Total Tango AI Files': element.totalFiles,
                 'Trust Audit Completed': element.completedFiles,
                 'Tango Score': element?.complianceScore,
@@ -1859,16 +1883,16 @@ export async function summaryCard( req, res ) {
               aggs: {
 
 
-                totalFiles: { value_count: { field: '_id' } },
+                'totalFiles': { value_count: { field: '_id' } },
 
-                completedFiles: {
+                'completedFiles': {
                   filter: {
-                    terms: { 'auditStatus.keyword': [ 'audited', 'reAudited' ] },
+                    terms: { 'auditStatus.keyword': [ 'Audited', 'ReAudited' ] },
                   },
                 },
 
                 //  ratio calc must be inside the same level
-                completedRatio: {
+                'completedRatio': {
                   bucket_script: {
                     buckets_path: {
                       audited: 'completedFiles._count',
@@ -1878,31 +1902,23 @@ export async function summaryCard( req, res ) {
                   },
                 },
 
-                tangoScore: {
-                  scripted_metric: {
-                    init_script: 'state.sum = 0; state.count = 0;',
-                    map_script: `
-                  if (doc['totalSteps'].size() != 0 && doc['totalSteps'].value > 0) {
-                    state.sum += (doc['coveredStepsAI'].value / doc['totalSteps'].value) * 100;
-                    state.count += 1;
-                  }
-                `,
-                    combine_script: 'return state;',
-                    reduce_script: `
-                  double totalSum = 0;
-                  double totalCount = 0;
-                  for (s in states) {
-                    totalSum += s.sum;
-                    totalCount += s.count;
-                  }
-                  return totalCount > 0 ? totalSum / totalCount : 0;
-                `,
+                'tangoScore': {
+                  'avg': {
+                    script: {
+                      source: `
+            if (doc['totalSteps'].size() > 0 && doc['coveredStepsAI'].size() > 0 && doc['totalSteps'].value > 0) {
+              return (1.0 * doc['coveredStepsAI'].value / doc['totalSteps'].value) * 100.0;
+            } else {
+              return null;
+            }
+          `,
+                    },
                   },
                 },
 
-                trustScore: {
+                'trustScore': {
                   filter: {
-                    terms: { 'auditStatus.keyword': [ 'audited', 'reAudited' ] },
+                    terms: { 'auditStatus.keyword': [ 'Audited', 'ReAudited' ] },
                   },
                   aggs: {
                     avg_val: { avg: { field: 'trustScore' } },
@@ -1910,7 +1926,7 @@ export async function summaryCard( req, res ) {
                 },
 
                 // 5. Past week comparison
-                trend: {
+                'trend': {
                   date_range: {
                     field: 'date',
                     format: 'yyyy-MM-dd',
@@ -1923,7 +1939,7 @@ export async function summaryCard( req, res ) {
                     total_count: { value_count: { field: '_id' } },
                   },
                 },
-                tangoScoreTrend: {
+                'tangoScoreTrend': {
                   bucket_script: {
                     buckets_path: {
                       current: 'trend[\'current\']>total_count',
@@ -1961,7 +1977,7 @@ export async function summaryCard( req, res ) {
       const temp= getOutput?.body?.aggregations?.all_docs?.wrapper?.buckets?.filtered;
       initialValue.totalFiles =temp?.totalFiles?.value;
       initialValue.completedFiles =temp?.completedFiles?.doc_count;
-      initialValue.completedRatio =temp?.completedRatio?.value || 0;
+      initialValue.completedRatio =Math.round( temp?.completedRatio?.value || 0 );
       initialValue.tangoScore =Math.round( temp?.tangoScore?.value || 0 );
       initialValue.tangoScoreTrend =temp?.tangoScoreTrend?.value || 0;
       initialValue.trustScore =temp?.trustScore?.avg_val?.value == null || temp?.trustScore?.avg_val?.value === undefined ? 'NA':Math.round( temp?.trustScore?.avg_val?.value );

package/src/dtos/eyeTestAudit.dtos.js

@@ -151,6 +151,9 @@ export const summaryListSchema = joi.object( {
   RMList: joi.array().items(
       joi.string().required(),
   ).optional(),
+  cluster: joi.array().items(
+      joi.string().required(),
+  ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
   complianceScore: joi.number().optional().allow( null ),
   nearAddition: joi.string().optional().allow( '' ),