Merge pull request #603 from OpenSignLabs/plan_sub

nxglabs · web-flow · commit 509f8f9a0765 · 2024-04-16T15:59:27.000+05:30
refactor: update extra-info of user
diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js
@@ -26,7 +26,7 @@ export async function fetchSubscription() {
     };
     const params = { extUserId: jsonSender[0].objectId };
     const tenatRes = await axios.post(url, params, { headers: headers });
-    const plan = tenatRes.data?.result?.result?.PlanName;
+    const plan = tenatRes.data?.result?.result?.PlanCode;
     const billingDate = tenatRes.data?.result?.result?.Next_billing_date?.iso;
     return { plan, billingDate };
   } catch (err) {
diff --git a/apps/OpenSign/src/pages/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.js
@@ -41,12 +41,8 @@ const PgSignUp = () => {
         const url = window.location.href;
         let paramString = url.split("?")[1];
         let queryString = new URLSearchParams(paramString);
-        // console.log("url ", queryString);
-
         let obj = { ...formData };
         for (let pair of queryString.entries()) {
-          // console.log("Key is: " + pair[0]);
-          // console.log("Value is: " + pair[1]);
           obj = { ...obj, [pair[0]]: pair[1] };
         }
         const zohoRes = await axios.post(
@@ -61,34 +57,27 @@ const PgSignUp = () => {
             }
           }
         );
-        // console.log("zohoRes ", zohoRes);
         const userSettings = JSON.parse(localStorage.getItem("userSettings"));
-        const extClass = userSettings[0].extended_class;
-        // console.log("extClass ", extClass);
-        const params = { email: userDetails.email };
-        const res = await Parse.Cloud.run("getUserDetails", params);
-        // console.log("res", res);
-        if (res) {
-          const updateQuery = new Parse.Object(extClass);
-          updateQuery.id = res.id;
-          updateQuery.set(
-            "Next_billing_date",
-            new Date(zohoRes.data.result.nextBillingDate)
-          );
-          updateQuery.set("Plan", zohoRes.data.result.plan);
-          updateQuery.set("Customer_id", zohoRes.data.result.customer_id);
-          updateQuery.set(
-            "Subscription_id",
-            zohoRes.data.result.subscription_id
-          );
-          const updateRes = await updateQuery.save();
-          if (updateRes) {
+        const params = { subscription: zohoRes.data.result.subscription };
+        const baseurl = `${parseBaseUrl}functions/savesubscription`;
+        try {
+          const res = await axios.post(baseurl, params, {
+            headers: {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": parseAppId,
+              sessiontoken: localStorage.getItem("accesstoken")
+            }
+          });
+          if (res) {
             localStorage.removeItem("userDetails");
             navigate(
               "/" + userSettings[0].pageType + "/" + userSettings[0].pageId
             );
             setIsLoader(false);
           }
+        } catch (err) {
+          console.log("err ", err.message);
+          setIsLoader(false);
         }
       } catch (err) {
         console.log("err ", err);
@@ -108,12 +97,8 @@ const PgSignUp = () => {
         const url = window.location.href;
         let paramString = url.split("?")[1];
         let queryString = new URLSearchParams(paramString);
-        // console.log("url ", queryString);
-
         let obj = { ...formData };
         for (let pair of queryString.entries()) {
-          // console.log("Key is: " + pair[0]);
-          // console.log("Value is: " + pair[1]);
           obj = { ...obj, [pair[0]]: pair[1] };
         }
         saveUser(obj);
@@ -157,19 +142,8 @@ const PgSignUp = () => {
             email: zohoRes.data.result.email,
             phone: zohoRes.data.result.phone,
             role: obj.role
-            // "pincode": "",
-            // "address": "",
-            // "country": "",
-            // "state": "",
-            // "city": ""
           },
-
-          planDetails: {
-            plan: zohoRes.data.result.plan || {},
-            nextBillingDate: zohoRes.data.result.nextBillingDate || "",
-            customer_id: zohoRes.data.result.customer_id || "",
-            subscription_id: zohoRes.data.result.subscription_id || ""
-          }
+          subscription: zohoRes.data.result.subscription
         };
         const usersignup = await Parse.Cloud.run("usersignup", params);
         // console.log("usersignup ", usersignup);
diff --git a/apps/OpenSignServer/cloud/customRoute/saveSubscription.js b/apps/OpenSignServer/cloud/customRoute/saveSubscription.js
@@ -3,7 +3,8 @@ export default async function saveSubscription(request, response) {
   const body = request.body;
   const Email = request.body.data.subscription.customer.email;
   const Next_billing_date = request.body.data.subscription.next_billing_at;
-  const planName = request.body.data.subscription.plan.name;
+  const planCode = request.body.data.subscription.plan.plan_code
+
   try {
     const extUserCls = new Parse.Query('contracts_Users');
     extUserCls.equalTo('Email', Email);
@@ -19,9 +20,10 @@ export default async function saveSubscription(request, response) {
       if (subscription) {
         const updateSubscription = new Parse.Object('contracts_Subscriptions');
         updateSubscription.id = subscription.id;
+        updateSubscription.set('SubscriptionId', SubscriptionId);
         updateSubscription.set('SubscriptionDetails', body);
         updateSubscription.set('Next_billing_date', new Date(Next_billing_date));
-        updateSubscription.set('PlanName', planName);
+        updateSubscription.set('PlanCode', planCode);
         await updateSubscription.save(null, { useMasterKey: true });
         return response.status(200).json({ status: 'update subscription!' });
       } else {
@@ -44,7 +46,7 @@ export default async function saveSubscription(request, response) {
           objectId: extUser.get('TenantId').id,
         });
         createSubscription.set('Next_billing_date', new Date(Next_billing_date));
-        createSubscription.set('PlanName', planName);
+        createSubscription.set('PlanCode', planCode);
         await createSubscription.save(null, { useMasterKey: true });
         return response.status(200).json({ status: 'create subscription!' });
       }
diff --git a/apps/OpenSignServer/cloud/main.js b/apps/OpenSignServer/cloud/main.js
@@ -33,6 +33,7 @@ import getInvoices from './parsefunction/getInvoices.js';
 import getPayments from './parsefunction/getPayments.js';
 import getSubscriptions from './parsefunction/getSubscriptions.js';
 import TenantAterFind from './parsefunction/TenantAfterFind.js';
+import saveSubscriptio from './parsefunction/saveSubscription.js';
 
 Parse.Cloud.define('AddUserToRole', addUserToGroups);
 Parse.Cloud.define('UserGroups', getUserGroups);
@@ -69,3 +70,4 @@ Parse.Cloud.afterFind('contracts_Document', DocumentBeforeFind);
 Parse.Cloud.afterFind('contracts_Template', TemplateAfterFind);
 Parse.Cloud.afterFind('contracts_Signature', SignatureAfterFind);
 Parse.Cloud.afterFind('partners_Tenant', TenantAterFind);
+Parse.Cloud.define('savesubscription', saveSubscriptio);
diff --git a/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js b/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js
@@ -14,13 +14,13 @@ export default async function SubscribeFree(request) {
       });
       subscriptionCls.descending('createdAt');
       const subcripitions = await subscriptionCls.first({ useMasterKey: true });
-      if (subcripitions?.get('PlanName') === 'freeplan') {
+      if (subcripitions?.get('PlanCode') === 'freeplan') {
         return { status: 'success', result: 'already subscribed!' };
       } else if (subcripitions?.get('Next_billing_date') < new Date()) {
         try {
           const updateSubscription = new Parse.Object('contracts_Subscriptions');
           updateSubscription.id = subcripitions.id;
-          updateSubscription.set('PlanName', 'freeplan');
+          updateSubscription.set('PlanCode', 'freeplan');
           await updateSubscription.save(null, { useMasterKey: true });
           return { status: 'success', result: 'subscribed!' };
         } catch (err) {
@@ -32,7 +32,7 @@ export default async function SubscribeFree(request) {
       } else {
         try {
           const createSubscription = new Parse.Object('contracts_Subscriptions');
-          createSubscription.set('PlanName', 'freeplan');
+          createSubscription.set('PlanCode', 'freeplan');
           createSubscription.set('ExtUserPtr', {
             __type: 'Pointer',
             className: 'contracts_Users',
diff --git a/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js b/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js
@@ -30,15 +30,9 @@ export default async function ZohoDetails(request) {
       headers: {
         Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
         'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
-        // 'X-com-zoho-billing-organizationid': process.env.ZOHO_BILLING_ORG_ID,
       },
     });
-    // console.log(
-    //   "userData.data.data.subscription.contactpersons ",
-    //   userData.data.data.subscription.contactpersons
-    // );
 
-    // console.log("userData.data.expiring_time ", userData.data.expiring_time);
     const first_name = userData.data.data.subscription.contactpersons[0].first_name || '';
     const last_name = userData.data.data.subscription.contactpersons[0].last_name || '';
     const company_name =
@@ -59,6 +53,7 @@ export default async function ZohoDetails(request) {
       customer_id: userData.data.data.subscription.customer_id,
       subscription_id: userData.data.data.subscription.subscription_id,
       jobTitle: jobTitle,
+      subscription: userData.data,
     };
     return resData;
   }
diff --git a/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js b/apps/OpenSignServer/cloud/parsefunction/saveSubscription.js
@@ -0,0 +1,77 @@
+import axios from 'axios';
+export default async function saveSubscriptio(request) {
+  const serverUrl = process.env.SERVER_URL;
+  const appId = process.env.APP_ID;
+  const subscription = request.params.subscription;
+  const SubscriptionId = subscription.data.subscription.subscription_id;
+  const body = subscription;
+  const Next_billing_date = subscription.data.subscription.next_billing_at;
+  const planCode = subscription.data.subscription.plan.plan_code;
+
+  try {
+    const userRes = await axios.get(serverUrl + '/users/me', {
+      headers: {
+        'X-Parse-Application-Id': appId,
+        'X-Parse-Session-Token': request.headers['sessiontoken'],
+      },
+    });
+    if (userRes.data && userRes.data.objectId) {
+      const extUserCls = new Parse.Query('contracts_Users');
+      extUserCls.equalTo('UserId', {
+        __type: 'Pointer',
+        className: '_User',
+        objectId: userRes.data.objectId,
+      });
+      const extUser = await extUserCls.first({ useMasterKey: true });
+      if (extUser) {
+        const subcriptionCls = new Parse.Query('contracts_Subscriptions');
+        subcriptionCls.equalTo('TenantId', {
+          __type: 'Pointer',
+          className: 'partners_Tenant',
+          objectId: extUser.get('TenantId').id,
+        });
+        const subscription = await subcriptionCls.first({ useMasterKey: true });
+        if (subscription) {
+          const updateSubscription = new Parse.Object('contracts_Subscriptions');
+          updateSubscription.id = subscription.id;
+          updateSubscription.set('SubscriptionId', SubscriptionId);
+          updateSubscription.set('SubscriptionDetails', body);
+          updateSubscription.set('Next_billing_date', new Date(Next_billing_date));
+          updateSubscription.set('PlanCode', planCode);
+          await updateSubscription.save(null, { useMasterKey: true });
+          return { status: 'update subscription!' };
+        } else {
+          const createSubscription = new Parse.Object('contracts_Subscriptions');
+          createSubscription.set('SubscriptionId', SubscriptionId);
+          createSubscription.set('SubscriptionDetails', body);
+          createSubscription.set('ExtUserPtr', {
+            __type: 'Pointer',
+            className: 'contracts_Users',
+            objectId: extUser.id,
+          });
+          createSubscription.set('CreatedBy', {
+            __type: 'Pointer',
+            className: '_User',
+            objectId: extUser.get('UserId').id,
+          });
+          createSubscription.set('TenantId', {
+            __type: 'Pointer',
+            className: 'partners_Tenant',
+            objectId: extUser.get('TenantId').id,
+          });
+          createSubscription.set('Next_billing_date', new Date(Next_billing_date));
+          createSubscription.set('PlanCode', planCode);
+          await createSubscription.save(null, { useMasterKey: true });
+          return { status: 'create subscription!' };
+        }
+      } else {
+        return { status: 'user not found!' };
+      }
+    } else {
+      return { status: 'user not found!' };
+    }
+  } catch (err) {
+    console.log('Err in save subscription', err);
+    throw new Error(err.message);
+  }
+}
diff --git a/apps/OpenSignServer/cloud/parsefunction/usersignup.js b/apps/OpenSignServer/cloud/parsefunction/usersignup.js
