saving, currun, fd and rd account working and tested

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/DepositAccountRecurringDetail.java

@@ -25,6 +25,7 @@ import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.PostLoad;
 import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import java.math.MathContext;
@@ -135,7 +136,17 @@ public class DepositAccountRecurringDetail extends AbstractPersistableCustom<Lon
         return actualChanges;
     }
 
+    @PostLoad
+    public void postLoad() {
+        if (this.recurringDetail == null) {
+            this.recurringDetail = new DepositRecurringDetail();
+        }
+    }
+
     public DepositRecurringDetail recurringDetail() {
+        if (this.recurringDetail == null) {
+            this.recurringDetail = new DepositRecurringDetail();
+        }
         return this.recurringDetail;
     }
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/CurrentAccountTemplateReadPlatformServiceImpl.java

@@ -30,7 +30,7 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData;
 import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.savings.SavingsApiConstants;
-import org.apache.fineract.portfolio.account.service.AccountNumberGenerator;
+import org.apache.fineract.portfolio.currentaccount.service.CurrentAccountNumberGenerator;
 import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
 import org.apache.fineract.infrastructure.dataqueries.data.DatatableData;
 import org.apache.fineract.infrastructure.dataqueries.data.EntityTables;
@@ -80,7 +80,7 @@ public class CurrentAccountTemplateReadPlatformServiceImpl implements CurrentAcc
     private final SavingsDropdownReadPlatformService dropdownReadPlatformService;
     private final ChargeReadPlatformService chargeReadPlatformService;
     private final EntityDatatableChecksReadService entityDatatableChecksReadService;
-    private final AccountNumberGenerator accountNumberGenerator;
+    private final CurrentAccountNumberGenerator currentAccountNumberGenerator;
     private final CodeValueReadPlatformService codeValueReadPlatformService;
 
     public CurrentAccountTemplateReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate,
@@ -91,7 +91,7 @@ public class CurrentAccountTemplateReadPlatformServiceImpl implements CurrentAcc
             final ChargeReadPlatformService chargeReadPlatformService,
             final EntityDatatableChecksReadService entityDatatableChecksReadService,
             final ColumnValidator columnValidator,
-            final AccountNumberGenerator accountNumberGenerator,
+            final CurrentAccountNumberGenerator currentAccountNumberGenerator,
             final CodeValueReadPlatformService codeValueReadPlatformService) {
         this.context = context;
         this.jdbcTemplate = jdbcTemplate;
@@ -102,7 +102,7 @@ public class CurrentAccountTemplateReadPlatformServiceImpl implements CurrentAcc
         this.dropdownReadPlatformService = dropdownReadPlatformService;
         this.chargeReadPlatformService = chargeReadPlatformService;
         this.entityDatatableChecksReadService = entityDatatableChecksReadService;
-        this.accountNumberGenerator = accountNumberGenerator;
+        this.currentAccountNumberGenerator = currentAccountNumberGenerator;
         this.codeValueReadPlatformService = codeValueReadPlatformService;
     }
 
