tango-app-api-payment-subscription 3.1.7 → 3.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.1.7",
+    "version": "3.1.9",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -24,10 +24,9 @@
         "jsdom": "^24.0.0",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "puppeteer": "^22.9.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.92",
-        "tango-app-api-middleware": "^3.1.7",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^3.1.11",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
 import * as basePriceService from '../services/basePrice.service.js';
 import * as storeService from '../services/store.service.js';
@@ -17,8 +17,7 @@ import path from 'path';
 // import pdfMake from 'pdfmake';
 // import htmlToPdfmake from 'html-to-pdfmake';
 import axios from 'axios';
-// import htmlpdf from 'html-pdf-node';
-import puppeteer from 'puppeteer';
+import htmlpdf from 'html-pdf-node';
 export const addBilling = async ( req, res ) => {
   try {
     let params = {
@@ -43,12 +42,13 @@ export const addBilling = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'billingInfo Updated',
+        logType: 'subscription',
+        logSubType: 'billingInfoUpdated',
         changes: [ 'Billing Address', 'Gst Number' ],
         eventType: 'update',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( { message: 'Billing Details Added Successfully', data: resultData } );
     } else {
       logger.error( 'Error Occurs WHile updating billing Details' );
@@ -426,12 +426,14 @@ export const updateSubscription = async ( req, res ) => {
             userName: req.user?.userName,
             email: req.user?.email,
             date: new Date(),
-            logType: 'billing',
-            logSubType: 'Trial Request',
-            changes: [ 'Name', 'Description', 'Category' ],
-            eventType: 'insert',
+            logType: 'subscription',
+            logSubType: 'trialRequest',
+            changes: [ `${convertTitleCase( item.name )} Trial Request` ],
+            eventType: 'create',
+            timestamp: new Date(),
+            showTo: [ 'client', 'tango' ],
           };
-          insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         }
       }
       if ( item.type == 'subscription' ) {
@@ -441,9 +443,47 @@ export const updateSubscription = async ( req, res ) => {
             subscribedDate: new Date(),
             status: 'live',
           } );
+          let productObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: requestBody.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            title: 'Subscription',
+            description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+            alertCta: [],
+            markasRead: false,
+            logType: 'subscription',
+            logSubType: 'subscription',
+            showPushNotification: true,
+            changes: [ `${convertTitleCase( item.name )} subscribed` ],
+            eventType: '',
+            date: new Date(),
+            showTo: [ 'client', 'tango' ],
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, productObj );
         } else {
           clientProducts[existsIndex].status = 'live';
           clientProducts[existsIndex].subscribedDate = new Date();
+          let productObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: requestBody.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            title: 'Subscription',
+            description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+            alertCta: [],
+            markasRead: false,
+            logType: 'subscription',
+            logSubType: 'subscription',
+            showPushNotification: true,
+            changes: [ `${convertTitleCase( item.name )} subscribed` ],
+            eventType: '',
+            date: new Date(),
+            showTo: [ 'client', 'tango' ],
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, productObj );
         }
         subscriptionCount = subscriptionCount + 1;
       }
