tango-app-api-audit 3.3.0-alpha.15 → 3.3.0-alpha.16

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2458,7 +2458,7 @@ export async function pendingSummaryTable( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
-      { auditStatus: { $in: inputData.filterByStatus } },
+      { auditStatus: { $ne: 'completed' } },
 
     ];
 
@@ -2473,6 +2473,10 @@ export async function pendingSummaryTable( req, res ) {
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
+
+    if ( inputData.filterByStatus.length > 0 ) {
+      filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
+    }
     const query =[
       {
         $match: {
@@ -2677,8 +2681,8 @@ export async function overAllAuditSummary( req, res ) {
           auditInprogress: { $cond: [ { $and: [ { $in: [ '$status', [ 'inprogress' ] ] }, { $eq: [ '$auditType', 'Audit' ] } ] }, 1, 0 ] },
           reAuditInprogress: { $cond: [ { $and: [ { $in: [ '$status', [ 'inprogress' ] ] }, { $eq: [ '$auditType', 'ReAudit' ] } ] }, 1, 0 ] },
           draft: { $cond: [ { $eq: [ '$status', 'drafted' ] }, 1, 0 ] },
-          assigned: { $cond: [ { $eq: [ '$status', 'drafted' ] }, 1, 0 ] },
-          exceptNoAssigned: { $cond: [ { $in: [ '$status', [ 'skipped', 'not_assign' ] ] }, 1, 0 ] },
+          assigned: { $cond: [ { $eq: [ '$status', 'assigned' ] }, 1, 0 ] },
+          exceptNoAssigned: { $cond: { if: { $not: { $in: [ '$status', [ 'skipped', 'not_assign' ] ] } }, then: 1, else: 0 } },
           auditCompleted: { $cond: [ { $and: [ { $in: [ '$status', [ 'completed' ] ] }, { $eq: [ '$auditType', 'Audit' ] } ] }, 1, 0 ] },
           reAuditCompleted: { $cond: [ { $and: [ { $in: [ '$status', [ 'completed' ] ] }, { $eq: [ '$auditType', 'ReAudit' ] } ] }, 1, 0 ] },
 
@@ -2706,7 +2710,6 @@ export async function overAllAuditSummary( req, res ) {
           reAuditInprogress: 1,
           draft: 1,
           assigned: 1,
-          exceptNoAssigned1: 1,
           exceptNoAssigned: { $subtract: [ temp.auditStores, '$exceptNoAssigned' ] },
           auditCompleted: 1,
           reAuditCompleted: 1,
@@ -3316,14 +3319,14 @@ export async function totalNotAssignedCount( req, res ) {
         $project: {
           inprogressAuditCount: {
             $cond: [
-              { $in: [ '$status', [ 'completed', 'not_assign' ] ] }, 1, 0,
+              { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] }, 1, 0,
             ],
           },
           inprogressZoneCount: { $cond: [
-            { $and: [ { $eq: [ '$moduleType', 'zone' ] }, { $in: [ '$status', [ 'completed', 'not_assign' ] ] } ] }, 1, 0,
+            { $and: [ { $eq: [ '$moduleType', 'zone' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
           ] },
           inprogressTrafficCount: { $cond: [
-            { $and: [ { $eq: [ '$moduleType', 'traffic' ] }, { $in: [ '$status', [ 'completed', 'not_assign' ] ] } ] }, 1, 0,
+            { $and: [ { $eq: [ '$moduleType', 'traffic' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
           ] },
 
         },