FINERACT-2232: DeferredIncomeApi as CapitalizedIncomeApi

fineract-client/src/main/java/org/apache/fineract/client/util/FineractClient.java

@@ -86,10 +86,10 @@ import org.apache.fineract.client.services.JournalEntriesApi;
 import org.apache.fineract.client.services.ListReportMailingJobHistoryApi;
 import org.apache.fineract.client.services.LoanAccountLockApi;
 import org.apache.fineract.client.services.LoanBuyDownFeesApi;
+import org.apache.fineract.client.services.LoanCapitalizedIncomeApi;
 import org.apache.fineract.client.services.LoanChargesApi;
 import org.apache.fineract.client.services.LoanCobCatchUpApi;
 import org.apache.fineract.client.services.LoanCollateralApi;
-import org.apache.fineract.client.services.LoanDeferredIncomeDataApi;
 import org.apache.fineract.client.services.LoanDisbursementDetailsApi;
 import org.apache.fineract.client.services.LoanInterestPauseApi;
 import org.apache.fineract.client.services.LoanProductsApi;
@@ -232,7 +232,7 @@ public final class FineractClient {
     public final LoanChargesApi loanCharges;
     public final LoanCobCatchUpApi loanCobCatchUpApi;
     public final LoanCollateralApi loanCollaterals;
-    public final LoanDeferredIncomeDataApi loanDeferredIncome;
+    public final LoanCapitalizedIncomeApi loanCapitalizedIncome;
     public final LoanProductsApi loanProducts;
     public final LoanReschedulingApi loanSchedules;
     public final LoansPointInTimeApi loansPointInTimeApi;
@@ -363,7 +363,7 @@ public final class FineractClient {
         loanCharges = retrofit.create(LoanChargesApi.class);
         loanCobCatchUpApi = retrofit.create(LoanCobCatchUpApi.class);
         loanCollaterals = retrofit.create(LoanCollateralApi.class);
-        loanDeferredIncome = retrofit.create(LoanDeferredIncomeDataApi.class);
+        loanCapitalizedIncome = retrofit.create(LoanCapitalizedIncomeApi.class);
         loanProducts = retrofit.create(LoanProductsApi.class);
         loanSchedules = retrofit.create(LoanReschedulingApi.class);
         loansPointInTimeApi = retrofit.create(LoansPointInTimeApi.class);

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/api/ApiConfiguration.java

@@ -40,9 +40,9 @@ import org.apache.fineract.client.services.InlineJobApi;
 import org.apache.fineract.client.services.JournalEntriesApi;
 import org.apache.fineract.client.services.LoanAccountLockApi;
 import org.apache.fineract.client.services.LoanBuyDownFeesApi;
+import org.apache.fineract.client.services.LoanCapitalizedIncomeApi;
 import org.apache.fineract.client.services.LoanChargesApi;
 import org.apache.fineract.client.services.LoanCobCatchUpApi;
-import org.apache.fineract.client.services.LoanDeferredIncomeDataApi;
 import org.apache.fineract.client.services.LoanDisbursementDetailsApi;
 import org.apache.fineract.client.services.LoanInterestPauseApi;
 import org.apache.fineract.client.services.LoanProductsApi;
@@ -265,7 +265,7 @@ public class ApiConfiguration {
     }
 
     @Bean
-    public LoanDeferredIncomeDataApi loanDeferredIncomeDataApi() {
-        return fineractClient.createService(LoanDeferredIncomeDataApi.class);
+    public LoanCapitalizedIncomeApi loanCapitalizedIncomeApi() {
+        return fineractClient.createService(LoanCapitalizedIncomeApi.class);
     }
 }

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java

@@ -85,7 +85,6 @@ import org.apache.fineract.client.models.GetLoansLoanIdTransactions;
 import org.apache.fineract.client.models.GetLoansLoanIdTransactionsResponse;
 import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
 import org.apache.fineract.client.models.IsCatchUpRunningDTO;
-import org.apache.fineract.client.models.LoanDeferredIncomeData;
 import org.apache.fineract.client.models.LoanProductChargeData;
 import org.apache.fineract.client.models.OldestCOBProcessedLoanDTO;
 import org.apache.fineract.client.models.PaymentAllocationOrder;
@@ -110,8 +109,8 @@ import org.apache.fineract.client.models.PutLoansLoanIdRequest;
 import org.apache.fineract.client.models.PutLoansLoanIdResponse;
 import org.apache.fineract.client.services.BusinessDateManagementApi;
 import org.apache.fineract.client.services.LoanBuyDownFeesApi;
+import org.apache.fineract.client.services.LoanCapitalizedIncomeApi;
 import org.apache.fineract.client.services.LoanCobCatchUpApi;
-import org.apache.fineract.client.services.LoanDeferredIncomeDataApi;
 import org.apache.fineract.client.services.LoanDisbursementDetailsApi;
 import org.apache.fineract.client.services.LoanInterestPauseApi;
 import org.apache.fineract.client.services.LoanProductsApi;
@@ -199,7 +198,7 @@ public class LoanStepDef extends AbstractStepDef {
     private LoanBuyDownFeesApi loanBuyDownFeesApi;
 
     @Autowired
-    private LoanDeferredIncomeDataApi loanDeferredIncomeDataApi;
+    private LoanCapitalizedIncomeApi loanCapitalizedIncomeApi;
 
     @Autowired
     private LoanCobCatchUpApi loanCobCatchUpApi;
@@ -4994,12 +4993,11 @@ public class LoanStepDef extends AbstractStepDef {
         long loanId = loanCreateResponse.body().getLoanId();
         String resourceId = String.valueOf(loanId);
 
-        final Response<LoanDeferredIncomeData> deferredIncomeResponse = loanDeferredIncomeDataApi.fetchDeferredIncomeDetails(loanId)
-                .execute();
-        ErrorHelper.checkSuccessfulApiCall(deferredIncomeResponse);
+        final Response<List<CapitalizedIncomeDetails>> capitalizeIncomeDetails = loanCapitalizedIncomeApi
+                .fetchCapitalizedIncomeDetails(loanId).execute();
+        ErrorHelper.checkSuccessfulApiCall(capitalizeIncomeDetails);
 
-        List<CapitalizedIncomeDetails> deferredIncome = deferredIncomeResponse.body().getCapitalizedIncomeData();
-        checkCapitalizedIncomeTransactionData(resourceId, deferredIncome, table);
+        checkCapitalizedIncomeTransactionData(resourceId, capitalizeIncomeDetails.body(), table);
     }
 
     @And("Deferred Capitalized Income by external-id contains the following data:")
@@ -5009,12 +5007,11 @@ public class LoanStepDef extends AbstractStepDef {
         String resourceId = String.valueOf(loanId);
         String externalId = loanCreateResponse.body().getResourceExternalId();
 
-        final Response<LoanDeferredIncomeData> deferredIncomeResponse = loanDeferredIncomeDataApi
-                .fetchDeferredIncomeDetailsByExternalId(externalId).execute();
-        ErrorHelper.checkSuccessfulApiCall(deferredIncomeResponse);
+        final Response<List<CapitalizedIncomeDetails>> capitalizeIncomeDetails = loanCapitalizedIncomeApi
+                .fetchCapitalizedIncomeDetailsByExternalId(externalId).execute();
+        ErrorHelper.checkSuccessfulApiCall(capitalizeIncomeDetails);
 
-        List<CapitalizedIncomeDetails> deferredIncome = deferredIncomeResponse.body().getCapitalizedIncomeData();
-        checkCapitalizedIncomeTransactionData(resourceId, deferredIncome, table);
+        checkCapitalizedIncomeTransactionData(resourceId, capitalizeIncomeDetails.body(), table);
     }
 
     @And("Admin successfully terminates loan contract")

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanCapitalizedIncomeApiResource.java

@@ -31,20 +31,22 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.core.domain.ExternalId;
 import org.apache.fineract.infrastructure.core.service.ExternalIdFactory;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
-import org.apache.fineract.portfolio.loanaccount.data.LoanDeferredIncomeData;
+import org.apache.fineract.portfolio.loanaccount.data.CapitalizedIncomeDetails;
+import org.apache.fineract.portfolio.loanaccount.data.LoanCapitalizedIncomeData;
 import org.apache.fineract.portfolio.loanaccount.service.CapitalizedIncomeBalanceReadService;
 import org.apache.fineract.portfolio.loanaccount.service.LoanReadPlatformService;
 import org.springframework.stereotype.Component;
 
 @Path("/v1/loans")
 @Component
-@Tag(name = "Loan Deferred Income data", description = "Loan deferred income like Capitalized Income to fetch the Deferred Income related informations")
+@Tag(name = "Loan Capitalized Income", description = "Fetch the Loan capitalized income related informations")
 @RequiredArgsConstructor
-public class LoanDeferredIncomeApiResource {
+public class LoanCapitalizedIncomeApiResource {
 
     private static final String RESOURCE_NAME_FOR_PERMISSIONS = "LOAN";
     private final PlatformSecurityContext context;
@@ -55,28 +57,56 @@ public class LoanDeferredIncomeApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Fetch the Capitalized Income related informations")
-    public LoanDeferredIncomeData fetchDeferredIncomeDetails(@PathParam("loanId") @Parameter(description = "loanId") final Long loanId) {
+    @Operation(deprecated = true, summary = "Fetch the Capitalized Income related informations")
+    public LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeData(
+            @PathParam("loanId") @Parameter(description = "loanId") final Long loanId) {
         this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
 
-        return capitalizedIncomeBalanceReadService.fetchLoanDeferredIncomeData(loanId);
+        return capitalizedIncomeBalanceReadService.fetchLoanCapitalizedIncomeData(loanId);
     }
 
     @GET
     @Path("/external-id/{loanExternalId}/deferredincome")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @Operation(summary = "Get the amortization details of Capitalized Income for a loan by external ID")
+    @Operation(deprecated = true, summary = "Get the amortization details of Capitalized Income for a loan by external ID")
     @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanDeferredIncomeData.class))) })
-    public LoanDeferredIncomeData fetchDeferredIncomeDetailsByExternalId(
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = LoanCapitalizedIncomeData.class))) })
+    public LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeDataByExternalId(
             @PathParam("loanExternalId") @Parameter(description = "loanExternalId", required = true) final String loanExternalId) {
         this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
 
         final ExternalId externalId = ExternalIdFactory.produce(loanExternalId);
         final Long resolvedLoanId = loanReadPlatformService.getResolvedLoanId(externalId);
 
-        return this.capitalizedIncomeBalanceReadService.fetchLoanDeferredIncomeData(resolvedLoanId);
+        return this.capitalizedIncomeBalanceReadService.fetchLoanCapitalizedIncomeData(resolvedLoanId);
+    }
+
+    @Path("/{loanId}/capitalized-incomes")
+    @GET
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Fetch the Capitalized Income related informations")
+    public List<CapitalizedIncomeDetails> fetchCapitalizedIncomeDetails(
+            @PathParam("loanId") @Parameter(description = "loanId") final Long loanId) {
+        this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
+
+        return capitalizedIncomeBalanceReadService.fetchLoanCapitalizedIncomeDetails(loanId);
+    }
+
+    @GET
+    @Path("/external-id/{loanExternalId}/capitalized-incomes")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Get the amortization details of Capitalized Income for a loan by external ID")
+    public List<CapitalizedIncomeDetails> fetchCapitalizedIncomeDetailsByExternalId(
+            @PathParam("loanExternalId") @Parameter(description = "loanExternalId", required = true) final String loanExternalId) {
+        this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
+
+        final ExternalId externalId = ExternalIdFactory.produce(loanExternalId);
+        final Long resolvedLoanId = loanReadPlatformService.getResolvedLoanId(externalId);
+
+        return this.capitalizedIncomeBalanceReadService.fetchLoanCapitalizedIncomeDetails(resolvedLoanId);
     }
 
 }

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanCapitalizedIncomeData.java

