tango-app-api-client 3.0.48-dev → 3.0.50-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.48-dev",
+    "version": "3.0.50-dev",
     "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.108",
+        "tango-api-schema": "^2.0.110",
         "tango-app-api-middleware": "^3.1.12",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/client.controllers.js

@@ -1,8 +1,8 @@
 import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, auditConfigurationUpdate, auditConfigurationGet, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, insert, update, findOneClient, updateOneClient } from '../service/client.service.js';
 import { checkFileExist, fileUpload, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData, appConfig, sendEmailWithSES } from 'tango-app-api-middleware';
 import { countDocumentsUser, findOneAndUpdateUser, findOneUser, getUserNameEmailById, updateManyUser } from '../service/user.service.js';
-import { aggregateStore, countDocumentsStore, findOneStore, updateManyStore } from '../service/store.service.js';
-import { aggregateCamera, countDocumentsCamera, updateManyCamera } from '../service/camera.service.js';
+import { aggregateStore, countDocumentsStore, findStore, findOneStore, updateManyStore } from '../service/store.service.js';
+import { aggregateCamera, countDocumentsCamera } from '../service/camera.service.js';
 import _ from 'lodash';
 import { findOneStandaredRole } from '../service/standaredRole.service.js';
 import { aggregateUserAssignedStore, deleteOneAssignedStore, updateOneUserAssignedStore } from '../service/userAssignedStore.service.js';
@@ -521,12 +521,16 @@ export async function detailedAllClientCount( req, res ) {
       },
     ];
     const result = await aggregateClient( query );
-    const activeStores = await countDocumentsStore( { 'status': 'active', 'edge.firstFile': true } );
-    const activeCameras = await countDocumentsCamera( { isUp: true, isActivated: true } );
+    const activeStores = await findStore( { 'status': 'active', 'edge.firstFile': true }, { storeId: 1 } );
+    let storesList = [];
+    for ( let store of activeStores ) {
+      storesList.push( store.storeId );
+    }
+    const activeCameras = await countDocumentsCamera( { storeId: { $in: storesList }, isUp: true, isActivated: true } );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
-    result[0].activeStoresCount = activeStores;
+    result[0].activeStoresCount = activeStores.length;
     result[0].activeCameraCount = activeCameras;
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
@@ -605,7 +609,7 @@ export async function updateBrandInfo( req, res ) {
 
     if ( req.body?.status === 'deactive' ) {
       await updateManyStore( { clientId: req.params?.id }, { status: 'deactive' } );
-      await updateManyCamera( { clientId: req.params?.id }, { isUp: false, isActivated: false } );
+      // await updateManyCamera( { clientId: req.params?.id }, { isUp: false, isActivated: false } );
       await updateManyUser( { clientId: req.params?.id }, { isActive: false } );
     }
 
@@ -784,6 +788,7 @@ export async function updateFeatureConfiguration( req, res ) {
       close: req.body?.close, conversionCalculation: req.body?.conversionCalculation, conversionCondition: req.body?.conversionCondition,
       conversionValue: req.body?.conversionValue, infraAlertCondition: req.body?.infraAlertCondition, infraAlertValue: req.body?.infraAlertValue, isFootfallDirectory: req.body?.isFootfallDirectory,
       isNormalized: req.body?.isNormalized, isPasserByData: req.body?.isPasserByData, missedOpportunityCalculation: req.body?.missedOpportunityCalculation, open: req.body?.open,
+      isExcludedArea: req.body?.isExcludedArea,
     } );
 
     let updateKeys = [];
@@ -1707,6 +1712,19 @@ export async function detailedClientCount( req, res ) {
     result['userName'] = user?.userName;
     result['email'] = user?.email;
     result['profileCompletion'] = 70;
+    let findCsm = await aggregateUserAssignedStore( [
+      {
+        $match: {
+          clientId: inputData.clientId,
+          tangoUserType: 'csm',
+        },
+      },
+    ] );
+
+    if ( findCsm&&findCsm.length>0 ) {
+      let finduser = await findOneUser( { email: findCsm[0].userEmail }, { userName: 1, email: 1, countryCode: 1, mobileNumber: 1 } );
+      result['csm'] = finduser;
+    }
 
     return res.sendSuccess( { result: result } );
   } catch ( error ) {

package/src/dtos/client.dtos.js

@@ -108,6 +108,7 @@ export const featureConfigurationSchemaBody = joi.object(
       isNormalized: joi.boolean().optional(),
       isPasserByData: joi.boolean().optional(),
       isFootfallDirectory: joi.boolean().optional(),
+      isExcludedArea: joi.boolean().optional(),
     },
 );
 

package/src/service/client.service.js

@@ -131,7 +131,7 @@ export function featureConfigurationUpdate( {
   clientId, billableCalculation, bouncedLimitCondition, bouncedLimitValue,
   close, conversionCalculation, conversionCondition,
   conversionValue, infraAlertCondition, infraAlertValue, isFootfallDirectory,
-  isNormalized, isPasserByData, missedOpportunityCalculation, open,
+  isNormalized, isPasserByData, missedOpportunityCalculation, open, isExcludedArea,
 } ) {
   return clientModel.updateOne( { clientId: clientId },
       {
@@ -150,6 +150,7 @@ export function featureConfigurationUpdate( {
           'featureConfigs.isNormalized': isNormalized,
           'featureConfigs.isPasserByData': isPasserByData,
           'featureConfigs.isFootfallDirectory': isFootfallDirectory,
+          'featureConfigs.isExcludedArea': isExcludedArea,
         },
       } );
 }

package/src/service/store.service.js

@@ -3,6 +3,9 @@ import storeModel from 'tango-api-schema/schema/store.model.js';
 export function countDocumentsStore( query ) {
   return storeModel.countDocuments( query );
 }
+export function findStore( query ) {
+  return storeModel.find( query );
+}
 
 export function aggregateStore( query ) {
   return storeModel.aggregate( query );