From fe12ed36355f94951fe0b664758510c396f4e7bc Mon Sep 17 00:00:00 2001
From: Arnold Galovics <galovicsarnold@gmail.com>
Date: Fri, 18 Nov 2022 13:49:52 +0100
Subject: [PATCH] FINERACT-1724: Swagger fix for loan transaction API

---
 .github/workflows/build-docker-mariadb.yml    |  2 +-
 .github/workflows/build-docker-postgresql.yml |  2 +-
 .../LoanTransactionsApiResourceSwagger.java   | 32 +++++++++++++++++++
 .../api/LoansApiResourceSwagger.java          |  4 +--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-docker-mariadb.yml b/.github/workflows/build-docker-mariadb.yml
index 21ba30d26..fa6ec376c 100644
--- a/.github/workflows/build-docker-mariadb.yml
+++ b/.github/workflows/build-docker-mariadb.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Start the stack
         run: docker-compose up -d
       - name: Wait for stack to come up
-        run: sleep 60
+        run: sleep 120
       - name: Check health
         run: curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
       - name: Check info
diff --git a/.github/workflows/build-docker-postgresql.yml b/.github/workflows/build-docker-postgresql.yml
index 52a6a1ecb..c194c9541 100644
--- a/.github/workflows/build-docker-postgresql.yml
+++ b/.github/workflows/build-docker-postgresql.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Start the stack
         run: docker-compose -f docker-compose-postgresql.yml up -d
       - name: Wait for stack to come up
-        run: sleep 60
+        run: sleep 120
       - name: Check health
         run: curl -f -k --retry 5 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
       - name: Check info
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 839a6d027..63623fe3a 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
@@ -185,6 +185,38 @@ final class LoanTransactionsApiResourceSwagger {
         @Schema(example = "[2012, 5, 18]")
         public LocalDate possibleNextRepaymentDate;
         public Set<GetLoanTransactionRelation> transactionRelations;
+        public PaymentDetailData paymentDetailData;
+
+        static final class PaymentDetailData {
+
+            private PaymentDetailData() {}
+
+            @Schema(example = "62")
+            public Long id;
+            public PaymentType paymentType;
+            @Schema(example = "acc123")
+            public String accountNumber;
+            @Schema(example = "che123")
+            public String checkNumber;
+            @Schema(example = "rou123")
+            public String routingCode;
+            @Schema(example = "rec123")
+            public String receiptNumber;
+            @Schema(example = "ban123")
+            public String bankNumber;
+        }
+
+        static final class PaymentType {
+
+            private PaymentType() {}
+
+            @Schema(example = "11")
+            public Long id;
+            @Schema(example = "DOWN_PAYMENT")
+            public String name;
+            @Schema(example = "true")
+            public Boolean isSystemDefined;
+        }
     }
 
     @Schema(description = "PostLoansLoanIdTransactionsRequest")
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 dd07b6807..74ffdd8e4 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
@@ -569,7 +569,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdPaymentType() {}
 
             @Schema(example = "11")
-            public Integer id;
+            public Long id;
             @Schema(example = "Cash")
             public String name;
             @Schema(example = "Cash Payment")
@@ -644,7 +644,7 @@ final class LoansApiResourceSwagger {
                 private GetLoansLoanIdPaymentDetailData() {}
 
                 @Schema(example = "62")
-                public Integer id;
+                public Long id;
                 public GetLoansLoanIdPaymentType paymentType;
                 @Schema(example = "acc123")
                 public String accountNumber;