| Codes |
codes |
@@ -14452,6 +14468,337 @@ GET https://DomainName/api/v1/audits
+
+
+
+
+
+
Account number format
+
Account number preferences are used to describe custom formats for account numbers associated with Customer, Loan and Savings accounts.
+
+
+
+
+
+
List Account number formats
+
Example Requests:
+
accountnumberformats
+
+
+
accountnumberformats?fields=accountType,prefixType
+
+
+
+GET https://DomainName/api/v1/accountnumberformats
+
+
+[
+ {
+ "id": 2,
+ "accountType":
+ {
+ "id": 1,
+ "code": "accountType.client",
+ "value": "CLIENT"
+ },
+ "prefixType":
+ {
+ "id": 101,
+ "code": "accountNumberPrefixType.clientType",
+ "value": "CLIENT_TYPE"
+ }
+ },
+ {
+ "id": 3,
+ "accountType":
+ {
+ "id": 2,
+ "code": "accountType.loan",
+ "value": "LOAN"
+ },
+ "prefixType":
+ {
+ "id": 201,
+ "code": "accountNumberPrefixType.loanProductShortName",
+ "value": "LOAN_PRODUCT_SHORT_NAME"
+ }
+ }
+]
+
+
+
+
+
Retrieve Account number format Template
+
This is a convenience resource. It can be useful when
+ building maintenance user interface screens for client
+ applications. The template data returned consists of any or all
+ of:
+
+ - Field Defaults
+ - Allowed Value Lists
+
+
+
Example Request:
+
accountnumberformats/template
+
+
+
+GET https://DomainName/api/v1/accountnumberformats/template
+
+
+
+
+ {
+ "accountTypeOptions":
+ [
+ {
+ "id": 1,
+ "code": "accountType.client",
+ "value": "CLIENT"
+ },
+ {
+ "id": 2,
+ "code": "accountType.loan",
+ "value": "LOAN"
+ },
+ {
+ "id": 3,
+ "code": "accountType.savings",
+ "value": "SAVINGS"
+ }
+ ],
+ "prefixTypeOptions":
+ {
+ "accountType.loan":
+ [
+ {
+ "id": 201,
+ "code": "accountNumberPrefixType.loanProductShortName",
+ "value": "LOAN_PRODUCT_SHORT_NAME"
+ },
+ {
+ "id": 1,
+ "code": "accountNumberPrefixType.officeName",
+ "value": "OFFICE_NAME"
+ }
+ ],
+ "accountType.client":
+ [
+ {
+ "id": 1,
+ "code": "accountNumberPrefixType.officeName",
+ "value": "OFFICE_NAME"
+ },
+ {
+ "id": 101,
+ "code": "accountNumberPrefixType.clientType",
+ "value": "CLIENT_TYPE"
+ }
+ ],
+ "accountType.savings":
+ [
+ {
+ "id": 301,
+ "code": "accountNumberPrefixType.savingsProductShortName",
+ "value": "SAVINGS_PRODUCT_SHORT_NAME"
+ },
+ {
+ "id": 1,
+ "code": "accountNumberPrefixType.officeName",
+ "value": "OFFICE_NAME"
+ }
+ ]
+ }
+ }
+
+
+
+
+
+
+
Retrieve an Account number format
+
Example Requests:
+
accountnumberformats/1
+
+
+
accountnumberformats/1?template=true
+
+
+
accountnumberformats/1?fields=accountType,prefixType
+
+
+
+GET https://DomainName/api/v1/accountnumberformats/{accountnumberformatId}
+
+
+
+{
+ "id": 2,
+ "accountType":
+ {
+ "id": 1,
+ "code": "accountType.client",
+ "value": "CLIENT"
+ },
+ "prefixType":
+ {
+ "id": 101,
+ "code": "accountNumberPrefixType.clientType",
+ "value": "CLIENT_TYPE"
+ }
+}
+
+
+
+
+
+
Create an Account number format
+
+ Note: You may associate a single Account number format for a given account type
+
+
+
+ Mandatory Fields
+ for Account number formats |
+
+
+ | accountType |
+
+
+
+
+
+POST https://DomainName/api/v1/accountnumberformats
+
+
+POST /accountnumberformats
+Content-Type: application/json
+Request Body:
+{
+ accountType :1,
+ prefixType: 101
+}
+
+
+{
+ "resourceId": 4
+}
+
+
+
+POST /accountnumberformats
+Content-Type: application/json
+Request Body:
+{
+ accountType :2,
+ prefixType: 201
+}
+
+
+{
+ "resourceId": 5
+}
+
+
+
+
+
Update an Account number format
+
+
+
+PUT https://DomainName/api/v1/accountnumberformats/{accountnumberformatId}
+
+
+PUT accountnumberformats/2
+Content-Type: application/json
+Request Body:
+{
+ prefixType:1
+}
+
+
+{
+ "resourceId": 2,
+ "changes":
+ {
+ "prefixType": "OFFICE_NAME"
+ }
+}
+
+
+
+
+
+
Delete an Account number format
+
+ Note: Account numbers created while this format was active would remain unchanged.
+
+
+
+
+DELETE https://DomainName/api/v1/accountnumberformats/{accountnumberformatId}
+
+
+DELETE accountnumberformats/2
+Content-Type: application/json
+No Request Body:
+
+
+{
+ "resourceId": 2
+}
+
+
+
+
maxLength.
*/
-public interface AccountNumberGenerator {
+@Component
+public class AccountNumberGenerator {
- String generate();
+ private final static int maxLength = 9;
-}
+ private final static String ID = "id";
+ private final static String CLIENT_TYPE = "clientType";
+ private final static String OFFICE_NAME = "officeName";
+ private final static String LOAN_PRODUCT_SHORT_NAME = "loanProductShortName";
+ private final static String SAVINGS_PRODUCT_SHORT_NAME = "savingsProductShortName";
+
+ public String generate(Client client, AccountNumberFormat accountNumberFormat) {
+ Map propertyMap = new HashMap<>();
+ propertyMap.put(ID, client.getId().toString());
+ propertyMap.put(OFFICE_NAME, client.getOffice().getName());
+ CodeValue clientType = client.clientType();
+ if (clientType != null) {
+ propertyMap.put(CLIENT_TYPE, clientType.label());
+ }
+ return generateAccountNumber(propertyMap, accountNumberFormat);
+ }
+
+ public String generate(Loan loan, AccountNumberFormat accountNumberFormat) {
+ Map propertyMap = new HashMap<>();
+ propertyMap.put(ID, loan.getId().toString());
+ propertyMap.put(OFFICE_NAME, loan.getOffice().getName());
+ propertyMap.put(LOAN_PRODUCT_SHORT_NAME, loan.loanProduct().getShortName());
+ return generateAccountNumber(propertyMap, accountNumberFormat);
+ }
+
+ public String generate(SavingsAccount savingsAccount, AccountNumberFormat accountNumberFormat) {
+ Map propertyMap = new HashMap<>();
+ propertyMap.put(ID, savingsAccount.getId().toString());
+ propertyMap.put(OFFICE_NAME, savingsAccount.office().getName());
+ propertyMap.put(SAVINGS_PRODUCT_SHORT_NAME, savingsAccount.savingsProduct().getShortName());
+ return generateAccountNumber(propertyMap, accountNumberFormat);
+ }
+
+ private String generateAccountNumber(Map propertyMap, AccountNumberFormat accountNumberFormat) {
+ String accountNumber = StringUtils.leftPad(propertyMap.get(ID), this.maxLength, '0');
+ if (accountNumberFormat != null && accountNumberFormat.getPrefixEnum() != null) {
+ AccountNumberPrefixType accountNumberPrefixType = AccountNumberPrefixType.fromInt(accountNumberFormat.getPrefixEnum());
+ String prefix = null;
+ switch (accountNumberPrefixType) {
+ case CLIENT_TYPE:
+ prefix = propertyMap.get(CLIENT_TYPE);
+ break;
+
+ case OFFICE_NAME:
+ prefix = propertyMap.get(OFFICE_NAME);
+ break;
+
+ case LOAN_PRODUCT_SHORT_NAME:
+ prefix = propertyMap.get(LOAN_PRODUCT_SHORT_NAME);
+ break;
+
+ case SAVINGS_PRODUCT_SHORT_NAME:
+ prefix = propertyMap.get(SAVINGS_PRODUCT_SHORT_NAME);
+ break;
+
+ default:
+ break;
+
+ }
+ accountNumber = StringUtils.overlay(accountNumber, prefix, 0, 0);
+ }
+ return accountNumber;
+ }
+
+}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/AccountNumberGeneratorFactory.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/AccountNumberGeneratorFactory.java
deleted file mode 100644
index d73ca7923..000000000
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/AccountNumberGeneratorFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-package org.mifosplatform.portfolio.client.domain;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class AccountNumberGeneratorFactory {
-
- public AccountNumberGenerator determineClientAccountNoGenerator(final Long clientId) {
- return new ZeroPaddedAccountNumberGenerator(clientId, 9);
- }
-
- public AccountNumberGenerator determineLoanAccountNoGenerator(final Long loanId) {
- return new ZeroPaddedAccountNumberGenerator(loanId, 9);
- }
-
- public AccountNumberGenerator determineSavingsAccountNoGenerator(final Long savingsAccountId) {
- return new ZeroPaddedAccountNumberGenerator(savingsAccountId, 9);
- }
-}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ZeroPaddedAccountNumberGenerator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ZeroPaddedAccountNumberGenerator.java
deleted file mode 100644
index 9e18e0dd5..000000000
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/ZeroPaddedAccountNumberGenerator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-package org.mifosplatform.portfolio.client.domain;
-
-/**
- * Example {@link AccountNumberGenerator} for clients that takes an entities
- * auto generated database id and zero fills it ensuring the identifier is
- * always of a given maxLength.
- */
-public class ZeroPaddedAccountNumberGenerator implements AccountNumberGenerator {
-
- private final Long id;
- private final int maxLength;
-
- public ZeroPaddedAccountNumberGenerator(final Long id, final int maxLength) {
- this.id = id;
- this.maxLength = maxLength;
- }
-
- @Override
- public String generate() {
- return String.format("%0" + this.maxLength + "d", this.id);
- }
-}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
index cfe532718..176bc93b4 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -16,6 +16,9 @@ import org.joda.time.format.DateTimeFormatter;
import org.mifosplatform.commands.domain.CommandWrapper;
import org.mifosplatform.commands.service.CommandProcessingService;
import org.mifosplatform.commands.service.CommandWrapperBuilder;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormat;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormatRepositoryWrapper;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.EntityAccountType;
import org.mifosplatform.infrastructure.codes.domain.CodeValue;
import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper;
import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService;
@@ -32,7 +35,6 @@ import org.mifosplatform.organisation.staff.domain.StaffRepositoryWrapper;
import org.mifosplatform.portfolio.client.api.ClientApiConstants;
import org.mifosplatform.portfolio.client.data.ClientDataValidator;
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
-import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.client.domain.Client;
import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper;
import org.mifosplatform.portfolio.client.domain.ClientStatus;
@@ -76,7 +78,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
private final NoteRepository noteRepository;
private final GroupRepository groupRepository;
private final ClientDataValidator fromApiJsonDeserializer;
- private final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory;
+ private final AccountNumberGenerator accountNumberGenerator;
private final StaffRepositoryWrapper staffRepository;
private final CodeValueRepositoryWrapper codeValueRepository;
private final LoanRepository loanRepository;
@@ -85,22 +87,24 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
private final SavingsApplicationProcessWritePlatformService savingsApplicationProcessWritePlatformService;
private final CommandProcessingService commandProcessingService;
private final ConfigurationDomainService configurationDomainService;
+ private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
@Autowired
public ClientWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context,
final ClientRepositoryWrapper clientRepository, final OfficeRepository officeRepository, final NoteRepository noteRepository,
- final ClientDataValidator fromApiJsonDeserializer, final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory,
+ final ClientDataValidator fromApiJsonDeserializer, final AccountNumberGenerator accountNumberGenerator,
final GroupRepository groupRepository, final StaffRepositoryWrapper staffRepository,
final CodeValueRepositoryWrapper codeValueRepository, final LoanRepository loanRepository,
final SavingsAccountRepository savingsRepository, final SavingsProductRepository savingsProductRepository,
final SavingsApplicationProcessWritePlatformService savingsApplicationProcessWritePlatformService,
- final CommandProcessingService commandProcessingService, final ConfigurationDomainService configurationDomainService) {
+ final CommandProcessingService commandProcessingService, final ConfigurationDomainService configurationDomainService,
+ final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository) {
this.context = context;
this.clientRepository = clientRepository;
this.officeRepository = officeRepository;
this.noteRepository = noteRepository;
this.fromApiJsonDeserializer = fromApiJsonDeserializer;
- this.accountIdentifierGeneratorFactory = accountIdentifierGeneratorFactory;
+ this.accountNumberGenerator = accountNumberGenerator;
this.groupRepository = groupRepository;
this.staffRepository = staffRepository;
this.codeValueRepository = codeValueRepository;
@@ -110,6 +114,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
this.savingsApplicationProcessWritePlatformService = savingsApplicationProcessWritePlatformService;
this.commandProcessingService = commandProcessingService;
this.configurationDomainService = configurationDomainService;
+ this.accountNumberFormatRepository = accountNumberFormatRepository;
}
@Transactional
@@ -227,9 +232,8 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
this.clientRepository.save(newClient);
if (newClient.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineClientAccountNoGenerator(newClient.getId());
- newClient.updateAccountNo(accountNoGenerator.generate());
+ AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository.findByAccountType(EntityAccountType.CLIENT);
+ newClient.updateAccountNo(accountNumberGenerator.generate(newClient, accountNumberFormat));
this.clientRepository.save(newClient);
}
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
index 9ab87a564..554a13f37 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
@@ -14,6 +14,9 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.joda.time.LocalDate;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormat;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormatRepositoryWrapper;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.EntityAccountType;
import org.mifosplatform.infrastructure.codes.domain.CodeValue;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.api.JsonQuery;
@@ -39,7 +42,6 @@ import org.mifosplatform.portfolio.calendar.domain.CalendarRepository;
import org.mifosplatform.portfolio.calendar.domain.CalendarType;
import org.mifosplatform.portfolio.calendar.exception.CalendarNotFoundException;
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
-import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.client.domain.Client;
import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper;
import org.mifosplatform.portfolio.client.exception.ClientNotActiveException;
@@ -114,7 +116,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
private final LoanChargeAssembler loanChargeAssembler;
private final CollateralAssembler loanCollateralAssembler;
private final AprCalculator aprCalculator;
- private final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory;
+ private final AccountNumberGenerator accountNumberGenerator;
private final LoanSummaryWrapper loanSummaryWrapper;
private final GroupRepositoryWrapper groupRepository;
private final LoanRepaymentScheduleTransactionProcessorFactory loanRepaymentScheduleTransactionProcessorFactory;
@@ -125,6 +127,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
private final LoanReadPlatformService loanReadPlatformService;
private final LoanRepaymentScheduleInstallmentRepository repaymentScheduleInstallmentRepository;
private final LoanAccountDomainService loanAccountDomainService;
+ private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
@Autowired
public LoanApplicationWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context, final FromJsonHelper fromJsonHelper,
@@ -134,13 +137,14 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
final LoanAssembler loanAssembler, final LoanChargeAssembler loanChargeAssembler,
final CollateralAssembler loanCollateralAssembler, final LoanRepository loanRepository, final NoteRepository noteRepository,
final LoanScheduleCalculationPlatformService calculationPlatformService, final ClientRepositoryWrapper clientRepository,
- final LoanProductRepository loanProductRepository, final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory,
+ final LoanProductRepository loanProductRepository, final AccountNumberGenerator accountNumberGenerator,
final LoanSummaryWrapper loanSummaryWrapper, final GroupRepositoryWrapper groupRepository,
final LoanRepaymentScheduleTransactionProcessorFactory loanRepaymentScheduleTransactionProcessorFactory,
final CalendarRepository calendarRepository, final CalendarInstanceRepository calendarInstanceRepository,
final SavingsAccountAssembler savingsAccountAssembler, final AccountAssociationsRepository accountAssociationsRepository,
final LoanRepaymentScheduleInstallmentRepository repaymentScheduleInstallmentRepository,
- final LoanReadPlatformService loanReadPlatformService, final LoanAccountDomainService loanAccountDomainService) {
+ final LoanReadPlatformService loanReadPlatformService, final LoanAccountDomainService loanAccountDomainService,
+ final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository) {
this.context = context;
this.fromJsonHelper = fromJsonHelper;
this.loanApplicationTransitionApiJsonValidator = loanApplicationTransitionApiJsonValidator;
@@ -155,7 +159,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
this.calculationPlatformService = calculationPlatformService;
this.clientRepository = clientRepository;
this.loanProductRepository = loanProductRepository;
- this.accountIdentifierGeneratorFactory = accountIdentifierGeneratorFactory;
+ this.accountNumberGenerator = accountNumberGenerator;
this.loanSummaryWrapper = loanSummaryWrapper;
this.groupRepository = groupRepository;
this.loanRepaymentScheduleTransactionProcessorFactory = loanRepaymentScheduleTransactionProcessorFactory;
@@ -166,6 +170,7 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
this.repaymentScheduleInstallmentRepository = repaymentScheduleInstallmentRepository;
this.loanReadPlatformService = loanReadPlatformService;
this.loanAccountDomainService = loanAccountDomainService;
+ this.accountNumberFormatRepository = accountNumberFormatRepository;
}
@@ -230,9 +235,9 @@ public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements Loa
}
if (newLoanApplication.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineLoanAccountNoGenerator(newLoanApplication.getId());
- newLoanApplication.updateAccountNo(accountNoGenerator.generate());
+ final AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository
+ .findByAccountType(EntityAccountType.LOAN);
+ newLoanApplication.updateAccountNo(this.accountNumberGenerator.generate(newLoanApplication, accountNumberFormat));
this.loanRepository.save(newLoanApplication);
}
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
index f996def8a..2e49759cc 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
@@ -981,8 +981,12 @@ public class LoanProduct extends AbstractPersistable {
return this.holdGuaranteeFunds;
}
-
public LoanProductGuaranteeDetails getLoanProductGuaranteeDetails() {
return this.loanProductGuaranteeDetails;
}
+
+ public String getShortName() {
+ return this.shortName;
+ }
+
}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountDomainServiceJpa.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountDomainServiceJpa.java
index 1a261a271..9a5ad8543 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountDomainServiceJpa.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountDomainServiceJpa.java
@@ -20,6 +20,9 @@ import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.mifosplatform.accounting.journalentry.service.JournalEntryWritePlatformService;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormat;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormatRepositoryWrapper;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.EntityAccountType;
import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.service.DateUtils;
@@ -32,7 +35,6 @@ import org.mifosplatform.portfolio.account.data.AccountTransferDTO;
import org.mifosplatform.portfolio.account.domain.AccountTransferType;
import org.mifosplatform.portfolio.account.service.AccountTransfersWritePlatformService;
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
-import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetail;
import org.mifosplatform.portfolio.savings.DepositAccountOnClosureType;
import org.mifosplatform.portfolio.savings.DepositAccountType;
@@ -50,28 +52,30 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
private final SavingsAccountRepositoryWrapper savingsAccountRepository;
private final ApplicationCurrencyRepositoryWrapper applicationCurrencyRepositoryWrapper;
private final JournalEntryWritePlatformService journalEntryWritePlatformService;
- private final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory;
+ private final AccountNumberGenerator accountNumberGenerator;
private final DepositAccountAssembler depositAccountAssembler;
private final SavingsAccountDomainService savingsAccountDomainService;
private final AccountTransfersWritePlatformService accountTransfersWritePlatformService;
private final ConfigurationDomainService configurationDomainService;
+ private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
@Autowired
public DepositAccountDomainServiceJpa(final SavingsAccountRepositoryWrapper savingsAccountRepository,
final ApplicationCurrencyRepositoryWrapper applicationCurrencyRepositoryWrapper,
- final JournalEntryWritePlatformService journalEntryWritePlatformService,
- final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory, final DepositAccountAssembler depositAccountAssembler,
- final SavingsAccountDomainService savingsAccountDomainService,
+ final JournalEntryWritePlatformService journalEntryWritePlatformService, final AccountNumberGenerator accountNumberGenerator,
+ final DepositAccountAssembler depositAccountAssembler, final SavingsAccountDomainService savingsAccountDomainService,
final AccountTransfersWritePlatformService accountTransfersWritePlatformService,
- final ConfigurationDomainService configurationDomainService) {
+ final ConfigurationDomainService configurationDomainService,
+ final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository) {
this.savingsAccountRepository = savingsAccountRepository;
this.applicationCurrencyRepositoryWrapper = applicationCurrencyRepositoryWrapper;
this.journalEntryWritePlatformService = journalEntryWritePlatformService;
- this.accountIdentifierGeneratorFactory = accountIdentifierGeneratorFactory;
+ this.accountNumberGenerator = accountNumberGenerator;
this.depositAccountAssembler = depositAccountAssembler;
this.savingsAccountDomainService = savingsAccountDomainService;
this.accountTransfersWritePlatformService = accountTransfersWritePlatformService;
this.configurationDomainService = configurationDomainService;
+ this.accountNumberFormatRepository = accountNumberFormatRepository;
}
@Transactional
@@ -104,12 +108,11 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
public SavingsAccountTransaction handleRDDeposit(final RecurringDepositAccount account, final DateTimeFormatter fmt,
final LocalDate transactionDate, final BigDecimal transactionAmount, final PaymentDetail paymentDetail,
final boolean isRegularTransaction) {
-
- final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
- .isSavingsInterestPostingAtCurrentPeriodEnd();
- final Integer financialYearBeginningMonth = this.configurationDomainService
- .retrieveFinancialYearBeginningMonth();
-
+
+ final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
+ .isSavingsInterestPostingAtCurrentPeriodEnd();
+ final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
+
boolean isAccountTransfer = false;
final boolean isPreMatureClosure = false;
final MathContext mc = MathContext.DECIMAL64;
@@ -117,8 +120,7 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
transactionAmount, paymentDetail, isAccountTransfer, isRegularTransaction);
account.handleScheduleInstallments(deposit);
- account.updateMaturityDateAndAmount(mc, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ account.updateMaturityDateAndAmount(mc, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
account.updateOverduePayments(DateUtils.getLocalDateOfTenant());
return deposit;
}
@@ -127,12 +129,11 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
@Override
public Long handleFDAccountClosure(final FixedDepositAccount account, final PaymentDetail paymentDetail, final AppUser user,
final JsonCommand command, final LocalDate tenantsTodayDate, final Map changes) {
-
- final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
- .isSavingsInterestPostingAtCurrentPeriodEnd();
- final Integer financialYearBeginningMonth = this.configurationDomainService
- .retrieveFinancialYearBeginningMonth();
-
+
+ final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
+ .isSavingsInterestPostingAtCurrentPeriodEnd();
+ final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
+
boolean isRegularTransaction = false;
boolean isAccountTransfer = false;
final boolean isPreMatureClosure = false;
@@ -157,15 +158,14 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
final DateTimeFormatter fmt = DateTimeFormat.forPattern(command.dateFormat()).withLocale(locale);
final LocalDate closedDate = command.localDateValueOfParameterNamed(SavingsApiConstants.closedOnDateParamName);
Long savingsTransactionId = null;
- account.postMaturityInterest(isSavingsInterestPostingAtCurrentPeriodEnd,
- financialYearBeginningMonth);
+ account.postMaturityInterest(isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
final Integer onAccountClosureId = command.integerValueOfParameterNamed(onAccountClosureIdParamName);
final DepositAccountOnClosureType onClosureType = DepositAccountOnClosureType.fromInt(onAccountClosureId);
if (onClosureType.isReinvest()) {
FixedDepositAccount reinvestedDeposit = account.reInvest(account.getAccountBalance());
this.depositAccountAssembler.assignSavingAccountHelpers(reinvestedDeposit);
reinvestedDeposit.updateMaturityDateAndAmountBeforeAccountActivation(mc, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
this.savingsAccountRepository.save(reinvestedDeposit);
autoGenerateAccountNumber(reinvestedDeposit);
final SavingsAccountTransaction withdrawal = this.handleWithdrawal(account, fmt, closedDate, account.getAccountBalance(),
@@ -204,12 +204,11 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
@Override
public Long handleRDAccountClosure(final RecurringDepositAccount account, final PaymentDetail paymentDetail, final AppUser user,
final JsonCommand command, final LocalDate tenantsTodayDate, final Map changes) {
-
- final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
- .isSavingsInterestPostingAtCurrentPeriodEnd();
- final Integer financialYearBeginningMonth = this.configurationDomainService
- .retrieveFinancialYearBeginningMonth();
-
+
+ final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
+ .isSavingsInterestPostingAtCurrentPeriodEnd();
+ final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
+
boolean isRegularTransaction = false;
boolean isAccountTransfer = false;
final boolean isPreMatureClosure = false;
@@ -222,19 +221,18 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
final DateTimeFormatter fmt = DateTimeFormat.forPattern(command.dateFormat()).withLocale(locale);
final LocalDate closedDate = command.localDateValueOfParameterNamed(SavingsApiConstants.closedOnDateParamName);
Long savingsTransactionId = null;
- account.postMaturityInterest(isSavingsInterestPostingAtCurrentPeriodEnd,
- financialYearBeginningMonth);
+ account.postMaturityInterest(isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
final BigDecimal transactionAmount = account.getAccountBalance();
final Integer onAccountClosureId = command.integerValueOfParameterNamed(onAccountClosureIdParamName);
final DepositAccountOnClosureType onClosureType = DepositAccountOnClosureType.fromInt(onAccountClosureId);
if (onClosureType.isReinvest()) {
RecurringDepositAccount reinvestedDeposit = account.reInvest(transactionAmount);
depositAccountAssembler.assignSavingAccountHelpers(reinvestedDeposit);
- reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd,
+ financialYearBeginningMonth);
reinvestedDeposit.processAccountUponActivation(fmt, user);
- reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd,
+ financialYearBeginningMonth);
this.savingsAccountRepository.save(reinvestedDeposit);
Money amountForDeposit = reinvestedDeposit.activateWithBalance();
@@ -242,8 +240,8 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
handleRDDeposit(reinvestedDeposit, fmt, reinvestedDeposit.getActivationLocalDate(), amountForDeposit.getAmount(),
paymentDetail, isRegularTransaction);
}
- reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ reinvestedDeposit.updateMaturityDateAndAmount(mc, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd,
+ financialYearBeginningMonth);
this.savingsAccountRepository.save(reinvestedDeposit);
autoGenerateAccountNumber(reinvestedDeposit);
@@ -283,9 +281,8 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
private void autoGenerateAccountNumber(final SavingsAccount account) {
if (account.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineSavingsAccountNoGenerator(account.getId());
- account.updateAccountNo(accountNoGenerator.generate());
+ final AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository.findByAccountType(EntityAccountType.SAVINGS);
+ account.updateAccountNo(this.accountNumberGenerator.generate(account, accountNumberFormat));
this.savingsAccountRepository.save(account);
}
}
@@ -294,12 +291,11 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
@Override
public Long handleFDAccountPreMatureClosure(final FixedDepositAccount account, final PaymentDetail paymentDetail, final AppUser user,
final JsonCommand command, final LocalDate tenantsTodayDate, final Map changes) {
-
- final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
- .isSavingsInterestPostingAtCurrentPeriodEnd();
- final Integer financialYearBeginningMonth = this.configurationDomainService
- .retrieveFinancialYearBeginningMonth();
-
+
+ final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
+ .isSavingsInterestPostingAtCurrentPeriodEnd();
+ final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
+
boolean isAccountTransfer = false;
boolean isRegularTransaction = false;
final boolean isPreMatureClosure = true;
@@ -312,8 +308,8 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
final DateTimeFormatter fmt = DateTimeFormat.forPattern(command.dateFormat()).withLocale(locale);
Long savingsTransactionId = null;
// post interest
- account.postPreMaturityInterest(closedDate, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ account.postPreMaturityInterest(closedDate, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd,
+ financialYearBeginningMonth);
final Integer closureTypeValue = command.integerValueOfParameterNamed(DepositsApiConstants.onAccountClosureIdParamName);
DepositAccountOnClosureType closureType = DepositAccountOnClosureType.fromInt(closureTypeValue);
@@ -351,13 +347,12 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
@Override
public Long handleRDAccountPreMatureClosure(final RecurringDepositAccount account, final PaymentDetail paymentDetail,
final AppUser user, final JsonCommand command, final LocalDate tenantsTodayDate, final Map changes) {
-
- final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
- .isSavingsInterestPostingAtCurrentPeriodEnd();
- final Integer financialYearBeginningMonth = this.configurationDomainService
- .retrieveFinancialYearBeginningMonth();
-
- boolean isAccountTransfer = false;
+
+ final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
+ .isSavingsInterestPostingAtCurrentPeriodEnd();
+ final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
+
+ boolean isAccountTransfer = false;
final boolean isPreMatureClosure = true;
boolean isRegularTransaction = false;
final Set existingTransactionIds = new HashSet<>();
@@ -369,8 +364,8 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
final DateTimeFormatter fmt = DateTimeFormat.forPattern(command.dateFormat()).withLocale(locale);
Long savingsTransactionId = null;
// post interest
- account.postPreMaturityInterest(closedDate, isPreMatureClosure,
- isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth);
+ account.postPreMaturityInterest(closedDate, isPreMatureClosure, isSavingsInterestPostingAtCurrentPeriodEnd,
+ financialYearBeginningMonth);
final Integer closureTypeValue = command.integerValueOfParameterNamed(DepositsApiConstants.onAccountClosureIdParamName);
DepositAccountOnClosureType closureType = DepositAccountOnClosureType.fromInt(closureTypeValue);
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
index 2412be611..0f26e3835 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
@@ -826,14 +826,12 @@ public class SavingsAccount extends AbstractPersistable {
if (applyWithdrawFee) {
// auto pay withdrawal fee
- payWithdrawalFee(transactionDTO.getTransactionAmount(), transactionDTO.getTransactionDate(),
- transactionDTO.getAppUser());
+ payWithdrawalFee(transactionDTO.getTransactionAmount(), transactionDTO.getTransactionDate(), transactionDTO.getAppUser());
}
return transaction;
}
- private void payWithdrawalFee(final BigDecimal transactionAmoount, final LocalDate transactionDate,
- final AppUser user) {
+ private void payWithdrawalFee(final BigDecimal transactionAmoount, final LocalDate transactionDate, final AppUser user) {
for (SavingsAccountCharge charge : this.charges()) {
if (charge.isWithdrawalFee() && charge.isActive()) {
charge.updateWithdralFeeAmount(transactionAmoount);
@@ -1214,6 +1212,10 @@ public class SavingsAccount extends AbstractPersistable {
return this.product.getId();
}
+ public SavingsProduct savingsProduct() {
+ return this.product;
+ }
+
private Boolean isCashBasedAccountingEnabledOnSavingsProduct() {
return this.product.isCashBasedAccountingEnabled();
}
@@ -1851,7 +1853,7 @@ public class SavingsAccount extends AbstractPersistable {
}
private void payActivationCharges(final boolean isSavingsInterestPostingAtCurrentPeriodEnd, final Integer financialYearBeginningMonth,
- final AppUser user) {
+ final AppUser user) {
boolean isSavingsChargeApplied = false;
for (SavingsAccountCharge savingsAccountCharge : this.charges()) {
if (savingsAccountCharge.isSavingsActivation()) {
@@ -2249,7 +2251,7 @@ public class SavingsAccount extends AbstractPersistable {
}
public void payCharge(final SavingsAccountCharge savingsAccountCharge, final Money amountPaid, final LocalDate transactionDate,
- final AppUser user) {
+ final AppUser user) {
savingsAccountCharge.pay(getCurrency(), amountPaid);
handlePayChargeTransactions(savingsAccountCharge, amountPaid, transactionDate, user);
}
@@ -2269,8 +2271,7 @@ public class SavingsAccount extends AbstractPersistable {
handleChargeTransactions(savingsAccountCharge, chargeTransaction);
}
- private void handleWaiverChargeTransactions(SavingsAccountCharge savingsAccountCharge, Money transactionAmount,
- AppUser user) {
+ private void handleWaiverChargeTransactions(SavingsAccountCharge savingsAccountCharge, Money transactionAmount, AppUser user) {
final SavingsAccountTransaction chargeTransaction = SavingsAccountTransaction.waiver(this, office(),
DateUtils.getLocalDateOfTenant(), transactionAmount, user);
handleChargeTransactions(savingsAccountCharge, chargeTransaction);
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProduct.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProduct.java
index a86803b32..1bd57c058 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProduct.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProduct.java
@@ -553,4 +553,8 @@ public class SavingsProduct extends AbstractPersistable {
return this.minBalanceForInterestCalculation;
}
+ public String getShortName() {
+ return this.shortName;
+ }
+
}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
index f2f06ac0c..7f10c9fd5 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
@@ -19,6 +19,9 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.joda.time.LocalDate;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormat;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormatRepositoryWrapper;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.EntityAccountType;
import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.data.ApiParameterError;
@@ -44,7 +47,6 @@ import org.mifosplatform.portfolio.calendar.domain.CalendarInstanceRepository;
import org.mifosplatform.portfolio.calendar.domain.CalendarType;
import org.mifosplatform.portfolio.calendar.service.CalendarUtils;
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
-import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.client.domain.Client;
import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper;
import org.mifosplatform.portfolio.client.exception.ClientNotActiveException;
@@ -91,7 +93,7 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
private final RecurringDepositAccountRepository recurringDepositAccountRepository;
private final DepositAccountAssembler depositAccountAssembler;
private final DepositAccountDataValidator depositAccountDataValidator;
- private final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory;
+ private final AccountNumberGenerator accountNumberGenerator;
private final ClientRepositoryWrapper clientRepository;
private final GroupRepository groupRepository;
private final SavingsProductRepository savingsProductRepository;
@@ -103,24 +105,26 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
private final FromJsonHelper fromJsonHelper;
private final CalendarInstanceRepository calendarInstanceRepository;
private final ConfigurationDomainService configurationDomainService;
+ private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
@Autowired
public DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context,
final SavingsAccountRepositoryWrapper savingAccountRepository, final DepositAccountAssembler depositAccountAssembler,
- final DepositAccountDataValidator depositAccountDataValidator,
- final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory, final ClientRepositoryWrapper clientRepository,
- final GroupRepository groupRepository, final SavingsProductRepository savingsProductRepository,
- final NoteRepository noteRepository, final StaffRepositoryWrapper staffRepository,
+ final DepositAccountDataValidator depositAccountDataValidator, final AccountNumberGenerator accountNumberGenerator,
+ final ClientRepositoryWrapper clientRepository, final GroupRepository groupRepository,
+ final SavingsProductRepository savingsProductRepository, final NoteRepository noteRepository,
+ final StaffRepositoryWrapper staffRepository,
final SavingsAccountApplicationTransitionApiJsonValidator savingsAccountApplicationTransitionApiJsonValidator,
final SavingsAccountChargeAssembler savingsAccountChargeAssembler,
final FixedDepositAccountRepository fixedDepositAccountRepository,
final RecurringDepositAccountRepository recurringDepositAccountRepository,
final AccountAssociationsRepository accountAssociationsRepository, final FromJsonHelper fromJsonHelper,
- final CalendarInstanceRepository calendarInstanceRepository, final ConfigurationDomainService configurationDomainService) {
+ final CalendarInstanceRepository calendarInstanceRepository, final ConfigurationDomainService configurationDomainService,
+ final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository) {
this.context = context;
this.savingAccountRepository = savingAccountRepository;
this.depositAccountAssembler = depositAccountAssembler;
- this.accountIdentifierGeneratorFactory = accountIdentifierGeneratorFactory;
+ this.accountNumberGenerator = accountNumberGenerator;
this.depositAccountDataValidator = depositAccountDataValidator;
this.clientRepository = clientRepository;
this.groupRepository = groupRepository;
@@ -135,6 +139,7 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
this.fromJsonHelper = fromJsonHelper;
this.calendarInstanceRepository = calendarInstanceRepository;
this.configurationDomainService = configurationDomainService;
+ this.accountNumberFormatRepository = accountNumberFormatRepository;
}
/*
@@ -187,9 +192,8 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
this.fixedDepositAccountRepository.save(account);
if (account.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineSavingsAccountNoGenerator(account.getId());
- account.updateAccountNo(accountNoGenerator.generate());
+ AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository.findByAccountType(EntityAccountType.CLIENT);
+ account.updateAccountNo(this.accountNumberGenerator.generate(account, accountNumberFormat));
this.savingAccountRepository.save(account);
}
@@ -239,9 +243,9 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
this.recurringDepositAccountRepository.save(account);
if (account.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineSavingsAccountNoGenerator(account.getId());
- account.updateAccountNo(accountNoGenerator.generate());
+ final AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository
+ .findByAccountType(EntityAccountType.SAVINGS);
+ account.updateAccountNo(this.accountNumberGenerator.generate(account, accountNumberFormat));
}
final Long savingsId = account.getId();
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
index 8b365d1f7..5bd7e0627 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
@@ -18,6 +18,9 @@ import org.apache.commons.lang.StringUtils;
import org.mifosplatform.commands.domain.CommandWrapper;
import org.mifosplatform.commands.service.CommandProcessingService;
import org.mifosplatform.commands.service.CommandWrapperBuilder;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormat;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.AccountNumberFormatRepositoryWrapper;
+import org.mifosplatform.infrastructure.accountnumberformat.domain.EntityAccountType;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.data.ApiParameterError;
import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
@@ -31,7 +34,6 @@ import org.mifosplatform.organisation.monetary.domain.Money;
import org.mifosplatform.organisation.staff.domain.Staff;
import org.mifosplatform.organisation.staff.domain.StaffRepositoryWrapper;
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
-import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.client.domain.Client;
import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper;
import org.mifosplatform.portfolio.client.exception.ClientNotActiveException;
@@ -71,7 +73,7 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
private final SavingsAccountRepositoryWrapper savingAccountRepository;
private final SavingsAccountAssembler savingAccountAssembler;
private final SavingsAccountDataValidator savingsAccountDataValidator;
- private final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory;
+ private final AccountNumberGenerator accountNumberGenerator;
private final ClientRepositoryWrapper clientRepository;
private final GroupRepository groupRepository;
private final SavingsProductRepository savingsProductRepository;
@@ -82,22 +84,24 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
private final CommandProcessingService commandProcessingService;
private final SavingsAccountDomainService savingsAccountDomainService;
private final SavingsAccountWritePlatformService savingsAccountWritePlatformService;
+ private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
@Autowired
public SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context,
final SavingsAccountRepositoryWrapper savingAccountRepository, final SavingsAccountAssembler savingAccountAssembler,
- final SavingsAccountDataValidator savingsAccountDataValidator,
- final AccountNumberGeneratorFactory accountIdentifierGeneratorFactory, final ClientRepositoryWrapper clientRepository,
- final GroupRepository groupRepository, final SavingsProductRepository savingsProductRepository,
- final NoteRepository noteRepository, final StaffRepositoryWrapper staffRepository,
+ final SavingsAccountDataValidator savingsAccountDataValidator, final AccountNumberGenerator accountNumberGenerator,
+ final ClientRepositoryWrapper clientRepository, final GroupRepository groupRepository,
+ final SavingsProductRepository savingsProductRepository, final NoteRepository noteRepository,
+ final StaffRepositoryWrapper staffRepository,
final SavingsAccountApplicationTransitionApiJsonValidator savingsAccountApplicationTransitionApiJsonValidator,
final SavingsAccountChargeAssembler savingsAccountChargeAssembler, final CommandProcessingService commandProcessingService,
final SavingsAccountDomainService savingsAccountDomainService,
- final SavingsAccountWritePlatformService savingsAccountWritePlatformService) {
+ final SavingsAccountWritePlatformService savingsAccountWritePlatformService,
+ final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository) {
this.context = context;
this.savingAccountRepository = savingAccountRepository;
this.savingAccountAssembler = savingAccountAssembler;
- this.accountIdentifierGeneratorFactory = accountIdentifierGeneratorFactory;
+ this.accountNumberGenerator = accountNumberGenerator;
this.savingsAccountDataValidator = savingsAccountDataValidator;
this.clientRepository = clientRepository;
this.groupRepository = groupRepository;
@@ -108,6 +112,7 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
this.savingsAccountChargeAssembler = savingsAccountChargeAssembler;
this.commandProcessingService = commandProcessingService;
this.savingsAccountDomainService = savingsAccountDomainService;
+ this.accountNumberFormatRepository = accountNumberFormatRepository;
this.savingsAccountWritePlatformService = savingsAccountWritePlatformService;
}
@@ -168,9 +173,8 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl
private void generateAccountNumber(final SavingsAccount account) {
if (account.isAccountNumberRequiresAutoGeneration()) {
- final AccountNumberGenerator accountNoGenerator = this.accountIdentifierGeneratorFactory
- .determineSavingsAccountNoGenerator(account.getId());
- account.updateAccountNo(accountNoGenerator.generate());
+ final AccountNumberFormat accountNumberFormat = this.accountNumberFormatRepository.findByAccountType(EntityAccountType.SAVINGS);
+ account.updateAccountNo(this.accountNumberGenerator.generate(account, accountNumberFormat));
this.savingAccountRepository.save(account);
}
diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V220__account_number_preferences.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V220__account_number_preferences.sql
new file mode 100644
index 000000000..e874bfb68
--- /dev/null
+++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V220__account_number_preferences.sql
@@ -0,0 +1,22 @@
+CREATE TABLE `c_account_number_format` (
+ `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+ `account_type_enum` SMALLINT(1) NOT NULL,
+ `prefix_type_enum` SMALLINT(2) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `account_type_enum` (`account_type_enum`)
+)
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB
+;
+
+
+/*permissions*/
+
+insert into `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`)
+VALUES ('configuration', 'CREATE_ACCOUNTNUMBERFORMAT', 'ACCOUNTNUMBERFORMAT', 'CREATE', 0);
+insert into `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`)
+VALUES ('configuration', 'READ_ACCOUNTNUMBERFORMAT', 'ACCOUNTNUMBERFORMAT', 'READ', 0);
+insert into `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`)
+VALUES ('configuration', 'UPDATE_ACCOUNTNUMBERFORMAT', 'ACCOUNTNUMBERFORMAT', 'UPDATE', 0);
+insert into `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`)
+VALUES ('configuration', 'DELETE_ACCOUNTNUMBERFORMAT', 'HOOK', 'DELETE', 0);
\ No newline at end of file