Skip to content

Commit 9abb019

Browse files
authored
Merge pull request #472 from arpitchaudhari/dev
Resolving merge conflict - topcoder-archive/topcoder-platform-taas-app#443 & Stripe Connectivity Issues
2 parents 92b7c97 + 198493b commit 9abb019

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

docs/swagger.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5754,12 +5754,9 @@ components:
57545754
numberOfResources:
57555755
type: number
57565756
description: "No. of resources required."
5757-
rates:
5757+
rate:
57585758
type: number
57595759
description: "Weekly rates"
5760-
durationWeeks:
5761-
type: number
5762-
description: "No. of weeks"
57635760
CalculateAmountResponse:
57645761
properties:
57655762
totalAmount:

src/services/TeamService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const { getAuditM2Muser } = require('../common/helper')
1919
const { matchedSkills, unMatchedSkills } = require('../../scripts/emsi-mapping/esmi-skills-mapping')
2020
const Role = models.Role
2121
const RoleSearchRequest = models.RoleSearchRequest
22-
const stripe = require("stripe")(config.STRIPE_SECRET_KEY);
22+
const stripe = require("stripe")(config.STRIPE_SECRET_KEY,{maxNetworkRetries: 5});
2323

2424
const emailTemplates = helper.getEmailTemplatesForKey('teamTemplates')
2525

@@ -1163,7 +1163,7 @@ suggestMembers.schema = Joi.object().keys({
11631163
*/
11641164
async function calculateAmount(amount) {
11651165
let totalAmount = 0;
1166-
_.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate * amt.durationWeeks)
1166+
_.forEach(amount, amt => totalAmount += amt.numberOfResources * amt.rate)
11671167
return { totalAmount };
11681168
}
11691169

0 commit comments

Comments
 (0)