tango-app-api-payment-subscription 3.0.47-dev → 3.0.49-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.47-dev",
+    "version": "3.0.49-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.75-dev",
+        "tango-app-api-middleware": "^1.0.72-test",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/paymentSubscription.controllers.js

@@ -42,8 +42,8 @@ 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',
       };
@@ -425,10 +425,11 @@ 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(),
           };
           insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         }
@@ -446,16 +447,15 @@ export const updateSubscription = async ( req, res ) => {
             clientId: requestBody.clientId,
             clientNotification: false,
             adminNotification: true,
-            logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
-            category: 'Brand Activity Log',
-            features: 'Subscription',
-            // title: 'Subscribed',
+            title: 'Subscription',
+            description: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
             alertCta: [],
             markasRead: false,
-            logType: 'Subscribed',
+            logType: 'subscription',
+            logSubType: 'subscription',
             showPushNotification: true,
-            changes: [ 'Plan Details', 'Price', 'Price Type' ],
-            eventType: 'update',
+            changes: [ `${convertTitleCase( item.name )} subscribed` ],
+            eventType: '',
             date: new Date(),
           };
           insertOpenSearchData( appConfig.opensearch.activityLog, productObj );
@@ -637,10 +637,10 @@ 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',
     };
     insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
@@ -671,10 +671,10 @@ 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',
     };
     insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
@@ -707,10 +707,10 @@ 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',
     };
     insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
@@ -778,8 +778,8 @@ 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',
       };
@@ -887,17 +887,18 @@ export const trialApproval = async ( req, res ) => {
           clientId: requestData.clientId,
           clientNotification: false,
           adminNotification: true,
-          logSubType: 'Subscription - Your 14 Days free trial has been started',
-          category: 'Brand Activity Log',
-          features: 'Subscription',
-          // title: 'Start Trial',
+          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: [ 'Plan Details' ],
-          eventType: 'update',
+          changes: [ `${convertTitleCase( requestData.name )} trial started` ],
+          eventType: '',
         };
         insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         let clientProducts = await paymentService.findOne( { clientId: requestData.clientId }, { planDetails: 1 } );
@@ -1049,17 +1050,18 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         clientId: req.body.clientId,
         clientNotification: false,
         adminNotification: true,
