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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.49-dev",
+    "version": "3.0.51-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.103",
+        "tango-api-schema": "^2.0.104",
         "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

@@ -462,6 +462,24 @@ export const updateSubscription = async ( req, res ) => {
         } 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(),
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, productObj );
         }
         subscriptionCount = subscriptionCount + 1;
       }
@@ -469,17 +487,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',
     };
@@ -506,7 +524,7 @@ export const updateSubscription = async ( req, res ) => {
     let data = {
       planDetails: details,
       price: pricingDetails.price,
-      priceType: requestBody.priceType,
+      priceType: requestBody?.priceType || requestBody?.client?.priceType,
 
     };
 
@@ -1022,9 +1040,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,
@@ -1060,7 +1078,7 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         logType: 'subscription',
         showPushNotification: true,
         date: new Date(),
-        changes: [ `${data.product} trial Extended` ],
+        changes: [ `${firstWord + ' ' + secondWord} trial Extended` ],
         eventType: '',
       };
       insertOpenSearchData( appConfig.opensearch.activityLog, notifyObj );
@@ -2390,10 +2408,10 @@ export const getRemindClients = async ( req, res ) => {
                   clientId: client.clientId,
                   clientNotification: false,
                   adminNotification: true,
-                  description: 'Subscription - Your Free trial is about to expire in 3 days. Pleas make sure to subscribe to the products',
+                  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: 'manage/settings/payment-subscription' }, { buttonName: 'Remind me later', redirectionUrl: 'cancel' } ],
+                  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,
@@ -3077,6 +3095,13 @@ export const invoiceRevised = async ( req, res ) => {
 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 = {
@@ -3089,9 +3114,17 @@ export const clientNotificationList = async ( req, res ) => {
               // { 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 {
@@ -3103,9 +3136,17 @@ export const clientNotificationList = async ( req, res ) => {
               // { 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' ],
       };
     }
@@ -3166,6 +3207,24 @@ export const updatePushNotification = async ( req, res ) => {
   }
 };
 
+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( ' ' );
@@ -3173,3 +3232,5 @@ function convertTitleCase( data ) {
   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(),
 } );
 

package/src/routes/paymentSubscription.routes.js

@@ -163,4 +163,5 @@ paymentSubscriptionRouter.get( '/invoiceRevised/:invoiceId', validate( validatio
 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 );