table changes on Maker-Checker workflow for Products, with approval-based updates and product locking to prevent concurrent edits

2026-07-06 17:49:39 +05:30
parent b0bfa386ce
commit 9980310c9e
21 changed files with 1175 additions and 232 deletions
@@ -51,6 +51,14 @@ import org.apache.fineract.portfolio.tax.data.TaxGroupData;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEdit;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditSubmittedFieldRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditChargeRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditGlMappingRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFacilityLimitRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFieldMapper;
+import java.util.Set;

@RequiredArgsConstructor
 public class CurrentProductReadPlatformServiceImpl implements CurrentProductReadPlatformService {
@@ -60,6 +68,11 @@ public class CurrentProductReadPlatformServiceImpl implements CurrentProductRead
    private final CurrentProductFacilityConfigRepository facilityConfigRepository;
    private final CurrentProductFacilityLimitRepository facilityLimitRepository;
    private final CurrentProductDepositLimitKycRepository depositLimitKycRepository;
+    private final ProductPendingEditRepository productPendingEditRepository;
+    private final ProductPendingEditSubmittedFieldRepository pendingEditSubmittedFieldRepository;
+    private final ProductPendingEditChargeRepository pendingEditChargeRepository;
+    private final ProductPendingEditGlMappingRepository pendingEditGlMappingRepository;
+    private final ProductPendingEditFacilityLimitRepository pendingEditFacilityLimitRepository;

    private final CurrentProductMapper currentProductRowMapper = new CurrentProductMapper();
    private final CurrentProductLookupMapper currentProductLookupsRowMapper = new CurrentProductLookupMapper();
@@ -150,41 +163,50 @@ public class CurrentProductReadPlatformServiceImpl implements CurrentProductRead
    }

    private static final String PENDING_EDIT_SCHEMA = "spt.id as tempId, spt.product_id as savingsProductId, "
-            + "cp.name as savingsProductName, spt.maker_id as makerId, maker.username as makerUsername, "
-            + "spt.checker_id as checkerId, checker.username as checkerUsername, spt.created_on as createdOn, "
-            + "spt.checked_on as checkedOn, spt.status as status, spt.reject_reason as rejectReason, "
-            + "spt.proposed_payload_json as proposedPayloadJson "
-            + "from m_savings_product_temp spt "
+            + "cp.name as savingsProductName, spt.createdby_id as makerId, maker.username as makerUsername, "
+            + "spt.lastmodifiedby_id as checkerId, checker.username as checkerUsername, spt.created_date as createdOn, "
+            + "spt.lastmodified_date as checkedOn, spt.status as status, spt.reject_reason as rejectReason "
+            + "from m_saving_product_temp spt "
            + "join m_current_product cp on cp.id = spt.product_id "
-            + "join m_appuser maker on maker.id = spt.maker_id "
-            + "left join m_appuser checker on checker.id = spt.checker_id "
+            + "join m_appuser maker on maker.id = spt.createdby_id "
+            + "left join m_appuser checker on checker.id = spt.lastmodifiedby_id "
            + "where spt.product_type = 'CURRENT' ";

