Skip to content

PM-1111 send challenge markup to payments #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2025
Merged

PM-1111 send challenge markup to payments #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
413096c
PM-111 - send the challenge markup value in the payments details
vas3a Jun 2, 2025
8464a84
code fix
vas3a Jun 2, 2025
476cf7f
PM-1111 - send challenge fee to finance api
vas3a Jun 2, 2025
d5b654d
move challenge fee to payment detail
vas3a Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/domain/Challenge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
completedChallenge.billing?.billingAccountId ?? 0,
completedChallenge.legacy?.subTrack ?? "Task",
completedChallenge.name,
completedChallenge.payments
completedChallenge.payments,
completedChallenge.billing?.markup ?? 0,
);
baValidation = {
challengeId: challenge?.id,
Expand Down Expand Up @@ -789,7 +790,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
completedChallenge.billing?.billingAccountId ?? 0,
completedChallenge.legacy?.subTrack ?? "Task",
completedChallenge.name,
completedChallenge.payments
completedChallenge.payments,
completedChallenge.billing?.markup ?? 0,
);

if (baValidation != null) {
Expand Down Expand Up @@ -914,7 +916,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
billingAccountId: number,
challengeType: string,
title: string,
payments: UpdateChallengeInputForACL_PaymentACL[]
payments: UpdateChallengeInputForACL_PaymentACL[],
challengeMarkup: number,
): Promise<number> {
const token = await m2mToken.getM2MToken();

Expand All @@ -931,7 +934,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
return 0;
}

let totalAmount = 0;
const totalAmount = payments.reduce((sum, payment) => sum + payment.amount, 0);
// TODO: Make this list exhaustive
const mapType = (type: string) => {
if (type === "placement") {
Expand All @@ -958,6 +961,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
installmentNumber: 1,
currency: "USD",
billingAccount: `${billingAccountId}`,
challengeFee: totalAmount * challengeMarkup,
},
];

Expand All @@ -970,8 +974,6 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
: title;
}

totalAmount += payment.amount;

const payload = {
winnerId: payment.userId.toString(),
type: "PAYMENT",
Expand Down
1 change: 1 addition & 0 deletions src/util/FinanceApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface PaymentDetail {
installmentNumber: number;
currency: string;
billingAccount: string;
challengeFee: number;
}

export interface PaymentPayload {
Expand Down