FINERACT-1971: Minor bug-fixes and enhancements

fineract-provider/src/test/java/org/apache/fineract/batch/command/CommandStrategyProviderTest.java

@@ -27,8 +27,8 @@ import java.util.stream.Stream;
 import org.apache.fineract.batch.command.internal.ActivateClientCommandStrategy;
 import org.apache.fineract.batch.command.internal.AdjustChargeByChargeExternalIdCommandStrategy;
 import org.apache.fineract.batch.command.internal.AdjustChargeCommandStrategy;
-import org.apache.fineract.batch.command.internal.AdjustTransactionByExternalIdCommandStrategy;
-import org.apache.fineract.batch.command.internal.AdjustTransactionCommandStrategy;
+import org.apache.fineract.batch.command.internal.AdjustLoanTransactionByExternalIdCommandStrategy;
+import org.apache.fineract.batch.command.internal.AdjustLoanTransactionCommandStrategy;
 import org.apache.fineract.batch.command.internal.ApplyLoanCommandStrategy;
 import org.apache.fineract.batch.command.internal.ApplySavingsCommandStrategy;
 import org.apache.fineract.batch.command.internal.ApproveLoanCommandStrategy;
@@ -50,8 +50,8 @@ import org.apache.fineract.batch.command.internal.GetDatatableEntryByAppTableIdC
 import org.apache.fineract.batch.command.internal.GetDatatableEntryByQueryCommandStrategy;
 import org.apache.fineract.batch.command.internal.GetLoanByExternalIdCommandStrategy;
 import org.apache.fineract.batch.command.internal.GetLoanByIdCommandStrategy;
-import org.apache.fineract.batch.command.internal.GetTransactionByExternalIdCommandStrategy;
-import org.apache.fineract.batch.command.internal.GetTransactionByIdCommandStrategy;
+import org.apache.fineract.batch.command.internal.GetLoanTransactionByExternalIdCommandStrategy;
+import org.apache.fineract.batch.command.internal.GetLoanTransactionByIdCommandStrategy;
 import org.apache.fineract.batch.command.internal.LoanStateTransistionsByExternalIdCommandStrategy;
 import org.apache.fineract.batch.command.internal.ModifyLoanApplicationCommandStrategy;
 import org.apache.fineract.batch.command.internal.UnknownCommandStrategy;
@@ -140,18 +140,18 @@ public class CommandStrategyProviderTest {
                         mock(CreateTransactionLoanCommandStrategy.class)),
                 Arguments.of("loans/123/transactions?command=chargeRefund", HttpMethod.POST, "createTransactionLoanCommandStrategy",
                         mock(CreateTransactionLoanCommandStrategy.class)),
