loadRequest(final Long id) {
- try {
- return this.jdbcTemplate.queryForMap("SELECT * FROM m_share_savings_debit_request WHERE id = ?", id);
- } catch (final EmptyResultDataAccessException e) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.request.not.found",
- "Savings-debit request " + id + " does not exist.");
- }
- }
-
- private Long requireGl(final Long productId, final int financialAccountType, final String label) {
- try {
- final Long glId = this.jdbcTemplate.queryForObject(
- "SELECT gl_account_id FROM acc_product_mapping "
- + " WHERE product_id = ? AND product_type = ? AND financial_account_type = ? AND charge_id IS NULL",
- Long.class, productId, PRODUCT_TYPE_SHARES, financialAccountType);
- if (glId == null) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.gl.not.mapped",
- label + " GL is not mapped for share product " + productId + ".");
- }
- return glId;
- } catch (final IncorrectResultSizeDataAccessException e) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.gl.not.mapped",
- label + " GL is not mapped for share product " + productId + ".");
- }
- }
-
- private void insertEntry(final Long officeId, final Long glAccountId, final int typeEnum, final BigDecimal amount, final String txnId,
- final LocalDate entryDate, final Long shareAccountId, final long userId, final LocalDateTime now, final String currencyCode,
- final String description) {
- this.jdbcTemplate.update(
- "INSERT INTO acc_gl_journal_entry " + "(account_id, office_id, currency_code, transaction_id, reversed, manual_entry, "
- + " entry_date, type_enum, amount, description, entity_id, "
- + " created_by, last_modified_by, created_date, lastmodified_date, "
- + " is_running_balance_calculated, office_running_balance, "
- + " organization_running_balance, submitted_on_date, transaction_date, created_on_utc, last_modified_on_utc) "
- + "VALUES (?,?,?,?,false,true,?,?,?,?,?,?,?,?,?,false,0,0,?,?,?,?)",
- glAccountId, officeId, currencyCode, txnId, java.sql.Date.valueOf(entryDate), typeEnum, amount, description, shareAccountId,
- userId, userId, now, now, java.sql.Date.valueOf(entryDate), java.sql.Date.valueOf(entryDate), toUtc(now), toUtc(now));
- }
-
- /**
- * A tenant-local timestamp converted to the real UTC instant, for the {@code *_on_utc} columns.
- *
- * {@code atOffset(ZoneOffset.UTC)} would only relabel it — stamping 18:34 IST as "18:34 UTC", which reads back as
- * 00:04 the next day and made an evening entry appear as midnight. The instant has to be resolved in the tenant's
- * own zone first, which is the zone {@code now} was taken in.
- */
- private java.time.OffsetDateTime toUtc(final LocalDateTime tenantLocalTime) {
- return tenantLocalTime.atZone(DateUtils.getDateTimeZoneOfTenant()).toOffsetDateTime()
- .withOffsetSameInstant(ZoneOffset.UTC);
- }
-
- private void validateCheckerRole(final AppUser user) {
- if (user.hasAnyPermission("ALL_FUNCTIONS")) {
- return;
- }
- final boolean isChecker = user.getRoles().stream().map(r -> r.getName() == null ? "" : r.getName().toLowerCase().trim())
- .anyMatch(n -> n.contains("manager") || n.contains("head cashier"));
- if (!isChecker) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.checker.required",
- "Only a Bank Manager (or Head Cashier) can approve or reject a savings-debit request.");
- }
- }
-
- private JsonObject parseBody(final String body) {
- if (body == null || body.isBlank()) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.request.empty", "Request body is required.");
- }
- try {
- return JsonParser.parseString(body).getAsJsonObject();
- } catch (final RuntimeException e) {
- throw new PlatformDataIntegrityException("error.msg.sharesavingsdebit.request.invalid", "Request body is not valid JSON.");
- }
- }
-
- private Long getLong(final JsonObject json, final String field) {
- return json.has(field) && !json.get(field).isJsonNull() ? json.get(field).getAsLong() : null;
- }
-
- private String getString(final JsonObject json, final String field) {
- if (!json.has(field) || json.get(field).isJsonNull()) {
- return null;
- }
- final String value = json.get(field).getAsString().trim();
- return value.isEmpty() ? null : value;
- }
-
- private Long toLong(final Object o) {
- return o instanceof Number n ? n.longValue() : null;
- }
-
- private int toInt(final Object o) {
- return o instanceof Number n ? n.intValue() : 0;
- }
-}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/AdditionalSharesFundingApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/AdditionalSharesFundingApiResource.java
index 709959d15..1b6345cc4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/AdditionalSharesFundingApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/AdditionalSharesFundingApiResource.java
@@ -45,14 +45,9 @@ import org.springframework.stereotype.Component;
* Can a member fund a new additional-share tranche from their savings, and for how much.
*
*
- * Distinct from {@code /sharesavingsdebit/eligibility}, which answers the same question for an account's first
- * application: that endpoint values the settlement by summing every purchase row on the account and treats
- * {@code collection_applied} as the account's one settlement. Applied to a further tranche it would quote the member's
- * entire holding history and report an already-settled account as ineligible.
- *
- *
- * Here the amount is the caller's — the tranche is not saved yet, so there is no row to read it from. The share count is
- * passed in and priced at the product's current market price, which is the same figure the apply form shows the member.
+ * Deliberately scoped to a single tranche rather than the account's whole holding history: the amount here is the
+ * caller's — the tranche is not saved yet, so there is no row to read it from. The share count is passed in and
+ * priced at the product's current market price, which is the same figure the apply form shows the member.
*/
@Path("/v1/shareaccounts/{accountId}/additionalshares")
@Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/ShareAdditionRequestsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/ShareAdditionRequestsApiResource.java
new file mode 100644
index 000000000..66d369a66
--- /dev/null
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/api/ShareAdditionRequestsApiResource.java
@@ -0,0 +1,196 @@
+/**
+ * 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.shareaccounts.api;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * Additional-share tranches awaiting approval, across every share account, for a centralized Approval Center queue.
+ *
+ *
+ * A tranche raised through "Apply Additional Shares" today is only visible for approval on its own account's page
+ * (the native {@code approveadditionalshares}/{@code rejectadditionalshares} commands, invoked directly from a button
+ * there) — there was no single place a checker could see every tranche waiting across the whole membership. This
+ * resource is the read side of that queue: one list of every pending tranche, and one detail view per tranche with
+ * everything a checker needs to decide, including the route-specific proof of funding a list row cannot show — which
+ * voucher(s) a cash tranche is resting on, or which savings account a savings tranche already debited.
+ *
+ *
+ * Approval and rejection themselves are NOT duplicated here — they still go through Fineract's own
+ * {@code approveadditionalshares}/{@code rejectadditionalshares} commands (same as the account-page buttons), so the
+ * journal postings and {@link org.apache.fineract.portfolio.shareaccounts.service.AdditionalShareTrancheFundingService}
+ * settle/unwind hooks that already run on those commands run exactly once, from exactly one code path.
+ */
+@Path("/v1/shareadditionrequests")
+@Component
+@Tag(name = "Share Addition Requests", description = "Additional-share tranches awaiting approval, across every share account.")
+@RequiredArgsConstructor
+@Consumes({ MediaType.APPLICATION_JSON })
+@Produces({ MediaType.APPLICATION_JSON })
+public class ShareAdditionRequestsApiResource {
+
+ /** m_share_account_transactions.status_enum for "submitted, awaiting approval". */
+ private static final int STATUS_APPLIED = 100;
+ /** m_share_account_transactions.type_enum for a share purchase (an original application or a tranche alike). */
+ private static final int TYPE_PURCHASED = 500;
+
+ private static final String FUNDING_CASH = "CASH";
+ private static final String FUNDING_SAVINGS = "SAVINGS";
+
+ private final PlatformSecurityContext context;
+ private final JdbcTemplate jdbcTemplate;
+ private final Gson gson = new GsonBuilder().serializeNulls().create();
+
+ // Every alias is double-quoted: PostgreSQL folds an unquoted alias to lower case, so
+ // queryForList would key the maps "shareaccountid" etc., which serialise straight into JSON and
+ // leave the client reading shareAccountId as undefined.
+ private static final String BASE_SELECT = """
+ SELECT t.id AS "transactionId",
+ sa.id AS "shareAccountId",
+ sa.account_no AS "accountNo",
+ sa.client_id AS "clientId",
+ c.display_name AS "clientName",
+ o.name AS "officeName",
+ sp.name AS "productName",
+ sa.currency_code AS "currencyCode",
+ t.transaction_date AS "transactionDate",
+ t.total_shares AS "totalShares",
+ t.unit_price AS "unitPrice",
+ t.amount AS "amount",
+ t.charge_amount AS "chargeAmount",
+ t.resolution_number AS "resolutionNumber",
+ t.meeting_date AS "meetingDate",
+ t.funding_source AS "fundingSource",
+ t.advance_collection_id AS "advanceCollectionId",
+ t.additional_collection_ids AS "additionalCollectionIds"
+ FROM m_share_account_transactions t
+ JOIN m_share_account sa ON sa.id = t.account_id
+ JOIN m_client c ON c.id = sa.client_id
+ JOIN m_office o ON o.id = c.office_id
+ JOIN m_share_product sp ON sp.id = sa.product_id
+ """;
+
+ @GET
+ @Operation(summary = "List additional-share tranches awaiting approval",
+ description = "Every pending tranche across every share account, with the member, account, shares and value a checker needs to see before deciding.")
+ public Response retrievePending() {
+ this.context.authenticatedUser();
+ final List> rows = this.jdbcTemplate.queryForList(
+ BASE_SELECT + " WHERE t.is_active = true AND t.status_enum = ? AND t.type_enum = ? "
+ + " ORDER BY t.transaction_date, t.id",
+ STATUS_APPLIED, TYPE_PURCHASED);
+ return Response.ok(gson.toJson(rows)).build();
+ }
+
+ @GET
+ @Path("/{transactionId}")
+ @Operation(summary = "Full detail for one pending tranche",
+ description = "The list row plus route-specific proof of funding: the voucher(s) behind a cash tranche, or the savings account already debited for a savings tranche.")
+ public Response retrieveOne(@PathParam("transactionId") final Long transactionId) {
+ this.context.authenticatedUser();
+
+ final Map row;
+ try {
+ row = this.jdbcTemplate.queryForMap(BASE_SELECT + " WHERE t.id = ?", transactionId);
+ } catch (final EmptyResultDataAccessException e) {
+ throw new PlatformDataIntegrityException("error.msg.shareaddition.not.found",
+ "Additional-share request " + transactionId + " does not exist.");
+ }
+
+ final Map out = new LinkedHashMap<>(row);
+ final String fundingSource = (String) row.get("fundingSource");
+
+ if (FUNDING_CASH.equals(fundingSource)) {
+ out.put("vouchers", vouchersFor(row));
+ } else if (FUNDING_SAVINGS.equals(fundingSource)) {
+ out.put("savingsAccount", savingsAccountFor(toLong(row.get("shareAccountId"))));
+ }
+
+ return Response.ok(gson.toJson(out)).build();
+ }
+
+ /**
+ * Every receipt funding a cash tranche — the lead voucher plus any further instalments — so a checker sees the
+ * whole pot behind the amount rather than just the first receipt.
+ */
+ private List> vouchersFor(final Map row) {
+ final List ids = new ArrayList<>();
+ final Long lead = toLong(row.get("advanceCollectionId"));
+ if (lead != null) {
+ ids.add(lead);
+ }
+ final String additional = (String) row.get("additionalCollectionIds");
+ if (additional != null && !additional.isBlank()) {
+ for (final String part : additional.split(",")) {
+ final String trimmed = part.trim();
+ if (!trimmed.isEmpty()) {
+ ids.add(Long.valueOf(trimmed));
+ }
+ }
+ }
+ if (ids.isEmpty()) {
+ return Collections.emptyList();
+ }
+ final String placeholders = String.join(",", Collections.nCopies(ids.size(), "?"));
+ return this.jdbcTemplate.queryForList("""
+ SELECT id, receipt_no AS "receiptNo", voucher_no AS "voucherNo", amount, collection_date AS "collectionDate",
+ collected_by_name AS "collectedByName", status
+ FROM m_share_advance_collection WHERE id IN (%s) ORDER BY id
+ """.formatted(placeholders), ids.toArray());
+ }
+
+ /** The savings account a savings-route tranche already debited, so a checker can see it was real money. */
+ private Map savingsAccountFor(final Long shareAccountId) {
+ try {
+ return this.jdbcTemplate.queryForMap("""
+ SELECT sav.id, sav.account_no AS "accountNo", sav.account_balance_derived AS "balance"
+ FROM m_savings_account sav
+ JOIN m_share_account sa ON sa.savings_account_id = sav.id
+ WHERE sa.id = ?
+ """, shareAccountId);
+ } catch (final EmptyResultDataAccessException e) {
+ return null;
+ }
+ }
+
+ private Long toLong(final Object o) {
+ return o instanceof Number ? ((Number) o).longValue() : null;
+ }
+}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
index 81229370f..30a3a348d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
@@ -658,17 +658,16 @@ public class ShareAccountDataSerializer {
private void handlechargesOnActivation(final ShareAccount account) {
// The entry fee is deliberately NOT marked paid here. Activating the account decides the
- // member may hold shares; it does not collect anything, and nobody has yet said where the
- // money comes from — a cash receipt at the counter, or a debit from the member's savings.
+ // member may hold shares; it does not collect anything, and nobody has yet said the cash
+ // receipt at the counter has actually been taken.
//
// Marking it paid at activation left amount_paid_derived at the full fee and
// amount_outstanding_derived at zero while nothing had actually been received, so the
// settlement step read the fee as already settled and asked the member for the share value
// alone ("shares 400.00 + charges 0"). The fee was then never collected at all.
//
- // It is marked paid where the money genuinely arrives: ShareAdvanceCollectionApiResource
- // (cash receipt) or ShareSavingsDebitRequestApiResource (savings debit), both of which set
- // amount_paid_derived and amount_outstanding_derived alongside the flag.
+ // It is marked paid where the money genuinely arrives: ShareAdvanceCollectionApiResource,
+ // which sets amount_paid_derived and amount_outstanding_derived alongside the flag.
//
// The charge transaction is still dated to the activation date — that records when the fee
// became due, which is a separate thing from when it was paid.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/AdditionalShareTrancheFundingService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/AdditionalShareTrancheFundingService.java
index 366f3bf16..d39cc5764 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/AdditionalShareTrancheFundingService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/AdditionalShareTrancheFundingService.java
@@ -47,12 +47,11 @@ import org.springframework.stereotype.Component;
* account, where it waits for the tranche to be approved.
*
*
- * Why this is separate from the account-level settlement resources. {@code ShareAdvanceCollectionApiResource} and
- * {@code ShareSavingsDebitRequestApiResource} settle an account's first application. Both value the settlement by
- * summing every purchase row on the account, and both guard with account-wide state — {@code collection_applied}, and
- * one-pending-request-per-account. Neither assumption survives a second tranche: the valuation would charge the member
- * for their entire holding history, and the guard would refuse the request outright. So tranche funding is valued and
- * recorded per transaction, and leaves that account-level state alone.
+ * Why this is separate from the account-level settlement resource. {@code ShareAdvanceCollectionApiResource}
+ * settles an account's first application. It values the settlement by summing every purchase row on the
+ * account, and guards with account-wide state — {@code collection_applied} — that assumption does not survive a
+ * second tranche: the valuation would charge the member for their entire holding history. So tranche funding is
+ * valued and recorded per transaction, and leaves that account-level state alone.
*
*
* Where the money ends up. Both routes leave it in Share Sundry (SHARES_SUSPENSE), so approving the tranche posts
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java
index 22d3189e7..cde09257e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountWritePlatformServiceJpaRepositoryImpl.java
@@ -268,9 +268,8 @@ public class ShareAccountWritePlatformServiceJpaRepositoryImpl implements ShareA
// shares; it does not collect anything from them. Posting Dr Share Sundry / Cr Share
// Capital at this point issues share capital against a Sundry balance that holds no
// receipt for it — in effect funding one member's shares out of money other members
- // paid in. The entries belong to settlement, where the money actually arrives: either
- // applying the member's cash receipt (ShareAdvanceCollectionApiResource) or debiting
- // their savings (ShareSavingsDebitRequestApiResource).
+ // paid in. The entries belong to settlement, where the money actually arrives: applying
+ // the member's cash receipt (ShareAdvanceCollectionApiResource).
businessEventNotifierService.notifyPostBusinessEvent(new ShareAccountApproveBusinessEvent(account));
return new CommandProcessingResultBuilder() //
@@ -367,15 +366,14 @@ public class ShareAccountWritePlatformServiceJpaRepositoryImpl implements ShareA
// Charges are deliberately NOT marked paid here. Attaching an entry fee when the
// account is created records what the member owes; activating the account decides they
- // may hold shares. Neither collects anything, and nobody has yet said where the money
- // is coming from — a cash receipt at the counter, or a debit from the member's savings.
+ // may hold shares. Neither collects anything, and nobody has yet said the cash receipt
+ // at the counter has actually been taken.
//
// Marking it paid at activation left the fee showing as settled while it was still
// outstanding, so the settlement step then asked the member for the share value alone
// and the fee was never collected at all. It is marked paid where the money actually
- // arrives: ShareAdvanceCollectionApiResource (cash receipt) or
- // ShareSavingsDebitRequestApiResource (savings debit), both of which set
- // amount_paid_derived and amount_outstanding_derived alongside the flag.
+ // arrives: ShareAdvanceCollectionApiResource, which sets amount_paid_derived and
+ // amount_outstanding_derived alongside the flag.
return new CommandProcessingResultBuilder() //
.withCommandId(jsonCommand.commandId()) //
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/final-changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/final-changelog-tenant.xml
index e4b93b87f..a226f501d 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/final-changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/final-changelog-tenant.xml
@@ -46,4 +46,5 @@
+
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0520_drop_share_savings_debit_request.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0520_drop_share_savings_debit_request.xml
new file mode 100644
index 000000000..aae3679c7
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0520_drop_share_savings_debit_request.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+