feat: add portfolio investment api constants and domain models

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

fineract-core/src/main/java/org/apache/fineract/commands/service/CommandSourceService.java

@@ -169,12 +169,26 @@ public class CommandSourceService {
                 || "RECURRINGDEPOSITPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
                 || "USER".equalsIgnoreCase(commandSource.getEntityName())
                 || "ROLE".equalsIgnoreCase(commandSource.getEntityName())
-                || isDdsEntity(commandSource.getEntityName())) {
+                || isDdsEntity(commandSource.getEntityName())
+                || isInvestmentEntity(commandSource.getEntityName())) {
             return false;
         }
         return true;
     }
 
+    /**
+     * The Investment module's maker-checker entities. Deals, settlements and their vouchers are entered by one person and
+     * approved by another, so a super user's investment work goes to a checker as well. Unlike DDS, a super user may still
+     * check an entry they made themselves. Daily rates are not here: they are entered without approval.
+     */
+    public static boolean isInvestmentEntity(final String entityName) {
+        return entityName != null && switch (entityName.toUpperCase()) {
+            case "INVESTMENTPARTY", "INVESTMENTSCRIPT", "INVESTMENTPURCHASE", "INVESTMENTSALE", "INVESTMENTFD", "INVESTMENTTRANSFER",
+                    "INVESTMENTINTEREST", "INVESTMENTVALUATION" -> true;
+            default -> false;
+        };
+    }
+
     /**
      * The DDS module's maker-checker entities. A super user's DDS work goes to a checker like anyone
      * else's: DDS moves customers' money, and every such move is to be approved by a second person.

fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java

@@ -95,6 +95,222 @@ public class CommandWrapperBuilder {
         return this;
     }
 
+    public CommandWrapperBuilder createInvestmentParty() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = null;
+        this.href = "/investment/parties";
+        return this;
+    }
+
+    public CommandWrapperBuilder updateInvestmentParty(final Long partyId) {
+        this.actionName = "UPDATE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = partyId;
+        this.href = "/investment/parties/" + partyId;
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentParty(final Long partyId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = partyId;
+        this.href = "/investment/parties/" + partyId;
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentScript() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTSCRIPT";
+        this.entityId = null;
+        this.href = "/investment/scripts";
+        return this;
+    }
+
+    public CommandWrapperBuilder updateInvestmentScript(final Long scriptId) {
+        this.actionName = "UPDATE";
+        this.entityName = "INVESTMENTSCRIPT";
+        this.entityId = scriptId;
+        this.href = "/investment/scripts/" + scriptId;
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentPurchase() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = null;
+        this.href = "/investment/purchases";
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId;
+        return this;
+    }
+
+    public CommandWrapperBuilder settleInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "SETTLE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/settle";
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentSale() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = null;
+        this.href = "/investment/sales";
+        return this;
+    }
+
+    public CommandWrapperBuilder settleInvestmentSale(final Long saleId) {
+        this.actionName = "SETTLE";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = saleId;
+        this.href = "/investment/sales/" + saleId + "/settle";
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentSale(final Long saleId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = saleId;
+        this.href = "/investment/sales/" + saleId;
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentFd() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = null;
+        this.href = "/investment/fds";
+        return this;
+    }
+
+    public CommandWrapperBuilder matureInvestmentFd(final Long fdId) {
+        this.actionName = "MATURE";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = fdId;
+        this.href = "/investment/fds/" + fdId + "/mature";
+        return this;
+    }
+
+    public CommandWrapperBuilder prematureInvestmentFd(final Long fdId) {
+        this.actionName = "PREMATURE";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = fdId;
+        this.href = "/investment/fds/" + fdId + "/premature";
+        return this;
+    }
+
+    public CommandWrapperBuilder renewInvestmentFd(final Long fdId) {
+        this.actionName = "RENEW";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = fdId;
+        this.href = "/investment/fds/" + fdId + "/renew";
+        return this;
+    }
+
+    public CommandWrapperBuilder postInvestmentFdInterest(final Long fdId) {
+        this.actionName = "POSTINTEREST";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = fdId;
+        this.href = "/investment/fds/" + fdId + "/interest";
+        return this;
+    }
+
+    public CommandWrapperBuilder setInvestmentDepositBase() {
+        this.actionName = "SETBASE";
+        this.entityName = "INVESTMENTFD";
+        this.entityId = null;
+        this.href = "/investment/fds/deposit-base";
+        return this;
+    }
+
+    public CommandWrapperBuilder amortiseInvestmentPremium() {
+        this.actionName = "AMORTISE";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = null;
+        this.href = "/investment/amortisation";
+        return this;
+    }
+
+    public CommandWrapperBuilder writeOffInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "WRITEOFF";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/write-off";
+        return this;
+    }
+
+    public CommandWrapperBuilder redeemInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "REDEEM";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/redeem";
+        return this;
+    }
+
+    public CommandWrapperBuilder switchInvestmentFund(final Long purchaseId) {
+        this.actionName = "SWITCH";
+        this.entityName = "INVESTMENTSALE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/switch";
+        return this;
+    }
+
+    public CommandWrapperBuilder dividendInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "DIVIDEND";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/dividends";
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentValuation() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTVALUATION";
+        this.entityId = null;
+        this.href = "/investment/valuations";
+        return this;
+    }
+
+    public CommandWrapperBuilder transferInvestmentSecurity(final Long purchaseId) {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTTRANSFER";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/transfer";
+        return this;
+    }
+
+    public CommandWrapperBuilder postInvestmentInterest(final Long purchaseId) {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTINTEREST";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/interest-postings";
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentDailyRate() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTDAILYRATE";
+        this.entityId = null;
+        this.href = "/investment/daily-rates";
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentDailyRate(final Long rateId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTDAILYRATE";
+        this.entityId = rateId;
+        this.href = "/investment/daily-rates/" + rateId;
+        return this;
+    }
+
     public CommandWrapperBuilder createChequeStockLot() {
         this.actionName = "CREATE";
         this.entityName = "CHEQUESTOCKLOT";

fineract-provider/src/main/java/org/apache/fineract/portfolio/branchday/api/BranchDayRegisterApiResource.java

@@ -46,6 +46,8 @@ import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.cashreport.service.VaultPositionService;
 import org.apache.fineract.portfolio.denominationmaster.service.CountedCashLedger;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdInterestService;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
 import org.apache.fineract.portfolio.savings.dailyinterest.SavingsDailyInterestOrchestrator;
 import org.apache.fineract.portfolio.savings.dailyinterest.SavingsInterestPostingReportService;
 import org.apache.fineract.portfolio.savings.fdinterest.FixedDepositInterestPostingOrchestrator;
@@ -95,8 +97,16 @@ public class BranchDayRegisterApiResource {
     private final SavingsDailyInterestOrchestrator savingsDailyInterestOrchestrator;
     private final FixedDepositInterestPostingReportService fdInterestPostingReportService;
     private final FixedDepositInterestPostingOrchestrator fdInterestPostingOrchestrator;
+    private final InvestmentPurchaseReadPlatformService investmentPurchaseReadPlatformService;
+    private final InvestmentFdInterestService investmentFdInterestService;
     private final Gson gson = new Gson();
 
+    private boolean isHeadOffice(final Long officeId) {
+        final Integer topLevel = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM m_office WHERE id = ? AND parent_id IS NULL",
+                Integer.class, officeId);
+        return topLevel != null && topLevel > 0;
+    }
+
     // ── GET /v1/branchday ── the register itself ──────────────────────────────
 
     /**
@@ -260,6 +270,13 @@ public class BranchDayRegisterApiResource {
         final Map<String, Object> fdInterest = fdInterestPostingReportService.dayCloseInterestView(officeId, businessDate);
         result.put("fdInterestPending", fdInterest.get("pending"));
         result.put("fdInterestDue", fdInterest.get("due"));
+        // Investment interest vouchers (coupon / provision) whose date has come but which are not posted yet.
+        // A reminder only: it never stops the close (Jitendra Sir). Investments are booked at Head Office, so
+        // only the Head Office close shows it.
+        result.put("investmentInterestPending",
+                isHeadOffice(officeId) ? investmentPurchaseReadPlatformService.retrieveDueInterest(0) : List.of());
+        // The same for FDs placed with other banks: interest vouchers and maturities due. A reminder only.
+        result.put("investmentFdPending", isHeadOffice(officeId) ? investmentFdInterestService.due(0) : List.of());
 
         return gson.toJson(result);
     }

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentAmortisationApiResource.java

@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentAmortisationData;
+import org.apache.fineract.portfolio.investment.data.InvestmentAmortisationDueData;
+import org.apache.fineract.portfolio.investment.service.InvestmentAmortisationService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/amortisation")
+@Component
+@Tag(name = "Investment Premium Amortisation", description = "Premium of HTM holdings amortised straight-line to maturity every 31 March.")
+@RequiredArgsConstructor
+public class InvestmentAmortisationApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentAmortisationService amortisationService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Path("{purchaseId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Amortisation schedule of a holding (06 Amortize Entry)")
+    public InvestmentAmortisationData schedule(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentSaleApiConstants.ENTITY);
+        return this.amortisationService.schedule(purchaseId);
+    }
+
+    @GET
+    @Path("due")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Holdings due for amortisation on a 31 March (07 Amortize Yearly Process)", description = "fyEnd dd-MM-yyyy")
+    public List<InvestmentAmortisationDueData> due(@QueryParam("fyEnd") @Parameter(description = "dd-MM-yyyy") final String fyEnd) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentSaleApiConstants.ENTITY);
+        return this.amortisationService.due(InvestmentApiDates.parse(fyEnd, null, "financial year end"));
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Post amortisation for a 31 March", description = "With purchaseId: that holding (Amortize Entry); without: "
+            + "every holding due (Amortize Yearly Process). One JV per holding: Dr 500604 / Cr premium GL.")
+    public CommandProcessingResult amortise(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().amortiseInvestmentPremium().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentApiConstants.java

@@ -0,0 +1,151 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Constants for the Treasury Investment masters (Bank / Party Master and Script Master), modelled on the bank's existing
+ * CBS Investment screens.
+ */
+public final class InvestmentApiConstants {
+
+    private InvestmentApiConstants() {}
+
+    public static final String ENTITY_PARTY = "INVESTMENTPARTY";
+    public static final String ENTITY_SCRIPT = "INVESTMENTSCRIPT";
+    public static final String RESOURCE_PARTY = "investmentparty";
+    public static final String RESOURCE_SCRIPT = "investmentscript";
+
+    /** Instrument ("Bond Type") an investment party / script belongs to. */
+    public static final Set<String> BOND_TYPES = Set.of("GOVT_SECURITY", "NON_SLR", "BOND", "MUTUAL_FUND", "FD", "SHARE");
+
+    /** Bond types that carry coupon terms (ISIN, interest rate, issue date are mandatory for these). */
+    public static final Set<String> DEBT_BOND_TYPES = Set.of("GOVT_SECURITY", "NON_SLR", "BOND");
+
+    /** SLR classification on the Script Master ("GOI" = Central Government). */
+    public static final Set<String> SLR_TYPES = Set.of("GOI", "STATE_GOVT", "TREASURY", "NON_SLR");
+
+    /** Script Code prefix per bond type, e.g. G00001 for the first Govt Security. */
+    public static final Map<String, String> SCRIPT_CODE_PREFIX = Map.of("GOVT_SECURITY", "G", "NON_SLR", "N", "BOND", "B", "MUTUAL_FUND",
+            "M", "FD", "F", "SHARE", "S");
+
+    /** Bond types that are non-SLR investments, counted against the RBI limit of 10% of deposits. */
+    public static final Set<String> NON_SLR_BOND_TYPES = Set.of("NON_SLR", "BOND", "MUTUAL_FUND");
+
+    /** Bond types that must carry a credit rating: corporate bonds, CPs and CDs. */
+    public static final Set<String> RATED_BOND_TYPES = Set.of("NON_SLR", "BOND");
+
+    /** Credit ratings on the Script Master: long-term (bonds) and short-term (CP / CD) scales, best first. */
+    public static final List<String> RATINGS = List.of("AAA", "AA+", "AA", "AA-", "A+", "A", "A-", "BBB+", "BBB", "BBB-", "BB+", "BB",
+            "BB-", "B+", "B", "B-", "C", "D", "A1+", "A1", "A2+", "A2", "A3+", "A3", "A4+", "A4", "UNRATED");
+
+    /** RBI: corporate bonds rated "A" or higher, CPs and CDs rated "A2" or higher. */
+    public static final Set<String> ELIGIBLE_RATINGS = Set.of("AAA", "AA+", "AA", "AA-", "A+", "A", "A-", "A1+", "A1", "A2+", "A2");
+
+    /** Short-term scale, for CPs and CDs (issued for up to one year); bonds carry the long-term scale. */
+    public static final Set<String> SHORT_TERM_RATINGS = Set.of("A1+", "A1", "A2+", "A2", "A3+", "A3", "A4+", "A4");
+
+    /** Credit rating agencies registered with SEBI. */
+    public static final List<String> RATING_AGENCIES = List.of("CRISIL", "ICRA", "CARE", "INDIA_RATINGS", "ACUITE", "BRICKWORK",
+            "INFOMERICS");
+
+    /** RBI: only debt and money-market mutual funds; their sub types start with this. */
+    public static final String DEBT_MF_SUB_TYPE_PREFIX = "DEBT";
+
+    /** Share investments: only these institutions (no shares of companies outside the co-operative sector). */
+    public static final String SHARE = "SHARE";
+    public static final String INSTITUTION_STATE_COOP_BANK = "STATE_COOP_BANK";
+    public static final String INSTITUTION_DCCB = "DCCB";
+    public static final String INSTITUTION_OTHER_COOP_SOCIETY = "OTHER_COOP_SOCIETY";
+    /** Membership shares of NPCI, CCIL, SWIFT, the Umbrella Organisation of UCBs and IDPIC. */
+    public static final String INSTITUTION_MEMBERSHIP_MIC_UO = "MEMBERSHIP_MIC_UO";
+    public static final Set<String> INSTITUTION_TYPES = Set.of(INSTITUTION_STATE_COOP_BANK, INSTITUTION_DCCB, INSTITUTION_OTHER_COOP_SOCIETY,
+            INSTITUTION_MEMBERSHIP_MIC_UO);
+    /** Co-operative institutions: their shares are valued on the dividend / balance sheet rules. */
+    public static final Set<String> COOP_INSTITUTION_TYPES = Set.of(INSTITUTION_STATE_COOP_BANK, INSTITUTION_DCCB,
+            INSTITUTION_OTHER_COOP_SOCIETY);
+
+    public static final String PARTY_CODE_PREFIX = "PTY-";
+
+    /**
+     * Deal slip: how the deal was confirmed to the counterparty (entered with the deal), and the counterparty's
+     * confirmation the back office records when it settles the deal.
+     */
+    public static final Set<String> CONFIRMATION_MODES = Set.of("EMAIL", "NDS_OM", "FAX", "LETTER", "PHONE");
+    public static final String CONFIRMATION_MODE = "confirmationMode";
+    public static final String CONFIRMATION_RECEIVED_ON = "confirmationReceivedOn";
+    public static final String CONFIRMATION_REF = "confirmationRef";
+
+    // Common parameters
+    public static final String BOND_TYPE = "bondType";
+    public static final String GL_ACCOUNT_ID = "glAccountId";
+    public static final String INTEREST_GL_ACCOUNT_ID = "interestGlAccountId";
+    public static final String ADDRESS1 = "address1";
+    public static final String ADDRESS2 = "address2";
+    public static final String ADDRESS3 = "address3";
+    public static final String CITY = "city";
+    public static final String PINCODE = "pincode";
+    public static final String PHONE = "phone";
+    public static final String FAX = "fax";
+    public static final String ACTIVE = "active";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    // Party parameters
+    public static final String PARTY_NAME = "partyName";
+    public static final String BANK_TYPE = "bankType";
+    public static final String RBI_CODE = "rbiCode";
+    public static final String EXPOSURE_LIMIT = "limit";
+    public static final String LEI_NO = "leiNo";
+    public static final String CP_BANK_NAME = "cpBankName";
+    public static final String CP_BRANCH_NAME = "cpBranchName";
+    public static final String CP_ACCOUNT_NO = "cpAccountNo";
+    public static final String CP_IFSC = "cpIfsc";
+    public static final String TDS_APPLICABLE = "tdsApplicable";
+    public static final String TDS_RATE = "tdsRate";
+    public static final String INSTITUTION_TYPE = "institutionType";
+    public static final String SUBSCRIBED_CAPITAL = "subscribedCapital";
+    public static final String LAST_BALANCE_SHEET_DATE = "lastBalanceSheetDate";
+    public static final String IN_LIQUIDATION = "inLiquidation";
+
+    // Script parameters
+    public static final String SLR_TYPE = "slrType";
+    public static final String SCRIPT_DESC = "scriptDesc";
+    public static final String ISIN = "isin";
+    public static final String FACE_VALUE_PER_UNIT = "faceValuePerUnit";
+    public static final String INT_RATE = "intRate";
+    public static final String ISSUE_DATE = "issueDate";
+    public static final String MATURITY_DATE = "maturityDate";
+    public static final String COMPANY_NAME = "companyName";
+    public static final String CORP_CODE = "corpCode";
+    public static final String RATING = "rating";
+    public static final String RATING_AGENCY = "ratingAgency";
+    public static final String LISTED = "listed";
+
+    public static final Set<String> PARTY_PARAMS = Set.of(BOND_TYPE, PARTY_NAME, ADDRESS1, ADDRESS2, ADDRESS3, CITY, PINCODE, PHONE, FAX,
+            BANK_TYPE, GL_ACCOUNT_ID, INTEREST_GL_ACCOUNT_ID, RBI_CODE, EXPOSURE_LIMIT, LEI_NO, CP_BANK_NAME, CP_BRANCH_NAME, CP_ACCOUNT_NO, CP_IFSC, ACTIVE,
+            TDS_APPLICABLE, TDS_RATE, INSTITUTION_TYPE, SUBSCRIBED_CAPITAL, LAST_BALANCE_SHEET_DATE, IN_LIQUIDATION, LOCALE, DATE_FORMAT);
+
+    public static final Set<String> SCRIPT_PARAMS = Set.of(BOND_TYPE, SLR_TYPE, SCRIPT_DESC, GL_ACCOUNT_ID, ISIN, FACE_VALUE_PER_UNIT,
+            INT_RATE, ISSUE_DATE, MATURITY_DATE, COMPANY_NAME, ADDRESS1, ADDRESS2, ADDRESS3, CITY, PINCODE, PHONE, FAX, CORP_CODE,
+            RATING, RATING_AGENCY, LISTED, ACTIVE, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentApiDates.java

@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.ResolverStyle;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+
+/** Query-parameter dates of the Investment APIs: DD-MM-YYYY, strictly (31-02 is refused, not moved to month end). */
+public final class InvestmentApiDates {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-uuuu").withResolverStyle(ResolverStyle.STRICT);
+
+    private InvestmentApiDates() {}
+
+    /** The date in {@code value}, or {@code fallback} when it is blank; a malformed date is a clear 403, not a 500. */
+    public static LocalDate parse(final String value, final LocalDate fallback, final String name) {
+        if (value == null || value.isBlank()) {
+            if (fallback == null) {
+                throw new GeneralPlatformDomainRuleException("error.msg.investment.date.required", "Enter the " + name + " as DD-MM-YYYY",
+                        name);
+            }
+            return fallback;
+        }
+        try {
+            return LocalDate.parse(value.trim(), DATE);
+        } catch (final DateTimeParseException e) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.date.invalid", "Enter the " + name + " as DD-MM-YYYY",
+                    value);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentBucketReportApiResource.java

@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.ResolverStyle;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentBucketReportData;
+import org.apache.fineract.portfolio.investment.service.InvestmentBucketReportService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/bucket-report")
+@Component
+@Tag(name = "Investment Bucket Wise", description = "Investments held on a date, split by the time left to maturity.")
+@RequiredArgsConstructor
+public class InvestmentBucketReportApiResource {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-uuuu").withResolverStyle(ResolverStyle.STRICT);
+
+    private final PlatformSecurityContext context;
+    private final InvestmentBucketReportService reportService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Bucket Wise Investment", description = "asOnDate dd-MM-yyyy; default today")
+    public InvestmentBucketReportData report(@QueryParam("asOnDate") @Parameter(description = "dd-MM-yyyy") final String asOnDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        if (asOnDate == null || asOnDate.isBlank()) {
+            return this.reportService.report(DateUtils.getBusinessLocalDate());
+        }
+        final LocalDate asOn;
+        try {
+            asOn = LocalDate.parse(asOnDate.trim(), DATE);
+        } catch (final DateTimeParseException e) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.report.date.invalid", "Enter the date as DD-MM-YYYY",
+                    asOnDate);
+        }
+        if (asOn.isAfter(DateUtils.getBusinessLocalDate())) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.report.future", "The as-on date cannot be after today");
+        }
+        return this.reportService.report(asOn);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDailyRateApiConstants.java

@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for the Daily Script Master (market rate of a script for a day). */
+public final class InvestmentDailyRateApiConstants {
+
+    private InvestmentDailyRateApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTDAILYRATE";
+    public static final String RESOURCE = "investmentdailyrate";
+
+    public static final String SCRIPT_ID = "scriptId";
+    public static final String RATE_DATE = "rateDate";
+    public static final String OPEN_RATE = "openRate";
+    public static final String HIGH_RATE = "highRate";
+    public static final String LOW_RATE = "lowRate";
+    public static final String CLOSE_RATE = "closeRate";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(SCRIPT_ID, RATE_DATE, OPEN_RATE, HIGH_RATE, LOW_RATE, CLOSE_RATE, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDailyRateApiResource.java

@@ -0,0 +1,93 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentDailyRateData;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/daily-rates")
+@Component
+@Tag(name = "Investment Daily Script Master", description = "Market rate of each script for a day; Purchase Entry takes its rate from here.")
+@RequiredArgsConstructor
+public class InvestmentDailyRateApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentDailyRateReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List daily script rates, newest first")
+    public List<InvestmentDailyRateData> retrieveAll(@QueryParam("scriptId") @Parameter(description = "scriptId") final Long scriptId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentDailyRateApiConstants.ENTITY);
+        return this.readPlatformService.retrieveAll(scriptId);
+    }
+
+    @GET
+    @Path("latest")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Newest rate of a script on or before a date", description = "onDate (dd-MM-yyyy) defaults to the business "
+            + "date. Returns no content when no rate has been entered for the script.")
+    public InvestmentDailyRateData retrieveLatest(@QueryParam("scriptId") @Parameter(description = "scriptId") final Long scriptId,
+            @QueryParam("onDate") @Parameter(description = "dd-MM-yyyy") final String onDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentDailyRateApiConstants.ENTITY);
+        final LocalDate on = InvestmentApiDates.parse(onDate, DateUtils.getBusinessLocalDate(), "date");
+        return this.readPlatformService.retrieveLatest(scriptId, on);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Save a daily script rate")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentDailyRate().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{rateId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop a daily script rate")
+    public CommandProcessingResult delete(@PathParam("rateId") @Parameter(description = "rateId") final Long rateId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentDailyRate(rateId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDealSlipApiResource.java

@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentDealSlipData;
+import org.apache.fineract.portfolio.investment.service.InvestmentDealSlipService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/deal-slips")
+@Component
+@Tag(name = "Investment Deal Slips", description = "Serially numbered deal slips of every purchase, sale, refund, redemption and "
+        + "switch, cancelled ones included, with the confirmation and who entered, approved and settled each deal.")
+@RequiredArgsConstructor
+public class InvestmentDealSlipApiResource {
+
+    /** Default window when no dates are given: the last 30 days. */
+    private static final int DEFAULT_DAYS = 30;
+
+    private final PlatformSecurityContext context;
+    private final InvestmentDealSlipService dealSlipService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Deal slip register", description = "Deals dated fromDate to toDate (dd-MM-yyyy; default the last 30 days) "
+            + "in slip number order; or the one slip numbered slipNo (a purchase deal number or a sale number).")
+    public List<InvestmentDealSlipData> retrieve(@QueryParam("fromDate") @Parameter(description = "dd-MM-yyyy") final String fromDate,
+            @QueryParam("toDate") @Parameter(description = "dd-MM-yyyy") final String toDate,
+            @QueryParam("slipNo") @Parameter(description = "202627000001 or 202627S00001") final String slipNo) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        if (StringUtils.isNotBlank(slipNo)) {
+            return this.dealSlipService.slip(slipNo);
+        }
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        final LocalDate to = InvestmentApiDates.parse(toDate, today, "To date");
+        final LocalDate from = InvestmentApiDates.parse(fromDate, to.minusDays(DEFAULT_DAYS), "From date");
+        if (to.isBefore(from)) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.dealslip.dates", "The To date cannot be before the From date");
+        }
+        return this.dealSlipService.register(from, to);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDiaryApiResource.java

@@ -0,0 +1,78 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentDiaryData;
+import org.apache.fineract.portfolio.investment.service.InvestmentDiaryService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/diary")
+@Component
+@Tag(name = "Investment Due Date Diary", description = "Coupons, provisions, amortisation, FD payouts and maturities due in a period.")
+@RequiredArgsConstructor
+public class InvestmentDiaryApiResource {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+    /** Default window when no dates are given: today and the next 30 days. */
+    private static final int DEFAULT_DAYS = 30;
+
+    private final PlatformSecurityContext context;
+    private final InvestmentDiaryService diaryService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Due Date Diary for all investments", description = "fromDate / toDate dd-MM-yyyy; default today to 30 days ahead")
+    public InvestmentDiaryData diary(@QueryParam("fromDate") @Parameter(description = "dd-MM-yyyy") final String fromDate,
+            @QueryParam("toDate") @Parameter(description = "dd-MM-yyyy") final String toDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        final LocalDate from = date(fromDate, today);
+        final LocalDate to = date(toDate, from.plusDays(DEFAULT_DAYS));
+        if (to.isBefore(from)) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.diary.dates", "The To date cannot be before the From date");
+        }
+        return this.diaryService.diary(from, to);
+    }
+
+    private static LocalDate date(final String value, final LocalDate fallback) {
+        if (value == null || value.isBlank()) {
+            return fallback;
+        }
+        try {
+            return LocalDate.parse(value.trim(), DATE);
+        } catch (final DateTimeParseException e) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.diary.date.invalid", "Enter the date as DD-MM-YYYY", value);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentFdApiConstants.java

@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+/** Fixed deposits placed with other banks. */
+public final class InvestmentFdApiConstants {
+
+    private InvestmentFdApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTFD";
+    public static final String BOND_TYPE_FD = "FD";
+
+    public static final String STATUS_ACTIVE = "ACTIVE";
+    public static final String STATUS_MATURED = "MATURED";
+    public static final String STATUS_PREMATURE = "PREMATURE";
+    public static final String STATUS_RENEWED = "RENEWED";
+
+    /** When the interest is paid: all at maturity (the usual case), or every half year / year. */
+    public static final String PAYOUT_AT_MATURITY = "MATURITY";
+    public static final String PAYOUT_HALF_YEARLY = "HALF_YEARLY";
+    public static final String PAYOUT_YEARLY = "YEARLY";
+    public static final Set<String> PAYOUTS = Set.of(PAYOUT_AT_MATURITY, PAYOUT_HALF_YEARLY, PAYOUT_YEARLY);
+
+    /** How the maturity amount is worked out, to compare with the bank's figure (Jitendra Sir). */
+    public static final String CALC_SIMPLE = "SIMPLE";
+    public static final String CALC_MONTHLY = "MONTHLY";
+    public static final String CALC_QUARTERLY = "QUARTERLY";
+    public static final String CALC_HALF_YEARLY = "HALF_YEARLY";
+    public static final String CALC_YEARLY = "YEARLY";
+    public static final Set<String> CALC_TYPES = Set.of(CALC_SIMPLE, CALC_MONTHLY, CALC_QUARTERLY, CALC_HALF_YEARLY, CALC_YEARLY);
+
+    /** RBI: deposits with other banks within 20% of total deposits as on the previous 31 March, and within 5% with one bank. */
+    public static final BigDecimal GROSS_LIMIT_PERCENT = BigDecimal.valueOf(20);
+    public static final BigDecimal BANK_LIMIT_PERCENT = BigDecimal.valueOf(5);
+    /** Current accounts with banks also count towards the 20% inter-bank exposure. */
+    public static final String BANK_BALANCE_HEADER_GL_CODE = "100200";
+    /** Deposits of the bank, for the suggested total-deposits figure: everything under the deposit header, plus RD. */
+    public static final String DEPOSIT_HEADER_GL_CODE = "200100";
+    public static final String RD_DEPOSIT_GL_CODE = "200201";
+
+    public static final String PARTY_ID = "partyId";
+    public static final String CERT_NO = "certNo";
+    public static final String CERT_DATE = "certDate";
+    public static final String DEAL_DATE = "dealDate";
+    public static final String AMOUNT = "amount";
+    public static final String INT_RATE = "intRate";
+    public static final String MATURITY_DATE = "maturityDate";
+    public static final String PAYOUT = "payout";
+    public static final String CALC_TYPE = "calcType";
+    public static final String BANK_GL_ACCOUNT_ID = "bankGlAccountId";
+    public static final String REMARKS = "remarks";
+    public static final String AS_ON_DATE = "asOnDate";
+    public static final String TOTAL_DEPOSITS = "totalDeposits";
+    public static final String OWNED_FUNDS = "ownedFunds";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final String CLOSURE_MATURITY = "MATURITY";
+    public static final String CLOSURE_PREMATURE = "PREMATURE";
+    public static final String CLOSURE_RENEWAL = "RENEWAL";
+    public static final String LINE_PROVISION = "PROVISION";
+    public static final String LINE_PAYOUT = "PAYOUT";
+    public static final String INTEREST_RECEIVABLE_GL_CODE = "100603";
+    /** Tax the other bank deducts from the interest, recoverable from the tax department. */
+    public static final String TDS_RECEIVABLE_GL_CODE = "100602";
+
+    public static final String CLOSE_DATE = "closeDate";
+    public static final String RECEIVED_AMOUNT = "receivedAmount";
+    public static final String TDS = "tds";
+    public static final String PENAL_AMOUNT = "penalAmount";
+    public static final String PRINCIPAL_BANK_GL_ACCOUNT_ID = "principalBankGlAccountId";
+    public static final String INTEREST_BANK_GL_ACCOUNT_ID = "interestBankGlAccountId";
+    public static final String NEW_CERT_NO = "newCertNo";
+    public static final String NEW_CERT_DATE = "newCertDate";
+    public static final String NEW_INT_RATE = "newIntRate";
+    public static final String NEW_MATURITY_DATE = "newMaturityDate";
+    public static final String NEW_PAYOUT = "newPayout";
+    public static final String NEW_CALC_TYPE = "newCalcType";
+    public static final String MATURITY_AMOUNT = "maturityAmount";
+    public static final String RENEWAL_AMOUNT = "renewalAmount";
+    public static final String DIFF_BANK_GL_ACCOUNT_ID = "diffBankGlAccountId";
+
+    public static final String LINE_MATURITY = "MATURITY";
+    public static final String LINE_TYPE = "lineType";
+    public static final String INT_DATE = "intDate";
+    /** Reminders show lines due within this many days (as for Govt securities). */
+    public static final int DUE_WITHIN_DAYS = 2;
+    public static final Set<String> INTEREST_PARAMS = Set.of(LINE_TYPE, INT_DATE, RECEIVED_AMOUNT, TDS, BANK_GL_ACCOUNT_ID, LOCALE,
+            DATE_FORMAT);
+
+    public static final Set<String> MATURE_PARAMS = Set.of(RECEIVED_AMOUNT, TDS, PRINCIPAL_BANK_GL_ACCOUNT_ID, INTEREST_BANK_GL_ACCOUNT_ID,
+            REMARKS, LOCALE, DATE_FORMAT);
+    public static final Set<String> PREMATURE_PARAMS = Set.of(CLOSE_DATE, RECEIVED_AMOUNT, TDS, PENAL_AMOUNT, PRINCIPAL_BANK_GL_ACCOUNT_ID,
+            INTEREST_BANK_GL_ACCOUNT_ID, REMARKS, LOCALE, DATE_FORMAT);
+    public static final Set<String> RENEW_PARAMS = Set.of(NEW_CERT_NO, NEW_CERT_DATE, NEW_INT_RATE, NEW_MATURITY_DATE, NEW_PAYOUT,
+            NEW_CALC_TYPE, MATURITY_AMOUNT, RENEWAL_AMOUNT, TDS, DIFF_BANK_GL_ACCOUNT_ID, REMARKS, LOCALE, DATE_FORMAT);
+
+    public static final Set<String> FD_PARAMS = Set.of(PARTY_ID, CERT_NO, CERT_DATE, DEAL_DATE, AMOUNT, INT_RATE, MATURITY_DATE, PAYOUT,
+            CALC_TYPE, BANK_GL_ACCOUNT_ID, REMARKS, LOCALE, DATE_FORMAT);
+    public static final Set<String> BASE_PARAMS = Set.of(AS_ON_DATE, TOTAL_DEPOSITS, OWNED_FUNDS, REMARKS, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentFdApiResource.java

@@ -0,0 +1,199 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentFdClosureData;
+import org.apache.fineract.portfolio.investment.data.InvestmentFdData;
+import org.apache.fineract.portfolio.investment.data.InvestmentFdDueData;
+import org.apache.fineract.portfolio.investment.data.InvestmentFdScheduleData;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdClosureService;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdInterestService;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/fds")
+@Component
+@Tag(name = "Investment FD", description = "Fixed deposits the bank places with other banks.")
+@RequiredArgsConstructor
+public class InvestmentFdApiResource {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final PlatformSecurityContext context;
+    private final InvestmentFdService fdService;
+    private final InvestmentFdClosureService closureService;
+    private final InvestmentFdInterestService interestService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "All FDs placed with other banks")
+    public List<InvestmentFdData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.fdService.retrieveAll();
+    }
+
+    @GET
+    @Path("quote")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Preview an FD: interest, maturity amount and the RBI limits", description = "Dates dd-MM-yyyy")
+    public InvestmentFdData quote(@QueryParam("partyId") final Long partyId, @QueryParam("amount") final BigDecimal amount,
+            @QueryParam("intRate") final BigDecimal intRate, @QueryParam("dealDate") final String dealDate,
+            @QueryParam("maturityDate") final String maturityDate, @QueryParam("payout") final String payout,
+            @QueryParam("calcType") final String calcType) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.fdService.quote(partyId, amount, intRate, date(dealDate), date(maturityDate), payout, calcType);
+    }
+
+    @GET
+    @Path("due")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "FD interest vouchers and maturities due", description = "Due now or within withinDays (default 2)")
+    public List<InvestmentFdDueData> due(@QueryParam("withinDays") final Integer withinDays) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.interestService.due(withinDays == null ? InvestmentFdApiConstants.DUE_WITHIN_DAYS : withinDays);
+    }
+
+    @GET
+    @Path("{fdId}/interest-schedule")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Interest lines of an FD", description = "31 Mar / 30 Sep provisions, payouts and maturity")
+    public InvestmentFdScheduleData schedule(@PathParam("fdId") final Long fdId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.interestService.schedule(fdId);
+    }
+
+    @POST
+    @Path("{fdId}/interest")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Post the next interest line of an FD", description = "lineType PROVISION | PAYOUT, intDate; payout: receivedAmount, tds")
+    public CommandProcessingResult postInterest(@PathParam("fdId") final Long fdId, @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        return this.commandsSourceWritePlatformService
+                .logCommandSource(new CommandWrapperBuilder().postInvestmentFdInterest(fdId).withJson(apiRequestBodyAsJson).build());
+    }
+
+    @GET
+    @Path("{fdId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "One FD")
+    public InvestmentFdData retrieveOne(@PathParam("fdId") @Parameter(description = "fdId") final Long fdId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.fdService.retrieveOne(fdId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Place an FD", description = "Dr the bank's FD GL / Cr our bank GL, dated the deal date; refused beyond the RBI limits.")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentFd().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @GET
+    @Path("{fdId}/closure-quote")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Preview a maturity, premature closure or renewal", description = "type MATURITY | PREMATURE | RENEWAL")
+    public InvestmentFdClosureData closureQuote(@PathParam("fdId") final Long fdId, @QueryParam("type") final String type,
+            @QueryParam("closeDate") final String closeDate, @QueryParam("receivedAmount") final BigDecimal receivedAmount,
+            @QueryParam("tds") final BigDecimal tds, @QueryParam("renewalAmount") final BigDecimal renewalAmount,
+            @QueryParam("principalBankGlAccountId") final Long principalBankGlAccountId,
+            @QueryParam("interestBankGlAccountId") final Long interestBankGlAccountId,
+            @QueryParam("diffBankGlAccountId") final Long diffBankGlAccountId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentFdApiConstants.ENTITY);
+        return this.closureService.quote(fdId, type, date(closeDate), receivedAmount, tds, renewalAmount, principalBankGlAccountId,
+                interestBankGlAccountId, diffBankGlAccountId);
+    }
+
+    @POST
+    @Path("{fdId}/mature")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Close an FD at maturity", description = "Dated the maturity date; amount as credited by the bank, optional TDS.")
+    public CommandProcessingResult mature(@PathParam("fdId") final Long fdId, @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        return this.commandsSourceWritePlatformService
+                .logCommandSource(new CommandWrapperBuilder().matureInvestmentFd(fdId).withJson(apiRequestBodyAsJson).build());
+    }
+
+    @POST
+    @Path("{fdId}/premature")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Close an FD before maturity", description = "Not calculated: the amount received (and any penal interest) is entered.")
+    public CommandProcessingResult premature(@PathParam("fdId") final Long fdId, @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        return this.commandsSourceWritePlatformService
+                .logCommandSource(new CommandWrapperBuilder().prematureInvestmentFd(fdId).withJson(apiRequestBodyAsJson).build());
+    }
+
+    @POST
+    @Path("{fdId}/renew")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Renew an FD at maturity", description = "New certificate, rate and maturity; money added or taken out goes through a bank GL.")
+    public CommandProcessingResult renew(@PathParam("fdId") final Long fdId, @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        return this.commandsSourceWritePlatformService
+                .logCommandSource(new CommandWrapperBuilder().renewInvestmentFd(fdId).withJson(apiRequestBodyAsJson).build());
+    }
+
+    @POST
+    @Path("deposit-base")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Record total deposits as on a 31 March", description = "The base of the RBI limits for the following year.")
+    public CommandProcessingResult setDepositBase(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().setInvestmentDepositBase().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    private static LocalDate date(final String value) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        try {
+            return LocalDate.parse(value.trim(), DATE);
+        } catch (final java.time.format.DateTimeParseException e) {
+            // A half-typed date is a bad request, not a server error.
+            throw new GeneralPlatformDomainRuleException("error.msg.investmentfd.date.invalid", "Enter the date as DD-MM-YYYY", value);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentInterestApiConstants.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for posting an interest schedule line (coupon or closing provision) of a holding to GL. */
+public final class InvestmentInterestApiConstants {
+
+    private InvestmentInterestApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTINTEREST";
+    public static final String RESOURCE = "investmentinterest";
+
+    public static final String LINE_TYPE = "lineType";
+    public static final String INT_DATE = "intDate";
+    /** Bank GL the coupon is received into; defaults to the purchase's paying bank. */
+    public static final String BANK_GL_ACCOUNT_ID = "bankGlAccountId";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(LINE_TYPE, INT_DATE, BANK_GL_ACCOUNT_ID, LOCALE, DATE_FORMAT);
+
+    /** A line shows as a task this many days before its date (Jitendra Sir). */
+    public static final int DUE_WITHIN_DAYS = 2;
+
+    public static final String INTEREST_RECEIVABLE_GL_CODE = "100603";
+    public static final String INTEREST_INCOME_GOVT_SECURITIES_GL_CODE = "400401";
+    public static final String INTEREST_INCOME_BONDS_GL_CODE = "400402";
+
+    /** Income GL for a holding's interest: SLR govt securities, or bonds / debentures for the rest. */
+    public static String interestIncomeGlCode(final String bondType) {
+        return "GOVT_SECURITY".equals(bondType) ? INTEREST_INCOME_GOVT_SECURITIES_GL_CODE : INTEREST_INCOME_BONDS_GL_CODE;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentInterestApiResource.java

@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestDueData;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestPostingData;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/interest-postings")
+@Component
+@Tag(name = "Investment Interest Posting", description = "Interest lines of holdings that are due to be posted with a voucher.")
+@RequiredArgsConstructor
+public class InvestmentInterestApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentPurchaseReadPlatformService readPlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Posted interest lines", description = "Coupons and closing provisions already posted to GL with their "
+            + "voucher, newest first.")
+    public List<InvestmentInterestPostingData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentInterestApiConstants.ENTITY);
+        return this.readPlatformService.retrieveInterestPostings();
+    }
+
+    @GET
+    @Path("due")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Interest lines due", description = "For every active holding, its next unposted interest line when that "
+            + "line's date is past or within withinDays days (default 2).")
+    public List<InvestmentInterestDueData> due(@QueryParam("withinDays") @Parameter(description = "withinDays") final Integer withinDays) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentInterestApiConstants.ENTITY);
+        return this.readPlatformService
+                .retrieveDueInterest(withinDays == null ? InvestmentInterestApiConstants.DUE_WITHIN_DAYS : withinDays);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentInterestReportApiResource.java

@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.ResolverStyle;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestReportData;
+import org.apache.fineract.portfolio.investment.service.InvestmentInterestReportService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/interest-report")
+@Component
+@Tag(name = "Investment Interest Received & Receivable", description = "Interest received in a period and receivable at its end.")
+@RequiredArgsConstructor
+public class InvestmentInterestReportApiResource {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-uuuu").withResolverStyle(ResolverStyle.STRICT);
+
+    private final PlatformSecurityContext context;
+    private final InvestmentInterestReportService reportService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Total Interest Received & Receivable", description = "fromDate / toDate dd-MM-yyyy; default 1 April of the "
+            + "current financial year to today")
+    public InvestmentInterestReportData report(@QueryParam("fromDate") @Parameter(description = "dd-MM-yyyy") final String fromDate,
+            @QueryParam("toDate") @Parameter(description = "dd-MM-yyyy") final String toDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        final LocalDate to = date(toDate, today);
+        if (to.isAfter(today)) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.report.future", "The To date cannot be after today");
+        }
+        // Without a From date the report runs from 1 April of the To date's financial year.
+        final LocalDate fyStart = LocalDate.of(to.getMonthValue() >= 4 ? to.getYear() : to.getYear() - 1, Month.APRIL, 1);
+        final LocalDate from = date(fromDate, fyStart);
+        if (to.isBefore(from)) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.report.dates", "The To date cannot be before the From date");
+        }
+        return this.reportService.report(from, to);
+    }
+
+    private static LocalDate date(final String value, final LocalDate fallback) {
+        if (value == null || value.isBlank()) {
+            return fallback;
+        }
+        try {
+            return LocalDate.parse(value.trim(), DATE);
+        } catch (final DateTimeParseException e) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.report.date.invalid", "Enter the date as DD-MM-YYYY", value);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPartyApiResource.java

@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+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.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentPartyData;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/parties")
+@Component
+@Tag(name = "Investment Bank / Party Master", description = "Counterparties an investment is bought from or placed with.")
+@RequiredArgsConstructor
+public class InvestmentPartyApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentMasterReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment parties")
+    public List<InvestmentPartyData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_PARTY);
+        return this.readPlatformService.retrieveAllParties();
+    }
+
+    @GET
+    @Path("{partyId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment party")
+    public InvestmentPartyData retrieveOne(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_PARTY);
+        return this.readPlatformService.retrieveParty(partyId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Create an investment party")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentParty().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @PUT
+    @Path("{partyId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Update an investment party")
+    public CommandProcessingResult update(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().updateInvestmentParty(partyId).withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{partyId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop an investment party")
+    public CommandProcessingResult delete(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentParty(partyId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPurchaseApiConstants.java

@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for the Investment Purchase Entry (a deal that creates a holding). */
+public final class InvestmentPurchaseApiConstants {
+
+    private InvestmentPurchaseApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTPURCHASE";
+    public static final String RESOURCE = "investmentpurchase";
+
+    public static final Set<String> SETTLEMENT_TYPES = Set.of("T+0", "T+1", "T+2");
+    public static final Set<String> CATEGORIES = Set.of("HTM (Held To Maturity)", "AFS (Available For Sale)", "HFT (Held For Trading)");
+
+    /** Saved deal; nothing posted to GL until it is settled. */
+    public static final String STATUS_PENDING_SETTLEMENT = "PENDING_SETTLEMENT";
+    /** Settled: posted to GL on the settlement date, now a holding. */
+    public static final String STATUS_ACTIVE = "ACTIVE";
+    /** Every unit sold before maturity. */
+    public static final String STATUS_SOLD = "SOLD";
+    /** Repaid at maturity. */
+    public static final String STATUS_REDEEMED = "REDEEMED";
+    /** Dropped before settlement; kept so its deal and certificate numbers are never given out again. */
+    public static final String STATUS_DROPPED = "DROPPED";
+
+    /** GLs the settlement entry debits besides the script's investment GL. */
+    public static final String BROKEN_PERIOD_INTEREST_GL_CODE = "500606";
+    public static final String STAMP_DUTY_GL_CODE = "500601";
+    public static final String BROKERAGE_GL_CODE = "500602";
+    public static final String OTHER_CHARGES_GL_CODE = "500603";
+
+    public static final String BOND_TYPE = "bondType";
+    public static final String SCRIPT_ID = "scriptId";
+    public static final String PARTY_ID = "partyId";
+    public static final String DEAL_DATE = "dealDate";
+    public static final String DEAL_TIME = "dealTime";
+    public static final String SETTLEMENT_TYPE = "settlementType";
+    public static final String FACE_VALUE = "faceValue";
+    public static final String PURCHASE_RATE = "purchaseRate";
+    public static final String CONSIDER_AMT = "considerAmt";
+    public static final String NAV = "nav";
+    public static final String STAMP_DUTY = "stampDuty";
+    public static final String BROKERAGE = "brokerage";
+    public static final String OTHER_CHARGES = "otherCharges";
+    public static final String CATEGORY = "category";
+    public static final String LAST_INT_DATE = "lastIntDate";
+    public static final String CR_GL_ACCOUNT_ID = "crGlAccountId";
+    public static final String SUB_TYPE = "subType";
+    /** Optional legacy fields (trade no, authorities, lien, delivery mode, …) kept as a JSON object. */
+    public static final String OTHER_DETAILS = "otherDetails";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(BOND_TYPE, SCRIPT_ID, PARTY_ID, DEAL_DATE, DEAL_TIME, SETTLEMENT_TYPE, FACE_VALUE,
+            PURCHASE_RATE, CONSIDER_AMT, NAV, STAMP_DUTY, BROKERAGE, OTHER_CHARGES, CATEGORY, LAST_INT_DATE, CR_GL_ACCOUNT_ID, SUB_TYPE,
+            OTHER_DETAILS, InvestmentApiConstants.CONFIRMATION_MODE, LOCALE, DATE_FORMAT);
+    /** Settle may carry the counterparty's confirmation of the deal. */
+    public static final Set<String> SETTLE_PARAMS = Set.of(InvestmentApiConstants.CONFIRMATION_RECEIVED_ON,
+            InvestmentApiConstants.CONFIRMATION_REF, LOCALE, DATE_FORMAT);
+
+    /** Dividend received on a share holding: Dr Bank / Cr 400404 Dividend on Investments, dated the day it is received. */
+    public static final String DIVIDEND_GL_CODE = "400404";
+    public static final String DIVIDEND_DATE = "dividendDate";
+    public static final String AMOUNT = "amount";
+    public static final String BANK_GL_ACCOUNT_ID = "bankGlAccountId";
+    public static final String REMARKS = "remarks";
+    public static final Set<String> DIVIDEND_PARAMS = Set.of(DIVIDEND_DATE, AMOUNT, BANK_GL_ACCOUNT_ID, REMARKS, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPurchaseApiResource.java

@@ -0,0 +1,252 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentDividendData;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestScheduleData;
+import org.apache.fineract.portfolio.investment.data.InvestmentNonSlrLimitData;
+import org.apache.fineract.portfolio.investment.data.InvestmentPurchaseData;
+import org.apache.fineract.portfolio.investment.data.InvestmentSaleData;
+import org.apache.fineract.portfolio.investment.data.InvestmentShareLimitData;
+import org.apache.fineract.portfolio.investment.service.InvestmentNonSlrService;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
+import org.apache.fineract.portfolio.investment.service.InvestmentSaleReadPlatformService;
+import org.apache.fineract.portfolio.investment.service.InvestmentShareService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/purchases")
+@Component
+@Tag(name = "Investment Purchase Entry", description = "Investment deals (Govt Security, Bond, Mutual Fund, …) — each becomes a holding.")
+@RequiredArgsConstructor
+public class InvestmentPurchaseApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentPurchaseReadPlatformService readPlatformService;
+    private final InvestmentSaleReadPlatformService saleReadPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+    private final InvestmentNonSlrService nonSlrService;
+    private final InvestmentShareService shareService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment purchases (holdings)")
+    public List<InvestmentPurchaseData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        return this.readPlatformService.retrieveAll();
+    }
+
+    @GET
+    @Path("non-slr-limit")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "RBI non-SLR limits for a purchase", description = "Where a non-SLR purchase of amount (book value) in scriptId "
+            + "on dealDate (dd-MM-yyyy, default today) stands against the 10% limits; any of them may be left out.")
+    public InvestmentNonSlrLimitData nonSlrLimit(@QueryParam("scriptId") @Parameter(description = "scriptId") final Long scriptId,
+            @QueryParam("dealDate") @Parameter(description = "dd-MM-yyyy") final String dealDate,
+            @QueryParam("amount") @Parameter(description = "amount") final BigDecimal amount) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate date = InvestmentApiDates.parse(dealDate, DateUtils.getBusinessLocalDate(), "deal date");
+        return this.nonSlrService.limits(date, scriptId, amount);
+    }
+
+    @GET
+    @Path("share-limit")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "RBI limits for a share purchase", description = "Where a purchase of amount (book value) of shares of partyId "
+            + "on dealDate (dd-MM-yyyy, default today) stands against the 2% of owned funds and 5% of the society's capital limits; "
+            + "membership shares are exempt.")
+    public InvestmentShareLimitData shareLimit(@QueryParam("partyId") @Parameter(description = "partyId") final Long partyId,
+            @QueryParam("dealDate") @Parameter(description = "dd-MM-yyyy") final String dealDate,
+            @QueryParam("amount") @Parameter(description = "amount") final BigDecimal amount) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate date = InvestmentApiDates.parse(dealDate, DateUtils.getBusinessLocalDate(), "deal date");
+        return this.shareService.limits(date, partyId, amount);
+    }
+
+    @GET
+    @Path("dividends")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Dividends received on share holdings", description = "Newest first, with their vouchers.")
+    public List<InvestmentDividendData> retrieveDividends() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        return this.shareService.retrieveDividends();
+    }
+
+    @GET
+    @Path("{purchaseId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment purchase")
+    public InvestmentPurchaseData retrieveOne(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        return this.readPlatformService.retrieveOne(purchaseId);
+    }
+
+    @GET
+    @Path("{purchaseId}/interest-schedule")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Interest schedule of a holding", description = "Half-yearly coupons and 31 Mar / 30 Sep closing provisions "
+            + "from purchase to maturity. Calculated only — nothing is posted. asOnDate (dd-MM-yyyy) defaults to the business date.")
+    public InvestmentInterestScheduleData retrieveInterestSchedule(
+            @PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @QueryParam("asOnDate") @Parameter(description = "dd-MM-yyyy") final String asOnDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate asOn = StringUtils.isBlank(asOnDate) ? null : InvestmentApiDates.parse(asOnDate, null, "as-on date");
+        return this.readPlatformService.retrieveInterestSchedule(purchaseId, asOn);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Save a purchase entry")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentPurchase().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/settle")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Settle a purchase", description = "On or after the settlement date: posts the purchase to GL dated the "
+            + "settlement date and makes the deal an active holding.")
+    public CommandProcessingResult settle(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().settleInvestmentPurchase(purchaseId)
+                .withJson(StringUtils.isBlank(apiRequestBodyAsJson) ? "{}" : apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/interest-postings")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Post an interest line", description = "Posts the next interest schedule line (coupon or closing provision) "
+            + "of a holding to GL with a JV voucher, on or after its date and in date order.")
+    public CommandProcessingResult postInterest(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().postInvestmentInterest(purchaseId).withJson(apiRequestBodyAsJson)
+                .build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @GET
+    @Path("{purchaseId}/redemption-quote")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "What the redemption at maturity will post", description = "Face value back against the book value still "
+            + "held; refused before maturity or while a sale is pending.")
+    public InvestmentSaleData redemptionQuote(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentSaleApiConstants.ENTITY);
+        return this.saleReadPlatformService.quoteRedemption(purchaseId);
+    }
+
+    @POST
+    @Path("{purchaseId}/redeem")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Redeem at maturity", description = "On or after maturity, once every coupon is posted: posts the face value "
+            + "received, dated the maturity date, and closes the holding.")
+    public CommandProcessingResult redeem(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().redeemInvestmentPurchase(purchaseId)
+                .withJson(StringUtils.isBlank(apiRequestBodyAsJson) ? "{}" : apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/write-off")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Write off part of the book value", description = "Dr Loss on Investments / Cr Investment for the amount "
+            + "given; the units stay held at the reduced book value.")
+    public CommandProcessingResult writeOff(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().writeOffInvestmentPurchase(purchaseId).withJson(apiRequestBodyAsJson)
+                .build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/dividends")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Record a dividend received on a share holding", description = "dividendDate, amount, bankGlAccountId, "
+            + "remarks: Dr the bank GL / Cr 400404 Dividend on Investments, dated the day it was received.")
+    public CommandProcessingResult postDividend(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().dividendInvestmentPurchase(purchaseId).withJson(apiRequestBodyAsJson)
+                .build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/transfer")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "GOI Category Transfer", description = "Moves the holding to another security (scriptId) of the same coupon "
+            + "rate, maturity and unit value; the book value moves between GLs only when the two scripts use different GLs.")
+    public CommandProcessingResult transfer(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().transferInvestmentSecurity(purchaseId).withJson(apiRequestBodyAsJson)
+                .build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/switch")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Mutual fund switch", description = "switchDate, units, fromNav, toScriptId, toNav, subType, remarks: the units "
+            + "leave this fund at fromNav and a new deal opens in the other scheme the same day; no bank leg.")
+    public CommandProcessingResult switchFund(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().switchInvestmentFund(purchaseId).withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{purchaseId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop a purchase entry")
+    public CommandProcessingResult delete(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentPurchase(purchaseId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentSaleApiConstants.java

@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Sale (before maturity) and redemption (at maturity) of investment holdings. */
+public final class InvestmentSaleApiConstants {
+
+    private InvestmentSaleApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTSALE";
+    public static final String RESOURCE = "investmentsale";
+
+    public static final String TYPE_SELL = "SELL";
+    public static final String TYPE_REDEEM = "REDEEM";
+    /** Part of the book value written off as a loss; the units stay held. */
+    public static final String TYPE_WRITEOFF = "WRITEOFF";
+    /** A year-end amortisation of premium (31 March); recorded like a sale so the book value comes down. */
+    public static final String TYPE_AMORTISE = "AMORTISE";
+    /** Units of a mutual fund switched at NAV into another scheme the same day; no money comes to the bank. */
+    public static final String TYPE_SWITCH = "SWITCH";
+
+    public static final String STATUS_PENDING_SETTLEMENT = "PENDING_SETTLEMENT";
+    public static final String STATUS_SETTLED = "SETTLED";
+    /** Dropped before settlement; kept so its sale number stays accounted for in the deal slip register. */
+    public static final String STATUS_DROPPED = "DROPPED";
+
+    /** Sales that are deals with a deal slip of their own (a sale number); write-offs and amortisation are not. */
+    public static final Set<String> NUMBERED_TYPES = Set.of(TYPE_SELL, TYPE_REDEEM, TYPE_SWITCH);
+
+    /** Profit on sale / redemption (income) and loss on sale / redemption (expense). */
+    public static final String PROFIT_ON_SALE_GL_CODE = "400405";
+    public static final String LOSS_ON_SALE_GL_CODE = "500605";
+    /** Premium still on the books at maturity is written off to the amortisation expense. */
+    public static final String PREMIUM_AMORTISATION_GL_CODE = "500604";
+    /** Premium paid over face value, held here until amortised (Jitendra Sir). */
+    public static final String PREMIUM_ON_INVESTMENTS_GL_CODE = "100707";
+
+    public static final String PURCHASE_ID = "purchaseId";
+    public static final String PARTY_ID = "partyId";
+    public static final String DEAL_DATE = "dealDate";
+    public static final String DEAL_TIME = "dealTime";
+    public static final String SETTLEMENT_TYPE = "settlementType";
+    public static final String UNITS = "units";
+    public static final String SALE_RATE = "saleRate";
+    public static final String BROKERAGE = "brokerage";
+    public static final String BANK_GL_ACCOUNT_ID = "bankGlAccountId";
+    public static final String SANCTION_AUTHORITY = "sanctionAuthority";
+    public static final String REMARKS = "remarks";
+    public static final String BROKER_CODE = "brokerCode";
+    public static final String AMOUNT = "amount";
+    public static final String FY_END = "fyEnd";
+    public static final String SWITCH_DATE = "switchDate";
+    public static final String FROM_NAV = "fromNav";
+    public static final String TO_SCRIPT_ID = "toScriptId";
+    public static final String TO_NAV = "toNav";
+    public static final String SUB_TYPE = "subType";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> SELL_PARAMS = Set.of(PURCHASE_ID, PARTY_ID, DEAL_DATE, DEAL_TIME, SETTLEMENT_TYPE, UNITS, SALE_RATE,
+            BROKERAGE, BANK_GL_ACCOUNT_ID, SANCTION_AUTHORITY, REMARKS, BROKER_CODE, InvestmentApiConstants.CONFIRMATION_MODE, LOCALE,
+            DATE_FORMAT);
+    /** Settle may carry the counterparty's confirmation of the deal. */
+    public static final Set<String> SETTLE_PARAMS = Set.of(InvestmentApiConstants.CONFIRMATION_RECEIVED_ON,
+            InvestmentApiConstants.CONFIRMATION_REF, LOCALE, DATE_FORMAT);
+    public static final Set<String> REDEEM_PARAMS = Set.of(BANK_GL_ACCOUNT_ID, REMARKS, LOCALE, DATE_FORMAT);
+    public static final Set<String> WRITEOFF_PARAMS = Set.of(AMOUNT, REMARKS, LOCALE, DATE_FORMAT);
+    public static final Set<String> AMORTISE_PARAMS = Set.of(PURCHASE_ID, FY_END, LOCALE, DATE_FORMAT);
+    public static final Set<String> SWITCH_PARAMS = Set.of(SWITCH_DATE, UNITS, FROM_NAV, TO_SCRIPT_ID, TO_NAV, SUB_TYPE, REMARKS, LOCALE,
+            DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentSaleApiResource.java

@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentSaleData;
+import org.apache.fineract.portfolio.investment.service.InvestmentSaleReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/sales")
+@Component
+@Tag(name = "Investment Sale", description = "Sale of holdings before maturity (all or part of the units), settled on the settlement date.")
+@RequiredArgsConstructor
+public class InvestmentSaleApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentSaleReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List sales and redemptions, newest first")
+    public List<InvestmentSaleData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentSaleApiConstants.ENTITY);
+        return this.readPlatformService.retrieveAll();
+    }
+
+    @GET
+    @Path("quote")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Work out a sale before saving it", description = "Price, interest from the buyer, cost, profit or loss "
+            + "and the net amount for the units, rate and deal date given (dd-MM-yyyy).")
+    public InvestmentSaleData quote(@QueryParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @QueryParam("dealDate") @Parameter(description = "dd-MM-yyyy") final String dealDate,
+            @QueryParam("settlementType") @Parameter(description = "T+0 / T+1 / T+2") final String settlementType,
+            @QueryParam("units") @Parameter(description = "units") final BigDecimal units,
+            @QueryParam("saleRate") @Parameter(description = "saleRate") final BigDecimal saleRate,
+            @QueryParam("brokerage") @Parameter(description = "brokerage") final BigDecimal brokerage,
+            @QueryParam("bankGlAccountId") @Parameter(description = "bankGlAccountId") final Long bankGlAccountId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentSaleApiConstants.ENTITY);
+        final LocalDate deal = InvestmentApiDates.parse(dealDate, null, "deal date");
+        return this.readPlatformService.quoteSale(purchaseId, deal, StringUtils.defaultIfBlank(settlementType, "T+0"), units, saleRate,
+                brokerage, bankGlAccountId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Save a sale", description = "Saved pending; nothing reaches the GL until it is settled.")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentSale().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{saleId}/settle")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Settle a sale", description = "On or after the settlement date: posts the sale to GL dated the settlement "
+            + "date and reduces the units held.")
+    public CommandProcessingResult settle(@PathParam("saleId") @Parameter(description = "saleId") final Long saleId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().settleInvestmentSale(saleId)
+                .withJson(StringUtils.isBlank(apiRequestBodyAsJson) ? "{}" : apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{saleId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop a pending sale")
+    public CommandProcessingResult delete(@PathParam("saleId") @Parameter(description = "saleId") final Long saleId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentSale(saleId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentScriptApiResource.java

@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+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.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentScriptData;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/scripts")
+@Component
+@Tag(name = "Investment Script Master", description = "Securities / instruments the bank invests in (Govt Security, Bond, Mutual Fund, …).")
+@RequiredArgsConstructor
+public class InvestmentScriptApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentMasterReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment scripts")
+    public List<InvestmentScriptData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_SCRIPT);
+        return this.readPlatformService.retrieveAllScripts();
+    }
+
+    @GET
+    @Path("{scriptId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment script")
+    public InvestmentScriptData retrieveOne(@PathParam("scriptId") @Parameter(description = "scriptId") final Long scriptId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_SCRIPT);
+        return this.readPlatformService.retrieveScript(scriptId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Create an investment script")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentScript().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @PUT
+    @Path("{scriptId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Update an investment script")
+    public CommandProcessingResult update(@PathParam("scriptId") @Parameter(description = "scriptId") final Long scriptId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().updateInvestmentScript(scriptId).withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentTransferApiResource.java

@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentSecurityTransferData;
+import org.apache.fineract.portfolio.investment.service.InvestmentSecurityTransferService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/transfers")
+@Component
+@Tag(name = "Investment Security Transfer", description = "GOI Category Transfer: a holding moved to another security of the same terms.")
+@RequiredArgsConstructor
+public class InvestmentTransferApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentSecurityTransferService transferService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List security transfers, newest first")
+    public List<InvestmentSecurityTransferData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission("INVESTMENTTRANSFER");
+        return this.transferService.retrieveAll();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentValuationApiConstants.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Market valuation (MTM) of AFS and HFT holdings, with net depreciation held in the Investment Depreciation Reserve. */
+public final class InvestmentValuationApiConstants {
+
+    private InvestmentValuationApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTVALUATION";
+    public static final String RESOURCE = "investmentvaluation";
+
+    /** Categories that are marked to market: HFT monthly, AFS quarterly (or more often). HTM is carried at cost. */
+    public static final Set<String> CATEGORIES = Set.of("AFS", "HFT");
+
+    /** Classes within which gains and losses are netted; one class never offsets another. */
+    public static final String CLASS_GOVT = "GOVT_SECURITY";
+    public static final String CLASS_BOND = "CORPORATE_BOND";
+    public static final String CLASS_FUND = "MUTUAL_FUND";
+    /** Shares are valued by rule, not at a market rate: face value, nil, or ₹1 per institution (see the valuation service). */
+    public static final String CLASS_SHARE = "SHARE";
+
+    /** Depreciation charged to P&L (Provisions &amp; Contingencies) and the reserve it is held in. */
+    public static final String DEPRECIATION_PROVISION_GL_CODE = "500504";
+    public static final String DEPRECIATION_RESERVE_GL_CODE = "200205";
+
+    public static final String VALUATION_DATE = "valuationDate";
+    public static final String CATEGORY = "category";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> RUN_PARAMS = Set.of(VALUATION_DATE, CATEGORY, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentValuationApiResource.java

@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentValuationData;
+import org.apache.fineract.portfolio.investment.service.InvestmentValuationService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/valuations")
+@Component
+@Tag(name = "Investment Valuation", description = "Market valuation (MTM) of AFS / HFT holdings; net depreciation held in the IDR.")
+@RequiredArgsConstructor
+public class InvestmentValuationApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentValuationService valuationService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Valuation runs, newest first")
+    public List<InvestmentValuationData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentValuationApiConstants.ENTITY);
+        return this.valuationService.retrieveAll();
+    }
+
+    @GET
+    @Path("preview")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "What a valuation would find and post, without saving", description = "valuationDate dd-MM-yyyy (default "
+            + "today), category AFS or HFT")
+    public InvestmentValuationData preview(@QueryParam("valuationDate") @Parameter(description = "dd-MM-yyyy") final String valuationDate,
+            @QueryParam("category") @Parameter(description = "AFS or HFT") final String category) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentValuationApiConstants.ENTITY);
+        return this.valuationService.preview(InvestmentApiDates.parse(valuationDate, DateUtils.getBusinessLocalDate(), "valuation date"),
+                category);
+    }
+
+    @GET
+    @Path("{valuationId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "One valuation run with its security-wise lines")
+    public InvestmentValuationData retrieveOne(@PathParam("valuationId") @Parameter(description = "valuationId") final Long valuationId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentValuationApiConstants.ENTITY);
+        return this.valuationService.retrieveOne(valuationId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Run and post a valuation", description = "valuationDate, category (AFS / HFT). Posts the change in IDR: "
+            + "Dr 500504 / Cr 200205 when it grows, the reverse when it falls.")
+    public CommandProcessingResult run(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentValuation().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentAmortisationData.java

@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/** Premium amortisation schedule of an HTM holding: one line per 31 March to maturity, then the rest at maturity. */
+@Getter
+@Builder
+public class InvestmentAmortisationData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String category;
+    private final String settlementDate;
+    private final String maturityDate;
+    private final BigDecimal faceValue;
+    private final BigDecimal premium;
+    private final BigDecimal unamortisedPremium;
+    private final BigDecimal bookValue;
+    private final String premiumGlCode;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** YEAR (31 March) or MATURITY (the remainder, written off on redemption). */
+        private final String kind;
+        private final String fyEnd;
+        private final String fromDate;
+        private final String toDate;
+        private final long days;
+        private final BigDecimal amount;
+        private final BigDecimal premiumAfter;
+        private final boolean posted;
+        private final String voucherNo;
+        private final String glTransactionId;
+        /** Next line to post and its 31 March has come. */
+        private final boolean postable;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentAmortisationDueData.java

@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** A holding's premium amortisation due for a 31 March (Amortize Yearly Process). */
+@Getter
+@Builder
+public class InvestmentAmortisationDueData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String fyEnd;
+    private final String fromDate;
+    private final long days;
+    private final BigDecimal unamortisedPremium;
+    private final BigDecimal amount;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentBucketReportData.java

@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Bucket Wise Investment: Govt Securities, bonds and FDs held on a date, split by the time left to maturity (up to 1
+ * year, over 1 to 3, over 3 to 5, over 5 years).
+ */
+@Getter
+@Builder
+public class InvestmentBucketReportData {
+
+    private final String asOnDate;
+    private final List<Bucket> buckets;
+    private final Bucket total;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Bucket {
+
+        private final String code;
+        private final String label;
+        private final int govtCount;
+        private final BigDecimal govtFaceValue;
+        private final BigDecimal govtBookValue;
+        private final int bondCount;
+        private final BigDecimal bondFaceValue;
+        private final BigDecimal bondBookValue;
+        private final int fdCount;
+        private final BigDecimal fdPrincipal;
+        /** Book value of securities and bonds plus FD principal. */
+        private final BigDecimal totalAmount;
+    }
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** Code of the bucket the holding falls in. */
+        private final String bucket;
+        /** GOVT_SECURITY, BOND (Non-SLR and other bonds) or FD. */
+        private final String instrument;
+        private final Long refId;
+        private final String dealNo;
+        /** Script, or bank and certificate of an FD. */
+        private final String particulars;
+        /** HTM / AFS / HFT of a security; blank for an FD. */
+        private final String category;
+        private final BigDecimal rate;
+        private final String maturityDate;
+        /** Days from the as-on date to maturity; negative when maturity has passed but it is not yet redeemed or closed. */
+        private final long daysToMaturity;
+        /** Face value held, or the FD principal. */
+        private final BigDecimal faceValue;
+        /** Cost less what sales, amortisation and write-offs took off, or the FD principal. */
+        private final BigDecimal bookValue;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentDailyRateData.java

@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDailyRate;
+
+@Getter
+@Builder
+public class InvestmentDailyRateData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final Long scriptId;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String bondType;
+    private final String rateDate;
+    private final BigDecimal openRate;
+    private final BigDecimal highRate;
+    private final BigDecimal lowRate;
+    private final BigDecimal closeRate;
+
+    public static InvestmentDailyRateData from(final InvestmentDailyRate r) {
+        return InvestmentDailyRateData.builder().id(r.getId()).scriptId(r.getScript().getId()).scriptCode(r.getScript().getScriptCode())
+                .scriptDesc(r.getScript().getScriptDesc()).bondType(r.getScript().getBondType())
+                .rateDate(r.getRateDate().format(DATE_FORMAT)).openRate(r.getOpenRate()).highRate(r.getHighRate()).lowRate(r.getLowRate())
+                .closeRate(r.getCloseRate()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentDealSlipData.java

@@ -0,0 +1,94 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * One deal slip: a purchase (BUY) or a sale, refund, redemption or switch, with everything the slip must show — the
+ * counterparty, the security, amount, price, deal date and time, settlement date, how the deal was confirmed, direct or
+ * through a broker (and the brokerage), and who entered, approved, settled or cancelled it. A dropped deal stays on the
+ * register as CANCELLED so its number is accounted for.
+ */
+@Getter
+@Builder
+public class InvestmentDealSlipData {
+
+    /** Purchase deal number (202627000001) or sale number (202627S00001). */
+    private final String slipNo;
+    /** BUY, SELL, REFUND (shares), REDEEM or SWITCH. */
+    private final String side;
+    /** PENDING_SETTLEMENT, SETTLED or CANCELLED. */
+    private final String status;
+    /** Status of the purchase / sale record itself (ACTIVE, SOLD, DROPPED, …). */
+    private final String recordStatus;
+    private final Long purchaseId;
+    private final Long saleId;
+    /** Deal number of the holding (for a sale, the purchase it sells from). */
+    private final String dealNo;
+    private final String certNo;
+    private final String dealDate;
+    private final String dealTime;
+    private final String settlementType;
+    private final String settlementDate;
+    private final String partyCode;
+    private final String counterparty;
+    private final String bondType;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String isin;
+    private final String category;
+    private final BigDecimal units;
+    private final BigDecimal faceValue;
+    /** Price per ₹100 of face value, NAV per unit or price per share. */
+    private final BigDecimal price;
+    /** Price of the units without interest or charges. */
+    private final BigDecimal consideration;
+    private final BigDecimal accruedInterest;
+    private final BigDecimal brokerage;
+    /** Stamp duty and other charges of a purchase. */
+    private final BigDecimal otherCharges;
+    /** Money paid out (purchase) or received (sale). */
+    private final BigDecimal netAmount;
+    private final String bankGlCode;
+    private final String bankGlName;
+    /** DIRECT or BROKER. */
+    private final String dealMode;
+    private final String brokerCode;
+    private final String tradeNo;
+    private final String orderNo;
+    private final String confirmationMode;
+    private final String confirmationReceivedOn;
+    private final String confirmationRef;
+    private final String enteredBy;
+    private final String enteredOn;
+    private final String approvedBy;
+    private final String approvedOn;
+    private final String settledBy;
+    private final String settledOn;
+    private final String settleApprovedBy;
+    private final String settleApprovedOn;
+    private final String cancelledBy;
+    private final String cancelledOn;
+    private final String voucherNo;
+    private final String glTransactionId;
+    private final String remarks;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentDiaryData.java

@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Due Date Diary: every dated event of the active investments in a period — Govt Security / bond coupons and 31 Mar /
+ * 30 Sep provisions, maturities, premium amortisation, and FD provisions, payouts and maturities.
+ */
+@Getter
+@Builder
+public class InvestmentDiaryData {
+
+    private final String fromDate;
+    private final String toDate;
+    private final String asOnDate;
+    private final int pendingCount;
+    private final int overdueCount;
+    /** Money expected in the period from coupons, FD payouts and maturities not yet received. */
+    private final BigDecimal expectedInflow;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        private final String date;
+        /** COUPON, PROVISION, MATURITY, AMORTISATION (Govt Security / bond); FD_PROVISION, FD_PAYOUT, FD_MATURITY. */
+        private final String kind;
+        /** SECURITY or FD — which screen the entry belongs to. */
+        private final String instrument;
+        private final Long refId;
+        private final String dealNo;
+        /** Script, or bank and certificate of an FD. */
+        private final String particulars;
+        private final BigDecimal amount;
+        /** POSTED, OVERDUE, DUE (today), UPCOMING. */
+        private final String status;
+        private final String voucherNo;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentDividendData.java

@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDividend;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+
+/** A dividend received on a share holding, with its voucher. */
+@Getter
+@Builder
+public class InvestmentDividendData {
+
+    private final Long id;
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final Long partyId;
+    private final String partyName;
+    private final String dividendDate;
+    private final BigDecimal amount;
+    private final String bankGlCode;
+    private final String bankGlName;
+    private final String remarks;
+    private final String glTransactionId;
+    private final String voucherNo;
+
+    public static InvestmentDividendData from(final InvestmentDividend d) {
+        final InvestmentPurchase p = d.getPurchase();
+        return InvestmentDividendData.builder().id(d.getId()).purchaseId(p.getId()).dealNo(p.getDealNo()).certNo(p.getCertNo())
+                .scriptCode(p.getScript().getScriptCode()).scriptDesc(p.getScript().getScriptDesc()).partyId(p.getParty().getId())
+                .partyName(p.getParty().getPartyName()).dividendDate(d.getDividendDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")))
+                .amount(d.getAmount()).bankGlCode(d.getBankGlAccount().getGlCode()).bankGlName(d.getBankGlAccount().getName())
+                .remarks(d.getRemarks()).glTransactionId(d.getGlTransactionId()).voucherNo(d.getVoucherNo()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentFdClosureData.java

@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+/** What closing an FD (maturity, premature or renewal) works out to, and the voucher it posts. */
+@Getter
+@Builder
+public class InvestmentFdClosureData {
+
+    private final Long fdId;
+    private final String dealNo;
+    private final String type;
+    private final String closeDate;
+    private final BigDecimal principal;
+    /** Interest the system works out for the period, to compare with the bank's figure. */
+    private final BigDecimal expectedInterest;
+    /** Interest already booked by provisions and not yet received. */
+    private final BigDecimal provisioned;
+    /** Money credited to our bank by the other bank (net of TDS). */
+    private final BigDecimal receivedAmount;
+    private final BigDecimal tds;
+    private final BigDecimal penalAmount;
+    /** Gross interest as per the bank: received + TDS − principal. */
+    private final BigDecimal interest;
+    /** Interest income of this entry: interest less what was provisioned (negative = reversed from income). */
+    private final BigDecimal income;
+    /** Bank's interest less the system's. */
+    private final BigDecimal difference;
+    private final BigDecimal renewalAmount;
+    /** Renewal: money added (positive) or taken out (negative) against the maturity amount. */
+    private final BigDecimal topUp;
+    private final List<Line> lines;
+
+    @Getter
+    @AllArgsConstructor
+    public static class Line {
+
+        private final String side;
+        private final String glCode;
+        private final String glName;
+        private final BigDecimal amount;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentFdData.java

@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.portfolio.investment.domain.InvestmentFd;
+
+/** An FD placed with another bank; also the shape of a purchase preview (with the limit check). */
+@Getter
+@Builder
+public class InvestmentFdData {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final String dealNo;
+    private final Long partyId;
+    private final String partyCode;
+    private final String partyName;
+    /** TDS rate the bank deducts on interest; null when it does not deduct TDS. */
+    private final BigDecimal tdsRate;
+    private final String certNo;
+    private final String certDate;
+    private final String dealDate;
+    private final BigDecimal principal;
+    private final BigDecimal intRate;
+    private final String maturityDate;
+    private final long days;
+    private final String payout;
+    private final String calcType;
+    private final BigDecimal expectedInterest;
+    private final BigDecimal expectedMaturityAmount;
+    /** Interest paid each half year / year for a payout FD. */
+    private final BigDecimal periodInterest;
+    private final String fdGlCode;
+    private final String fdGlName;
+    private final String interestGlCode;
+    private final String interestGlName;
+    private final Long bankGlAccountId;
+    private final String bankGlCode;
+    private final String bankGlName;
+    private final String status;
+    private final String remarks;
+    private final String glTransactionId;
+    private final String voucherNo;
+    private final String renewedFromDealNo;
+    private final String closedOnDate;
+    private final String closureType;
+    private final BigDecimal closureAmount;
+    private final BigDecimal closureInterest;
+    private final BigDecimal closureTds;
+    private final BigDecimal closurePenal;
+    private final String closureVoucherNo;
+    private final String closureGlTransactionId;
+    private final InvestmentFdLimitData limit;
+
+    public static InvestmentFdData from(final InvestmentFd f, final BigDecimal periodInterest) {
+        return builder().id(f.getId()).dealNo(f.getDealNo()).partyId(f.getParty().getId()).partyCode(f.getParty().getPartyCode())
+                .partyName(f.getParty().getPartyName())
+                .tdsRate(f.getParty().isTdsApplicable() ? f.getParty().getTdsRate() : null).certNo(f.getCertNo())
+                .certDate(format(f.getCertDate()))
+                .dealDate(format(f.getDealDate())).principal(f.getPrincipal()).intRate(f.getIntRate())
+                .maturityDate(format(f.getMaturityDate())).days(ChronoUnit.DAYS.between(f.getDealDate(), f.getMaturityDate()))
+                .payout(f.getPayout()).calcType(f.getCalcType()).expectedInterest(f.getExpectedInterest())
+                .expectedMaturityAmount(f.getExpectedMaturityAmount()).periodInterest(periodInterest).fdGlCode(code(f.getFdGlAccount()))
+                .fdGlName(name(f.getFdGlAccount())).interestGlCode(code(f.getInterestGlAccount())).interestGlName(name(f.getInterestGlAccount()))
+                .bankGlAccountId(f.getBankGlAccount().getId()).bankGlCode(code(f.getBankGlAccount())).bankGlName(name(f.getBankGlAccount()))
+                .status(f.getStatus()).remarks(f.getRemarks()).glTransactionId(f.getGlTransactionId()).voucherNo(f.getVoucherNo())
+                .renewedFromDealNo(f.getRenewedFrom() == null ? null : f.getRenewedFrom().getDealNo()).closedOnDate(format(f.getClosedOnDate()))
+                .closureType(f.getClosureType()).closureAmount(f.getClosureAmount()).closureInterest(f.getClosureInterest())
+                .closureTds(f.getClosureTds()).closurePenal(f.getClosurePenal()).closureVoucherNo(f.getClosureVoucherNo()).closureGlTransactionId(f.getClosureGlTransactionId()).build();
+    }
+
+    private static String code(final GLAccount gl) {
+        return gl == null ? null : gl.getGlCode();
+    }
+
+    private static String name(final GLAccount gl) {
+        return gl == null ? null : gl.getName();
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentFdDueData.java

@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** The next interest voucher (or the maturity) of an FD that is due, or due within the reminder window. */
+@Getter
+@Builder
+public class InvestmentFdDueData {
+
+    private final Long fdId;
+    private final String dealNo;
+    private final String partyName;
+    private final String certNo;
+    /** PROVISION, PAYOUT or MATURITY. */
+    private final String lineType;
+    private final String intDate;
+    /** What the bank credits (net of TDS); a provision line: what it books. */
+    private final BigDecimal amount;
+    private final BigDecimal grossInterest;
+    private final BigDecimal tds;
+    private final boolean postable;
+    private final boolean overdue;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentFdLimitData.java

@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** Where a new FD stands against the RBI limits on deposits with other banks. */
+@Getter
+@Builder
+public class InvestmentFdLimitData {
+
+    /** The 31 March the limits are based on. */
+    private final String asOnDate;
+    /** Total deposits as on that date, as entered; empty until someone enters it. */
+    private final BigDecimal totalDeposits;
+    /** Owned funds (paid-up share capital + reserves) as on that date, the base of the 2% limit on co-operative shares. */
+    private final BigDecimal ownedFunds;
+    /** The same figure worked out from the deposit GLs, as a suggestion. */
+    private final BigDecimal glTotalDeposits;
+    private final BigDecimal grossLimit;
+    private final BigDecimal fdOutstanding;
+    private final BigDecimal bankBalances;
+    private final BigDecimal grossAfter;
+    private final BigDecimal bankLimit;
+    private final String partyName;
+    private final BigDecimal bankAfter;
+    private final BigDecimal newAmount;
+    private final boolean withinLimits;
+    private final String message;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentFdScheduleData.java

@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/** Interest lines of an FD: 31 Mar / 30 Sep provisions, payouts of a half-yearly / yearly FD, and maturity. */
+@Getter
+@Builder
+public class InvestmentFdScheduleData {
+
+    private final InvestmentFdData fd;
+    /** Provisioned interest not yet received (interest receivable of this FD). */
+    private final BigDecimal provisioned;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** PROVISION, PAYOUT or MATURITY (shown for information; closed on the Maturity screen). */
+        private final String lineType;
+        private final String intDate;
+        private final String fromDate;
+        private final String toDate;
+        private final long days;
+        private final BigDecimal grossInterest;
+        /** Payout: the part already provisioned, cleared from interest receivable. */
+        private final BigDecimal alreadyBooked;
+        private final BigDecimal tds;
+        /** Provision: interest booked. Payout: interest income of the payout (gross less already booked). */
+        private final BigDecimal amount;
+        private final boolean posted;
+        private final String voucherNo;
+        private final String glTransactionId;
+        /** The next line to post, and its date has come. */
+        private final boolean postable;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestDueData.java

@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** The next unposted interest line of a holding that is due, or due within the reminder window — a task to post. */
+@Getter
+@Builder
+public class InvestmentInterestDueData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String lineType;
+    private final String intDate;
+    private final BigDecimal grossInterest;
+    private final BigDecimal amount;
+    /** The date has come: it can be posted now. */
+    private final boolean postable;
+    /** The date has passed without posting. */
+    private final boolean overdue;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestPostingData.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** An interest line (coupon or closing provision) already posted to GL with its voucher — for the transaction log. */
+@Getter
+@Builder
+public class InvestmentInterestPostingData {
+
+    private final Long id;
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String bondType;
+    private final String scriptDesc;
+    private final String lineType;
+    private final String intDate;
+    private final String fromDate;
+    private final String toDate;
+    private final BigDecimal grossInterest;
+    private final BigDecimal alreadyBooked;
+    private final BigDecimal amount;
+    /** Debit side: the bank for a coupon, interest receivable for a provision. */
+    private final String drGlCode;
+    private final String drGlName;
+    private final String incomeGlCode;
+    private final String incomeGlName;
+    private final String glTransactionId;
+    private final String voucherNo;
+    private final String postedOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestReportData.java

@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Total Interest Received & Receivable: per Govt Security / bond deal and FD, the interest received in a period and
+ * the interest earned up to its last day that has not come in yet.
+ */
+@Getter
+@Builder
+public class InvestmentInterestReportData {
+
+    private final String fromDate;
+    private final String toDate;
+    private final BigDecimal totalReceived;
+    private final BigDecimal totalReceivable;
+    private final BigDecimal totalProvisioned;
+    private final BigDecimal total;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** SECURITY or FD. */
+        private final String instrument;
+        private final Long refId;
+        private final String dealNo;
+        /** Script, or bank and certificate of an FD. */
+        private final String particulars;
+        private final String status;
+        /** Face value of the deal as bought, or the FD principal. */
+        private final BigDecimal principal;
+        private final BigDecimal rate;
+        /** Interest that came in during the period (coupons, FD payouts, interest paid at closure), gross of TDS. */
+        private final BigDecimal received;
+        /** Interest earned up to the To date and not yet received. */
+        private final BigDecimal receivable;
+        /** Part of the receivable already booked by 31 Mar / 30 Sep provisions (Interest Receivable 100603). */
+        private final BigDecimal provisioned;
+        private final BigDecimal total;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestScheduleData.java

@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Interest schedule of one holding: every half-yearly coupon and every 31 March / 30 September closing provision from
+ * purchase to maturity. Calculated, not yet posted.
+ */
+@Getter
+@Builder
+public class InvestmentInterestScheduleData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final BigDecimal faceValue;
+    private final BigDecimal unitValue;
+    private final BigDecimal balanceUnits;
+    private final BigDecimal purchaseRate;
+    private final BigDecimal bookValue;
+    private final BigDecimal intRate;
+    private final String dealDate;
+    private final String lastIntDate;
+    private final String maturityDate;
+    /**
+     * Broken-period interest paid to the seller at purchase — booked as an expense (GL 500606), not in this schedule.
+     */
+    private final BigDecimal purchasedAccruedInterest;
+    private final BigDecimal couponPerHalfYear;
+    private final String asOnDate;
+    private final String interestGlCode;
+    private final String interestGlName;
+    /** Bank the coupon is received into by default: the purchase's paying bank. */
+    private final Long bankGlAccountId;
+    private final String bankGlCode;
+    private final String bankGlName;
+    private final String status;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** COUPON (cash received) or PROVISION (closing accrual). */
+        private final String type;
+        private final String intDate;
+        private final String fromDate;
+        private final String toDate;
+        private final int days;
+        /** Coupon received, or interest earned since the last coupon up to the closing. */
+        private final BigDecimal grossInterest;
+        /** Interest Receivable balance before this line (purchased accrued interest / earlier provision). */
+        private final BigDecimal alreadyBooked;
+        /** Provision to book now, or the part of the coupon that is new income. */
+        private final BigDecimal amount;
+        /** True when the date is on or before the as-on date. */
+        private final boolean due;
+        /** Posted to GL: its JV voucher and GL transaction. */
+        private final boolean posted;
+        private final String voucherNo;
+        private final String glTransactionId;
+        private final String postedOnDate;
+        /** The next line to post and its date has come. */
+        private final boolean postable;
+        /** Unposted and its date is within the reminder window (or past). */
+        private final boolean dueSoon;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentNonSlrLimitData.java

@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** Where a new non-SLR purchase stands against the RBI limits on non-SLR and unlisted non-SLR investments. */
+@Getter
+@Builder
+public class InvestmentNonSlrLimitData {
+
+    /** The 31 March the limits are based on. */
+    private final String asOnDate;
+    /** Total deposits as on that date, as entered for the FD limits; empty until someone enters it. */
+    private final BigDecimal totalDeposits;
+    /** 10% of total deposits. */
+    private final BigDecimal nonSlrLimit;
+    /** Book value of non-SLR investments held or pending settlement, before this deal. */
+    private final BigDecimal nonSlrOutstanding;
+    private final BigDecimal nonSlrAfter;
+    /** Book value of non-SLR investments held on that 31 March. */
+    private final BigDecimal nonSlrBase;
+    /** 10% of the non-SLR investments held on that 31 March. */
+    private final BigDecimal unlistedLimit;
+    private final BigDecimal unlistedOutstanding;
+    private final BigDecimal unlistedAfter;
+    private final BigDecimal newAmount;
+    /** Whether this deal's security is listed or proposed to be listed; unlisted ones also count against the unlisted limit. */
+    private final boolean listed;
+    private final boolean withinLimits;
+    private final String message;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentPartyData.java

@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentParty;
+
+@Getter
+@Builder
+public class InvestmentPartyData {
+
+    private final Long id;
+    private final String partyCode;
+    private final String bondType;
+    private final String partyName;
+    private final String address1;
+    private final String address2;
+    private final String address3;
+    private final String city;
+    private final String pincode;
+    private final String phone;
+    private final String fax;
+    private final String bankType;
+    private final Long glAccountId;
+    private final String glCode;
+    private final String glName;
+    private final Long interestGlAccountId;
+    private final String interestGlCode;
+    private final String interestGlName;
+    private final boolean tdsApplicable;
+    private final BigDecimal tdsRate;
+    private final String rbiCode;
+    private final BigDecimal limit;
+    private final String leiNo;
+    private final String cpBankName;
+    private final String cpBranchName;
+    private final String cpAccountNo;
+    private final String cpIfsc;
+    private final String institutionType;
+    private final BigDecimal subscribedCapital;
+    private final String lastBalanceSheetDate;
+    private final boolean inLiquidation;
+    private final boolean active;
+
+    public static InvestmentPartyData from(final InvestmentParty p) {
+        return InvestmentPartyData.builder().id(p.getId()).partyCode(p.getPartyCode()).bondType(p.getBondType())
+                .partyName(p.getPartyName()).address1(p.getAddress1()).address2(p.getAddress2()).address3(p.getAddress3())
+                .city(p.getCity()).pincode(p.getPincode()).phone(p.getPhone()).fax(p.getFax()).bankType(p.getBankType())
+                .glAccountId(p.getGlAccount().getId()).glCode(p.getGlAccount().getGlCode()).glName(p.getGlAccount().getName())
+                .interestGlAccountId(p.getInterestGlAccount() == null ? null : p.getInterestGlAccount().getId())
+                .interestGlCode(p.getInterestGlAccount() == null ? null : p.getInterestGlAccount().getGlCode())
+                .interestGlName(p.getInterestGlAccount() == null ? null : p.getInterestGlAccount().getName())
+                .tdsApplicable(p.isTdsApplicable()).tdsRate(p.getTdsRate()).rbiCode(p.getRbiCode()).limit(p.getExposureLimit())
+                .leiNo(p.getLeiNo()).cpBankName(p.getCpBankName())
+                .cpBranchName(p.getCpBranchName()).cpAccountNo(p.getCpAccountNo()).cpIfsc(p.getCpIfsc())
+                .institutionType(p.getInstitutionType()).subscribedCapital(p.getSubscribedCapital())
+                .lastBalanceSheetDate(p.getLastBalanceSheetDate() == null ? null
+                        : p.getLastBalanceSheetDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")))
+                .inLiquidation(p.isInLiquidation()).active(p.isActive()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentPurchaseData.java

@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+
+@Getter
+@Builder
+public class InvestmentPurchaseData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final String dealNo;
+    private final String certNo;
+    private final String bondType;
+    private final Long scriptId;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String isin;
+    private final Long partyId;
+    private final String partyCode;
+    private final String partyName;
+    private final String dealDate;
+    private final String dealTime;
+    private final String settlementType;
+    private final String settlementDate;
+    private final BigDecimal faceValue;
+    private final BigDecimal purchaseRate;
+    private final BigDecimal units;
+    private final BigDecimal balanceUnits;
+    private final BigDecimal brokerage;
+    private final BigDecimal stampDuty;
+    private final BigDecimal otherCharges;
+    private final BigDecimal bookValue;
+    private final BigDecimal premiumDiscount;
+    private final BigDecimal intRate;
+    private final String issueDate;
+    private final String maturityDate;
+    private final String lastIntDate;
+    private final Integer accruedDays;
+    private final BigDecimal accruedInterest;
+    private final BigDecimal settlementAmount;
+    private final BigDecimal ytm;
+    private final String category;
+    private final String subType;
+    private final Long investmentGlAccountId;
+    private final String investmentGlCode;
+    private final String investmentGlName;
+    private final Long crGlAccountId;
+    private final String crGlCode;
+    private final String crGlName;
+    private final String otherDetails;
+    private final String confirmationMode;
+    private final String confirmationReceivedOn;
+    private final String confirmationRef;
+    private final String status;
+    private final String glTransactionId;
+    private final String settledOnDate;
+
+    public static InvestmentPurchaseData from(final InvestmentPurchase p) {
+        return InvestmentPurchaseData.builder().id(p.getId()).dealNo(p.getDealNo()).certNo(p.getCertNo()).bondType(p.getBondType())
+                .scriptId(p.getScript().getId()).scriptCode(p.getScript().getScriptCode()).scriptDesc(p.getScript().getScriptDesc())
+                .isin(p.getScript().getIsin()).partyId(p.getParty().getId()).partyCode(p.getParty().getPartyCode())
+                .partyName(p.getParty().getPartyName()).dealDate(format(p.getDealDate())).dealTime(p.getDealTime())
+                .settlementType(p.getSettlementType()).settlementDate(format(p.getSettlementDate())).faceValue(p.getFaceValue())
+                .purchaseRate(p.getPurchaseRate()).units(p.getUnits()).balanceUnits(p.getBalanceUnits()).brokerage(p.getBrokerage())
+                .stampDuty(p.getStampDuty()).otherCharges(p.getOtherCharges()).bookValue(p.getBookValue())
+                .premiumDiscount(p.getPremiumDiscount()).intRate(p.getIntRate()).issueDate(format(p.getIssueDate()))
+                .maturityDate(format(p.getMaturityDate())).lastIntDate(format(p.getLastIntDate())).accruedDays(p.getAccruedDays())
+                .accruedInterest(p.getAccruedInterest()).settlementAmount(p.getSettlementAmount()).ytm(p.getYtm()).category(p.getCategory())
+                .subType(p.getSubType()).investmentGlAccountId(p.getInvestmentGlAccount().getId())
+                .investmentGlCode(p.getInvestmentGlAccount().getGlCode()).investmentGlName(p.getInvestmentGlAccount().getName())
+                .crGlAccountId(p.getCrGlAccount().getId()).crGlCode(p.getCrGlAccount().getGlCode()).crGlName(p.getCrGlAccount().getName())
+                .otherDetails(p.getOtherDetails()).confirmationMode(p.getConfirmationMode())
+                .confirmationReceivedOn(format(p.getConfirmationReceivedOn())).confirmationRef(p.getConfirmationRef())
+                .status(p.getStatus()).glTransactionId(p.getGlTransactionId())
+                .settledOnDate(format(p.getSettledOnDate())).build();
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentSaleData.java

@@ -0,0 +1,110 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentSale;
+
+/** A sale or redemption of a holding — also the shape of a quote before it is saved. */
+@Getter
+@Builder
+public class InvestmentSaleData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final Long purchaseId;
+    private final String dealNo;
+    /** Deal slip number of the sale itself, e.g. 202627S00001 (empty for a write-off or amortisation). */
+    private final String saleNo;
+    private final String certNo;
+    private final String bondType;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String saleType;
+    private final Long partyId;
+    private final String partyName;
+    private final String dealDate;
+    private final String dealTime;
+    private final String settlementType;
+    private final String settlementDate;
+    private final BigDecimal units;
+    private final BigDecimal faceValue;
+    private final BigDecimal saleRate;
+    private final BigDecimal consideration;
+    private final Integer accruedDays;
+    private final BigDecimal accruedInterest;
+    private final BigDecimal receivableCleared;
+    /** Interest from the buyer not yet booked: accrued interest less the receivable cleared. */
+    private final BigDecimal interestIncome;
+    private final BigDecimal brokerage;
+    private final BigDecimal bookValueSold;
+    private final BigDecimal premiumCleared;
+    private final BigDecimal profitLoss;
+    private final BigDecimal netAmount;
+    private final Long bankGlAccountId;
+    private final String bankGlCode;
+    private final String bankGlName;
+    private final String investmentGlCode;
+    /** GL the premium share is credited to: 100707, or the investment GL for deals settled before it was used. */
+    private final String premiumGlCode;
+    private final String sanctionAuthority;
+    private final String remarks;
+    private final String brokerCode;
+    private final String confirmationMode;
+    private final String confirmationReceivedOn;
+    private final String confirmationRef;
+    private final String status;
+    private final String glTransactionId;
+    private final String voucherNo;
+    private final String settledOnDate;
+
+    public static InvestmentSaleData from(final InvestmentSale s) {
+        return builder().id(s.getId()).purchaseId(s.getPurchase().getId()).dealNo(s.getPurchase().getDealNo()).saleNo(s.getSaleNo())
+                .certNo(s.getPurchase().getCertNo()).bondType(s.getPurchase().getBondType())
+                .scriptCode(s.getPurchase().getScript().getScriptCode()).scriptDesc(s.getPurchase().getScript().getScriptDesc())
+                .saleType(s.getSaleType()).partyId(s.getParty() == null ? null : s.getParty().getId())
+                .partyName(s.getParty() == null ? null : s.getParty().getPartyName()).dealDate(format(s.getDealDate()))
+                .dealTime(s.getDealTime()).settlementType(s.getSettlementType()).settlementDate(format(s.getSettlementDate()))
+                .units(s.getUnits()).faceValue(s.getFaceValue()).saleRate(s.getSaleRate()).consideration(s.getConsideration())
+                .accruedDays(s.getAccruedDays()).accruedInterest(s.getAccruedInterest()).receivableCleared(s.getReceivableCleared())
+                .interestIncome(zero(s.getAccruedInterest()).subtract(zero(s.getReceivableCleared()))).brokerage(s.getBrokerage())
+                .bookValueSold(s.getBookValueSold()).premiumCleared(s.getPremiumCleared()).profitLoss(s.getProfitLoss()).netAmount(s.getNetAmount())
+                .bankGlAccountId(s.getBankGlAccount().getId()).bankGlCode(s.getBankGlAccount().getGlCode())
+                .bankGlName(s.getBankGlAccount().getName()).investmentGlCode(s.getPurchase().getInvestmentGlAccount().getGlCode())
+                .premiumGlCode(s.getPurchase().getPremiumGlAccount() != null ? s.getPurchase().getPremiumGlAccount().getGlCode()
+                        : s.getPurchase().getInvestmentGlAccount().getGlCode())
+                .sanctionAuthority(s.getSanctionAuthority()).remarks(s.getRemarks()).brokerCode(s.getBrokerCode())
+                .confirmationMode(s.getConfirmationMode()).confirmationReceivedOn(format(s.getConfirmationReceivedOn()))
+                .confirmationRef(s.getConfirmationRef()).status(s.getStatus())
+                .glTransactionId(s.getGlTransactionId()).voucherNo(s.getVoucherNo()).settledOnDate(format(s.getSettledOnDate())).build();
+    }
+
+    private static BigDecimal zero(final BigDecimal v) {
+        return v == null ? BigDecimal.ZERO : v;
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentScriptData.java

@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScript;
+
+@Getter
+@Builder
+public class InvestmentScriptData {
+
+    /** Dates go out as DD-MM-YYYY, the format the Investment screens use throughout. */
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final String scriptCode;
+    private final String bondType;
+    private final String slrType;
+    private final String scriptDesc;
+    private final Long glAccountId;
+    private final String glCode;
+    private final String glName;
+    private final String isin;
+    private final BigDecimal faceValuePerUnit;
+    private final BigDecimal intRate;
+    private final String issueDate;
+    private final String maturityDate;
+    private final String companyName;
+    private final String address1;
+    private final String address2;
+    private final String address3;
+    private final String city;
+    private final String pincode;
+    private final String phone;
+    private final String fax;
+    private final String corpCode;
+    private final String rating;
+    private final String ratingAgency;
+    private final boolean listed;
+    private final boolean active;
+
+    public static InvestmentScriptData from(final InvestmentScript s) {
+        return InvestmentScriptData.builder().id(s.getId()).scriptCode(s.getScriptCode()).bondType(s.getBondType())
+                .slrType(s.getSlrType()).scriptDesc(s.getScriptDesc()).glAccountId(s.getGlAccount().getId())
+                .glCode(s.getGlAccount().getGlCode()).glName(s.getGlAccount().getName()).isin(s.getIsin())
+                .faceValuePerUnit(s.getFaceValuePerUnit()).intRate(s.getIntRate()).issueDate(format(s.getIssueDate()))
+                .maturityDate(format(s.getMaturityDate())).companyName(s.getCompanyName()).address1(s.getAddress1())
+                .address2(s.getAddress2()).address3(s.getAddress3()).city(s.getCity()).pincode(s.getPincode()).phone(s.getPhone())
+                .fax(s.getFax()).corpCode(s.getCorpCode()).rating(s.getRating()).ratingAgency(s.getRatingAgency()).listed(s.isListed())
+                .active(s.isActive()).build();
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentSecurityTransferData.java

@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentSecurityTransfer;
+
+/** A GOI Category Transfer of a holding, for the transaction log. */
+@Getter
+@Builder
+public class InvestmentSecurityTransferData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String bondType;
+    private final String fromScriptCode;
+    private final String fromScriptDesc;
+    private final String toScriptCode;
+    private final String toScriptDesc;
+    private final String fromGlCode;
+    private final String toGlCode;
+    private final String toGlName;
+    private final String transferDate;
+    private final BigDecimal units;
+    private final BigDecimal bookValue;
+    private final String remarks;
+    private final String glTransactionId;
+    private final String voucherNo;
+
+    public static InvestmentSecurityTransferData from(final InvestmentSecurityTransfer t) {
+        return builder().id(t.getId()).purchaseId(t.getPurchase().getId()).dealNo(t.getPurchase().getDealNo())
+                .certNo(t.getPurchase().getCertNo()).bondType(t.getPurchase().getBondType()).fromScriptCode(t.getFromScript().getScriptCode())
+                .fromScriptDesc(t.getFromScript().getScriptDesc()).toScriptCode(t.getToScript().getScriptCode())
+                .toScriptDesc(t.getToScript().getScriptDesc()).fromGlCode(t.getFromGlAccount().getGlCode())
+                .toGlCode(t.getToGlAccount().getGlCode()).toGlName(t.getToGlAccount().getName())
+                .transferDate(t.getTransferDate().format(DATE_FORMAT)).units(t.getUnits()).bookValue(t.getBookValue())
+                .remarks(t.getRemarks()).glTransactionId(t.getGlTransactionId()).voucherNo(t.getVoucherNo()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentShareLimitData.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Where a share purchase stands against the RBI limits: shares of co-operative societies within 2% of owned funds, and
+ * within 5% of one society's subscribed capital. Membership shares (DCCB, State Co-op Bank, NPCI / CCIL / SWIFT, Umbrella
+ * Organisation, IDPIC) may exceed them.
+ */
+@Getter
+@Builder
+public class InvestmentShareLimitData {
+
+    /** The 31 March the owned funds are taken from. */
+    private final String asOnDate;
+    private final String institutionType;
+    /** True for membership shares, which the limits do not bind. */
+    private final boolean exempt;
+    private final BigDecimal ownedFunds;
+    private final BigDecimal coopLimit;
+    private final BigDecimal coopOutstanding;
+    private final BigDecimal coopAfter;
+    private final String partyName;
+    private final BigDecimal subscribedCapital;
+    private final BigDecimal institutionLimit;
+    private final BigDecimal institutionOutstanding;
+    private final BigDecimal institutionAfter;
+    private final BigDecimal newAmount;
+    private final boolean withinLimits;
+    private final String message;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentValuationData.java

@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * A market valuation (MTM) of AFS or HFT holdings: a preview before posting (no id) or a posted run. Each security is
+ * valued at the Daily Script Master rate; the IDR needed per class is its net loss, a net gain is ignored.
+ */
+@Getter
+@Builder
+public class InvestmentValuationData {
+
+    private final Long id;
+    private final String valuationDate;
+    private final String category;
+    private final BigDecimal requiredTotal;
+    /** IDR held from the category's previous run. */
+    private final BigDecimal previousTotal;
+    /** Posted (or to be posted): more provision when positive, a write-back when negative. */
+    private final BigDecimal delta;
+    private final String provisionGlCode;
+    private final String reserveGlCode;
+    private final String glTransactionId;
+    private final String voucherNo;
+    /** Date of the category's last run, if any; a new run must be dated after it. */
+    private final String lastRunDate;
+    /** Scripts held with no rate on or before the valuation date: the run is refused until they are entered. */
+    private final List<String> missingRates;
+    /** A preview can be posted: no rate missing, dated after the last run, and something to value or to write back. */
+    private final boolean postable;
+    private final List<ClassTotal> classes;
+    private final List<Line> lines;
+
+    @Getter
+    @Builder
+    public static class ClassTotal {
+
+        /** GOVT_SECURITY, CORPORATE_BOND or MUTUAL_FUND. */
+        private final String assetClass;
+        private final BigDecimal bookValue;
+        private final BigDecimal marketValue;
+        private final BigDecimal netDifference;
+        private final BigDecimal required;
+    }
+
+    @Getter
+    @Builder
+    public static class Line {
+
+        private final Long purchaseId;
+        private final String dealNo;
+        private final String certNo;
+        private final String bondType;
+        private final String scriptCode;
+        private final String scriptDesc;
+        private final String assetClass;
+        private final BigDecimal units;
+        private final BigDecimal bookValue;
+        private final BigDecimal rate;
+        private final String rateDate;
+        private final BigDecimal marketValue;
+        private final BigDecimal difference;
+        /** How a share was valued; empty for a holding valued at its market rate. */
+        private final String valuationBasis;
+        private final boolean npi;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDailyRate.java

@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Daily Script Master: the market rate of a script for one day, as the bank's existing CBS keeps it. Purchase Entry
+ * takes its rate from here (Jitendra Sir). Close rate is mandatory; open, high and low are optional.
+ */
+@Entity
+@Table(name = "m_investment_daily_rate")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentDailyRate extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "script_id", nullable = false)
+    private InvestmentScript script;
+
+    @Column(name = "rate_date", nullable = false)
+    private LocalDate rateDate;
+
+    @Column(name = "open_rate", scale = 6, precision = 19)
+    private BigDecimal openRate;
+
+    @Column(name = "high_rate", scale = 6, precision = 19)
+    private BigDecimal highRate;
+
+    @Column(name = "low_rate", scale = 6, precision = 19)
+    private BigDecimal lowRate;
+
+    @Column(name = "close_rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal closeRate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDailyRateRepository.java

@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentDailyRateRepository extends JpaRepository<InvestmentDailyRate, Long> {
+
+    boolean existsByScriptIdAndRateDate(Long scriptId, LocalDate rateDate);
+
+    /** The newest rate of a script on or before a date. */
+    Optional<InvestmentDailyRate> findFirstByScriptIdAndRateDateLessThanEqualOrderByRateDateDesc(Long scriptId, LocalDate onDate);
+
+    List<InvestmentDailyRate> findByScriptIdOrderByRateDateDesc(Long scriptId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDepositBase.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** The bank's total deposits as on a 31 March: the base for the RBI limits on deposits placed with other banks. */
+@Entity
+@Table(name = "m_investment_deposit_base")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentDepositBase extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @Column(name = "as_on_date", nullable = false, unique = true)
+    private LocalDate asOnDate;
+
+    @Column(name = "total_deposits", scale = 6, precision = 19, nullable = false)
+    private BigDecimal totalDeposits;
+
+    /** Owned funds (paid-up share capital + reserves) on the same date: shares of co-operative societies are limited to 2% of it. */
+    @Column(name = "owned_funds", scale = 6, precision = 19)
+    private BigDecimal ownedFunds;
+
+    @Column(name = "remarks", length = 500)
+    private String remarks;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDepositBaseRepository.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.time.LocalDate;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentDepositBaseRepository extends JpaRepository<InvestmentDepositBase, Long> {
+
+    Optional<InvestmentDepositBase> findByAsOnDate(LocalDate asOnDate);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDividend.java

@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** A dividend received on a share holding: booked as income when it is received (Dr Bank / Cr Dividend on Investments). */
+@Entity
+@Table(name = "m_investment_dividend")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentDividend extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    @Column(name = "dividend_date", nullable = false)
+    private LocalDate dividendDate;
+
+    @Column(name = "amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal amount;
+
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id", nullable = false)
+    private GLAccount bankGlAccount;
+
+    @Column(name = "remarks", length = 500)
+    private String remarks;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDividendRepository.java

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.time.LocalDate;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentDividendRepository extends JpaRepository<InvestmentDividend, Long> {
+
+    List<InvestmentDividend> findAllByOrderByDividendDateDescIdDesc();
+
+    /** Whether the institution has paid us any dividend on or before a date (on any of our holdings of its shares). */
+    boolean existsByPurchasePartyIdAndDividendDateLessThanEqual(Long partyId, LocalDate date);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentFd.java

@@ -0,0 +1,135 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** A fixed deposit the bank has placed with another bank, from placement to maturity, premature closure or renewal. */
+@Entity
+@Table(name = "m_investment_fd")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentFd extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @Column(name = "deal_no", nullable = false, length = 20, unique = true)
+    private String dealNo;
+
+    @ManyToOne
+    @JoinColumn(name = "party_id", nullable = false)
+    private InvestmentParty party;
+
+    /** The bank's FD GL (from the party), debited when the money is placed. */
+    @ManyToOne
+    @JoinColumn(name = "fd_gl_account_id", nullable = false)
+    private GLAccount fdGlAccount;
+
+    @ManyToOne
+    @JoinColumn(name = "interest_gl_account_id", nullable = false)
+    private GLAccount interestGlAccount;
+
+    /** Certificate (receipt) number issued by the other bank. */
+    @Column(name = "cert_no", nullable = false, length = 50)
+    private String certNo;
+
+    @Column(name = "cert_date")
+    private LocalDate certDate;
+
+    @Column(name = "deal_date", nullable = false)
+    private LocalDate dealDate;
+
+    @Column(name = "principal", scale = 6, precision = 19, nullable = false)
+    private BigDecimal principal;
+
+    @Column(name = "int_rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal intRate;
+
+    @Column(name = "maturity_date", nullable = false)
+    private LocalDate maturityDate;
+
+    @Column(name = "payout", nullable = false, length = 20)
+    private String payout;
+
+    @Column(name = "calc_type", nullable = false, length = 20)
+    private String calcType;
+
+    @Column(name = "expected_interest", scale = 6, precision = 19)
+    private BigDecimal expectedInterest;
+
+    @Column(name = "expected_maturity_amount", scale = 6, precision = 19)
+    private BigDecimal expectedMaturityAmount;
+
+    /** Our bank account the money was paid from. */
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id", nullable = false)
+    private GLAccount bankGlAccount;
+
+    /** The FD this one renews, if any. */
+    @ManyToOne
+    @JoinColumn(name = "renewed_from_id")
+    private InvestmentFd renewedFrom;
+
+    @Column(name = "status", nullable = false, length = 20)
+    private String status;
+
+    @Column(name = "remarks", length = 500)
+    private String remarks;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+
+    @Column(name = "closed_on_date")
+    private LocalDate closedOnDate;
+
+    /** MATURITY, PREMATURE or RENEWAL. */
+    @Column(name = "closure_type", length = 20)
+    private String closureType;
+
+    @Column(name = "closure_amount", scale = 6, precision = 19)
+    private BigDecimal closureAmount;
+
+    @Column(name = "closure_interest", scale = 6, precision = 19)
+    private BigDecimal closureInterest;
+
+    @Column(name = "closure_tds", scale = 6, precision = 19)
+    private BigDecimal closureTds;
+
+    @Column(name = "closure_penal", scale = 6, precision = 19)
+    private BigDecimal closurePenal;
+
+    @Column(name = "closure_gl_transaction_id", length = 50)
+    private String closureGlTransactionId;
+
+    @Column(name = "closure_voucher_no", length = 30)
+    private String closureVoucherNo;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentFdInterest.java

@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** A posted interest line of an FD: a 31 Mar / 30 Sep provision, or a half-yearly / yearly payout. */
+@Entity
+@Table(name = "m_investment_fd_interest")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentFdInterest extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "fd_id", nullable = false)
+    private InvestmentFd fd;
+
+    /** PROVISION or PAYOUT. */
+    @Column(name = "line_type", nullable = false, length = 20)
+    private String lineType;
+
+    @Column(name = "int_date", nullable = false)
+    private LocalDate intDate;
+
+    @Column(name = "from_date")
+    private LocalDate fromDate;
+
+    @Column(name = "to_date")
+    private LocalDate toDate;
+
+    @Column(name = "days")
+    private Integer days;
+
+    @Column(name = "gross_interest", scale = 6, precision = 19)
+    private BigDecimal grossInterest;
+
+    /** For a payout: the part already provisioned, cleared from interest receivable. */
+    @Column(name = "already_booked", scale = 6, precision = 19)
+    private BigDecimal alreadyBooked;
+
+    @Column(name = "tds", scale = 6, precision = 19)
+    private BigDecimal tds;
+
+    @Column(name = "amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal amount;
+
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id")
+    private GLAccount bankGlAccount;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+
+    @Column(name = "posted_on_date")
+    private LocalDate postedOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentFdInterestRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentFdInterestRepository extends JpaRepository<InvestmentFdInterest, Long> {
+
+    List<InvestmentFdInterest> findByFdIdOrderByIntDateAscIdAsc(Long fdId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentFdRepository.java

@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.LockModeType;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface InvestmentFdRepository extends JpaRepository<InvestmentFd, Long> {
+
+    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
+    @Query("select f from InvestmentFd f where f.id = :fdId")
+    Optional<InvestmentFd> findByIdWithLock(@Param("fdId") Long fdId);
+
+    List<InvestmentFd> findByStatusOrderByIdAsc(String status);
+
+    boolean existsByPartyIdAndCertNoIgnoreCase(Long partyId, String certNo);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentInterestPosting.java

@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** One interest schedule line of a holding (coupon received or closing provision) that has been posted to GL. */
+@Entity
+@Table(name = "m_investment_interest_posting")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentInterestPosting extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    /** COUPON or PROVISION. */
+    @Column(name = "line_type", nullable = false, length = 20)
+    private String lineType;
+
+    @Column(name = "int_date", nullable = false)
+    private LocalDate intDate;
+
+    @Column(name = "from_date")
+    private LocalDate fromDate;
+
+    @Column(name = "to_date")
+    private LocalDate toDate;
+
+    @Column(name = "days")
+    private Integer days;
+
+    @Column(name = "gross_interest", scale = 6, precision = 19)
+    private BigDecimal grossInterest;
+
+    @Column(name = "already_booked", scale = 6, precision = 19)
+    private BigDecimal alreadyBooked;
+
+    @Column(name = "amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal amount;
+
+    /** Bank the coupon was received into (coupon lines only). */
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id")
+    private GLAccount bankGlAccount;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+
+    @Column(name = "posted_on_date")
+    private LocalDate postedOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentInterestPostingRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentInterestPostingRepository extends JpaRepository<InvestmentInterestPosting, Long> {
+
+    List<InvestmentInterestPosting> findByPurchaseIdOrderByIntDateAsc(Long purchaseId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentParty.java

@@ -0,0 +1,135 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Bank / Party Master — the counterparty an investment is bought from or placed with (bank, RBI, issuer, AMC, broker),
+ * following the bank's existing CBS Bank / Party Master.
+ */
+@Entity
+@Table(name = "m_investment_party")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentParty extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @Column(name = "party_code", nullable = false, length = 20, unique = true)
+    private String partyCode;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    @Column(name = "party_name", nullable = false, length = 150)
+    private String partyName;
+
+    @Column(name = "address1", length = 150)
+    private String address1;
+
+    @Column(name = "address2", length = 150)
+    private String address2;
+
+    @Column(name = "address3", length = 150)
+    private String address3;
+
+    @Column(name = "city", length = 100)
+    private String city;
+
+    @Column(name = "pincode", length = 10)
+    private String pincode;
+
+    @Column(name = "phone", length = 20)
+    private String phone;
+
+    @Column(name = "fax", length = 20)
+    private String fax;
+
+    @Column(name = "bank_type", length = 60)
+    private String bankType;
+
+    @ManyToOne
+    @JoinColumn(name = "gl_account_id", nullable = false)
+    private GLAccount glAccount;
+
+    /** Interest income GL of the FDs placed with this bank (Bond Type FD only). */
+    @ManyToOne
+    @JoinColumn(name = "interest_gl_account_id")
+    private GLAccount interestGlAccount;
+
+    /** Whether this bank deducts TDS from the interest on FDs placed with it (some banks do, some do not). */
+    @Column(name = "tds_applicable", nullable = false)
+    private boolean tdsApplicable;
+
+    /** TDS rate in per cent, set only when the bank deducts TDS. */
+    @Column(name = "tds_rate", scale = 4, precision = 9)
+    private BigDecimal tdsRate;
+
+    @Column(name = "rbi_code", length = 30)
+    private String rbiCode;
+
+    @Column(name = "exposure_limit", scale = 6, precision = 19)
+    private BigDecimal exposureLimit;
+
+    @Column(name = "lei_no", length = 30)
+    private String leiNo;
+
+    @Column(name = "cp_bank_name", length = 150)
+    private String cpBankName;
+
+    @Column(name = "cp_branch_name", length = 150)
+    private String cpBranchName;
+
+    @Column(name = "cp_account_no", length = 40)
+    private String cpAccountNo;
+
+    @Column(name = "cp_ifsc", length = 11)
+    private String cpIfsc;
+
+    /** Share institutions only: DCCB, State Co-op Bank, other co-operative society, or MIC / Umbrella Organisation. */
+    @Column(name = "institution_type", length = 30)
+    private String institutionType;
+
+    /** The institution's subscribed share capital: our holding in a co-operative society is limited to 5% of it. */
+    @Column(name = "subscribed_capital", scale = 6, precision = 19)
+    private BigDecimal subscribedCapital;
+
+    /** Date of the institution's latest balance sheet we have; one older than 18 months values its shares at ₹1. */
+    @Column(name = "last_balance_sheet_date")
+    private LocalDate lastBalanceSheetDate;
+
+    /** An institution in liquidation: its shares are fully provided for. */
+    @Column(name = "is_in_liquidation", nullable = false)
+    private boolean inLiquidation;
+
+    /** An inactive party is kept for history but not offered for new deals. */
+    @Column(name = "is_active", nullable = false)
+    private boolean active = true;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPartyRepository.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentPartyRepository extends JpaRepository<InvestmentParty, Long> {
+
+    /** Locks the bank so two FDs with it are checked against the 5% limit one after the other. */
+    @org.springframework.data.jpa.repository.Lock(value = jakarta.persistence.LockModeType.PESSIMISTIC_WRITE)
+    @org.springframework.data.jpa.repository.Query("select p from InvestmentParty p where p.id = :partyId")
+    java.util.Optional<InvestmentParty> findByIdWithLock(@org.springframework.data.repository.query.Param("partyId") Long partyId);}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPurchase.java

@@ -0,0 +1,174 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Investment Purchase Entry — one deal (as in the bank's existing CBS "Govt.Security/Bond Entry"). Once saved it is the
+ * holding that interest, sale and redemption later work against; {@link #balanceUnits} tracks what is still held. Every
+ * derived figure (units, book value, accrued interest, settlement amount) is computed by the backend.
+ */
+@Entity
+@Table(name = "m_investment_purchase")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentPurchase extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    /** Financial-year deal number, e.g. 202627000001 for the first deal of FY 2026-27. */
+    @Column(name = "deal_no", nullable = false, length = 20, unique = true)
+    private String dealNo;
+
+    /** Certificate number — system-generated running number. */
+    @Column(name = "cert_no", nullable = false, length = 20, unique = true)
+    private String certNo;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    @ManyToOne
+    @JoinColumn(name = "script_id", nullable = false)
+    private InvestmentScript script;
+
+    @ManyToOne
+    @JoinColumn(name = "party_id", nullable = false)
+    private InvestmentParty party;
+
+    @Column(name = "deal_date", nullable = false)
+    private LocalDate dealDate;
+
+    @Column(name = "deal_time", length = 8)
+    private String dealTime;
+
+    @Column(name = "settlement_type", nullable = false, length = 5)
+    private String settlementType;
+
+    @Column(name = "settlement_date", nullable = false)
+    private LocalDate settlementDate;
+
+    @Column(name = "face_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal faceValue;
+
+    /** Price per ₹100 face value (Govt Security / Bond); NAV for a mutual fund. */
+    @Column(name = "purchase_rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal purchaseRate;
+
+    @Column(name = "units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal units;
+
+    @Column(name = "balance_units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal balanceUnits;
+
+    @Column(name = "brokerage", scale = 6, precision = 19)
+    private BigDecimal brokerage;
+
+    @Column(name = "stamp_duty", scale = 6, precision = 19)
+    private BigDecimal stampDuty;
+
+    @Column(name = "other_charges", scale = 6, precision = 19)
+    private BigDecimal otherCharges;
+
+    @Column(name = "book_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bookValue;
+
+    @Column(name = "premium_discount", scale = 6, precision = 19)
+    private BigDecimal premiumDiscount;
+
+    @Column(name = "int_rate", scale = 4, precision = 9)
+    private BigDecimal intRate;
+
+    @Column(name = "issue_date")
+    private LocalDate issueDate;
+
+    @Column(name = "maturity_date")
+    private LocalDate maturityDate;
+
+    @Column(name = "last_int_date")
+    private LocalDate lastIntDate;
+
+    @Column(name = "accrued_days")
+    private Integer accruedDays;
+
+    /** Interest paid to the seller from the last coupon date up to the deal date (30/360). */
+    @Column(name = "accrued_interest", scale = 6, precision = 19)
+    private BigDecimal accruedInterest;
+
+    @Column(name = "settlement_amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal settlementAmount;
+
+    @Column(name = "ytm", scale = 4, precision = 9)
+    private BigDecimal ytm;
+
+    @Column(name = "category", nullable = false, length = 40)
+    private String category;
+
+    @Column(name = "sub_type", length = 40)
+    private String subType;
+
+    /** Investment GL the holding is booked to (from the script). */
+    @ManyToOne
+    @JoinColumn(name = "investment_gl_account_id", nullable = false)
+    private GLAccount investmentGlAccount;
+
+    /** Bank GL the purchase is paid from ("CR. To A/c"). */
+    @ManyToOne
+    @JoinColumn(name = "cr_gl_account_id", nullable = false)
+    private GLAccount crGlAccount;
+
+    /** GL holding the premium paid over face value (100707) until it is amortised; empty when it sits in the investment GL. */
+    @ManyToOne
+    @JoinColumn(name = "premium_gl_account_id")
+    private GLAccount premiumGlAccount;
+
+    @Column(name = "other_details", length = 4000)
+    private String otherDetails;
+
+    /** How the deal was confirmed to the counterparty (EMAIL, NDS_OM, FAX, LETTER, PHONE), entered with the deal. */
+    @Column(name = "confirmation_mode", length = 10)
+    private String confirmationMode;
+
+    /** Date the counterparty's confirmation / contract note reached the back office, recorded on Settle. */
+    @Column(name = "confirmation_received_on")
+    private LocalDate confirmationReceivedOn;
+
+    @Column(name = "confirmation_ref", length = 100)
+    private String confirmationRef;
+
+    @Column(name = "status", nullable = false, length = 20)
+    private String status;
+
+    /** Journal entry transaction posted when the deal was settled. */
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "settled_on_date")
+    private LocalDate settledOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPurchaseRepository.java

@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.LockModeType;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface InvestmentPurchaseRepository extends JpaRepository<InvestmentPurchase, Long> {
+
+    /** Locks the deal row so two postings on one deal (double click, two users) run one after the other. */
+    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
+    @Query("select p from InvestmentPurchase p where p.id = :purchaseId")
+    Optional<InvestmentPurchase> findByIdWithLock(@Param("purchaseId") Long purchaseId);
+
+    boolean existsByScriptIdAndStatusNot(Long scriptId, String status);
+
+    boolean existsByScriptIdAndStatus(Long scriptId, String status);
+
+    /** Every deal dated in the period, dropped ones included (the deal slip register). */
+    List<InvestmentPurchase> findByDealDateBetween(LocalDate from, LocalDate to);
+
+    Optional<InvestmentPurchase> findByDealNo(String dealNo);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentSale.java

@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** A sale of some or all units of a holding before maturity (SELL), or its repayment at maturity (REDEEM). */
+@Entity
+@Table(name = "m_investment_sale")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentSale extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    /**
+     * Deal slip number of a sale, redemption or switch: financial year, "S" and a running number, e.g. 202627S00001.
+     * Empty for a write-off or amortisation, which are not deals.
+     */
+    @Column(name = "sale_no", length = 20, unique = true)
+    private String saleNo;
+
+    /** SELL, REDEEM, WRITEOFF or AMORTISE. */
+    @Column(name = "sale_type", nullable = false, length = 10)
+    private String saleType;
+
+    /** Buyer of a sale; empty for a redemption. */
+    @ManyToOne
+    @JoinColumn(name = "party_id")
+    private InvestmentParty party;
+
+    @Column(name = "deal_date", nullable = false)
+    private LocalDate dealDate;
+
+    @Column(name = "deal_time", length = 8)
+    private String dealTime;
+
+    @Column(name = "settlement_type", length = 5)
+    private String settlementType;
+
+    @Column(name = "settlement_date", nullable = false)
+    private LocalDate settlementDate;
+
+    @Column(name = "units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal units;
+
+    @Column(name = "face_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal faceValue;
+
+    /** Price per ₹100 of face value; 100 for a redemption. */
+    @Column(name = "sale_rate", scale = 6, precision = 19)
+    private BigDecimal saleRate;
+
+    /** Price received for the units, without interest. */
+    @Column(name = "consideration", scale = 6, precision = 19, nullable = false)
+    private BigDecimal consideration;
+
+    @Column(name = "accrued_days")
+    private Integer accruedDays;
+
+    /** Interest the buyer pays us for the days since the last coupon. */
+    @Column(name = "accrued_interest", scale = 6, precision = 19)
+    private BigDecimal accruedInterest;
+
+    /** Part of that interest already booked by a closing provision, cleared from interest receivable. */
+    @Column(name = "receivable_cleared", scale = 6, precision = 19)
+    private BigDecimal receivableCleared;
+
+    @Column(name = "brokerage", scale = 6, precision = 19)
+    private BigDecimal brokerage;
+
+    /** Cost of the units sold, taken off the investment GL. */
+    @Column(name = "book_value_sold", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bookValueSold;
+
+    /** Part of the book value taken off that was unamortised premium (credited to the premium GL). */
+    @Column(name = "premium_cleared", scale = 6, precision = 19)
+    private BigDecimal premiumCleared;
+
+    /** Consideration less cost: positive is profit, negative is loss. */
+    @Column(name = "profit_loss", scale = 6, precision = 19, nullable = false)
+    private BigDecimal profitLoss;
+
+    /** Money into the bank: consideration plus interest, less brokerage. */
+    @Column(name = "net_amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal netAmount;
+
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id", nullable = false)
+    private GLAccount bankGlAccount;
+
+    @Column(name = "sanction_authority", length = 100)
+    private String sanctionAuthority;
+
+    @Column(name = "remarks", length = 500)
+    private String remarks;
+
+    /** Broker of a sale done through a broker (Broker Master code); empty for a direct deal. */
+    @Column(name = "broker_code", length = 20)
+    private String brokerCode;
+
+    /** How the deal was confirmed to the counterparty (EMAIL, NDS_OM, FAX, LETTER, PHONE), entered with the sale. */
+    @Column(name = "confirmation_mode", length = 10)
+    private String confirmationMode;
+
+    /** Date the counterparty's confirmation / contract note reached the back office, recorded on Settle. */
+    @Column(name = "confirmation_received_on")
+    private LocalDate confirmationReceivedOn;
+
+    @Column(name = "confirmation_ref", length = 100)
+    private String confirmationRef;
+
+    @Column(name = "status", nullable = false, length = 20)
+    private String status;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+
+    @Column(name = "settled_on_date")
+    private LocalDate settledOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentSaleRepository.java

@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.LockModeType;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface InvestmentSaleRepository extends JpaRepository<InvestmentSale, Long> {
+
+    List<InvestmentSale> findByPurchaseIdOrderByIdAsc(Long purchaseId);
+
+    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
+    @Query("select s from InvestmentSale s where s.id = :saleId")
+    Optional<InvestmentSale> findByIdWithLock(@Param("saleId") Long saleId);
+
+    /** Every numbered sale, redemption and switch dated in the period, dropped ones included (the deal slip register). */
+    List<InvestmentSale> findBySaleNoNotNullAndDealDateBetween(LocalDate from, LocalDate to);
+
+    Optional<InvestmentSale> findBySaleNo(String saleNo);
+
+    /** The deal of a sale, without loading either, so the deal can be locked first. */
+    @Query("select s.purchase.id from InvestmentSale s where s.id = :saleId")
+    Optional<Long> findPurchaseIdBySaleId(@Param("saleId") Long saleId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentScript.java

@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Script Master — what is being bought (a Govt Security, bond, mutual fund scheme, share, …), following the bank's
+ * existing CBS Script Master. A purchase picks these terms up instead of the dealer re-typing them.
+ */
+@Entity
+@Table(name = "m_investment_script")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentScript extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    /** System-generated: bond-type letter + running number, e.g. G00001. */
+    @Column(name = "script_code", nullable = false, length = 20, unique = true)
+    private String scriptCode;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    /** GOI / STATE_GOVT / TREASURY / NON_SLR. */
+    @Column(name = "slr_type", length = 20)
+    private String slrType;
+
+    @Column(name = "script_desc", nullable = false, length = 150)
+    private String scriptDesc;
+
+    @ManyToOne
+    @JoinColumn(name = "gl_account_id", nullable = false)
+    private GLAccount glAccount;
+
+    @Column(name = "isin", length = 20)
+    private String isin;
+
+    @Column(name = "face_value_per_unit", scale = 6, precision = 19, nullable = false)
+    private BigDecimal faceValuePerUnit;
+
+    @Column(name = "int_rate", scale = 4, precision = 9)
+    private BigDecimal intRate;
+
+    @Column(name = "issue_date")
+    private LocalDate issueDate;
+
+    @Column(name = "maturity_date")
+    private LocalDate maturityDate;
+
+    @Column(name = "company_name", length = 150)
+    private String companyName;
+
+    @Column(name = "address1", length = 150)
+    private String address1;
+
+    @Column(name = "address2", length = 150)
+    private String address2;
+
+    @Column(name = "address3", length = 150)
+    private String address3;
+
+    @Column(name = "city", length = 100)
+    private String city;
+
+    @Column(name = "pincode", length = 10)
+    private String pincode;
+
+    @Column(name = "phone", length = 20)
+    private String phone;
+
+    @Column(name = "fax", length = 20)
+    private String fax;
+
+    @Column(name = "corp_code", length = 30)
+    private String corpCode;
+
+    /** Credit rating, long-term (AAA … D) for bonds or short-term (A1+ … A4) for CPs / CDs; UNRATED when none. */
+    @Column(name = "rating", length = 10)
+    private String rating;
+
+    @Column(name = "rating_agency", length = 30)
+    private String ratingAgency;
+
+    /** Listed on an exchange, or proposed to be listed (RBI counts those as listed when bought). */
+    @Column(name = "is_listed", nullable = false)
+    private boolean listed = true;
+
+    @Column(name = "is_active", nullable = false)
+    private boolean active = true;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentScriptRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentScriptRepository extends JpaRepository<InvestmentScript, Long> {
+
+    List<InvestmentScript> findByIsinIgnoreCase(String isin);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentSecurityTransfer.java

@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** A holding moved from one government security script to another of the same terms (GOI Category Transfer). */
+@Entity
+@Table(name = "m_investment_security_transfer")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentSecurityTransfer extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    @ManyToOne
+    @JoinColumn(name = "from_script_id", nullable = false)
+    private InvestmentScript fromScript;
+
+    @ManyToOne
+    @JoinColumn(name = "to_script_id", nullable = false)
+    private InvestmentScript toScript;
+
+    @ManyToOne
+    @JoinColumn(name = "from_gl_account_id", nullable = false)
+    private GLAccount fromGlAccount;
+
+    @ManyToOne
+    @JoinColumn(name = "to_gl_account_id", nullable = false)
+    private GLAccount toGlAccount;
+
+    @Column(name = "transfer_date", nullable = false)
+    private LocalDate transferDate;
+
+    @Column(name = "units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal units;
+
+    /** Book value carried over; moved between GLs only when the two scripts map to different GLs. */
+    @Column(name = "book_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bookValue;
+
+    @Column(name = "remarks", length = 500)
+    private String remarks;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentSecurityTransferRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentSecurityTransferRepository extends JpaRepository<InvestmentSecurityTransfer, Long> {
+
+    List<InvestmentSecurityTransfer> findByPurchaseIdOrderByTransferDateAscIdAsc(Long purchaseId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentValuation.java

@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * One market valuation (MTM) of a category's holdings on a date: the IDR it needs per class and in total, what the
+ * previous run held, and the difference posted to GL.
+ */
+@Entity
+@Table(name = "m_investment_valuation")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentValuation extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @Column(name = "valuation_date", nullable = false)
+    private LocalDate valuationDate;
+
+    /** AFS or HFT. */
+    @Column(name = "category", nullable = false, length = 10)
+    private String category;
+
+    @Column(name = "govt_required", scale = 6, precision = 19, nullable = false)
+    private BigDecimal govtRequired;
+
+    @Column(name = "bond_required", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bondRequired;
+
+    @Column(name = "fund_required", scale = 6, precision = 19, nullable = false)
+    private BigDecimal fundRequired;
+
+    @Column(name = "share_required", scale = 6, precision = 19, nullable = false)
+    private BigDecimal shareRequired;
+
+    @Column(name = "required_total", scale = 6, precision = 19, nullable = false)
+    private BigDecimal requiredTotal;
+
+    /** IDR held for the category before this run (the previous run's total). */
+    @Column(name = "previous_total", scale = 6, precision = 19, nullable = false)
+    private BigDecimal previousTotal;
+
+    /** Posted to GL: more provision when positive, a write-back when negative. */
+    @Column(name = "delta", scale = 6, precision = 19, nullable = false)
+    private BigDecimal delta;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentValuationLine.java

@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
+
+/** One security of a market valuation: book value still held against the market value at the Daily Script Master rate. */
+@Entity
+@Table(name = "m_investment_valuation_line")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentValuationLine extends AbstractPersistableCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "valuation_id", nullable = false)
+    private InvestmentValuation valuation;
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    /** The security on the valuation date (a later GOI transfer does not change it). */
+    @ManyToOne
+    @JoinColumn(name = "script_id", nullable = false)
+    private InvestmentScript script;
+
+    @Column(name = "asset_class", nullable = false, length = 20)
+    private String assetClass;
+
+    @Column(name = "units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal units;
+
+    @Column(name = "book_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bookValue;
+
+    @Column(name = "rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal rate;
+
+    @Column(name = "rate_date", nullable = false)
+    private LocalDate rateDate;
+
+    @Column(name = "market_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal marketValue;
+
+    /** Market value less book value: a loss when negative. */
+    @Column(name = "difference", scale = 6, precision = 19, nullable = false)
+    private BigDecimal difference;
+
+    /** How a share was valued (face value, nil, ₹1); empty for a holding valued at its market rate. */
+    @Column(name = "valuation_basis", length = 100)
+    private String valuationBasis;
+
+    /** A non-performing investment: shares of an institution whose latest balance sheet is over 18 months old. */
+    @Column(name = "is_npi", nullable = false)
+    private boolean npi;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentValuationLineRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentValuationLineRepository extends JpaRepository<InvestmentValuationLine, Long> {
+
+    List<InvestmentValuationLine> findByValuationIdOrderByIdAsc(Long valuationId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentValuationRepository.java

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentValuationRepository extends JpaRepository<InvestmentValuation, Long> {
+
+    /** The latest run of a category: the IDR it holds is what the next run compares with. */
+    Optional<InvestmentValuation> findFirstByCategoryOrderByValuationDateDescIdDesc(String category);
+
+    List<InvestmentValuation> findAllByOrderByValuationDateDescIdDesc();
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentDailyRateNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentDailyRateNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentDailyRateNotFoundException(final Long id) {
+        super("error.msg.investmentdailyrate.id.invalid", "Daily script rate with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentFdNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentFdNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentFdNotFoundException(final Long id) {
+        super("error.msg.investmentfd.id.invalid", "FD " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentPartyNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentPartyNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentPartyNotFoundException(final Long id) {
+        super("error.msg.investmentparty.id.invalid", "Investment party with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentPurchaseNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentPurchaseNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentPurchaseNotFoundException(final Long id) {
+        super("error.msg.investmentpurchase.id.invalid", "Investment purchase with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentScriptNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentScriptNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentScriptNotFoundException(final Long id) {
+        super("error.msg.investmentscript.id.invalid", "Investment script with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentValuationNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentValuationNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentValuationNotFoundException(final Long id) {
+        super("error.msg.investmentvaluation.id.invalid", "Investment valuation " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/AmortiseInvestmentPremiumCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentAmortisationService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSALE", action = "AMORTISE")
+@RequiredArgsConstructor
+public class AmortiseInvestmentPremiumCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentAmortisationService amortisationService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.amortisationService.amortise(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentDailyRateCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTDAILYRATE", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentDailyRateCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentDailyRateWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createDailyRate(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentFdCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTFD", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentFdCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentFdService fdService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.fdService.create(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentPartyCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPARTY", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentPartyCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createParty(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentPurchaseWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createPurchase(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentSaleCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentSaleWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSALE", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentSaleCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentSaleWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createSale(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentScriptCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSCRIPT", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentScriptCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createScript(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentValuationCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentValuationService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTVALUATION", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentValuationCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentValuationService valuationService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.valuationService.run(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentDailyRateCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTDAILYRATE", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentDailyRateCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentDailyRateWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deleteDailyRate(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentPartyCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPARTY", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentPartyCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deleteParty(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentPurchaseWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deletePurchase(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentSaleCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentSaleWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSALE", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentSaleCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentSaleWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deleteSale(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DividendInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentShareService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "DIVIDEND")
+@RequiredArgsConstructor
+public class DividendInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentShareService shareService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.shareService.postDividend(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/MatureInvestmentFdCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdClosureService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTFD", action = "MATURE")
+@RequiredArgsConstructor
+public class MatureInvestmentFdCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentFdClosureService closureService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.closureService.mature(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/PostInvestmentFdInterestCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdInterestService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTFD", action = "POSTINTEREST")
+@RequiredArgsConstructor
+public class PostInvestmentFdInterestCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentFdInterestService interestService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.interestService.post(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/PostInvestmentInterestCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentInterestPostingWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTINTEREST", action = "CREATE")
+@RequiredArgsConstructor
+public class PostInvestmentInterestCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentInterestPostingWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.postInterest(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/PrematureInvestmentFdCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdClosureService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTFD", action = "PREMATURE")
+@RequiredArgsConstructor
+public class PrematureInvestmentFdCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentFdClosureService closureService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.closureService.premature(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/RedeemInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentSaleWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSALE", action = "REDEEM")
+@RequiredArgsConstructor
+public class RedeemInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentSaleWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.redeem(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/RenewInvestmentFdCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentFdClosureService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTFD", action = "RENEW")
+@RequiredArgsConstructor
+public class RenewInvestmentFdCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentFdClosureService closureService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.closureService.renew(command.entityId(), command);
+    }
+}