-    private static final RowMapper<SavingsProductTempData> PENDING_EDIT_MAPPER = (rs, rowNum) -> {
-        final SavingsProductTempData data = new SavingsProductTempData();
-        data.setId(rs.getLong("tempId"));
-        data.setSavingsProductId(rs.getLong("savingsProductId"));
-        data.setSavingsProductName(rs.getString("savingsProductName"));
-        data.setMakerId(rs.getLong("makerId"));
-        data.setMakerUsername(rs.getString("makerUsername"));
-        data.setCheckerId(JdbcSupport.getLong(rs, "checkerId"));
-        data.setCheckerUsername(rs.getString("checkerUsername"));
-        data.setCreatedOn(rs.getTimestamp("createdOn") == null ? null : rs.getTimestamp("createdOn").toLocalDateTime());
-        data.setCheckedOn(rs.getTimestamp("checkedOn") == null ? null : rs.getTimestamp("checkedOn").toLocalDateTime());
-        data.setStatus(rs.getString("status"));
-        data.setRejectReason(rs.getString("rejectReason"));
-        final String proposedPayloadJson = rs.getString("proposedPayloadJson");
-        if (proposedPayloadJson != null) {
-            data.setProposedChanges(GSON.fromJson(proposedPayloadJson, new TypeToken<Map<String, Object>>() {}.getType()));
-        }
-        return data;
-    };
+    private RowMapper<SavingsProductTempData> getPendingEditRowMapper() {
+        return (rs, rowNum) -> {
+            final SavingsProductTempData data = new SavingsProductTempData();
+            data.setId(rs.getLong("tempId"));
+            data.setSavingsProductId(rs.getLong("savingsProductId"));
+            data.setSavingsProductName(rs.getString("savingsProductName"));
+            data.setMakerId(rs.getLong("makerId"));
+            data.setMakerUsername(rs.getString("makerUsername"));
+            data.setCheckerId(JdbcSupport.getLong(rs, "checkerId"));
+            data.setCheckerUsername(rs.getString("checkerUsername"));
+            data.setCreatedOn(rs.getTimestamp("createdOn") == null ? null : rs.getTimestamp("createdOn").toLocalDateTime());
+            data.setCheckedOn(rs.getTimestamp("checkedOn") == null ? null : rs.getTimestamp("checkedOn").toLocalDateTime());
+            data.setStatus(rs.getString("status"));
+            data.setRejectReason(rs.getString("rejectReason"));
+
+            final Long tempId = data.getId();
+            final java.util.Optional<ProductPendingEdit> opt = this.productPendingEditRepository.findById(tempId);
+            if (opt.isPresent()) {
+                final ProductPendingEdit pendingEdit = opt.get();
+                final Set<String> submittedFields = new java.util.HashSet<>(
+                        this.pendingEditSubmittedFieldRepository.findFieldNamesByPendingEditId(pendingEdit.getId()));
+                final Map<String, Object> proposedChanges = ProductPendingEditFieldMapper.reconstructProposedChangesMap(
+                        pendingEdit, submittedFields, this.pendingEditChargeRepository, this.pendingEditGlMappingRepository,
+                        this.pendingEditFacilityLimitRepository, GSON);
+                data.setProposedChanges(proposedChanges);
+            }
+            return data;
+        };
+    }

    @Override
    public Collection<SavingsProductTempData> retrieveAllPendingEdits() {
        this.context.authenticatedUser();
-        final String sql = "select " + PENDING_EDIT_SCHEMA + "and spt.status = 'PENDING' order by spt.created_on desc";
-        return this.jdbcTemplate.query(sql, PENDING_EDIT_MAPPER);
+        final String sql = "select " + PENDING_EDIT_SCHEMA + "and spt.status = 'PENDING' order by spt.created_date desc";
+        return this.jdbcTemplate.query(sql, getPendingEditRowMapper());
    }

    @Override
@@ -192,7 +214,7 @@ public class CurrentProductReadPlatformServiceImpl implements CurrentProductRead
        this.context.authenticatedUser();
        final String sql = "select " + PENDING_EDIT_SCHEMA + "and spt.status = 'PENDING' and spt.product_id = ?";
        try {
-            return this.jdbcTemplate.queryForObject(sql, PENDING_EDIT_MAPPER, new Object[] { productId }); // NOSONAR
+            return this.jdbcTemplate.queryForObject(sql, getPendingEditRowMapper(), new Object[] { productId }); // NOSONAR
        } catch (final EmptyResultDataAccessException e) {
            throw new CurrentProductNoPendingEditException(productId);
        }
@@ -249,7 +271,7 @@ public class CurrentProductReadPlatformServiceImpl implements CurrentProductRead
            sqlBuilder.append("cp.balance_swap_option as balanceSwapOption, cp.msme as msme, cp.auto_debit_facility as autoDebitFacility, ");
            sqlBuilder.append("cp.avg_balance_calc_period as avgBalanceCalcPeriod, cp.valid_for_period as validForPeriod, ");
            sqlBuilder.append("cp.od_account_closed_zero_balance_in_day_closing as odAccountClosedZeroBalanceInDayClosing, ");