-                Arguments.of("loans/123/transactions/123", HttpMethod.POST, "adjustTransactionCommandStrategy",
-                        mock(AdjustTransactionCommandStrategy.class)),
-                Arguments.of("loans/123/transactions/123?command=chargeback", HttpMethod.POST, "adjustTransactionCommandStrategy",
-                        mock(AdjustTransactionCommandStrategy.class)),
+                Arguments.of("loans/123/transactions/123", HttpMethod.POST, "adjustLoanTransactionCommandStrategy",
+                        mock(AdjustLoanTransactionCommandStrategy.class)),
+                Arguments.of("loans/123/transactions/123?command=chargeback", HttpMethod.POST, "adjustLoanTransactionCommandStrategy",
+                        mock(AdjustLoanTransactionCommandStrategy.class)),
                 Arguments.of(
                         "loans/external-id/8dfad438-2319-48ce-8520-10a62801e9a1/transactions/external-id/7dfad438-2319-48ce-8520-10a62801e9ab",
-                        HttpMethod.POST, "adjustTransactionByExternalIdCommandStrategy",
-                        mock(AdjustTransactionByExternalIdCommandStrategy.class)),
+                        HttpMethod.POST, "adjustLoanTransactionByExternalIdCommandStrategy",
+                        mock(AdjustLoanTransactionByExternalIdCommandStrategy.class)),
                 Arguments.of(
                         "loans/external-id/8dfad438-2319-48ce-8520-10a62801e9a1/transactions/external-id/7dfad438-2319-48ce-8520-10a62801e9ab?command=chargeback",
-                        HttpMethod.POST, "adjustTransactionByExternalIdCommandStrategy",
-                        mock(AdjustTransactionByExternalIdCommandStrategy.class)),
+                        HttpMethod.POST, "adjustLoanTransactionByExternalIdCommandStrategy",
+                        mock(AdjustLoanTransactionByExternalIdCommandStrategy.class)),
                 Arguments.of("clients/456?command=activate", HttpMethod.POST, "activateClientCommandStrategy",
                         mock(ActivateClientCommandStrategy.class)),
                 Arguments.of("loans/123?command=approve", HttpMethod.POST, "approveLoanCommandStrategy",
@@ -166,11 +166,12 @@ public class CommandStrategyProviderTest {
                         mock(CreateLoanRescheduleRequestCommandStrategy.class)),
                 Arguments.of("rescheduleloans/123?command=approve", HttpMethod.POST, "approveLoanRescheduleCommandStrategy",
                         mock(ApproveLoanRescheduleCommandStrategy.class)),
-                Arguments.of("loans/123/transactions/123", HttpMethod.GET, "getTransactionByIdCommandStrategy",
-                        mock(GetTransactionByIdCommandStrategy.class)),
+                Arguments.of("loans/123/transactions/123", HttpMethod.GET, "getLoanTransactionByIdCommandStrategy",
+                        mock(GetLoanTransactionByIdCommandStrategy.class)),
                 Arguments.of(
                         "loans/external-id/8dfad438-2319-48ce-8520-10a62801e9a1/transactions/external-id/7dfad438-2319-48ce-8520-10a62801e9ab?fields=id",
-                        HttpMethod.GET, "getTransactionByExternalIdCommandStrategy", mock(GetTransactionByExternalIdCommandStrategy.class)),
+                        HttpMethod.GET, "getLoanTransactionByExternalIdCommandStrategy",
+                        mock(GetLoanTransactionByExternalIdCommandStrategy.class)),
                 Arguments.of("datatables/test_dt_table/123", HttpMethod.GET, "getDatatableEntryByAppTableIdCommandStrategy",
                         mock(GetDatatableEntryByAppTableIdCommandStrategy.class)),
                 Arguments.of("datatables/test_dt_table/123?genericResultSet=true", HttpMethod.GET,

fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/AdjustLoanTransactionByExternalIdCommandStrategyTest.java

@@ -38,12 +38,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Test class for {@link AdjustTransactionByExternalIdCommandStrategy}.
+ * Test class for {@link AdjustLoanTransactionByExternalIdCommandStrategy}.
  */
-public class AdjustTransactionByExternalIdCommandStrategyTest {
+public class AdjustLoanTransactionByExternalIdCommandStrategyTest {
 
     /**
-     * Test {@link AdjustTransactionByExternalIdCommandStrategy#execute} happy path scenario.
+     * Test {@link AdjustLoanTransactionByExternalIdCommandStrategy#execute} happy path scenario.
      */
     @Test
     public void testExecuteWithoutCommandSuccessScenario() {
@@ -73,7 +73,7 @@ public class AdjustTransactionByExternalIdCommandStrategyTest {
     }
 
     /**
-     * Test {@link AdjustTransactionByExternalIdCommandStrategy#execute} happy path scenario.
+     * Test {@link AdjustLoanTransactionByExternalIdCommandStrategy#execute} happy path scenario.
      */
     @Test
     public void testExecuteWithCommandSuccessScenario() {
@@ -150,14 +150,14 @@ public class AdjustTransactionByExternalIdCommandStrategyTest {
         /**
          * The class under test.
          */
-        private final AdjustTransactionByExternalIdCommandStrategy subjectToTest;
+        private final AdjustLoanTransactionByExternalIdCommandStrategy subjectToTest;
 
         /**
          * Constructor.
          */
         TestContext() {
             MockitoAnnotations.openMocks(this);
-            subjectToTest = new AdjustTransactionByExternalIdCommandStrategy(loanTransactionsApiResource);
+            subjectToTest = new AdjustLoanTransactionByExternalIdCommandStrategy(loanTransactionsApiResource);
         }
     }
 }

fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/AdjustLoanTransactionCommandStrategyTest.java

@@ -36,12 +36,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Test class for {@link AdjustTransactionCommandStrategy}.
+ * Test class for {@link AdjustLoanTransactionCommandStrategy}.
  */
-public class AdjustTransactionCommandStrategyTest {
+public class AdjustLoanTransactionCommandStrategyTest {
 
     /**
-     * Test {@link AdjustTransactionCommandStrategy#execute} happy path scenario.
+     * Test {@link AdjustLoanTransactionCommandStrategy#execute} happy path scenario.
      */
     @Test
     public void testExecuteWithoutCommandSuccessScenario() {
@@ -71,7 +71,7 @@ public class AdjustTransactionCommandStrategyTest {
     }
 
     /**
-     * Test {@link AdjustTransactionCommandStrategy#execute} happy path scenario.
+     * Test {@link AdjustLoanTransactionCommandStrategy#execute} happy path scenario.
      */
     @Test
     public void testExecuteWithCommandSuccessScenario() {
@@ -148,14 +148,14 @@ public class AdjustTransactionCommandStrategyTest {
         /**
          * The class under test.
          */
-        private final AdjustTransactionCommandStrategy subjectToTest;
+        private final AdjustLoanTransactionCommandStrategy subjectToTest;
 
         /**
          * Constructor.
          */
         TestContext() {
             MockitoAnnotations.openMocks(this);
-            subjectToTest = new AdjustTransactionCommandStrategy(loanTransactionsApiResource);
+            subjectToTest = new AdjustLoanTransactionCommandStrategy(loanTransactionsApiResource);
         }
     }
 }

fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetLoanTransactionByExternalIdCommandStrategyTest.java

@@ -40,16 +40,16 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Test class for {@link GetTransactionByExternalIdCommandStrategy}.
+ * Test class for {@link GetLoanTransactionByExternalIdCommandStrategy}.
  */
-public class GetTransactionByExternalIdCommandStrategyTest {
+public class GetLoanTransactionByExternalIdCommandStrategyTest {
 
     private static Stream<Arguments> provideQueryParameters() {
         return Stream.of(Arguments.of(null, 0), Arguments.of("id,date,amount", 1));
     }
 
     /**
-     * Test {@link GetTransactionByExternalIdCommandStrategy#execute} happy path scenario.
+     * Test {@link GetLoanTransactionByExternalIdCommandStrategy#execute} happy path scenario.
      */
     @ParameterizedTest
     @MethodSource("provideQueryParameters")
@@ -132,7 +132,7 @@ public class GetTransactionByExternalIdCommandStrategyTest {
         /**
          * The class under test.
          */
-        private final GetTransactionByExternalIdCommandStrategy subjectToTest;
+        private final GetLoanTransactionByExternalIdCommandStrategy subjectToTest;
 
         /**
          * Constructor.
@@ -140,7 +140,7 @@ public class GetTransactionByExternalIdCommandStrategyTest {
 
         TestContext() {
             MockitoAnnotations.openMocks(this);
-            subjectToTest = new GetTransactionByExternalIdCommandStrategy(loanTransactionsApiResource);
+            subjectToTest = new GetLoanTransactionByExternalIdCommandStrategy(loanTransactionsApiResource);
         }
     }
 }

fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetLoanTransactionByIdCommandStrategyTest.java

@@ -38,16 +38,16 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Test class for {@link GetTransactionByIdCommandStrategy}.
+ * Test class for {@link GetLoanTransactionByIdCommandStrategy}.
  */
-public class GetTransactionByIdCommandStrategyTest {
+public class GetLoanTransactionByIdCommandStrategyTest {
 
     private static Stream<Arguments> provideQueryParameters() {
         return Stream.of(Arguments.of(null, 0), Arguments.of("id,date,amount", 1));
     }
 
     /**
-     * Test {@link GetTransactionByIdCommandStrategy#execute} happy path scenario.
+     * Test {@link GetLoanTransactionByIdCommandStrategy#execute} happy path scenario.
      */
     @ParameterizedTest
     @MethodSource("provideQueryParameters")
@@ -128,7 +128,7 @@ public class GetTransactionByIdCommandStrategyTest {
         /**
          * The class under test.
          */
-        private final GetTransactionByIdCommandStrategy subjectToTest;
+        private final GetLoanTransactionByIdCommandStrategy subjectToTest;
 
         /**
          * Constructor.
@@ -136,7 +136,7 @@ public class GetTransactionByIdCommandStrategyTest {
 
         TestContext() {
             MockitoAnnotations.openMocks(this);
-            subjectToTest = new GetTransactionByIdCommandStrategy(loanTransactionsApiResource);
+            subjectToTest = new GetLoanTransactionByIdCommandStrategy(loanTransactionsApiResource);
         }
     }
 }