tango-app-api-client 3.0.9-dev → 3.0.11-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.9-dev",
+    "version": "3.0.11-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -23,8 +23,8 @@
         "lodash": "^4.17.21",
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
-        "tango-api-schema": "^2.0.50",
-        "tango-app-api-middleware": "^1.0.30",
+        "tango-api-schema": "^2.0.53",
+        "tango-app-api-middleware": "^1.0.39-dev",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -1,5 +1,5 @@
 import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, auditConfigurationUpdate, auditConfigurationGet, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, getClientCount, insert, update } from '../service/client.service.js';
-import { checkFileExist, fileUpload, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData } from 'tango-app-api-middleware';
+import { checkFileExist, fileUpload, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData, appConfig } from 'tango-app-api-middleware';
 import { countDocumentsUser, findOneAndUpdateUser, findOneUser, getUserNameEmailById } from '../service/user.service.js';
 import { aggregateStore, countDocumentsStore } from '../service/store.service.js';
 import { aggregateCamera, countDocumentsCamera } from '../service/camera.service.js';
@@ -102,59 +102,59 @@ export async function clientDetails( req, res ) {
   try {
     const client = await getClientData( { id: req.params.id } );
     if ( client ) {
-      const isLogoExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
-      const isGstCertificateExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `${client.clientId}/documents/${client.document?.gst?.path}` } );
-      const isAddressCertificateExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
-      const isPanCertificateExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `${client.clientId}/documents/${client.document?.pan?.path}` } );
-      const isCinCertificateExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `${client.clientId}/documents/${client.document?.cin?.path}` } );
-      const isContractCertificateExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `documents/contract.pdf` } );
-      const isTermsAndConditionsExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `documents/terms&conditions.pdf` } );
+      const isLogoExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
+      const isGstCertificateExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `${client.clientId}/documents/${client.document?.gst?.path}` } );
+      const isAddressCertificateExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
+      const isPanCertificateExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `${client.clientId}/documents/${client.document?.pan?.path}` } );
+      const isCinCertificateExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `${client.clientId}/documents/${client.document?.cin?.path}` } );
+      const isContractCertificateExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `documents/contract.pdf` } );
+      const isTermsAndConditionsExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `documents/terms&conditions.pdf` } );
 
 
       if ( isLogoExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
         client.profileDetails.logo = signedFilUrl;
       } else {
         client.profileDetails.logo = '';
       }
 
       if ( isGstCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `${client.clientId}/documents/${client.document?.gst?.path}` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/documents/${client.document?.gst?.path}` } );
         client.document.gst.path = signedFilUrl;
       } else {
         client.document.gst.path = '';
       }
 
       if ( isAddressCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
         client.document.addressProof.path = signedFilUrl;
       } else {
         client.document.addressProof.path = '';
       }
 
       if ( isPanCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `${client.clientId}/documents/${client.document?.pan?.path}` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/documents/${client.document?.pan?.path}` } );
         client.document.pan.path = signedFilUrl;
       } else {
         client.document.pan.path = '';
       }
 
       if ( isCinCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `${client.clientId}/documents/${client.document?.cin?.path}` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `${client.clientId}/documents/${client.document?.cin?.path}` } );
         client.document.cin.path = signedFilUrl;
       } else {
         client.document.cin.path = '';
       }
 
       if ( isContractCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `documents/contract.pdf` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `documents/contract.pdf` } );
         client._doc.document.contract = signedFilUrl;
       } else {
         client._doc.document.contract = '';
       }
 
       if ( isTermsAndConditionsExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `documents/terms&conditions.pdf` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `documents/terms&conditions.pdf` } );
         client._doc.document.termsAndconditions = signedFilUrl;
       } else {
         client._doc.document.termsAndconditions = '';
@@ -226,7 +226,7 @@ export async function updateBrandInfo( req, res ) {
 
     if ( req.files?.logo ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/logo/`,
         fileName: `brandLogo.${req.files.logo.name.split( '.' )[1]}`,
         ContentType: req.files.logo.mimetype,
@@ -279,7 +279,7 @@ export async function updateBillingDetails( req, res ) {
 
     if ( req.files?.gstCertificate ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/documents/`,
         fileName: `gstCertificate.${req.files.gstCertificate.name.split( '.' )[1]}`,
         ContentType: req.files.gstCertificate.mimetype,
@@ -498,7 +498,7 @@ export async function updateDocuments( req, res ) {
 
     if ( req.files?.addressDoc ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/documents/`,
         fileName: `addressCertificate.${req.files.addressDoc.name.split( '.' )[1]}`,
         ContentType: req.files.addressDoc.mimetype,
@@ -511,7 +511,7 @@ export async function updateDocuments( req, res ) {
     }
     if ( req.files?.gstDoc ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/documents/`,
         fileName: `gstCertificate.${req.files.gstDoc.name.split( '.' )[1]}`,
         ContentType: req.files.gstDoc.mimetype,
@@ -524,7 +524,7 @@ export async function updateDocuments( req, res ) {
     }
     if ( req.files?.panDoc ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/documents/`,
         fileName: `panCertificate.${req.files.panDoc.name.split( '.' )[1]}`,
         ContentType: req.files.panDoc.mimetype,
@@ -537,7 +537,7 @@ export async function updateDocuments( req, res ) {
     }
     if ( req.files?.cinDoc ) {
       const uploadDataParams = {
-        Bucket: 'sandbox-tango-client',
+        Bucket: appConfig.cloud.aws.bucket.assets,
         Key: `${req.params.id}/documents/`,
         fileName: `cinCertificate.${req.files.cinDoc.name.split( '.' )[1]}`,
         ContentType: req.files.cinDoc.mimetype,
@@ -593,9 +593,9 @@ export async function getAuditConfiguration( req, res ) {
   try {
     const auditConfig = await auditConfigurationGet( { storeId: req.params?.id } );
     if ( auditConfig ) {
-      const isDocExist = await checkFileExist( { Bucket: `sandbox-tango-client`, Key: `templates/audit_bulk_update.xlsx` } );
+      const isDocExist = await checkFileExist( { Bucket: appConfig.cloud.aws.bucket.assets, Key: `templates/audit_bulk_update.xlsx` } );
       if ( isDocExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: 'sandbox-tango-client', file_path: `templates/audit_bulk_update.xlsx` } );
+        const signedFilUrl = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.assets, file_path: `templates/audit_bulk_update.xlsx` } );
         auditConfig._doc.templateUrl = signedFilUrl;
       } else {
         auditConfig._doc.templateUrl = '';
@@ -755,8 +755,8 @@ export async function clientList( req, res ) {
       }
       return list;
     } );
-    const clientList = await Promise.all( promises );
-    clientList.flat();
+    const clientListResult = await Promise.all( promises );
+    const clientList= clientListResult.flat();
     const storeQuery = [
       {
         $match: {
@@ -812,19 +812,19 @@ export async function clientList( req, res ) {
         const list = [];
         for ( let i = 0; i < chunk.length; i++ ) {
           list.push( {
-            'client Name': chunk[i].clientName,
-            'client Id': chunk[i].clientId,
-            'Active Store': chunk[i].activeStoreCount,
-            'Active Camera': chunk[i].activeCameraCount,
-            'Payment Status': chunk[i].paymentStatus,
-            'Subs Plan': chunk[i].subscriptionType,
-            'Status': chunk[i].status,
+            'client Name': chunk[i]?.clientName,
+            'client Id': chunk[i]?.clientId,
+            'Active Store': chunk[i]?.activeStoreCount || 0,
+            'Active Camera': chunk[i]?.activeCameraCount && chunk[i]?.activeCameraCount!=undefined? chunk[i]?.activeCameraCount: 0,
+            'Payment Status': chunk[i]?.paymentStatus,
+            'Subs Plan': chunk[i]?.subscriptionType,
+            'Status': chunk[i]?.status,
           } );
         }
         return list;
       } );
-      const exportResult = await Promise.all( promises );
-      exportResult.flat();
+      const temp = await Promise.all( promises );
+      const exportResult = temp.flat();
       await download( exportResult, res );
       return;
     }