-            sqlBuilder.append("exists(select 1 from m_savings_product_temp spt where spt.product_id = cp.id "
+            sqlBuilder.append("exists(select 1 from m_saving_product_temp spt where spt.product_id = cp.id "
                    + "and spt.product_type = 'CURRENT' and spt.status = 'PENDING') as isPendingApproval ");

            sqlBuilder.append("from m_current_product cp ");
@@ -63,6 +63,16 @@ import org.apache.fineract.portfolio.savings.DepositAccountType;
 import org.apache.fineract.portfolio.savings.domain.ProductPendingEdit;
 import org.apache.fineract.portfolio.savings.domain.ProductPendingEditRepository;
 import org.apache.fineract.portfolio.savings.exception.SavingsProductNotFoundException;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditSubmittedField;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditSubmittedFieldRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditCharge;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditChargeRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFacilityLimit;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFacilityLimitRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditGlMapping;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditGlMappingRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFieldMapper;
+import com.google.gson.JsonObject;
 import org.apache.fineract.portfolio.tax.domain.TaxGroup;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.dao.DataAccessException;
@@ -72,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
@RequiredArgsConstructor
 public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements CurrentProductWritePlatformService {

+    private static final com.google.gson.Gson GSON = new com.google.gson.Gson();
    private final PlatformSecurityContext context;
    private final CurrentProductRepository currentProductRepository;
    private final CurrentProductDataValidator fromApiJsonDataValidator;
@@ -81,6 +92,10 @@ public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements Curr
    private final CurrentProductFacilityLimitRepository facilityLimitRepository;
    private final CurrentProductDepositLimitKycRepository depositLimitKycRepository;
    private final ProductPendingEditRepository productPendingEditRepository;
+    private final ProductPendingEditSubmittedFieldRepository pendingEditSubmittedFieldRepository;
+    private final ProductPendingEditChargeRepository pendingEditChargeRepository;
+    private final ProductPendingEditFacilityLimitRepository pendingEditFacilityLimitRepository;
+    private final ProductPendingEditGlMappingRepository pendingEditGlMappingRepository;
    private final FromJsonHelper fromApiJsonHelper;
    private final CommandSourceRepository commandSourceRepository;

@@ -281,7 +296,28 @@ public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements Curr

        this.fromApiJsonDataValidator.validateForUpdate(command.json(), product);

-        final ProductPendingEdit pendingEdit = new ProductPendingEdit(ProductPendingEdit.TYPE_CURRENT, productId, maker, command.json());
+        final ProductPendingEdit pendingEdit = new ProductPendingEdit(ProductPendingEdit.TYPE_CURRENT, productId, maker);
+
+        final java.util.Set<String> submitted = ProductPendingEditFieldMapper.populateCoreFields(command, pendingEdit.getCoreFields());
+        final java.util.Set<String> currentOnlySubmitted = ProductPendingEditFieldMapper.populateCurrentOnlyFields(command, pendingEdit.getCurrentOnlyFields());
+        final boolean facilityConfigSubmitted = ProductPendingEditFieldMapper.populateFacilityConfig(command, pendingEdit.getFacilityConfigFields());
+        final boolean depositLimitKycSubmitted = ProductPendingEditFieldMapper.populateDepositLimitKyc(command, pendingEdit.getDepositLimitKycFields());
+        final boolean glMappingSubmitted = ProductPendingEditFieldMapper.populateGlAccountMapping(command, pendingEdit.getGlAccountMappingFields());
+
+        if (!currentOnlySubmitted.isEmpty()) {
+            submitted.add("avgBalanceCalcPeriod");
+            submitted.add("validForPeriod");
+            submitted.add("odAccountClosedZeroBalanceInDayClosing");
+        }
+        if (facilityConfigSubmitted) {
+            submitted.add("accountFacilityConfig");
+        }
+        if (depositLimitKycSubmitted) {
+            submitted.add("depositLimitKyc");
+        }
+        if (glMappingSubmitted) {
+            submitted.add("glAccountMapping");
+        }

        final CommandSource auditEntry = CommandSource.builder() //
                .actionName("UPDATE") //
@@ -300,6 +336,30 @@ public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements Curr

        this.productPendingEditRepository.saveAndFlush(pendingEdit);

+        for (final String fieldName : submitted) {
+            this.pendingEditSubmittedFieldRepository.save(new ProductPendingEditSubmittedField(pendingEdit, fieldName));
+        }
+
+        final List<Long> chargeIds = ProductPendingEditFieldMapper.extractChargeIds(command);
+        if (chargeIds != null) {
+            this.pendingEditSubmittedFieldRepository.save(new ProductPendingEditSubmittedField(pendingEdit, "charges"));
+            for (final Long chargeId : chargeIds) {
+                this.pendingEditChargeRepository.save(new ProductPendingEditCharge(pendingEdit, chargeId));
+            }
+        }
+
+        final List<ProductPendingEditFacilityLimit> facilityLimits = ProductPendingEditFieldMapper.extractFacilityLimits(command, pendingEdit);
+        if (facilityLimits != null) {
+            this.pendingEditSubmittedFieldRepository.save(new ProductPendingEditSubmittedField(pendingEdit, "accountFacilityLimits"));
+            this.pendingEditFacilityLimitRepository.saveAll(facilityLimits);
+        }
+
+        final List<ProductPendingEditGlMapping> glMappings = ProductPendingEditFieldMapper.extractGlArrayMappings(command, pendingEdit);
+        if (glMappings != null) {
+            this.pendingEditSubmittedFieldRepository.save(new ProductPendingEditSubmittedField(pendingEdit, "glArrayMappings"));
+            this.pendingEditGlMappingRepository.saveAll(glMappings);
+        }
+
        return new CommandProcessingResultBuilder() //
                .withEntityId(product.getId()) //
                .build();
@@ -318,8 +378,33 @@ public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements Curr
            throw new CurrentProductSelfApprovalNotAllowedException(productId);
        }

-        final JsonCommand replayedCommand = JsonCommand.fromJsonElement(productId,
-                this.fromApiJsonHelper.parse(pendingEdit.getProposedPayloadJson()), this.fromApiJsonHelper);
+        final Set<String> submittedFields = new java.util.HashSet<>(
+                this.pendingEditSubmittedFieldRepository.findFieldNamesByPendingEditId(pendingEdit.getId()));
+        final JsonObject root = new JsonObject();
+        root.addProperty("locale", "en");
+        root.addProperty("dateFormat", "yyyy-MM-dd");
+        ProductPendingEditFieldMapper.writeCoreFieldsToJson(root, pendingEdit.getCoreFields(), submittedFields);
+        ProductPendingEditFieldMapper.writeCurrentOnlyFieldsToJson(root, pendingEdit.getCurrentOnlyFields(), submittedFields);
+        ProductPendingEditFieldMapper.writeFacilityConfigToJson(root, pendingEdit.getFacilityConfigFields(),
+                submittedFields.contains("accountFacilityConfig"));
+        ProductPendingEditFieldMapper.writeDepositLimitKycToJson(root, pendingEdit.getDepositLimitKycFields(),
+                submittedFields.contains("depositLimitKyc"));
+        if (submittedFields.contains("glAccountMapping")) {
+            ProductPendingEditFieldMapper.writeGlAccountMappingToJson(root, pendingEdit.getGlAccountMappingFields());
+        }
+        if (submittedFields.contains("charges")) {
+            ProductPendingEditFieldMapper.writeChargesToJson(root,
+                    this.pendingEditChargeRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        if (submittedFields.contains("accountFacilityLimits")) {
+            ProductPendingEditFieldMapper.writeFacilityLimitsToJson(root,
+                    this.pendingEditFacilityLimitRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        if (submittedFields.contains("glArrayMappings")) {
+            ProductPendingEditFieldMapper.writeGlArrayMappingsToJson(root,
+                    this.pendingEditGlMappingRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        final JsonCommand replayedCommand = JsonCommand.fromJsonElement(productId, root, this.fromApiJsonHelper);
        final CommandProcessingResult result = update(productId, replayedCommand);

        pendingEdit.markApproved(checker);
@@ -340,12 +425,40 @@ public class CurrentProductWritePlatformServiceJpaRepositoryImpl implements Curr
                return existing.get();
            }
        }
+        final Set<String> submittedFields = new java.util.HashSet<>(
+                this.pendingEditSubmittedFieldRepository.findFieldNamesByPendingEditId(pendingEdit.getId()));
+        final JsonObject root = new JsonObject();
+        root.addProperty("locale", "en");
+        root.addProperty("dateFormat", "yyyy-MM-dd");
+        ProductPendingEditFieldMapper.writeCoreFieldsToJson(root, pendingEdit.getCoreFields(), submittedFields);
+        ProductPendingEditFieldMapper.writeCurrentOnlyFieldsToJson(root, pendingEdit.getCurrentOnlyFields(), submittedFields);
+        ProductPendingEditFieldMapper.writeFacilityConfigToJson(root, pendingEdit.getFacilityConfigFields(),
+                submittedFields.contains("accountFacilityConfig"));
+        ProductPendingEditFieldMapper.writeDepositLimitKycToJson(root, pendingEdit.getDepositLimitKycFields(),
+                submittedFields.contains("depositLimitKyc"));
+        if (submittedFields.contains("glAccountMapping")) {
+            ProductPendingEditFieldMapper.writeGlAccountMappingToJson(root, pendingEdit.getGlAccountMappingFields());
+        }
+        if (submittedFields.contains("charges")) {
+            ProductPendingEditFieldMapper.writeChargesToJson(root,
+                    this.pendingEditChargeRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        if (submittedFields.contains("accountFacilityLimits")) {
+            ProductPendingEditFieldMapper.writeFacilityLimitsToJson(root,
+                    this.pendingEditFacilityLimitRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        if (submittedFields.contains("glArrayMappings")) {
+            ProductPendingEditFieldMapper.writeGlArrayMappingsToJson(root,
+                    this.pendingEditGlMappingRepository.findByPendingEditId(pendingEdit.getId()));
+        }
+        final String commandJson = GSON.toJson(root);
+
        final CommandSource auditEntry = CommandSource.builder() //
                .actionName("UPDATE") //
                .entityName("CURRENTPRODUCT") //
                .resourceGetUrl("/currentproducts/" + productId) //
                .resourceId(productId) //
-                .commandAsJson(pendingEdit.getProposedPayloadJson()) //
+                .commandAsJson(commandJson) //
                .maker(pendingEdit.getMaker()) //
                .madeOnDate(DateUtils.getAuditOffsetDateTime()) //
                .status(CommandProcessingResultType.AWAITING_APPROVAL.getValue()) //
@@ -23,6 +23,10 @@ import org.apache.fineract.commands.domain.CommandSourceRepository;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.savings.domain.ProductPendingEditRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditSubmittedFieldRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditChargeRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditFacilityLimitRepository;
+import org.apache.fineract.portfolio.savings.domain.ProductPendingEditGlMappingRepository;
 import org.apache.fineract.portfolio.currentproduct.data.CurrentProductDataValidator;
 import org.apache.fineract.portfolio.currentproduct.domain.CurrentProductAssembler;
 import org.apache.fineract.portfolio.currentproduct.domain.CurrentProductDepositLimitKycRepository;
@@ -46,9 +50,17 @@ public class CurrentProductConfiguration {
    public CurrentProductReadPlatformService currentProductReadPlatformService(PlatformSecurityContext context,
            JdbcTemplate jdbcTemplate, CurrentProductFacilityConfigRepository currentFacilityConfigRepository,
            CurrentProductFacilityLimitRepository currentFacilityLimitRepository,
-            CurrentProductDepositLimitKycRepository currentDepositLimitKycRepository) {
+            CurrentProductDepositLimitKycRepository currentDepositLimitKycRepository,
+            ProductPendingEditRepository productPendingEditRepository,
+            ProductPendingEditSubmittedFieldRepository pendingEditSubmittedFieldRepository,
+            ProductPendingEditChargeRepository pendingEditChargeRepository,
+            ProductPendingEditGlMappingRepository pendingEditGlMappingRepository,
+            ProductPendingEditFacilityLimitRepository pendingEditFacilityLimitRepository) {
        return new CurrentProductReadPlatformServiceImpl(context, jdbcTemplate, currentFacilityConfigRepository,
-                currentFacilityLimitRepository, currentDepositLimitKycRepository);
+                currentFacilityLimitRepository, currentDepositLimitKycRepository,
+                productPendingEditRepository, pendingEditSubmittedFieldRepository,
+                pendingEditChargeRepository, pendingEditGlMappingRepository,
+                pendingEditFacilityLimitRepository);
    }

    @Bean
@@ -61,11 +73,16 @@ public class CurrentProductConfiguration {
            CurrentProductFacilityLimitRepository currentFacilityLimitRepository,
            CurrentProductDepositLimitKycRepository currentDepositLimitKycRepository,
            ProductPendingEditRepository productPendingEditRepository,
+            ProductPendingEditSubmittedFieldRepository pendingEditSubmittedFieldRepository,
+            ProductPendingEditChargeRepository pendingEditChargeRepository,
+            ProductPendingEditFacilityLimitRepository pendingEditFacilityLimitRepository,
+            ProductPendingEditGlMappingRepository pendingEditGlMappingRepository,
            FromJsonHelper fromApiJsonHelper,
            CommandSourceRepository commandSourceRepository) {
        return new CurrentProductWritePlatformServiceJpaRepositoryImpl(context, currentProductRepository, currentProductDataValidator,
                currentProductAssembler, accountMappingWritePlatformService, currentFacilityConfigRepository,
-                currentFacilityLimitRepository, currentDepositLimitKycRepository, productPendingEditRepository, fromApiJsonHelper,
-                commandSourceRepository);
+                currentFacilityLimitRepository, currentDepositLimitKycRepository, productPendingEditRepository,
+                pendingEditSubmittedFieldRepository, pendingEditChargeRepository, pendingEditFacilityLimitRepository,
+                pendingEditGlMappingRepository, fromApiJsonHelper, commandSourceRepository);
    }
 }