From c8a084cb9734989850ab728762176dd2fc6f81de Mon Sep 17 00:00:00 2001 From: Arnold Galovics Date: Wed, 21 Sep 2022 18:17:23 +0200 Subject: [PATCH] FINERACT-1724: Swagger fixes here and there --- .../client/api/ClientsApiResourceSwagger.java | 4 ++ .../api/LoanChargesApiResourceSwagger.java | 48 +++++++++---------- .../LoanTransactionsApiResourceSwagger.java | 2 + .../api/LoansApiResourceSwagger.java | 4 ++ 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java index 6f5beda69..799f69706 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java @@ -161,6 +161,8 @@ final class ClientsApiResourceSwagger { public Integer officeId; @Schema(example = "Head Office") public String officeName; + @Schema(example = "test@test.com") + public String emailAddress; } @Schema(example = "2") @@ -248,6 +250,8 @@ final class ClientsApiResourceSwagger { public String savingsProductName; @Schema(example = "[]") public List groups; + @Schema(example = "test@test.com") + public String emailAddress; } @Schema(description = "PostClientsRequest") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java index c40d27572..32853c09b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java @@ -88,18 +88,18 @@ final class LoanChargesApiResourceSwagger { @Schema(example = "0") public Double amountPercentageAppliedTo; public GetLoanChargeCurrency currency; - @Schema(example = "100") - public Float amount; - @Schema(example = "0") - public Float amountPaid; - @Schema(example = "0") - public Float amountWaived; - @Schema(example = "0") - public Float amountWrittenOff; - @Schema(example = "100") - public Float amountOutstanding; - @Schema(example = "100") - public Float amountOrPercentage; + @Schema(example = "100.00") + public Double amount; + @Schema(example = "0.00") + public Double amountPaid; + @Schema(example = "0.00") + public Double amountWaived; + @Schema(example = "0.00") + public Double amountWrittenOff; + @Schema(example = "100.00") + public Double amountOutstanding; + @Schema(example = "100.00") + public Double amountOrPercentage; @Schema(example = "false") public Boolean penalty; } @@ -146,19 +146,19 @@ final class LoanChargesApiResourceSwagger { @Schema(example = "false") public Boolean penalty; public GetLoansLoanIdChargesChargeIdResponse.GetLoanChargeCurrency currency; - @Schema(example = "100") - public Float amount; + @Schema(example = "100.00") + public Double amount; public GetLoanChargeTemplateChargeTimeType chargeTimeType; public GetLoanChargeTemplateChargeAppliesTo chargeAppliesTo; public GetLoansLoanIdChargesChargeIdResponse.GetLoanChargeCalculationType chargeCalculationType; } - @Schema(example = "0") - public Float amountPaid; - @Schema(example = "0") - public Float amountWaived; - @Schema(example = "0") - public Float amountWrittenOff; + @Schema(example = "0.00") + public Double amountPaid; + @Schema(example = "0.00") + public Double amountWaived; + @Schema(example = "0.00") + public Double amountWrittenOff; public Set chargeOptions; @Schema(example = "false") public Boolean penalty; @@ -173,8 +173,8 @@ final class LoanChargesApiResourceSwagger { public Integer chargeId; @Schema(example = "en") public String locale; - @Schema(example = "100") - public Float amount; + @Schema(example = "100.00") + public Double amount; @Schema(example = "dd MMMM yyyy") public String dateFormat; @Schema(example = "29 April 2013") @@ -205,8 +205,8 @@ final class LoanChargesApiResourceSwagger { public String dateFormat; @Schema(example = "en") public String locale; - @Schema(example = "60") - public Float amount; + @Schema(example = "60.00") + public Double amount; @Schema(example = "27 March 2013") public String dueDate; } 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 39ea011ee..c08258692 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 @@ -208,6 +208,8 @@ final class LoanTransactionsApiResourceSwagger { public Double transactionAmount; @Schema(example = "An optional note about why your adjusting or changing the transaction.") public String note; + @Schema(example = "95174ff9-1a75-4d72-a413-6f9b1cb988b7") + public String reversalExternalId; } @Schema(description = "PostLoansLoanIdTransactionsTransactionIdResponse") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java index e27724778..8c082e213 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java @@ -777,6 +777,10 @@ final class LoansApiResourceSwagger { public String transactionType; @Schema(description = "List of GetLoansLoanIdLoanRepaymentScheduleInstallmentData") public List loanRepaymentScheduleInstallments; + @Schema(example = "95174ff9-1a75-4d72-a413-6f9b1cb988b7") + public String reversalExternalId; + @Schema(example = "[2022, 9, 19]") + public LocalDate reversedOnDate; } static final class GetLoansLoanIdLoanChargeData {