From 9f43ec235ad51bd930c651e11abc9e8ed0a55f34 Mon Sep 17 00:00:00 2001 From: Janos Haber Date: Mon, 12 Dec 2022 23:01:13 +0100 Subject: [PATCH] FINERACT-1724 - [x] Swagger `Changes` class name collision. --- .../api/LoanTransactionsApiResourceSwagger.java | 10 +++++----- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java index 89258bfcb..d4fb22220 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java @@ -280,9 +280,9 @@ final class LoanTransactionsApiResourceSwagger { public Long subResourceId; @Schema(example = "95174ff9-1a75-4d72-a413-6f9b1cb988b7") public String subResourceExternalId; - public PostLoansLoanIdTransactionsResponse.Changes changes; + public PostLoansLoanIdTransactionsResponse.PostLoansLoanIdTransactionsResponseChanges changes; - static final class Changes { + static final class PostLoansLoanIdTransactionsResponseChanges { @Schema(example = "en_GB") public String locale; @@ -291,7 +291,7 @@ final class LoanTransactionsApiResourceSwagger { @Schema(example = "28 June 2022") public String transactionDate; @Schema(example = "50,000.00") - public Double transactionAmount; + public String transactionAmount; @Schema(example = "An optional note about why your adjusting or changing the transaction.") public String note; @Schema(example = "95174ff9-1a75-4d72-a413-6f9b1cb988b7") @@ -331,7 +331,7 @@ final class LoanTransactionsApiResourceSwagger { private PutChargeTransactionChangesResponse() {} - static final class Changes { + static final class PutChargeTransactionChangesResponseChanges { @Schema(example = "10.0") public Double amount; @@ -368,7 +368,7 @@ final class LoanTransactionsApiResourceSwagger { public Long subResourceId; @Schema(example = "95174ff9-1a75-4d72-a413-6f9b1cb988b7") public String subResourceExternalId; - public PutChargeTransactionChangesResponse.Changes changes; + public PutChargeTransactionChangesResponse.PutChargeTransactionChangesResponseChanges changes; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 06b9a8fed..a6887602a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -920,7 +920,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf changes.put("transactionAmount", command.stringValueOfParameterNamed("transactionAmount")); changes.put("locale", command.locale()); changes.put("dateFormat", command.dateFormat()); - changes.put("paymentTypeId", command.stringValueOfParameterNamed("paymentTypeId")); + changes.put("paymentTypeId", command.longValueOfParameterNamed("paymentTypeId")); final String noteText = command.stringValueOfParameterNamed("note"); if (StringUtils.isNotBlank(noteText)) { @@ -1078,7 +1078,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf changes.put("transactionAmount", command.stringValueOfParameterNamed("transactionAmount")); changes.put("locale", command.locale()); changes.put("dateFormat", command.dateFormat()); - changes.put("paymentTypeId", command.stringValueOfParameterNamed("paymentTypeId")); + changes.put("paymentTypeId", command.longValueOfParameterNamed("paymentTypeId")); final List existingTransactionIds = new ArrayList<>(); final List existingReversedTransactionIds = new ArrayList<>(); @@ -1250,7 +1250,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf changes.put("transactionAmount", command.stringValueOfParameterNamed(LoanApiConstants.TRANSACTION_AMOUNT_PARAMNAME)); changes.put("locale", command.locale()); changes.put("dateFormat", command.dateFormat()); - changes.put("paymentTypeId", command.stringValueOfParameterNamed(LoanApiConstants.PAYMENT_TYPE_PARAMNAME)); + changes.put("paymentTypeId", command.longValueOfParameterNamed(LoanApiConstants.PAYMENT_TYPE_PARAMNAME)); final Money transactionAmountAsMoney = Money.of(loan.getCurrency(), transactionAmount); final PaymentDetail paymentDetail = this.paymentDetailWritePlatformService.createPaymentDetail(command, changes);