Skip to content

PP-13622 Fix incorrect negation for won disputes in CSV files #3806

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
marcotranchino merged 1 commit into from
Apr 11, 2025
Merged

PP-13622 Fix incorrect negation for won disputes in CSV files #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/main/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static org.apache.commons.text.WordUtils.capitalizeFully;
import static uk.gov.pay.ledger.transaction.model.TransactionType.DISPUTE;
import static uk.gov.pay.ledger.transaction.model.TransactionType.REFUND;
import static uk.gov.pay.ledger.transaction.state.TransactionState.WON;
import static uk.gov.pay.ledger.util.JsonParser.safeGetAsBoolean;
import static uk.gov.pay.ledger.util.JsonParser.safeGetAsLong;
import static uk.gov.pay.ledger.util.JsonParser.safeGetAsString;
Expand Down Expand Up @@ -154,7 +155,11 @@ public Map<String, Object> toMap(TransactionEntity transactionEntity) {
getPaymentTransactionAttributes(transactionEntity, transactionDetails.get("payment_details"))
);
result.put(FIELD_GOVUK_PAYMENT_ID, transactionEntity.getParentExternalId());
result.put(FIELD_AMOUNT, penceToCurrency(transactionEntity.getAmount() * -1));
if (transactionEntity.getState() == WON) {
result.put(FIELD_AMOUNT, penceToCurrency(transactionEntity.getAmount()));
} else {
result.put(FIELD_AMOUNT, penceToCurrency(transactionEntity.getAmount() * -1));
}
}

result.put(FIELD_PROVIDER_ID, sanitiseAgainstSpreadsheetFormulaInjection(transactionEntity.getGatewayTransactionId()));
Expand Down
31 changes: 30 additions & 1 deletion src/test/java/uk/gov/pay/ledger/transaction/model/CsvTransactionFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,35 @@ void toMapShouldReturnMapWithCorrectCsvDataForDisputeTransaction() {
assertThat(csvDataMap.get("Card Expiry Date"), is("10/21"));
}

@Test
void toMapShouldNotNegateAmountForWonDisputeTransaction() {
TransactionEntity transactionEntity = transactionFixture
.withTransactionType(TransactionType.DISPUTE.name())
.withState(TransactionState.WON)
.withAmount(2000L)
.withFee(0L)
.withNetAmount(2000L)
.withParentExternalId("parent-external-id")
.withReference("ref-1")
.withDescription("test description")
.withDefaultPaymentDetails()
.withDefaultTransactionDetails()
.toEntity();

Map<String, Object> csvDataMap = csvTransactionFactory.toMap(transactionEntity);

assertPaymentDetails(csvDataMap, transactionEntity);
assertThat(csvDataMap.get("Amount"), is("20.00"));
assertThat(csvDataMap.get("Net"), is("20.00"));
assertThat(csvDataMap.get("Fee"), is("0.00"));
assertThat(csvDataMap.get("Provider ID"), is(transactionFixture.getGatewayTransactionId()));
assertThat(csvDataMap.get("GOV.UK Payment ID"), is(transactionFixture.getParentExternalId()));
assertThat(csvDataMap.get("State"), is("Dispute won in your favour"));
assertThat(csvDataMap.get("Finished"), is(true));
assertThat(csvDataMap.get("Date Created"), is("12 Mar 2018"));
assertThat(csvDataMap.get("Time Created"), is("16:25:01"));
}

@Test
void toMapShouldUseAmountForTotalAmountForSuccessfulPayment() {
TransactionEntity transactionEntity = transactionFixture
Expand Down Expand Up @@ -454,4 +483,4 @@ private void assertPaymentDetails(Map<String, Object> csvDataMap, TransactionEnt
assertThat(csvDataMap.get("Card Type"), is("credit"));
assertThat(csvDataMap.get("Wallet Type"), is("Apple Pay"));
}
}
}
Loading