tango-app-api-client 3.1.14 → 3.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.1.14",
+    "version": "3.1.15",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -25,8 +25,8 @@
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.93",
-        "tango-app-api-middleware": "^3.1.9",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^3.1.11",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -1,11 +1,11 @@
-import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, auditConfigurationUpdate, auditConfigurationGet, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, insert, update, findOneClient } from '../service/client.service.js';
+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, updateManyStore } from '../service/store.service.js';
+import { aggregateStore, countDocumentsStore, findOneStore, updateManyStore } from '../service/store.service.js';
 import { aggregateCamera, countDocumentsCamera, updateManyCamera } from '../service/camera.service.js';
 import _ from 'lodash';
 import { findOneStandaredRole } from '../service/standaredRole.service.js';
-import { aggregateUserAssignedStore } from '../service/userAssignedStore.service.js';
+import { aggregateUserAssignedStore, deleteOneAssignedStore, updateOneUserAssignedStore } from '../service/userAssignedStore.service.js';
 import { aggregateTickets } from '../service/tangoticket.service.js';
 import { join } from 'path';
 import { readFileSync } from 'fs';
@@ -180,6 +180,44 @@ export async function create( req, res ) {
 
     await postApi( `${appConfig.url.oldapidomain}/oldDefaultRoleInsert`, oldDefaultRolesInsertData );
 
+    const logObj = {
+      clientId: insertedClientRecord.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'brandDetails',
+      logSubType: 'brandApproval',
+      changes: [ insertedClientRecord.clientName ],
+      showTo: [],
+      eventType: 'approve',
+      showTo: [ 'client', 'tango' ],
+    };
+
+    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+
+    for ( let index = 0; index < leadRecord?.planDetails?.product?.length; index++ ) {
+      const logObj = {
+        userName: req.user?.userName,
+        email: req.user?.email,
+        clientId: insertedClientRecord.clientId,
+        clientNotification: false,
+        adminNotification: true,
+        logSubType: 'startTrial',
+        description: 'Subscription - Your 14 Days free trial has been started',
+        title: 'Subscription',
+        alertCta: [],
+        markasRead: false,
+        logType: 'subscription',
+        showPushNotification: true,
+        date: new Date(),
+        changes: [ `${convertTitleCase( leadRecord?.planDetails?.product[index] )} trial started` ],
+        eventType: '',
+        showTo: [ 'client', 'tango' ],
+      };
+
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
 
     if ( insertClient ) {
       const userRecord = {
@@ -200,6 +238,13 @@ export async function create( req, res ) {
   }
 }
 
+function convertTitleCase( data ) {
+  let [ firstWord, secondWord ] = data.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
+  firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+  data = firstWord + ' ' + secondWord;
+  return data;
+}
+
 export const sendEmail = ( data ) => {
   try {
     const attachments = null;
@@ -249,6 +294,16 @@ export async function getClients( req, res ) {
           $match: {
             userEmail: req?.user?.email,
             assignedType: { $eq: 'client' },
+            $expr: {
+              $cond: {
+                if: { $and: [
+                  { $eq: [ '$userType', 'tango' ] },
+                  { $eq: [ '$tangoUserType', 'csm' ] },
+                ] },
+                then: { $eq: [ '$isClientApproved', true ] },
+                else: true,
+              },
+            },
           },
         },
         {
@@ -413,11 +468,30 @@ export async function detailedAllClientCount( req, res ) {
 
         },
       },
+      {
+        $project: {
+          _id: 0,
+          totalCount: 1,
+          activeClient: 1,
+          paidClient: 1,
+          trialClient: 1,
+          freeClient: 1,
+          holdClient: 1,
+          suspendClient: 1,
+          deactiveClient: 1,
+          activeStoresCount: { $ifNull: [ 0, 0 ] },
+          activeCameraCount: { $ifNull: [ 0, 0 ] },
+        },
+      },
     ];
     const result = await aggregateClient( query );
-    if ( result == 0 ) {
+    const activeStores = await countDocumentsStore( { 'status': 'active', 'edge.firstFile': true } );
+    const activeCameras = await countDocumentsCamera( { isUp: true, isActivated: true } );
+    if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
+    result[0].activeStoresCount = activeStores;
+    result[0].activeCameraCount = activeCameras;
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'detailedAllClientCount' } );
@@ -465,9 +539,12 @@ export async function updateBrandInfo( req, res ) {
       logSubType: 'brandInfo',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
 
     const updateAck = await brandInfoUpdate( {
@@ -559,9 +636,13 @@ export async function updateBillingDetails( req, res ) {
       logSubType: 'billingDetails',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
 
     const updateAck = await billingDetailsUpdate( {
       clientId: req.params?.id, tradeName: req.body?.tradeName, gstNumber: req.body?.gstNumber,
@@ -597,9 +678,13 @@ export async function updateSignatoryDetails( req, res ) {
       logSubType: 'signatoryDetails',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
     const updateAck = await signatoryDetailsUpdate( {
       clientId: req.params?.id, name: req.body?.name, email: req.body?.email,
       number: req.body?.number, designation: req.body?.designation,
@@ -640,8 +725,12 @@ export async function updateTicketConfiguration( req, res ) {
       logSubType: 'ticketConfig',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'tango' ],
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -725,8 +814,11 @@ export async function updateFeatureConfiguration( req, res ) {
       logSubType: 'featureConfig',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -764,9 +856,13 @@ export async function domainDetailsConfiguration( req, res ) {
       logSubType: 'domainDetails',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
@@ -874,9 +970,12 @@ export async function updateDocuments( req, res ) {
       logSubType: 'documentUpload',
       changes: updateKeys,
       eventType: 'update',
+      showTo: [ 'client', 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -912,35 +1011,37 @@ export async function getAuditConfiguration( req, res ) {
 export async function auditConfiguration( req, res ) {
   try {
     for ( let i = 0; i < req.body?.length; i++ ) {
+      const previousStore = await findOneStore( { storeId: req.body[i].storeId }, { auditConfigs: 1, _id: 0 } );
       await auditConfigurationUpdate( {
         storeId: req.body[i].storeId,
         count: req.body[i].count,
         iteration: req.body[i].iteration,
         ratio: normalizeNumber( req.body[i].ratio, 0, 100 ),
       } );
-    }
-
-    const user = await getUserNameEmailById( req.userId );
-
-    const logObj = {
-      clientId: req.params?.id,
-      userName: user.userName,
-      email: user.email,
-      date: new Date(),
-      logType: 'configuration',
-      logSubType: 'auditConfig',
-      eventType: 'update',
-    };
 
-    if ( req.body?.length === 1 ) {
-      logObj.changes = [ `Audit config for store id ${req.body[0].storeId}` ];
-    }
+      const logObj = {
+        clientId: req.params?.id,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'configuration',
+        logSubType: 'auditConfig',
+        eventType: 'update',
+        showTo: [ 'tango' ],
+        changes: [ `Audit config for store id ${req.body[i].storeId}` ],
+        storeId: req.body[i].storeId,
+        previous: previousStore,
+        current: {
+          storeId: req.body[i].storeId,
+          count: req.body[i].count,
+          iteration: req.body[i].iteration,
+          ratio: normalizeNumber( req.body[i].ratio, 0, 100 ),
+        },
+      };
 
-    if ( req.body?.length > 1 ) {
-      logObj.changes = [ `Audit config bulk` ];
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     }
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
 
     res.sendSuccess( { result: 'Updated Successfully' } );
   } catch ( error ) {
@@ -978,6 +1079,15 @@ export async function clientList( req, res ) {
           $match: {
             userEmail: { $eq: req?.user?.email },
             userType: 'tango',
+            $expr: {
+              $cond: {
+                if: { $and: [
+                  { $eq: [ '$tangoUserType', 'csm' ] },
+                ] },
+                then: { $eq: [ '$isClientApproved', true ] },
+                else: true,
+              },
+            },
 
           },
         }, {
@@ -1003,6 +1113,10 @@ export async function clientList( req, res ) {
       );
     }
     if ( inputData.filterByPaymentStatus ) {
+      if ( inputData.filterByPaymentStatus.includes( 'paid' ) ) {
+        inputData.filterByPaymentStatus.push( ...[ 'unbilled', 'due' ] );
+      }
+
       clientQuery.push(
           {
             $match: {
@@ -1253,8 +1367,13 @@ export async function clientList( req, res ) {
           list.push( {
             'client Name': chunk[i]?.clientName,
             'client Id': chunk[i]?.clientId,
+            'Installation Stores Count': chunk[i]?.installedStores || 0,
+            'Onboarded Stores Count': chunk[i]?.totalStores,
+            'Store Progress': chunk[i]?.installedStores? `${ ( ( chunk[i]?.installedStores/ chunk[i]?.totalStores )* 100 ).toFixed( 0 )}%`: '0%',
             'Active Store': chunk[i]?.activeStoreCount || 0,
             'Active Camera': chunk[i]?.activeCameraCount && chunk[i]?.activeCameraCount != undefined ? chunk[i]?.activeCameraCount : 0,
+            'Pending Stores': chunk[i]?.pendingStores || 0,
+            'Failed Stores': chunk[i]?.failedStores || 0,
             'Payment Status': chunk[i]?.paymentStatus,
             'Subs Plan': chunk[i]?.subscriptionType,
             'Status': chunk[i]?.status,
@@ -1326,7 +1445,10 @@ export async function detailedClientCount( req, res ) {
 export async function getActivityLogs( req, res ) {
   try {
     const query = {
-      '_source': [ 'userId', 'userName', 'email', 'date', 'logType', 'logSubType', 'changes', 'eventType' ],
+      '_source': [
+        'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
+        'changes', 'eventType',
+      ],
       'query': {
         'bool': {
           'must': [
@@ -1340,6 +1462,13 @@ export async function getActivityLogs( req, res ) {
       },
       'from': ( req.body.offset - 1 ) * req.body.limit,
       'size': req.body.limit,
+      'sort': [
+        {
+          'date': {
+            'order': 'desc',
+          },
+        },
+      ],
     };
 
     if ( req.body?.logTypeFilters?.length ) {
@@ -1363,7 +1492,15 @@ export async function getActivityLogs( req, res ) {
       } );
     }
 
-    const logs = await getOpenSearchData( 'tango-retail-activity-logs', query );
+    query.query.bool.must.push(
+        {
+          'terms': {
+            'showTo.keyword': [ req.user.userType ],
+          },
+        },
+    );
+
+    const logs = await getOpenSearchData( appConfig.opensearch.activityLog, query );
 
     const hits = logs?.body?.hits?.hits;
     const totalDocuments = logs?.body?.hits?.total?.value;
@@ -1379,6 +1516,7 @@ export async function getActivityLogs( req, res ) {
   }
 }
 
+
 async function postApi( url, data ) {
   const requestOptions = {
     method: 'POST',
@@ -1415,3 +1553,34 @@ async function getApi( url ) {
   }
 }
 
+
+export async function csmAssignConfirmation( req, res ) {
+  try {
+    const client = await findOneClient( { clientId: req.query.clientId }, { notifyCsmAssign: 1, _id: 0 } );
+    if ( !client ) {
+      res.sendError( 'No data found', 204 );
+    }
+    res.sendSuccess( client );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.params, function: 'csmAssignConfirmation' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+
+export async function clientCsmAssignAction( req, res ) {
+  try {
+    await updateOneClient( { clientId: req.query.clientId }, { notifyCsmAssign: false } );
+    if ( req.body.action === 'approve' ) {
+      await updateOneUserAssignedStore( { clientId: req.query.clientId, tangoUserType: 'csm', assignedType: 'client' }, { isClientApproved: true } );
+    }
+
+    if ( req.body.action === 'decline' ) {
+      await deleteOneAssignedStore( { clientId: req.query.clientId, tangoUserType: 'csm', assignedType: 'client' } );
+    }
+
+    res.sendSuccess( 'Updated Succesfully' );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.params, function: 'csmAssignConfirmation' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}

package/src/docs/client.docs.js

@@ -40,14 +40,6 @@ export const clientDocs = {
       description: 'Get list of clients',
       operationId: 'get-clients',
       parameters: [
-        {
-          in: 'path',
-          name: 'id',
-          required: true,
-          schema: {
-            type: 'string',
-          },
-        },
       ],
       responses: {
         200: { description: 'Success' },
@@ -455,14 +447,6 @@ export const clientDocs = {
       description: 'Get toatal info about overall clients',
       operationId: 'detailed-all-client-count',
       parameters: [
-        {
-          in: 'path',
-          name: 'id',
-          required: true,
-          schema: {
-            type: 'string',
-          },
-        },
       ],
       responses: {
         200: { description: 'Success' },

package/src/dtos/client.dtos.js

@@ -261,3 +261,24 @@ export const activityLogSchema = joi.object( {
 export const activityLogValid = {
   body: activityLogSchema,
 };
+
+export const getAssignedClientSchama = joi.object( {
+  clientId: joi.string().required(),
+} );
+
+export const getAssignedClientValid = {
+  query: getAssignedClientSchama,
+};
+
+export const postClientCamApprovalSchamaQuery = joi.object( {
+  clientId: joi.string().required(),
+} );
+
+export const postClientCamApprovalSchamaBody = joi.object( {
+  action: joi.string().required(),
+} );
+
+export const postClientCamApprovalValid = {
+  query: postClientCamApprovalSchamaQuery,
+  body: postClientCamApprovalSchamaBody,
+};

package/src/routes/client.routes.js

@@ -1,7 +1,7 @@
 
 import express from 'express';
-import { activityLogValid, auditConfigValid, billingDetailsValid, brandInfoValid, clientCreationValid, clientDetailsValid, documentsValid, domainDetailsValid, featureConfigurationValid, getAuditConfigValid, signatoryDetailsValid, ticketConfigurationValid, userConfigurationValid } from '../dtos/client.dtos.js';
-import { auditConfiguration, changeStatus, clientDetails, create, domainDetailsConfiguration, getActivityLogs, getAuditConfiguration, getClients, getCsmUsers, getOpsUsers, updateBillingDetails, updateBrandInfo, updateDocuments, updateFeatureConfiguration, updateSignatoryDetails, updateTicketConfiguration, userConfiguration } from '../controllers/client.controllers.js';
+import { activityLogValid, auditConfigValid, billingDetailsValid, brandInfoValid, clientCreationValid, clientDetailsValid, documentsValid, domainDetailsValid, featureConfigurationValid, getAssignedClientValid, getAuditConfigValid, postClientCamApprovalValid, signatoryDetailsValid, ticketConfigurationValid, userConfigurationValid } from '../dtos/client.dtos.js';
+import { auditConfiguration, changeStatus, clientCsmAssignAction, clientDetails, create, csmAssignConfirmation, domainDetailsConfiguration, getActivityLogs, getAuditConfiguration, getClients, getCsmUsers, getOpsUsers, updateBillingDetails, updateBrandInfo, updateDocuments, updateFeatureConfiguration, updateSignatoryDetails, updateTicketConfiguration, userConfiguration } from '../controllers/client.controllers.js';
 import { authorize, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { clientListValid, detailedClientCountValid } from '../dtos/client.dtos.js';
 import { isclientIdExists, isclientNameExists } from '../validations/client.validations.js';
@@ -93,4 +93,10 @@ clientRouter.post( '/activity-log', isAllowedSessionHandler, authorize(
       { featureName: 'settings', name: 'activityLog', permissions: [ 'isView' ] } ] } ),
 validate( activityLogValid ), getActivityLogs );
 
+clientRouter.get( '/show-csm-assign-confirmation', isAllowedSessionHandler,
+    validate( getAssignedClientValid ), csmAssignConfirmation );
+
+clientRouter.post( '/client-csm-assign-action', isAllowedSessionHandler,
+    validate( postClientCamApprovalValid ), clientCsmAssignAction );
+
 

package/src/service/client.service.js

@@ -285,3 +285,12 @@ export function findOneClient( query, field ) {
   return clientModel.findOne( query, field );
 }
 
+export async function updateOneClient( query, record ) {
+  return clientModel.updateOne(
+      query,
+      {
+        $set: record,
+      },
+  );
+}
+

package/src/service/store.service.js

@@ -11,3 +11,7 @@ export function aggregateStore( query ) {
 export function updateManyStore( query, record ) {
   return storeModel.updateMany( query, { $set: record } );
 }
+
+export function findOneStore( query, field ) {
+  return storeModel.findOne( query, field );
+}

package/src/service/userAssignedStore.service.js

@@ -4,3 +4,16 @@ import userAssignedStoreModel from 'tango-api-schema/schema/userAssignedStore.mo
 export async function aggregateUserAssignedStore( query ) {
   return await userAssignedStoreModel.aggregate( query );
 };
+
+export async function updateOneUserAssignedStore( query, record ) {
+  return userAssignedStoreModel.updateOne(
+      query,
+      {
+        $set: record,
+      },
+  );
+}
+
+export async function deleteOneAssignedStore( query ) {
+  return userAssignedStoreModel.deleteOne( query );
+}