This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 093c1d5bfb7874a983383014e57c3eb1145938d0
Merge: ecda61bf73 566bec9848
Author: Adam Saghy <[email protected]>
AuthorDate: Wed Oct 28 22:19:54 2026 +0000

    Merge pull request #6698 from ThevinuJ/FINERACT-2639
    
    FINERACT-2639: Implement office-hierarchy access checks for monetary 
transactions

 .../loanaccount/domain/LoanRepositoryWrapper.java  |   9 +
 .../loanaccount/service/LoanAssembler.java         |   2 +
 .../domain/LoanRepositoryWrapperTest.java          |  80 +++++++++
 .../AccountTransfersWritePlatformServiceImpl.java  |  32 +++-
 .../account/starter/AccountConfiguration.java      |   5 +-
 ...SheetWritePlatformServiceJpaRepositoryImpl.java |   3 +
 .../loanaccount/service/LoanAssemblerImpl.java     |   5 +
 .../LoanChargeWritePlatformServiceImpl.java        |  16 +-
 .../LoanWritePlatformServiceJpaRepositoryImpl.java |  38 ++---
 .../savings/domain/DepositAccountAssembler.java    |   6 +
 .../savings/domain/SavingsAccountAssembler.java    |   5 +
 ...countWritePlatformServiceJpaRepositoryImpl.java |  30 ++--
 ...countWritePlatformServiceJpaRepositoryImpl.java |  30 ++--
 .../LoanChargeWritePlatformServiceImplTest.java    |   2 +-
 ...nWritePlatformServiceJpaRepositoryImplTest.java |  18 +-
 .../domain/DepositAccountAssemblerTest.java        |  80 +++++++++
 ...tWritePlatformServiceJpaRepositoryImplTest.java |  36 +++-
 .../domain/SavingsAccountRepositoryWrapper.java    |   9 +
 .../SavingsAccountRepositoryWrapperTest.java       |  80 +++++++++
 ...ansferOfficeHierarchyAccessIntegrationTest.java | 187 +++++++++++++++++++++
 .../LoanOfficeHierarchyAccessIntegrationTest.java  | 166 ++++++++++++++++++
 ...epositOfficeHierarchyAccessIntegrationTest.java | 111 ++++++++++++
 ...avingsOfficeHierarchyAccessIntegrationTest.java | 144 ++++++++++++++++
 23 files changed, 1016 insertions(+), 78 deletions(-)

diff --cc 
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepositoryWrapper.java
index 7900ce8d95,a5decfa9fd..f9318b3915
--- 
a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepositoryWrapper.java
+++ 
b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanRepositoryWrapper.java
@@@ -28,9 -28,9 +28,10 @@@ import lombok.RequiredArgsConstructor
  import org.apache.fineract.accounting.common.AccountingRuleType;
  import org.apache.fineract.infrastructure.core.config.FineractProperties;
  import org.apache.fineract.infrastructure.core.domain.ExternalId;
+ import 
org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
  import org.apache.fineract.portfolio.accountdetails.domain.AccountType;
  import 
org.apache.fineract.portfolio.loanaccount.exception.LoanNotFoundException;
 +import 
org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleType;
  import org.springframework.data.repository.query.Param;
  import org.springframework.stereotype.Service;
  import org.springframework.transaction.annotation.Transactional;
diff --cc 
fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java
index 56209e5a5c,7e987684c4..214e0859f8
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersWritePlatformServiceImpl.java
@@@ -131,24 -131,21 +134,25 @@@ public class AccountTransfersWritePlatf
  
          if (isSavingsToSavingsAccountTransfer(fromAccountType, 
toAccountType)) {
  
 +            // one global lock order for both accounts, so that crossing 
transfers (A to B and B to A) do not deadlock
 +            
this.savingsAccountAssembler.lockInIdOrder(command.longValueOfParameterNamed(fromAccountIdParamName),
 +                    command.longValueOfParameterNamed(toAccountIdParamName));
 +
              fromSavingsAccountId = 
command.longValueOfParameterNamed(fromAccountIdParamName);
-             final SavingsAccount fromSavingsAccount = 
this.savingsAccountAssembler.assembleFrom(fromSavingsAccountId,
+             final SavingsAccount fromSavingsAccount = 
this.savingsAccountAssembler.assembleFromInUserScope(fromSavingsAccountId,
                      backdatedTxnsAllowedTill);
  
              final SavingsTransactionBooleanValues transactionBooleanValues = 
new SavingsTransactionBooleanValues(isAccountTransfer,
                      isRegularTransaction, 
fromSavingsAccount.isWithdrawalFeeApplicableForTransfer(), isInterestTransfer, 
isWithdrawBalance);
              final SavingsAccountTransaction withdrawal = 
this.savingsAccountDomainService.handleWithdrawal(fromSavingsAccount, fmt,
 -                    transactionDate, transactionAmount, paymentDetail, 
transactionBooleanValues, backdatedTxnsAllowedTill);
 +                    transactionDate, transactionTime, transactionAmount, 
paymentDetail, transactionBooleanValues, backdatedTxnsAllowedTill);
  
              final Long toSavingsId = 
command.longValueOfParameterNamed(toAccountIdParamName);
-             final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFrom(toSavingsId, 
backdatedTxnsAllowedTill);
+             final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFromInUserScope(toSavingsId,
+                     backdatedTxnsAllowedTill);
  
              final SavingsAccountTransaction deposit = 
this.savingsAccountDomainService.handleDeposit(toSavingsAccount, fmt, 
transactionDate,
 -                    transactionAmount, paymentDetail, isAccountTransfer, 
isRegularTransaction, backdatedTxnsAllowedTill);
 +                    transactionTime, transactionAmount, paymentDetail, 
isAccountTransfer, isRegularTransaction, backdatedTxnsAllowedTill);
  
              if 
