tango-app-api-infra 3.1.19 → 3.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.19",
+    "version": "3.1.21",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.115",
-        "tango-app-api-middleware": "^3.1.19",
+        "tango-app-api-middleware": "^3.1.26",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/dataMismatch.controller.js

@@ -219,7 +219,7 @@ export async function activityList( req, res ) {
     if ( req.user.userType === 'client' ) {
       query.forEach( ( e ) => {
         if ( e.$match ) {
-          $match.$and.push( { 'dataMismatch.showToClient': true } );
+          e.$match.$and.push( { 'dataMismatch.showToClient': true } );
         }
       } );
     }

package/src/controllers/infra.controllers.js

@@ -961,6 +961,7 @@ export async function allCounts( req, res ) {
           datamismatchCount: {
             $cond: [ { $or: [ { $eq: [ '$issueType', 'highcount' ] }, { $eq: [ '$issueType', 'lowcount' ] } ] }, 1, 0,
             ],
+
           },
           matCount: {
             $cond: [ { $and: [ { $eq: [ '$issueType', 'mat' ] } ] }, 1, 0,
@@ -980,6 +981,28 @@ export async function allCounts( req, res ) {
         },
       },
     ];
+
+    if ( req.user.userType === 'client' ) {
+      countQuery.forEach( ( item ) => {
+        if ( item.$project ) {
+          item.$project.datamismatchCount.$cond = [
+            {
+              $and: [
+                {
+                  $or: [
+                    { $eq: [ '$issueType', 'highcount' ] },
+                    { $eq: [ '$issueType', 'lowcount' ] },
+                  ],
+                },
+                { $eq: [ '$dataMismatch.showToClient', true ] },
+              ],
+            },
+            1,
+            0,
+          ];
+        }
+      } );
+    }
     let result = await aggregateTangoTicket( countQuery );
     res.sendSuccess( result );
   } catch ( error ) {
@@ -1775,6 +1798,10 @@ export async function dataMismatchTable( req, res ) {
       },
 
     ];
+
+    if ( req.user.userType === 'client' ) {
+      countFilter.push( { 'dataMismatch.showToClient': true } );
+    }
     if ( inputData.clientId && inputData?.clientId?.length > 0 ) {
       countFilter.push( {
         'basicDetails.clientId': { $in: inputData.clientId },
@@ -1836,6 +1863,10 @@ export async function dataMismatchTable( req, res ) {
       { 'basicDetails.clientId': { $in: inputData.clientId } },
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
     ];
+
+    if ( req.user.userType === 'client' ) {
+      filter.push( { 'dataMismatch.showToClient': true } );
+    }
     const query = [
       {
         $match: {

package/src/controllers/userInfra.controller.js

@@ -802,11 +802,11 @@ export async function pendingTicket( req, res ) {
             ],
           },
           datamismatchCount: {
-            $cond: [ { $and: [ { $or: [ { $eq: [ '$issueType', 'highcount' ] }, { $eq: [ '$issueType', 'lowcount' ] } ] }, { $eq: [ '$status', 'closed' ] } ] }, 1, 0,
+            $cond: [ { $and: [ { $or: [ { $eq: [ '$issueType', 'highcount' ] }, { $eq: [ '$issueType', 'lowcount' ] } ] }, { $ne: [ '$status', 'closed' ] } ] }, 1, 0,
             ],
           },
           matCount: {
-            $cond: [ { $and: [ { $eq: [ '$issueType', 'mat' ] }, { $eq: [ '$status', 'open' ] } ] }, 1, 0,
+            $cond: [ { $and: [ { $eq: [ '$issueType', 'mat' ] }, { $ne: [ '$status', 'closed' ] } ] }, 1, 0,
             ],
           },
         },