@@ -231,7 +231,7 @@ public class CurrentAccountTemplateReadPlatformServiceImpl implements CurrentAcc
                         productData.getOdAccountClosedZeroBalanceInDayClosing() != null && productData.getOdAccountClosedZeroBalanceInDayClosing());
                 // Generate preview account number using current product's own GL account ID
                 try {
-                    final String preview = accountNumberGenerator.previewAccountNumberByGlAccountId(productData.getGlAccountId(), officeId);
+                    final String preview = currentAccountNumberGenerator.preview(productId, officeId);
                     template.setPreviewAccountNo(preview);
                 } catch (final Exception ex) {
                     log.warn("Failed to generate preview account number for productId={}: {}", productId, ex.getMessage());

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/CurrentAccountWritePlatformServiceImpl.java

@@ -45,6 +45,7 @@ import org.apache.fineract.portfolio.currentaccount.service.CurrentAccountWriteP
 import org.apache.fineract.portfolio.currentaccount.service.CurrentAccountNumberGenerator;
 import org.apache.fineract.portfolio.currentproduct.domain.CurrentProduct;
 import org.apache.fineract.portfolio.currentproduct.domain.CurrentProductRepository;
+import org.apache.fineract.useradministration.domain.AppUser;
 import org.apache.fineract.accounting.common.AccountingConstants.CashAccountsForSavings;
 import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
@@ -127,6 +128,7 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
         boolean balanceSwapOption = json.has("balanceSwapOption") && !json.get("balanceSwapOption").isJsonNull()
                 ? json.get("balanceSwapOption").getAsBoolean() : product.isBalanceSwapOption();
 
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = CurrentAccount.createNew(
                 client, productId, office, null, "TEMP", submittedOnDate, accountTypeEnum,
                 product.currency().getCode(), product.currency().getDigitsAfterDecimal(),
@@ -139,6 +141,7 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
                 product.getCustomerSegment(), product.isAutoPost(),
                 product.getInterestCalculateSelector(), product.getAveragePeriod(),
                 product.getAvgBalanceCalcPeriod());
+        account.setSubmittedOnByUser(user);
 
         boolean shareLinkingEnabled = json.has("shareLinkingEnabled") && !json.get("shareLinkingEnabled").isJsonNull()
                 ? json.get("shareLinkingEnabled").getAsBoolean() : product.isShareLinkingEnabled();
@@ -258,12 +261,12 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     @Override
     @Transactional
     public CommandProcessingResult approveApplication(final Long accountId, final JsonCommand command) {
-        context.authenticatedUser();
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
         LocalDate approvedOnDate = parseDate(getString(json, "approvedOnDate"), getString(json, "dateFormat"), getString(json, "locale"));
         if (approvedOnDate == null) approvedOnDate = LocalDate.now();
-        account.approve(approvedOnDate);
+        account.approve(approvedOnDate, user);
         currentAccountRepository.saveAndFlush(account);
         return new CommandProcessingResultBuilder().withEntityId(accountId).build();
     }
@@ -275,6 +278,7 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
         final CurrentAccount account = findAccount(accountId);
         account.setStatusEnum(100);
         account.setApprovedOnDate(null);
+        account.setApprovedOnByUser(null);
         currentAccountRepository.saveAndFlush(account);
         return new CommandProcessingResultBuilder().withEntityId(accountId).build();
     }
@@ -282,7 +286,7 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     @Override
     @Transactional
     public CommandProcessingResult activate(final Long accountId, final JsonCommand command) {
-        context.authenticatedUser();
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
         LocalDate activatedOnDate = parseDate(getString(json, "activatedOnDate"), getString(json, "dateFormat"), getString(json, "locale"));
@@ -303,7 +307,7 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
                             openingBalanceValue, minRequired)));
         }
 
-        account.activate(activatedOnDate);
+        account.activate(activatedOnDate, user);
         applyFacilityChargesOnActivation(account);
 
         java.math.BigDecimal currentBalance = java.math.BigDecimal.ZERO;
@@ -360,12 +364,12 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     @Override
     @Transactional
     public CommandProcessingResult rejectApplication(final Long accountId, final JsonCommand command) {
-        context.authenticatedUser();
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
         LocalDate rejectedOnDate = parseDate(getString(json, "rejectedOnDate"), getString(json, "dateFormat"), getString(json, "locale"));
         if (rejectedOnDate == null) rejectedOnDate = LocalDate.now();
-        account.reject(rejectedOnDate);
+        account.reject(rejectedOnDate, user);
         currentAccountRepository.saveAndFlush(account);
         return new CommandProcessingResultBuilder().withEntityId(accountId).build();
     }
@@ -373,12 +377,12 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     @Override
     @Transactional
     public CommandProcessingResult withdrawApplication(final Long accountId, final JsonCommand command) {
-        context.authenticatedUser();
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
         LocalDate withdrawnOnDate = parseDate(getString(json, "withdrawnOnDate"), getString(json, "dateFormat"), getString(json, "locale"));
         if (withdrawnOnDate == null) withdrawnOnDate = LocalDate.now();
-        account.withdraw(withdrawnOnDate);
+        account.withdraw(withdrawnOnDate, user);
         currentAccountRepository.saveAndFlush(account);
         return new CommandProcessingResultBuilder().withEntityId(accountId).build();
     }