@@ -451,17 +491,17 @@ export const updateSubscription = async ( req, res ) => {
 
     let details = {
       subscriptionType: premiumType,
-      subscriptionPeriod: requestBody.subscriptionPeriod,
-      totalCamera: requestBody.totalCamera,
-      totalStores: requestBody.totalStores,
-      storeSize: requestBody.storeSize,
+      subscriptionPeriod: requestBody?.subscriptionPeriod || requestBody?.client?.planDetails?.subscriptionPeriod,
+      totalCamera: requestBody.totalCamera || requestBody?.client?.planDetails?.totalCamera,
+      totalStores: requestBody.totalStores || requestBody?.client?.planDetails?.totalStores,
+      storeSize: requestBody?.storeSize || requestBody?.client?.planDetails?.storeSize,
       product: clientProducts,
     };
 
     req.body = {
-      'camaraPerSqft': req.body.storeSize,
-      'storesCount': req.body.totalStores,
-      'planName': requestBody.subscriptionPeriod,
+      'camaraPerSqft': details.storeSize,
+      'storesCount': details.totalStores,
+      'planName': details.subscriptionPeriod,
       'products': clientProducts.map( ( item ) => item.productName ),
       'currencyType': 'rupees',
     };
@@ -488,22 +528,22 @@ export const updateSubscription = async ( req, res ) => {
     let data = {
       planDetails: details,
       price: pricingDetails.price,
-      priceType: requestBody.priceType,
+      priceType: requestBody?.priceType || requestBody?.client?.priceType,
 
     };
 
     let result = await paymentService.updateOne( { clientId: req.params.clientId }, data );
-    const logObj = {
-      clientId: req.body.clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Subscrption Details updated',
-      changes: [ 'Plan Details', 'Price', 'Price Type' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: req.body.clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Subscrption Details updated',
+    //   changes: [ 'Plan Details', 'Price', 'Price Type' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     let storeProduct = clientProducts.map( ( item ) => item.productName );
     await storeService.updateMany( { clientId: req.params.clientId }, { product: storeProduct } );
 
@@ -619,12 +659,13 @@ export const unsubscribeProduct = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'billing',
-      logSubType: 'Unsubscribed Request',
-      changes: [ 'Reason', 'Description', 'Category' ],
-      eventType: 'insert',
+      logType: 'subscription',
+      logSubType: 'unsubscribedRequest',
+      changes: [ `${req.body.clientId} Unsubscribed Request ` ],
+      eventType: 'create',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -653,12 +694,13 @@ export const trialExtendRequest = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'billing',
-      logSubType: 'Trial Extend Request',
-      changes: [ 'Name', 'Description', 'Category' ],
-      eventType: 'insert',
+      logType: 'subscription',
+      logSubType: 'trialExtendRequest',
+      changes: [ `${convertTitleCase( req.body.product )} trial Extend Request` ],
+      eventType: 'create',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -689,12 +731,13 @@ export const trialRequest = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'billing',
-      logSubType: 'Trial Request',
-      changes: [ 'Name', 'Description', 'Category' ],
-      eventType: 'insert',
+      logType: 'subscription',
+      logSubType: 'trialRequest',
+      changes: [ `${convertTitleCase( req.body.product )} trial Request` ],
+      eventType: 'create',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -760,12 +803,13 @@ export const updateInvoiceDetails = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Update Payment and Invoice Details',
+        logType: 'subscription',
+        logSubType: 'updatePaymentInvoice',
         changes: [ 'Pro Rate', 'Payment Type', 'Payment Cycle', 'Currency Type', 'Invoice To', 'Payment Agreement To', 'Invoice On', 'Extend Payment PeriodDays' ],
         eventType: 'update',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Invoice Updated Successfully' );
     } ).catch( ( e ) => {
       return res.sendError( e, 500 );
@@ -863,6 +907,27 @@ export const trialApproval = async ( req, res ) => {
     requestData.status = 'completed';
     requestData.save().then( async () => {
       if ( req.body.type == 'approve' ) {
+        let logObj = {
+          userName: req.user?.userName,
+          email: req.user?.email,
+          clientId: requestData.clientId,
+          clientNotification: false,
+          adminNotification: true,
+          logSubType: 'startTrial',
+          description: 'Subscription - Your 14 Days free trial has been started',
+          // category: 'Brand Activity Log',
+          // features: 'Subscription',
+          title: 'Subscription',
+          alertCta: [],
+          markasRead: false,
+          logType: 'Start Trial',
+          showPushNotification: true,
+          date: new Date(),
+          changes: [ `${convertTitleCase( requestData.name )} trial started` ],
+          eventType: '',
+          showTo: [ 'client', 'tango' ],
+        };
+        insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         let clientProducts = await paymentService.findOne( { clientId: requestData.clientId }, { planDetails: 1 } );
         if ( clientProducts?.planDetails.subscriptionType == 'free' ) {
           clientProducts.planDetails.subscriptionType = 'premium';
@@ -944,17 +1009,17 @@ export const trialApproval = async ( req, res ) => {
           logger.error( { error: error, function: 'oldBulkStoreUpdate' } );
         } );
       }
-      const logObj = {
-        clientId: req.body.clientId,
-        userName: req.user?.userName,
-        email: req.user?.email,
-        date: new Date(),
-        logType: 'billing',
-        logSubType: 'Trial Approved',
-        changes: [ 'status' ],
-        eventType: 'update',
-      };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      // const logObj = {
+      //   clientId: req.body.clientId,
+      //   userName: req.user?.userName,
+      //   email: req.user?.email,
+      //   date: new Date(),
+      //   logType: 'billing',
+      //   logSubType: 'Trial Approved',
+      //   changes: [ 'status' ],
+      //   eventType: 'update',
+      // };
+      // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -984,9 +1049,9 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         requestData.save();
       }
       let userDetails = await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+      let [ firstWord, secondWord ] = req.body.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
+      firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
       if ( userDetails ) {
-        let [ firstWord, secondWord ] = req.body.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
-        firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
         let data = {
           userName: userDetails.userName,
           product: firstWord + ' ' + secondWord,
@@ -1006,17 +1071,38 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
-      const logObj = {
-        clientId: req.body.clientId,
+      let notifyObj = {
         userName: req.user?.userName,
         email: req.user?.email,
+        clientId: req.body.clientId,
+        clientNotification: false,
+        adminNotification: true,
+        logSubType: 'trialExtended',
+        description: `Your Trial has been extended for ${req.body.days} days, explore the service with no extra charge and keep unlocking better insights`,
+        // category: 'Brand Activity Log',
+        // features: 'Subscription',
+        title: 'Subscription',
+        alertCta: [],
+        markasRead: false,
+        logType: 'subscription',
+        showPushNotification: true,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Trial Extend Approved',
-        changes: [ 'status' ],
-        eventType: 'update',
+        changes: [ `${firstWord + ' ' + secondWord} trial Extended` ],
+        eventType: '',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, notifyObj );
+      // const logObj = {
+      //   clientId: req.body.clientId,
+      //   userName: req.user?.userName,
+      //   email: req.user?.email,
+      //   date: new Date(),
+      //   logType: 'billing',
+      //   logSubType: 'Trial Extend Approved',
+      //   changes: [ 'status' ],
+      //   eventType: 'update',
+      // };
+      // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Trial Extended Successfully' );
     } ).catch( ( e ) => {
       logger.error( { error: e, function: 'trialExtendRequestApproval' } );
@@ -1054,11 +1140,46 @@ export const productSubscribe = async ( req, res ) => {
     let productList = product.map( ( item ) => item.productName );
     for ( let item of req.body.product ) {
       if ( productList.includes( item.name ) && item.type == 'unsubscribe' ) {
+        let logObj = {
+          userName: req.user?.userName,
+          email: req.user?.email,
+          clientId: clientInfo.clientId,
+          logSubType: 'productUnsubscribe',
+          logType: 'subscription',
+          date: new Date(),
+          changes: [ `${convertTitleCase( item.name )} product unsubscribed` ],
+          eventType: '',
+          timestamp: new Date(),
+          showTo: [ 'client', 'tango' ],
+        };
+        insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         await storeService.addremoveElement( { clientId: clientInfo.clientId, product: { $in: item.name } }, { $pull: { product: item.name } } );
         await clientRequestService.deleteOne( { clientId: clientInfo.clientId, status: 'pending', name: item.name } );
       }
       if ( !productList.includes( item.name ) && [ 'trial', 'subscription' ].includes( item.type ) ) {
         if ( item.type == 'trial' ) {
+          let logObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: clientInfo.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            logSubType: 'startTrial',
+            description: 'Subscription - Your 14 Days free trial has been started',
+            // category: 'Brand Activity Log',
+            // features: 'Subscription',
+            title: 'Start Trial',
+            alertCta: [],
+            markasRead: false,
+            logType: 'subscription',
+            showPushNotification: true,
+            date: new Date(),
+            changes: [ `${convertTitleCase( item.name )} trial started` ],
+            eventType: '',
+            timestamp: new Date(),
+            showTo: [ 'client', 'tango' ],
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
             productName: item.name,
             trialStartDate: new Date(),
@@ -1070,6 +1191,27 @@ export const productSubscribe = async ( req, res ) => {
           let productName = firstWord + ' ' + secondWord;
           trialProduct.push( productName );
         } else {
+          let logObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: clientInfo.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            logSubType: 'productSubscribed',
+            description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+            // category: 'Brand Activity Log',
+            // features: 'Subscription',
+            title: 'Subscription',
+            alertCta: [],
+            markasRead: false,
+            logType: 'subscription',
+            showPushNotification: true,
+            date: new Date(),
+            changes: [ `${convertTitleCase( item.name )} prodcut Subscribed` ],
+            eventType: '',
+            showTo: [ 'client', 'tango' ],
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
             productName: item.name,
             subscribedDate: new Date(),
@@ -1082,6 +1224,27 @@ export const productSubscribe = async ( req, res ) => {
         let productIndex = product.findIndex( ( ele ) => ele.productName == item.name );
         if ( productIndex != -1 ) {
           if ( item.type == 'subscription' ) {
+            let logObj = {
+              userName: req.user?.userName,
+              email: req.user?.email,
+              clientId: clientInfo.clientId,
+              clientNotification: false,
+              adminNotification: true,
+              logSubType: 'productSubscribed',
+              description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+              // category: 'Brand Activity Log',
+              // features: 'Subscription',
+              title: 'Subscription',
+              alertCta: [],
+              markasRead: false,
+              logType: 'subscription',
+              showPushNotification: true,
+              date: new Date(),
+              changes: [ `${convertTitleCase( item.name )} prodcut Subscribed` ],
+              eventType: '',
+              showTo: [ 'client', 'tango' ],
+            };
+            insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
             product[productIndex].subscribedDate = new Date();
             product[productIndex].status = 'live';
             subscriptionCount = subscriptionCount + 1;
@@ -1172,17 +1335,17 @@ export const productSubscribe = async ( req, res ) => {
         logger.error( { error: error, function: 'oldBulkStoreUpdate' } );
       } );
     } );
-    const logObj = {
-      clientId: req.body.clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Product subscribe and unsubscribe',
-      changes: [ 'Plan Details' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: req.body.clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Product subscribe and unsubscribe',
+    //   changes: [ 'Plan Details' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     return res.sendSuccess( 'Product Subscribed Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'updateProductSubscribe' } );
@@ -1228,12 +1391,13 @@ export const unsubscribeApproval = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Unsubscribed Approved',
-        changes: [ 'status' ],
-        eventType: 'update',
+        logType: 'subscription',
+        logSubType: 'unsubscribedApproved',
+        changes: [ `${requestData.clientId} unsubscribed` ],
+        eventType: '',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -1459,6 +1623,19 @@ export const addStoreProduct = async ( req, res ) => {
         storeProduct.push( item.name );
       }
       if ( item.type == 'unsubscribe' ) {
+        let logObj = {
+          userName: req.user?.userName,
+          email: req.user?.email,
+          clientId: req.body.clientId,
+          logSubType: 'productUnsubscribed',
+          logType: 'subscription',
+          date: new Date(),
+          changes: [ ` ${req.body.store.toString()} ${convertTitleCase( item.name )} product unsubscribed` ],
+          eventType: '',
+          showTo: [ 'client', 'tango' ],
+
+        };
+        insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         removedProduct.push( item.name );
       }
       if ( !productList.includes( item.name ) ) {
@@ -1497,6 +1674,26 @@ export const addStoreProduct = async ( req, res ) => {
             firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
             let productName = firstWord + ' ' + secondWord;
             trialProduct.push( productName );
+            let logObj = {
+              userName: req.user?.userName,
+              email: req.user?.email,
+              clientId: req.body.clientId,
+              clientNotification: false,
+              adminNotification: true,
+              logSubType: 'startTrial',
+              description: 'Subscription - Your 14 Days free trial has been started',
+              title: 'Start Trial',
+              alertCta: [],
+              markasRead: false,
+              logType: 'subscription',
+              showPushNotification: true,
+              date: new Date(),
+              changes: [ `${convertTitleCase( item.name )} trial started` ],
+              eventType: '',
+              showTo: [ 'client', 'tango' ],
+
+            };
+            insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           }
           if ( item.type == 'subscription' ) {
             clientProduct.push( {
@@ -1505,6 +1702,25 @@ export const addStoreProduct = async ( req, res ) => {
               status: 'live',
             } );
             subscriptionCount = subscriptionCount + 1;
+            let logObj = {
+              userName: req.user?.userName,
+              email: req.user?.email,
+              clientId: req.body.clientId,
+              clientNotification: false,
+              adminNotification: true,
+              logSubType: 'productSubscription',
+              description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+              title: 'Subscription',
+              alertCta: [],
+              markasRead: false,
+              logType: 'subscription',
+              showPushNotification: true,
+              date: new Date(),
+              changes: [ `${convertTitleCase( item.name )} product subscribed` ],
+              eventType: '',
+              showTo: [ 'client', 'tango' ],
+            };
+            insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           }
         }
       }
@@ -1572,17 +1788,17 @@ export const addStoreProduct = async ( req, res ) => {
       }
       await storeService.updateOne( { storeId: item.storeId, clientId: clientId }, { product: product } );
     } );
-    const logObj = {
-      clientId: clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Store Prosuct Addition',
-      changes: [ 'product' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Store Product Addition',
+    //   changes: [ 'product' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     let products = clientInfo.planDetails.product.map( ( item ) => {
       let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
       return firstWord.toLowerCase() + '_' + secondWord.toLowerCase();
@@ -1976,12 +2192,13 @@ export const pricingListUpdate = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Update Product Pricing Details',
+        logType: 'subscription',
+        logSubType: 'updateProductPricing',
         changes: keys,
         eventType: 'update',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );
   } catch ( e ) {
@@ -2150,12 +2367,13 @@ export const updatedRevisedPrice = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Revised Price Updation',
+        logType: 'subscription',
+        logSubType: 'revisedPriceUpdation',
         changes: [ 'amount', 'revisedAmount', 'discount' ],
         eventType: 'update',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Credit notes Updated Successfully' );
     } );
   } catch ( e ) {
@@ -2226,6 +2444,25 @@ export const getRemindClients = async ( req, res ) => {
                   product: firstWord + ' ' + secondWord,
                   domain: appConfig.url.domain,
                 };
+                let logObj = {
+                  clientId: client.clientId,
+                  clientNotification: false,
+                  adminNotification: true,
+                  description: 'Subscription - Your Free trial is about to expire in 3 days. Please make sure to subscribe to the products',
+                  logSubType: 'trialReminder',
+                  title: 'Subscription',
+                  alertCta: [ { buttonName: 'Subscribe now', redirectionUrl: 'subscribed', product: item.productName, name: data.product, clientId: client.clientId }, { buttonName: 'Remind me later', redirectionUrl: 'remind' } ],
+                  markasRead: false,
+                  logType: 'subscription',
+                  showPushNotification: true,
+                  date: new Date(),
+                  userName: userDetails?.userName,
+                  email: userDetails?.email,
+                  changes: [ `${data.product} trial is going to expired.` ],
+                  eventType: '',
+                  showTo: [ 'client', 'tango' ],
+                };
+                insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
                 const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialReminderEmail.hbs', 'utf8' );
                 const template = Handlebars.compile( templateHtml );
                 const html = template( { data: data } );
@@ -2412,45 +2649,55 @@ export const invoiceDownload = async ( req, res ) => {
       const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
       const template = Handlebars.compile( templateHtml );
       const html = template( { ...invoiceData } );
-      // let file = {
-      //   content: html,
-      // };
-      const browser = await puppeteer.launch( {
-        headless: true, // Set to false if you need to debug
-        args: [ '--no-sandbox', '--disable-setuid-sandbox' ],
-      } );
-      const page = await browser.newPage();
-      await page.setContent( html, { timeout: 60000 } );
-      const pdfBuffer = await page.pdf( {
-        format: 'A4',
-        printBackground: true,
-        margin: {
-          top: '20px',
-          right: '20px',
-          bottom: '20px',
-          left: '20px',
+      let file = {
+        content: html,
+      };
+      let options = {
+        format: 'A4', margin: {
+          top: '0.5in',
+          right: '0.5in',
+          bottom: '0.5in',
+          left: '0.5in',
         },
+        printBackground: true, preferCSSPageSize: true,
+      };
+      const date = dayjs( invoiceData.monthOfbilling, 'MM' );
+      const monthName = date.format( 'MMMM' );
+
+
+      htmlpdf.generatePdf( file, options ).then( async function( pdfBuffer ) {
+        if ( req.body.sendInvoice ) {
+          let mailSubject = `Invoice for ${monthName} - Tango/${clientDetails.clientName}`;
+          let mailbody = `<div>Dear Team,</div>
+          <div style="margin-top:10px">
+          Please find attached the Invoice for the month of ${monthName}'24.
+          </div>
+          <div style="margin-top:10px">
+          Best Regards,
+          </div>
+          <div style="margin-top:5px">
+          Tango Finance
+          </div>`;
+
+          let filename = `${clientDetails.clientName}-${invoiceData.invoice}-${monthName}.pdf`;
+          let attachments = {
+            filename: `${filename}`,
+            content: pdfBuffer,
+            contentType: 'application/pdf', // e.g., 'application/pdf'
+          };
+          clientDetails.paymentInvoice.invoiceCC = [ ...clientDetails.paymentInvoice.invoiceCC, ...[ 'sireesha@tangotech.co.in' ] ];
+          // return;
+          const result = await sendEmailWithSES( clientDetails.paymentInvoice.invoiceTo, mailSubject, mailbody, attachments, 'no-reply@tangotech.ai', clientDetails.paymentInvoice.invoiceCC );
+          if ( result ) {
+            await invoiceService.updateOne( { _id: req.params.invoiceId }, { status: req.body.status } );
+            return res.sendSuccess( result );
+          }
+        }
+        res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
+        res.set( 'Content-Type', 'application/pdf' );
+        res.send( pdfBuffer );
       } );
-      await browser.close();
-      res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
-      res.set( 'Content-Type', 'application/pdf' );
-      res.send( pdfBuffer );
-
-      // let options = {
-      //   path: `../../invoice/test.pdf`,
-      //   format: 'A4', margin: {
-      //     top: '0.5in',
-      //     right: '0.5in',
-      //     bottom: '0.5in',
-      //     left: '0.5in',
-      //   },
-      //   printBackground: true, preferCSSPageSize: true,
-      // };
-      // htmlpdf.generatePdf( file, options ).then( async function( pdfBuffer ) {
-      //   res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
-      //   res.set( 'Content-Type', 'application/pdf' );
-      //   res.send( pdfBuffer );
-      // } );
+      return;
     }
 
 
@@ -2521,11 +2768,12 @@ export const updateInvoiceStatus = async ( req, res ) => {
         email: req.user?.email,
         date: new Date(),
         logType: 'invoice',
-        logSubType: 'Invoice Status Updated to Paid',
+        logSubType: 'InvoiceStatus',
         changes: [ 'amount', 'paymentType', 'status' ],
         eventType: 'update',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Invoice updated Successfully' );
     } );
   } catch ( e ) {
@@ -2886,3 +3134,146 @@ export const invoiceRevised = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+export const clientNotificationList = async ( req, res ) => {
+  try {
+    let from = ( req.query.offset - 1 ) * req.query.limit;
+    let start = new Date();
+    let userTimezoneOffset = start.getTimezoneOffset() * 60000;
+    start = new Date( start.getTime() - userTimezoneOffset );
+    start.setUTCHours( 0, 0, 0, 0 );
+    let end = new Date();
+    end = new Date( end.getTime() - userTimezoneOffset );
+    end.setUTCHours( 23, 59, 59, 59 );
+    let query;
+    if ( req.user.role == 'superadmin' ) {
+      query = {
+        from: from,
+        size: req.query.limit,
+        query: {
+          bool: {
+            must: [
+              { match: { clientId: req.user.clientId } },
+              // { match: { logType: 'notification' } },
+              { match: { adminNotification: true } },
+              { match: { markasRead: false } },
+              { range: { date: { gte: start, lte: end } } },
+            ],
+          },
+        },
+        sort: [
+          {
+            date: {
+              order: 'desc',
+            },
+          },
+        ],
+        _source: [ 'title', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'description' ],
+      };
+    } else {
+      query = {
+        query: {
+          bool: {
+            must: [
+              { match: { clientId: req.user.clientId } },
+              // { match: { type: 'notification' } },
+              { match: { clientNotification: true } },
+              { match: { markasRead: false } },
+              { range: { date: { gte: start, lte: end } } },
+            ],
+          },
+        },
+        sort: [
+          {
+            date: {
+              order: 'desc',
+            },
+          },
+        ],
+        _source: [ 'title', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'description' ],
+      };
+    }
+    let result = await getOpenSearchData( appConfig.opensearch.activityLog, query );
+    if ( !result || !result.body.hits.hits.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    return res.sendSuccess( { count: result.body.hits.total.value, result: result.body.hits.hits } );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'clientNotificationList' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updateNotification = async ( req, res ) => {
+  try {
+    let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
+    if ( openSearchDetails && openSearchDetails?.statusCode == 200 && openSearchDetails?.body?._source ) {
+      const document = {
+        doc: {
+          markasRead: true,
+        },
+      };
+      let updateResult = await updateOpenSearchData( appConfig.opensearch.activityLog, req.params.notificationId, document );
+      if ( updateResult?.statusCode == 200 && updateResult?.body?.result == 'updated' ) {
+        return res.sendSuccess( 'Notification Updated Successfully' );
+      }
+      return res.sendError( 'Something went wrong', 500 );
+    } else {
+      return res.sendError( 'no data found', 204 );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updateNotification' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updatePushNotification = async ( req, res ) => {
+  try {
+    let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
+    if ( openSearchDetails && openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+      const document = {
+        doc: {
+          showPushNotification: false,
+        },
+      };
+      let updateResult = await updateOpenSearchData( appConfig.opensearch.activityLog, req.params.notificationId, document );
+      if ( updateResult?.statusCode == 200 ) {
+        return res.sendSuccess( 'Notification Updated Successfully' );
+      }
+      return res.sendError( 'Something went wrong', 500 );
+    } else {
+      return res.sendError( 'no data found', 204 );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updatePushNotification' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updateRemind = async ( req, res ) => {
+  try {
+    let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
+    if ( openSearchDetails && openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+      let date = new Date( new Date( openSearchDetails.body._source.date ).getTime() + 24 * 60 * 60 * 1000 );
+      openSearchDetails.body._source.date = date;
+      openSearchDetails.body._source.markasRead = false;
+      insertOpenSearchData( appConfig.opensearch.activityLog, openSearchDetails.body._source );
+      return res.sendSuccess( 'Notification Updated Successfully' );
+    } else {
+      return res.sendError( 'no data found', 204 );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updatePushNotification' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+
+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;
+}
+
+

package/src/dtos/validation.dtos.js

@@ -181,13 +181,13 @@ export const validateStoreProductsParams = {
 
 export const validateUpdateSubscriptionSchema =joi.object( {
   clientId: joi.string().required(),
-  price: joi.number().required(),
-  priceType: joi.string().required(),
-  subscriptionType: joi.string().required(),
-  subscriptionPeriod: joi.string().required(),
-  totalCamera: joi.number().required(),
-  totalStores: joi.string().required(),
-  storeSize: joi.string().required(),
+  price: joi.number().optional(),
+  priceType: joi.string().optional(),
+  subscriptionType: joi.string().optional(),
+  subscriptionPeriod: joi.string().optional(),
+  totalCamera: joi.number().optional(),
+  totalStores: joi.string().optional(),
+  storeSize: joi.string().optional(),
   products: joi.array().required(),
 } );
 
@@ -248,3 +248,20 @@ export const validateInvoiceUpdateSchema = joi.object( {
 export const validateInvoiceUpdateParams = {
   body: validateInvoiceUpdateSchema,
 };
+
+export const validateIdSchema = joi.object( {
+  notificationId: joi.string().required(),
+} );
+
+export const validateId = {
+  params: validateIdSchema,
+};
+
+export const notificationSchema = {
+  limit: joi.number().required(),
+  offset: joi.number().required(),
+};
+
+export const notificationParams = {
+  query: notificationSchema,
+};

package/src/routes/paymentSubscription.routes.js

@@ -160,3 +160,8 @@ paymentSubscriptionRouter.post( '/invoice/create', validateClient, paymentContro
 paymentSubscriptionRouter.post( '/invoiceGenerate', paymentController.invoiceGenerate );
 paymentSubscriptionRouter.post( '/dailyPricing/insert', validate( validationDtos.dailyPricingParams ), paymentController.dailyPricingInsert );
 paymentSubscriptionRouter.get( '/invoiceRevised/:invoiceId', validate( validationDtos.invoiceRevisedParams ), paymentController.invoiceRevised );
+paymentSubscriptionRouter.get( '/notificationList', isAllowedSessionHandler, validate( validationDtos.notificationParams ), paymentController.clientNotificationList );
+paymentSubscriptionRouter.put( '/notification/update/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updateNotification );
+paymentSubscriptionRouter.put( '/pushNotification/update/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updatePushNotification );
+paymentSubscriptionRouter.post( '/updateRemind/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updateRemind );
+

package/src/services/invoice.service.js

@@ -11,6 +11,9 @@ export const findOne = async ( query ={}, record={} ) => {
 export const find = async ( query ={}, record={} ) => {
   return await model.invoiceModel.find( query, record );
 };
+export const updateOne = async ( query ={}, record={} ) => {
+  return await model.invoiceModel.updateOne( query, { $set: record } );
+};
 export const findandsort = async ( query ={}, record={}, sort={} ) => {
   return await model.invoiceModel.find( query, record ).sort( sort );
 };