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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.50-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

@@ -487,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',
     };
@@ -524,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,
 
     };
 
@@ -2408,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', product: data.product, clientId: client.clientId }, { buttonName: 'Remind me later', redirectionUrl: 'remind' } ],
+                  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,

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(),
 } );