tango-app-api-infra 3.0.40-dev → 3.0.42-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.40-dev",
+    "version": "3.0.42-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -385,7 +385,7 @@ export async function emailUserList( req, res ) {
         $match: {
           userType: 'client',
           clientId: inputData.clientId,
-          ...( inputData.role ) ? { role: inputData.role } : {},
+          role: inputData.role,
         },
       },
       {
@@ -465,19 +465,19 @@ export async function emailUserList( req, res ) {
     const result = await aggregateUser( query );
     for ( let user of result ) {
       if ( user.role == 'superadmin' ) {
-        let storelist = await findStore( { clientId: user.clientId, status: 'active' }, { storeName: 1 } );
+        let storelist = await findStore( { clientId: inputData.clientId, status: 'active' }, { storeName: 1 } );
         user.assigned = storelist.length;
         user.assignedValue = storelist;
       } else if ( user.role != 'superadmin' ) {
         if ( user.assignedType == 'group' ) {
           for ( let group of user.assignedValue ) {
             let groupdata = await findOneGroup( { groupName: group } );
-            let storelist = await findStore( { storeId: { $in: groupdata.storeList } }, { storeName: 1 } );
+            let storelist = await findStore( { clientId: inputData.clientId, storeId: { $in: groupdata.storeList } }, { storeName: 1 } );
             user.assigned = storelist.length;
             user.assignedValue = storelist;
           }
         } else if ( user.assignedType == 'store' ) {
-          let storelist = await findStore( { storeId: { $in: user.assignedValue } }, { storeName: 1 } );
+          let storelist = await findStore( { clientId: inputData.clientId, storeId: { $in: user.assignedValue } }, { storeName: 1 } );
           user.assignedValue = storelist;
         }
       }

package/src/controllers/internalInfra.controller.js

@@ -294,7 +294,8 @@ export async function emailUserList( req, res ) {
     let clientList = await aggregateClient( [
       {
         $match: {
-          status: 'active',
+          'status': 'active',
+
           // clientId:{ req.body.clientId},
         },
       },
@@ -314,8 +315,8 @@ export async function emailUserList( req, res ) {
                 '$expr': {
                   $and: [
                     { '$eq': [ '$clientId', '$$clientId' ] },
-                    { '$eq': [ '$userType', 'client' ] },
-
+                    { '$eq': [ '$clientId', '$$clientId' ] },
+                    { '$eq': [ '$emailAlert.infra', true ] },
                   ],
                 },
               },