-        logSubType: `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: 'Trial Extend',
+        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: 'Trial Extend',
+        logType: 'subscription',
         showPushNotification: true,
         date: new Date(),
-        changes: [ 'status' ],
-        eventType: 'update',
+        changes: [ `${data.product} trial Extended` ],
+        eventType: '',
       };
       insertOpenSearchData( appConfig.opensearch.activityLog, notifyObj );
       // const logObj = {
@@ -1110,6 +1112,18 @@ 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(),
+        };
+        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 } );
       }
@@ -1121,17 +1135,19 @@ export const productSubscribe = async ( req, res ) => {
             clientId: clientInfo.clientId,
             clientNotification: false,
             adminNotification: true,
-            logSubType: 'Subscription - Your 14 Days free trial has been started',
-            category: 'Brand Activity Log',
-            features: 'Subscription',
-            // title: 'Start Trial',
+            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: 'Start Trial',
+            logType: 'subscription',
             showPushNotification: true,
             date: new Date(),
-            changes: [ 'Plan Details' ],
-            eventType: 'update',
+            changes: [ `${convertTitleCase( item.name )} trial started` ],
+            eventType: '',
+            timestamp: new Date(),
           };
           insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
@@ -1151,17 +1167,18 @@ export const productSubscribe = async ( req, res ) => {
             clientId: clientInfo.clientId,
             clientNotification: false,
             adminNotification: true,
-            logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
-            category: 'Brand Activity Log',
-            features: 'Subscription',
-            // title: 'Subscribed',
+            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: 'Subscribed',
+            logType: 'subscription',
             showPushNotification: true,
             date: new Date(),
-            changes: [ 'Plan Details' ],
-            eventType: 'update',
+            changes: [ `${convertTitleCase( item.name )} prodcut Subscribed` ],
+            eventType: '',
           };
           insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
@@ -1322,10 +1339,10 @@ 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: '',
       };
       insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'updated Successfully' );
@@ -1553,6 +1570,18 @@ 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: '',
+
+        };
+        insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         removedProduct.push( item.name );
       }
       if ( !productList.includes( item.name ) ) {
@@ -1597,17 +1626,16 @@ export const addStoreProduct = async ( req, res ) => {
               clientId: req.body.clientId,
               clientNotification: false,
               adminNotification: true,
-              logSubType: 'Subscription - Your 14 Days free trial has been started',
-              category: 'Brand Activity Log',
-              features: 'Subscription',
-              // title: 'Start Trial',
+              logSubType: 'startTrial',
+              description: 'Subscription - Your 14 Days free trial has been started',
+              title: 'Start Trial',
               alertCta: [],
               markasRead: false,
-              logType: 'Start Trial',
+              logType: 'subscription',
               showPushNotification: true,
               date: new Date(),
-              changes: [ 'product' ],
-              eventType: 'update',
+              changes: [ `${convertTitleCase( item.name )} trial started` ],
+              eventType: '',
 
             };
             insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
@@ -1625,17 +1653,16 @@ export const addStoreProduct = async ( req, res ) => {
               clientId: req.body.clientId,
               clientNotification: false,
               adminNotification: true,
-              logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
-              category: 'Brand Activity Log',
-              features: 'Subscription',
-              // title: 'Subscribed',
+              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: 'Subscribed',
+              logType: 'subscription',
               showPushNotification: true,
               date: new Date(),
-              changes: [ 'product' ],
-              eventType: 'update',
+              changes: [ `${convertTitleCase( item.name )} product subscribed` ],
+              eventType: '',
             };
             insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           }
@@ -2109,8 +2136,8 @@ 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',
       };
@@ -2283,8 +2310,8 @@ 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',
       };
@@ -2363,17 +2390,17 @@ export const getRemindClients = async ( req, res ) => {
                   clientId: client.clientId,
                   clientNotification: false,
                   adminNotification: true,
-                  logSubType: 'Subscription - Your Free trial is about to expire in 3 days. Pleas make sure to subscribe to the products',
-                  category: 'Brand Activity Log',
-                  features: 'Subscription',
-                  // title: 'Trial reminder',
+                  description: 'Subscription - Your Free trial is about to expire in 3 days. Pleas make sure to subscribe to the products',
+                  logSubType: 'trialReminder',
+                  title: 'Subscription',
                   alertCta: [ { buttonName: 'Subscribe now', redirectionUrl: 'manage/settings/payment-subscription' }, { buttonName: 'Remind me later', redirectionUrl: 'cancel' } ],
                   markasRead: false,
-                  logType: 'Trial reminder',
+                  logType: 'subscription',
                   showPushNotification: true,
                   date: new Date(),
                   userName: userDetails?.userName,
                   email: userDetails?.email,
+                  changes: [ `${data.product} trial is going to expired.` ],
                 };
                 insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
                 const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialReminderEmail.hbs', 'utf8' );
@@ -2681,7 +2708,7 @@ 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',
       };
@@ -3049,9 +3076,12 @@ export const invoiceRevised = async ( req, res ) => {
 
 export const clientNotificationList = async ( req, res ) => {
   try {
+    let from = ( req.query.offset - 1 ) * req.query.limit;
     let query;
     if ( req.user.role == 'superadmin' ) {
       query = {
+        from: from,
+        size: req.query.limit,
         query: {
           bool: {
             must: [
@@ -3062,7 +3092,7 @@ export const clientNotificationList = async ( req, res ) => {
             ],
           },
         },
-        _source: [ 'logType', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'logSubType' ],
+        _source: [ 'title', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'description' ],
       };
     } else {
       query = {
@@ -3076,14 +3106,14 @@ export const clientNotificationList = async ( req, res ) => {
             ],
           },
         },
-        _source: [ 'logType', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'logSubType' ],
+        _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( result.body.hits.hits );
+    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 );
@@ -3093,7 +3123,7 @@ export const clientNotificationList = async ( req, res ) => {
 export const updateNotification = async ( req, res ) => {
   try {
     let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
-    if ( openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+    if ( openSearchDetails && openSearchDetails?.statusCode == 200 && openSearchDetails?.body?._source ) {
       const document = {
         doc: {
           markasRead: true,
@@ -3101,9 +3131,11 @@ export const updateNotification = async ( req, res ) => {
       };
       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.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' } );
@@ -3114,7 +3146,7 @@ export const updateNotification = async ( req, res ) => {
 export const updatePushNotification = async ( req, res ) => {
   try {
     let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
-    if ( openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+    if ( openSearchDetails && openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
       const document = {
         doc: {
           showPushNotification: false,
@@ -3122,12 +3154,22 @@ export const updatePushNotification = async ( req, res ) => {
       };
       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.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 );
   }
 };
+
+
+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

@@ -256,3 +256,12 @@ export const validateIdSchema = joi.object( {
 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,7 +160,7 @@ 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, paymentController.clientNotificationList );
+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 );