From 258340969351268a3958c15d7de1e791cb076558 Mon Sep 17 00:00:00 2001 From: Arpitkumar Chaudhari Date: Wed, 11 Aug 2021 09:06:45 +0530 Subject: [PATCH 1/2] #443 & Stripe Connectivity Issues --- docs/swagger.yaml | 5 +---- src/services/TeamService.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2ab802b2..3332dfac 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -5698,12 +5698,9 @@ components: numberOfResources: type: number description: "No. of resources required." - rates: + rate: type: number description: "Weekly rates" - durationWeeks: - type: number - description: "No. of weeks" CalculateAmountResponse: properties: totalAmount: diff --git a/src/services/TeamService.js b/src/services/TeamService.js index 576f198b..a76e2dac 100644 --- a/src/services/TeamService.js +++ b/src/services/TeamService.js @@ -20,7 +20,7 @@ const { getAuditM2Muser } = require('../common/helper') const { matchedSkills, unMatchedSkills } = require('../../scripts/emsi-mapping/esmi-skills-mapping') const Role = models.Role const RoleSearchRequest = models.RoleSearchRequest -const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY); +const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY,{maxNetworkRetries: 5}); const emailTemplates = _.mapValues(emailTemplateConfig, (template) => { return { @@ -1170,7 +1170,7 @@ suggestMembers.schema = Joi.object().keys({ */ async function calculateAmount(amount) { let totalAmount = 0; - _.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate * amt.durationWeeks) + _.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate) return { totalAmount }; } From e14172b08f4fe31f47bd0693eafeefc23bf1354c Mon Sep 17 00:00:00 2001 From: Arpitkumar Chaudhari Date: Wed, 11 Aug 2021 09:06:45 +0530 Subject: [PATCH 2/2] https://github.com/topcoder-platform/taas-app/issues/443 & Stripe Connectivity Issues --- docs/swagger.yaml | 5 +---- src/services/TeamService.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2ab802b2..3332dfac 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -5698,12 +5698,9 @@ components: numberOfResources: type: number description: "No. of resources required." - rates: + rate: type: number description: "Weekly rates" - durationWeeks: - type: number - description: "No. of weeks" CalculateAmountResponse: properties: totalAmount: diff --git a/src/services/TeamService.js b/src/services/TeamService.js index 576f198b..a76e2dac 100644 --- a/src/services/TeamService.js +++ b/src/services/TeamService.js @@ -20,7 +20,7 @@ const { getAuditM2Muser } = require('../common/helper') const { matchedSkills, unMatchedSkills } = require('../../scripts/emsi-mapping/esmi-skills-mapping') const Role = models.Role const RoleSearchRequest = models.RoleSearchRequest -const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY); +const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY,{maxNetworkRetries: 5}); const emailTemplates = _.mapValues(emailTemplateConfig, (template) => { return { @@ -1170,7 +1170,7 @@ suggestMembers.schema = Joi.object().keys({ */ async function calculateAmount(amount) { let totalAmount = 0; - _.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate * amt.durationWeeks) + _.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate) return { totalAmount }; }