tango-app-api-client 3.0.41-dev → 3.0.43-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.41-dev",
+    "version": "3.0.43-dev",
     "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-app-api-middleware": "^1.0.72-test",
+        "tango-api-schema": "^2.0.103",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -180,6 +180,41 @@ 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 ],
+      eventType: 'approve',
+    };
+
+    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: '',
+      };
+
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
 
     if ( insertClient ) {
       const userRecord = {
@@ -200,6 +235,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;
@@ -486,7 +528,9 @@ export async function updateBrandInfo( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
 
     const updateAck = await brandInfoUpdate( {
@@ -580,7 +624,10 @@ export async function updateBillingDetails( req, res ) {
       eventType: 'update',
     };
 
-    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,
@@ -618,7 +665,10 @@ export async function updateSignatoryDetails( req, res ) {
       eventType: 'update',
     };
 
-    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,
@@ -660,7 +710,10 @@ export async function updateTicketConfiguration( req, res ) {
       changes: updateKeys,
       eventType: 'update',
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -745,7 +798,9 @@ export async function updateFeatureConfiguration( req, res ) {
       changes: updateKeys,
       eventType: 'update',
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -785,7 +840,10 @@ export async function domainDetailsConfiguration( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
@@ -895,7 +953,9 @@ export async function updateDocuments( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -959,7 +1019,9 @@ export async function auditConfiguration( req, res ) {
       logObj.changes = [ `Audit config bulk` ];
     }
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     res.sendSuccess( { result: 'Updated Successfully' } );
   } catch ( error ) {
@@ -1354,7 +1416,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': [
@@ -1368,6 +1433,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 ) {
@@ -1391,7 +1463,7 @@ export async function getActivityLogs( req, res ) {
       } );
     }
 
-    const logs = await getOpenSearchData( 'tango-retail-activity-logs', query );
+    const logs = await getOpenSearchData( appConfig.opensearch.activityLog, query );
 
     const hits = logs?.body?.hits?.hits;
     const totalDocuments = logs?.body?.hits?.total?.value;
@@ -1407,6 +1479,7 @@ export async function getActivityLogs( req, res ) {
   }
 }
 
+
 async function postApi( url, data ) {
   const requestOptions = {
     method: 'POST',