@@ -30,7 +30,7 @@ import lombok.ToString;
 @ToString
 @Getter
 @Setter
-public class LoanDeferredIncomeData {
+public class LoanCapitalizedIncomeData {
 
     private List<CapitalizedIncomeDetails> capitalizedIncomeData;
 

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/CapitalizedIncomeBalanceReadService.java

@@ -18,10 +18,13 @@
  */
 package org.apache.fineract.portfolio.loanaccount.service;
 
-import org.apache.fineract.portfolio.loanaccount.data.LoanDeferredIncomeData;
+import java.util.List;
+import org.apache.fineract.portfolio.loanaccount.data.CapitalizedIncomeDetails;
+import org.apache.fineract.portfolio.loanaccount.data.LoanCapitalizedIncomeData;
 
 public interface CapitalizedIncomeBalanceReadService {
 
-    LoanDeferredIncomeData fetchLoanDeferredIncomeData(Long loanId);
+    LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeData(Long loanId);
 
+    List<CapitalizedIncomeDetails> fetchLoanCapitalizedIncomeDetails(Long loanId);
 }

fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/CapitalizedIncomeBalanceReadServiceImpl.java

@@ -25,12 +25,13 @@ import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
 import org.apache.fineract.infrastructure.core.service.MathUtil;
 import org.apache.fineract.portfolio.loanaccount.data.CapitalizedIncomeDetails;
-import org.apache.fineract.portfolio.loanaccount.data.LoanDeferredIncomeData;
+import org.apache.fineract.portfolio.loanaccount.data.LoanCapitalizedIncomeData;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanCapitalizedIncomeBalance;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper;
 import org.apache.fineract.portfolio.loanaccount.repository.LoanCapitalizedIncomeBalanceRepository;
 import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 @RequiredArgsConstructor
 public class CapitalizedIncomeBalanceReadServiceImpl implements CapitalizedIncomeBalanceReadService {
 
@@ -38,8 +39,7 @@ public class CapitalizedIncomeBalanceReadServiceImpl implements CapitalizedIncom
     private final LoanCapitalizedIncomeBalanceRepository capitalizedIncomeBalanceRepository;
 
     @Override
-    @Transactional
-    public LoanDeferredIncomeData fetchLoanDeferredIncomeData(final Long loanId) {
+    public LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeData(final Long loanId) {
         if (loanRepository.isEnabledCapitalizedIncome(loanId)) {
 
             List<CapitalizedIncomeDetails> capitalizedIncomeData = new ArrayList<>();
@@ -56,7 +56,31 @@ public class CapitalizedIncomeBalanceReadServiceImpl implements CapitalizedIncom
                         capitalizedIncomeBalance.getChargedOffAmount()));
             }
 
-            return new LoanDeferredIncomeData(capitalizedIncomeData);
+            return new LoanCapitalizedIncomeData(capitalizedIncomeData);
+        }
+        throw new GeneralPlatformDomainRuleException("error.msg.loan.is.not.enabled.capitalized.income",
+                "Loan: " + loanId + " is not enabled Capitalized Income feature", loanId);
+    }
+
+    @Override
+    public List<CapitalizedIncomeDetails> fetchLoanCapitalizedIncomeDetails(final Long loanId) {
+        if (loanRepository.isEnabledCapitalizedIncome(loanId)) {
+
+            List<CapitalizedIncomeDetails> capitalizedIncomeData = new ArrayList<>();
+            List<LoanCapitalizedIncomeBalance> capitalizedIncomeBalances = capitalizedIncomeBalanceRepository.findAllByLoanId(loanId);
+            for (final LoanCapitalizedIncomeBalance capitalizedIncomeBalance : capitalizedIncomeBalances) {
+                final BigDecimal amortizedAmount = capitalizedIncomeBalance.getAmount() //
+                        .subtract(MathUtil.nullToZero(capitalizedIncomeBalance.getUnrecognizedAmount())) //
+                        .subtract(MathUtil.nullToZero(capitalizedIncomeBalance.getAmountAdjustment())) //
+                        .subtract(MathUtil.nullToZero(capitalizedIncomeBalance.getChargedOffAmount()));
+
+                capitalizedIncomeData.add(new CapitalizedIncomeDetails(capitalizedIncomeBalance.getAmount(), amortizedAmount,
+                        capitalizedIncomeBalance.getUnrecognizedAmount(), //
+                        capitalizedIncomeBalance.getAmountAdjustment(), //
+                        capitalizedIncomeBalance.getChargedOffAmount()));
+            }
+
+            return capitalizedIncomeData;
         }
         throw new GeneralPlatformDomainRuleException("error.msg.loan.is.not.enabled.capitalized.income",
                 "Loan: " + loanId + " is not enabled Capitalized Income feature", loanId);

integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanCapitalizedIncomeTest.java

@@ -25,12 +25,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.fineract.client.models.CapitalizedIncomeDetails;
 import org.apache.fineract.client.models.GetLoansLoanIdResponse;
 import org.apache.fineract.client.models.GetLoansLoanIdTransactions;
-import org.apache.fineract.client.models.LoanDeferredIncomeData;
+import org.apache.fineract.client.models.LoanCapitalizedIncomeData;
 import org.apache.fineract.client.models.PostClientsResponse;
 import org.apache.fineract.client.models.PostLoanProductsRequest;
 import org.apache.fineract.client.models.PostLoanProductsResponse;
@@ -89,9 +90,16 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
                     transaction(50.0, "Capitalized Income", "01 January 2024"), //
                     transaction(0.55, "Capitalized Income Amortization", "01 January 2024") //
             );
-            final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
-            assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
-            final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
+            final LoanCapitalizedIncomeData loanCapitalizedIncomeData = loanTransactionHelper.fetchLoanCapitalizedIncomeData(loanId);
+            assertTrue(loanCapitalizedIncomeData.getCapitalizedIncomeData().size() > 0);
+            CapitalizedIncomeDetails capitalizedIncomeData = loanCapitalizedIncomeData.getCapitalizedIncomeData().get(0);
+            assertNotNull(capitalizedIncomeData);
+            assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
+            assertEquals(0.55, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
+            final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
+            assertNotNull(capitalizedIncomeDetails);
+            assertTrue(loanCapitalizedIncomeData.getCapitalizedIncomeData().size() == capitalizedIncomeDetails.size());
+            capitalizedIncomeData = capitalizedIncomeDetails.get(0);
             assertNotNull(capitalizedIncomeData);
             assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
             assertEquals(0.55, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
@@ -107,9 +115,9 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
                     transaction(0.03, "Accrual", "02 January 2024"), //
                     transaction(0.55, "Capitalized Income Amortization", "02 January 2024") //
             );
-            final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
-            assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
-            final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
+            final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
+            assertTrue(capitalizedIncomeDetails.size() > 0);
+            final CapitalizedIncomeDetails capitalizedIncomeData = capitalizedIncomeDetails.get(0);
             assertNotNull(capitalizedIncomeData);
             assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
             assertEquals(1.1, Utils.getDoubleValue(capitalizedIncomeData.getAmortizedAmount()));
@@ -198,9 +206,9 @@ public class LoanCapitalizedIncomeTest extends BaseLoanIntegrationTest {
                     transaction(50.0, "Capitalized Income", "01 January 2024"), //
                     transaction(50.0, "Capitalized Income Adjustment", "01 April 2024") //
             );
-            final LoanDeferredIncomeData loanDeferredIncomeData = loanTransactionHelper.fetchDeferredIncomeDetails(loanId);
-            assertTrue(loanDeferredIncomeData.getCapitalizedIncomeData().size() > 0);
-            final CapitalizedIncomeDetails capitalizedIncomeData = loanDeferredIncomeData.getCapitalizedIncomeData().get(0);
+            final List<CapitalizedIncomeDetails> capitalizedIncomeDetails = loanTransactionHelper.fetchCapitalizedIncomeDetails(loanId);
+            assertTrue(capitalizedIncomeDetails.size() > 0);
+            final CapitalizedIncomeDetails capitalizedIncomeData = capitalizedIncomeDetails.get(0);
             assertNotNull(capitalizedIncomeData);
             assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmount()));
             assertEquals(50.0, Utils.getDoubleValue(capitalizedIncomeData.getAmountAdjustment()));

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java