(!fromSavingsAccount.getCurrency().getCode().equals(toSavingsAccount.getCurrency().getCode()))
 {
                  throw new 
DifferentCurrenciesException(fromSavingsAccount.getCurrency().getCode(),
@@@ -169,10 -166,10 +173,10 @@@
              final SavingsTransactionBooleanValues transactionBooleanValues = 
new SavingsTransactionBooleanValues(isAccountTransfer,
                      isRegularTransaction, 
fromSavingsAccount.isWithdrawalFeeApplicableForTransfer(), isInterestTransfer, 
isWithdrawBalance);
              final SavingsAccountTransaction withdrawal = 
this.savingsAccountDomainService.handleWithdrawal(fromSavingsAccount, fmt,
 -                    transactionDate, transactionAmount, paymentDetail, 
transactionBooleanValues, backdatedTxnsAllowedTill);
 +                    transactionDate, transactionTime, transactionAmount, 
paymentDetail, transactionBooleanValues, backdatedTxnsAllowedTill);
  
              final Long toLoanAccountId = 
command.longValueOfParameterNamed(toAccountIdParamName);
-             Loan toLoanAccount = 
this.loanAccountAssembler.assembleFrom(toLoanAccountId);
+             Loan toLoanAccount = 
this.loanAccountAssembler.assembleFromInUserScope(toLoanAccountId);
  
              final Boolean isHolidayValidationDone = false;
              final HolidayDetailDTO holidayDetailDto = null;
@@@ -200,10 -197,11 +204,11 @@@
                      new CommandProcessingResultBuilder(), transactionDate, 
transactionAmount, paymentDetail, null, externalId);
  
              final Long toSavingsAccountId = 
command.longValueOfParameterNamed(toAccountIdParamName);
-             final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFrom(toSavingsAccountId, 
backdatedTxnsAllowedTill);
+             final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFromInUserScope(toSavingsAccountId,
+                     backdatedTxnsAllowedTill);
  
              final SavingsAccountTransaction deposit = 
this.savingsAccountDomainService.handleDeposit(toSavingsAccount, fmt, 
transactionDate,
 -                    transactionAmount, paymentDetail, isAccountTransfer, 
isRegularTransaction, backdatedTxnsAllowedTill);
 +                    transactionTime, transactionAmount, paymentDetail, 
isAccountTransfer, isRegularTransaction, backdatedTxnsAllowedTill);
  
              final AccountTransferDetails accountTransferDetails = 
this.accountTransferAssembler.assembleLoanToSavingsTransfer(command,
                      fromLoanAccount, toSavingsAccount, deposit, 
loanRefundTransaction);
@@@ -630,10 -619,11 +645,11 @@@
                  new CommandProcessingResultBuilder(), transactionDate, 
transactionAmount, paymentDetail, null, externalId);
  
          final Long toSavingsAccountId = 
command.longValueOfParameterNamed(toAccountIdParamName);
-         final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFrom(toSavingsAccountId, 
backdatedTxnsAllowedTill);
+         final SavingsAccount toSavingsAccount = 
this.savingsAccountAssembler.assembleFromInUserScope(toSavingsAccountId,
+                 backdatedTxnsAllowedTill);
  
          final SavingsAccountTransaction deposit = 
this.savingsAccountDomainService.handleDeposit(toSavingsAccount, fmt, 
transactionDate,
 -                transactionAmount, paymentDetail, true, true, 
backdatedTxnsAllowedTill);
 +                transactionTime, transactionAmount, paymentDetail, true, 
true, backdatedTxnsAllowedTill);
  
          final AccountTransferDetails accountTransferDetails = 
this.accountTransferAssembler.assembleLoanToSavingsTransfer(command,
                  fromLoanAccount, toSavingsAccount, deposit, 
loanRefundTransaction);
diff --cc 
fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImplTest.java
index 42af8e8922,373e2b7477..f2d9ac776d
--- 
a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImplTest.java
+++ 
b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImplTest.java
@@@ -185,24 -168,9 +185,24 @@@ class LoanChargeWritePlatformServiceImp
      @Mock
      private LoanScheduleService loanScheduleService;
  
 +    @Mock
 +    private LoanAccrualsProcessingService loanAccrualsProcessingService;
 +
 +    @Mock
 +    private FromJsonHelper fromApiJsonHelper;
 +
 +    @Mock
 +    private LoanChargeReadPlatformService loanChargeReadPlatformService;
 +
 +    @Mock
 +    private LoanUtilService loanUtilService;
 +
 +    @Mock
 +    private ExternalIdFactory externalIdFactory;
 +
      @BeforeEach
      void setUp() {
-         when(loanAssembler.assembleFrom(LOAN_ID)).thenReturn(loan);
+         when(loanAssembler.assembleFromInUserScope(LOAN_ID)).thenReturn(loan);
          
when(chargeRepository.findOneWithNotFoundDetection(anyLong())).thenReturn(chargeDefinition);
          
when(chargeDefinition.getChargeTimeType()).thenReturn(SPECIFIED_DUE_DATE);
          when(chargeDefinition.getCurrencyCode()).thenReturn(CURRENCY_CODE);

Reply via email to