@@ -386,12 +390,12 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     @Override
     @Transactional
     public CommandProcessingResult closeAccount(final Long accountId, final JsonCommand command) {
-        context.authenticatedUser();
+        final AppUser user = context.authenticatedUser();
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
         LocalDate closedOnDate = parseDate(getString(json, "closedOnDate"), getString(json, "dateFormat"), getString(json, "locale"));
         if (closedOnDate == null) closedOnDate = LocalDate.now();
-        account.close(closedOnDate);
+        account.close(closedOnDate, user);
         currentAccountRepository.saveAndFlush(account);
         return new CommandProcessingResultBuilder().withEntityId(accountId).build();
     }
@@ -403,6 +407,19 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
         final CurrentAccount account = findAccount(accountId);
         final JsonObject json = command.parsedJson().getAsJsonObject();
 
+        if (account.getStatusEnum() != null) {
+            if (account.getStatusEnum() == 500) {
+                account.setStatusEnum(100);
+                account.setRejectedOnDate(null);
+                account.setRejectedOnByUser(null);
+            } else if (account.getStatusEnum() == 400) {
+                account.setStatusEnum(100);
+                account.setWithdrawnOnDate(null);
+                account.setWithdrawnOnByUser(null);
+            }
+        }
+
+
         if (json.has("externalId") && !json.get("externalId").isJsonNull())
             account.setExternalId(json.get("externalId").getAsString());
         if (json.has("accountStatus") && !json.get("accountStatus").isJsonNull())
@@ -498,7 +515,10 @@ public class CurrentAccountWritePlatformServiceImpl implements CurrentAccountWri
     }
 
     private CurrentAccountFacilityConfig assembleFacilityConfig(CurrentAccount account, JsonObject fcJson) {
-        final CurrentAccountFacilityConfig cfg = CurrentAccountFacilityConfig.createFor(account);
+        CurrentAccountFacilityConfig cfg = account.getFacilityConfig();
+        if (cfg == null) {
+            cfg = CurrentAccountFacilityConfig.createFor(account);
+        }
         cfg.setAtmFacility(getBool(fcJson, "atmFacility"));
         cfg.setAtmWithdrawalFacility(getBool(fcJson, "atmWithdrawalFacility"));
         cfg.setUpiFacility(getBool(fcJson, "upiFacility"));

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/starter/SavingsConfiguration.java

@@ -47,6 +47,7 @@ import org.apache.fineract.portfolio.account.domain.AccountAssociationsRepositor
 import org.apache.fineract.portfolio.account.domain.StandingInstructionRepository;
 import org.apache.fineract.portfolio.account.service.AccountAssociationsReadPlatformService;
 import org.apache.fineract.portfolio.account.service.AccountNumberGenerator;
+import org.apache.fineract.portfolio.currentaccount.service.CurrentAccountNumberGenerator;
 import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService;
 import org.apache.fineract.portfolio.account.service.AccountTransfersWritePlatformService;
 import org.apache.fineract.portfolio.calendar.domain.CalendarInstanceRepository;
@@ -404,11 +405,11 @@ public class SavingsConfiguration {
             GroupReadPlatformService groupReadPlatformService, CurrentProductReadPlatformService currentProductReadPlatformService,
             StaffReadPlatformService staffReadPlatformService, SavingsDropdownReadPlatformService dropdownReadPlatformService,
             ChargeReadPlatformService chargeReadPlatformService, EntityDatatableChecksReadService entityDatatableChecksReadService,
-            ColumnValidator columnValidator, AccountNumberGenerator accountNumberGenerator,
+            ColumnValidator columnValidator, CurrentAccountNumberGenerator currentAccountNumberGenerator,
             CodeValueReadPlatformService codeValueReadPlatformService) {
         return new CurrentAccountTemplateReadPlatformServiceImpl(context, jdbcTemplate, clientReadPlatformService, groupReadPlatformService,
                 currentProductReadPlatformService, staffReadPlatformService, dropdownReadPlatformService, chargeReadPlatformService,
-                entityDatatableChecksReadService, columnValidator, accountNumberGenerator, codeValueReadPlatformService);
+                entityDatatableChecksReadService, columnValidator, currentAccountNumberGenerator, codeValueReadPlatformService);
     }
 
     @Bean