@@ -46,6 +46,7 @@ import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.fineract.client.models.AdvancedPaymentData;
 import org.apache.fineract.client.models.BuyDownFeeAmortizationDetails;
+import org.apache.fineract.client.models.CapitalizedIncomeDetails;
 import org.apache.fineract.client.models.CommandProcessingResult;
 import org.apache.fineract.client.models.DeleteLoansLoanIdChargesChargeIdResponse;
 import org.apache.fineract.client.models.DeleteLoansLoanIdResponse;
@@ -69,7 +70,7 @@ import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTemplateRespo
 import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionIdResponse;
 import org.apache.fineract.client.models.GetLoansResponse;
 import org.apache.fineract.client.models.InterestPauseRequestDto;
-import org.apache.fineract.client.models.LoanDeferredIncomeData;
+import org.apache.fineract.client.models.LoanCapitalizedIncomeData;
 import org.apache.fineract.client.models.PaymentTypeData;
 import org.apache.fineract.client.models.PostAddAndDeleteDisbursementDetailRequest;
 import org.apache.fineract.client.models.PostLoanProductsRequest;
@@ -3048,8 +3049,13 @@ public class LoanTransactionHelper {
                 .ok(FineractClientHelper.getFineractClient().loanTransactions.executeLoanTransaction(loanId, request, "undo-charge-off"));
     }
 
-    public LoanDeferredIncomeData fetchDeferredIncomeDetails(Long loanId) {
-        return Calls.ok(FineractClientHelper.getFineractClient().loanDeferredIncome.fetchDeferredIncomeDetails(loanId));
+    @Deprecated(forRemoval = true)
+    public LoanCapitalizedIncomeData fetchLoanCapitalizedIncomeData(Long loanId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().loanCapitalizedIncome.fetchLoanCapitalizedIncomeData(loanId));
+    }
+
+    public List<CapitalizedIncomeDetails> fetchCapitalizedIncomeDetails(Long loanId) {
+        return Calls.ok(FineractClientHelper.getFineractClient().loanCapitalizedIncome.fetchCapitalizedIncomeDetails(loanId));
     }
 
     // TODO: Rewrite to use fineract-client instead!