tango-app-api-client 3.1.8 → 3.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.1.8",
+    "version": "3.1.10",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.91",
+        "tango-api-schema": "^2.0.89",
         "tango-app-api-middleware": "^3.1.7",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/client.controllers.js

@@ -44,7 +44,7 @@ export async function create( req, res ) {
     };
     const user = await findOneUser( userQuery );
     if ( !user ) {
-      return res.sendError( { error: 'User doesnot exist' }, 500 );
+      return res.sendError( `User doesn't exist`, 500 );
     }
     const data = {
       email: leadRecord?.corporateEmail,
@@ -176,10 +176,9 @@ export async function create( req, res ) {
       'role': 'storesuperadmin',
     };
 
-
     await postApi( `${appConfig.url.oldapidomain}/oldBrandAdd`, oldBrandInsertData );
 
-    await postApi( `${appConfig.url.oldapidomain}/oldUserAdd`, [ oldDefaultRolesInsertData ] );
+    await postApi( `${appConfig.url.oldapidomain}/oldDefaultRoleInsert`, oldDefaultRolesInsertData );
 
 
     if ( insertClient ) {
@@ -197,7 +196,7 @@ export async function create( req, res ) {
     }
   } catch ( error ) {
     logger.info( { error: error, message: req.body, function: 'create' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -225,7 +224,7 @@ export async function changeStatus( req, res, next ) {
     };
     const result = await update( query, record );
     if ( result.matchedCount == 0 ) {
-      res.sendError( 'Not Found', 204 );
+      res.sendError( 'Data Not Found', 204 );
     }
     if ( inputData.status == 'approved' ) {
       return next();
@@ -234,7 +233,7 @@ export async function changeStatus( req, res, next ) {
     }
   } catch ( error ) {
     logger.info( { error: error, message: req.body, function: 'changeStatus' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -296,7 +295,7 @@ export async function getClients( req, res ) {
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'getClients' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -413,7 +412,7 @@ export async function detailedAllClientCount( req, res ) {
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'detailedAllClientCount' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -514,7 +513,7 @@ export async function updateBrandInfo( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateBrandInfo' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -565,7 +564,7 @@ export async function updateBillingDetails( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateBillingDetails' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -601,7 +600,7 @@ export async function updateSignatoryDetails( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateSignatoryDetails' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -640,7 +639,7 @@ export async function updateTicketConfiguration( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateTicketConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -725,7 +724,7 @@ export async function updateFeatureConfiguration( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateTicketConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -764,7 +763,7 @@ export async function domainDetailsConfiguration( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'domainDetailsConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -778,7 +777,7 @@ export async function userConfiguration( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'userConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -875,7 +874,7 @@ export async function updateDocuments( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateBillingDetails' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -892,11 +891,11 @@ export async function getAuditConfiguration( req, res ) {
       }
       res.sendSuccess( auditConfig );
     } else {
-      res.sendError( { error: 'Store not found' }, 404 );
+      res.sendError( 'Store not Found', 404 );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'getAuditConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -937,7 +936,7 @@ export async function auditConfiguration( req, res ) {
     res.sendSuccess( { result: 'Updated Successfully' } );
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'auditConfiguration' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -951,7 +950,7 @@ export async function getCsmUsers( req, res ) {
     if ( users?.length ) {
       res.sendSuccess( users );
     } else {
-      res.sendError( 'No users found', 404 );
+      res.sendError( 'No Users Found', 404 );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'getAuditConfiguration' } );
@@ -963,6 +962,37 @@ export async function clientList( req, res ) {
     let clientQuery = [];
     const limit = inputData.limit || 10;
     const skip = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
+    logger.info( { message: req?.user?.role } );
+    if ( req?.user?.role !== 'superadmin' ) {
+      const query = [
+        {
+          $match: {
+            userEmail: { $eq: req?.user?.email },
+            userType: 'tango',
+
+          },
+        }, {
+
+          $group: {
+            _id: null,
+            clientList: { $push: '$assignedValue' },
+          },
+        },
+      ];
+      const clientIdList = await aggregateUserAssignedStore( query );
+      logger.info( { message: clientIdList, value: 'clientIdList' } );
+      if ( clientIdList.length ==0 ) {
+        return res.sendError( 'No Data Found', 204 );
+      }
+
+      clientQuery.push(
+          {
+            $match: {
+              clientId: { $in: clientIdList[0].clientList },
+            },
+          },
+      );
+    }
     if ( inputData.filterByPaymentStatus ) {
       clientQuery.push(
           {
@@ -1027,7 +1057,7 @@ export async function clientList( req, res ) {
 
     const clientCount = await aggregateClient( clientQuery );
     if ( clientCount.length == 0 ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
+      return res.sendError( 'No Data Found', 204 );
     }
 
     if ( inputData.sortColumName ) {
@@ -1231,7 +1261,7 @@ export async function clientList( req, res ) {
     return res.sendSuccess( { result: sortedResult, count: clientCount.length } );
   } catch ( error ) {
     logger.error( { error: error, function: 'clientList' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -1245,7 +1275,7 @@ export async function getOpsUsers( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'getOpsUsers' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -1269,8 +1299,6 @@ export async function detailedClientCount( req, res ) {
 
     if ( isLogoExist ) {
       const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
-      logger.info( { signedFilUrl: signedFilUrl, data: 'signedFilUrl' } );
-
       result['logo'] = signedFilUrl;
     } else {
       result['logo'] = '';
@@ -1282,7 +1310,7 @@ export async function detailedClientCount( req, res ) {
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'detailedClientCount' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -1338,7 +1366,7 @@ export async function getActivityLogs( req, res ) {
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'getActivityLogs' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 

package/src/validations/client.validations.js

@@ -6,12 +6,12 @@ export async function isclientNameExists( req, res, next ) {
     const inputData = req.body;
     const client = await model.clientModel.findOne( { clientName: inputData?.clientName } );
     if ( client ) {
-      return res.sendError( 'clientName is exists', 403 );
+      return res.sendError( 'ClientName is Exists', 403 );
     }
     return next();
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'isclientNameExists' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
@@ -23,13 +23,13 @@ export async function isclientIdExists( req, res, next ) {
     };
     const client = await findOneClient( query );
     if ( !client ) {
-      return res.sendError( { error: `client doesn't exists` }, 204 );
+      return res.sendError( `Client doesn't Exists`, 204 );
     }
     req.query.clientName = client.clientName;
     req.query.userId = client.userId;
     return next();
   } catch ( error ) {
     logger.error( { error: error, function: 'isclientIdExists' } );
-    return res.sendError( error, 500 );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }