Revert "FINERACT-1932: Fineract modularization - fineract-savings"

This reverts commit b9314d0.
ruchiD · Dec 15, 2023 · 834cfb6 · 834cfb6
1 parent f981ffe
commit 834cfb6
Show file tree

Hide file tree

Showing 213 changed files with 78 additions and 352 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,6 @@ buildscript {
                 'fineract-provider',
                 'fineract-investor',
                 'fineract-loan',
-                'fineract-savings',
                 'integration-tests',
                 'twofactor-tests',
                 'oauth2-tests',
@@ -47,8 +46,7 @@ buildscript {
                 'fineract-core',
                 'fineract-provider',
                 'fineract-investor',
-                'fineract-loan',
-                'fineract-savings'
+                'fineract-loan'
             ].contains(it.name)
         }
         npmRepository = 'https://npm.pkg.github.com'

diff --git a/...vingsProductToGLAccountMappingHelper.java → ...vingsProductToGLAccountMappingHelper.java b/...vingsProductToGLAccountMappingHelper.java → ...vingsProductToGLAccountMappingHelper.java
diff --git a/...tfolio/loanaccount/domain/LoanStatus.java → ...tfolio/loanaccount/domain/LoanStatus.java b/...tfolio/loanaccount/domain/LoanStatus.java → ...tfolio/loanaccount/domain/LoanStatus.java
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
@@ -21,7 +21,6 @@ dependencies {
     implementation(project(path: ':fineract-core'))
     implementation(project(path: ':fineract-investor'))
     implementation(project(path: ':fineract-loan'))
-    implementation(project(path: ':fineract-savings'))
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
     // Never use "compile" scope, but make all dependencies either 'implementation', 'runtimeOnly' or 'testCompile'.

diff --git a/...dataqueries/api/DataTableApiConstant.java → ...dataqueries/api/DataTableApiConstant.java b/...dataqueries/api/DataTableApiConstant.java → ...dataqueries/api/DataTableApiConstant.java
diff --git a/.../dataqueries/data/DataTableValidator.java → .../dataqueries/data/DataTableValidator.java b/.../dataqueries/data/DataTableValidator.java → .../dataqueries/data/DataTableValidator.java
diff --git a/...ueries/data/DatatableCheckStatusData.java → ...ueries/data/DatatableCheckStatusData.java b/...ueries/data/DatatableCheckStatusData.java → ...ueries/data/DatatableCheckStatusData.java
diff --git a/...dataqueries/data/DatatableChecksData.java → ...dataqueries/data/DatatableChecksData.java b/...dataqueries/data/DatatableChecksData.java → ...dataqueries/data/DatatableChecksData.java
diff --git a/...eries/data/EntityDataTableChecksData.java → ...eries/data/EntityDataTableChecksData.java b/...eries/data/EntityDataTableChecksData.java → ...eries/data/EntityDataTableChecksData.java
diff --git a/...ucture/dataqueries/data/EntityTables.java → ...ucture/dataqueries/data/EntityTables.java b/...ucture/dataqueries/data/EntityTables.java → ...ucture/dataqueries/data/EntityTables.java
diff --git a/...ataqueries/data/GenericResultsetData.java → ...ataqueries/data/GenericResultsetData.java b/...ataqueries/data/GenericResultsetData.java → ...ataqueries/data/GenericResultsetData.java
diff --git a/...tructure/dataqueries/data/ReportData.java → ...tructure/dataqueries/data/ReportData.java b/...tructure/dataqueries/data/ReportData.java → ...tructure/dataqueries/data/ReportData.java
diff --git a/...re/dataqueries/data/ReportExportType.java → ...re/dataqueries/data/ReportExportType.java b/...re/dataqueries/data/ReportExportType.java → ...re/dataqueries/data/ReportExportType.java
diff --git a/...dataqueries/data/ReportParameterData.java → ...dataqueries/data/ReportParameterData.java b/...dataqueries/data/ReportParameterData.java → ...dataqueries/data/ReportParameterData.java
diff --git a/...queries/data/ReportParameterJoinData.java → ...queries/data/ReportParameterJoinData.java b/...queries/data/ReportParameterJoinData.java → ...queries/data/ReportParameterJoinData.java
diff --git a/...re/dataqueries/data/ResultsetRowData.java → ...re/dataqueries/data/ResultsetRowData.java b/...re/dataqueries/data/ResultsetRowData.java → ...re/dataqueries/data/ResultsetRowData.java
diff --git a/...tructure/dataqueries/data/StatusEnum.java → ...tructure/dataqueries/data/StatusEnum.java b/...tructure/dataqueries/data/StatusEnum.java → ...tructure/dataqueries/data/StatusEnum.java
diff --git a/...taqueries/service/GenericDataService.java → ...taqueries/service/GenericDataService.java b/...taqueries/service/GenericDataService.java → ...taqueries/service/GenericDataService.java
diff --git a/.../service/ReadWriteNonCoreDataService.java → .../service/ReadWriteNonCoreDataService.java b/.../service/ReadWriteNonCoreDataService.java → .../service/ReadWriteNonCoreDataService.java
diff --git a/...teroperation/data/InteropAccountData.java → ...teroperation/data/InteropAccountData.java b/...teroperation/data/InteropAccountData.java → ...teroperation/data/InteropAccountData.java
diff --git a/...operation/data/InteropIdentifierData.java → ...operation/data/InteropIdentifierData.java b/...operation/data/InteropIdentifierData.java → ...operation/data/InteropIdentifierData.java
diff --git a/...rovider/src/main/java/org/apache/fineract/interoperation/data/InteropTransactionData.java b/...rovider/src/main/java/org/apache/fineract/interoperation/data/InteropTransactionData.java
@@ -21,18 +21,41 @@
 import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import lombok.Getter;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.service.MathUtil;
+import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountChargePaidBy;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction;
 import org.apache.fineract.portfolio.savings.service.SavingsEnumerations;
 
-@Getter
 public class InteropTransactionData extends CommandProcessingResult {
 
+    // private final SavingsAccountTransactionEnumData transactionType;
+    // private final PaymentDetailData paymentDetailData;
+    // private final BigDecimal outstandingChargeAmount;
+    // private final boolean reversed;
+    // private final AccountTransferData transfer;
+    // private final LocalDate submittedOnDate;
+    // private final boolean interestedPostedAsOn;
+    // private final String submittedByUsername;
+    // // templates
+    // final Collection<PaymentTypeData> paymentTypeOptions;
+    // //import fields
+    // private Long paymentTypeId;
+    // private String checkNumber;
+    // private String routingCode;
+    // private String receiptNumber;
+    // private String bankNumber;
+
+    // private String transactionReference;
+    // private String statementReference;
+    // private CreditDebitType creditDebit;
+    // private TransactionStatus status;
+    // private String transactionInformation;
+    // private String addressLine;
+
     @NotNull
     private final String accountId;
     @NotNull
@@ -52,7 +75,7 @@ public class InteropTransactionData extends CommandProcessingResult {
     @NotNull
     private final LocalDate valueDateTime;
 
-    private String note;
+    private final String note;
 
     public InteropTransactionData(Long entityId, String accountId, String transactionId, SavingsAccountTransactionType transactionType,
             BigDecimal amount, BigDecimal chargeAmount, String currency, BigDecimal accountBalance, LocalDate bookingDateTime,
@@ -94,14 +117,33 @@ public static InteropTransactionData build(SavingsAccountTransaction transaction
         LocalDate valueDateTime = endOfBalanceLocalDate == null ? bookingDateTime : endOfBalanceLocalDate;
 
         StringBuilder sb = new StringBuilder();
-        sb.append(SavingsEnumerations.transactionType(transactionType).getValue());
+        int currLength = 0;
+        for (Note note : transaction.getNotes()) {
+            String s = note.getNote();
+            if (s == null) {
+                continue;
+            }
+
+            int availableLength = 500 - currLength;
+            if (availableLength <= 1) {
+                break;
+            }
+
+            if (currLength > 0) {
+                sb.append(' ');
+                availableLength--;
+            }
+            if (s.length() > availableLength) {
+                s = s.substring(availableLength);
+            }
+            sb.append(s);
+            currLength = sb.length();
+        }
+        if (currLength == 0) {
+            sb.append(SavingsEnumerations.transactionType(transactionType).getValue());
+        }
 
         return new InteropTransactionData(savingsAccount.getId(), savingsAccount.getExternalId().getValue(), transactionId, transactionType,
                 amount, chargeAmount, currency, runningBalance, bookingDateTime, valueDateTime, sb.toString());
     }
-
-    public void updateNote(String note) {
-        this.note = note;
-    }
-
 }
diff --git a/...ovider/src/main/java/org/apache/fineract/interoperation/data/InteropTransactionsData.java b/...ovider/src/main/java/org/apache/fineract/interoperation/data/InteropTransactionsData.java
@@ -22,15 +22,11 @@
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction;
 
-@Getter
-@Setter
 public class InteropTransactionsData extends CommandProcessingResult {
 
     List<InteropTransactionData> transactions;

diff --git a/...roperation/domain/InteropActionState.java → ...roperation/domain/InteropActionState.java b/...roperation/domain/InteropActionState.java → ...roperation/domain/InteropActionState.java
diff --git a/...eroperation/domain/InteropAmountType.java → ...eroperation/domain/InteropAmountType.java b/...eroperation/domain/InteropAmountType.java → ...eroperation/domain/InteropAmountType.java
diff --git a/...eroperation/domain/InteropIdentifier.java → ...eroperation/domain/InteropIdentifier.java b/...eroperation/domain/InteropIdentifier.java → ...eroperation/domain/InteropIdentifier.java
diff --git a/...eration/domain/InteropIdentifierType.java → ...eration/domain/InteropIdentifierType.java b/...eration/domain/InteropIdentifierType.java → ...eration/domain/InteropIdentifierType.java
diff --git a/...peration/domain/InteropInitiatorType.java → ...peration/domain/InteropInitiatorType.java b/...peration/domain/InteropInitiatorType.java → ...peration/domain/InteropInitiatorType.java
diff --git a/...ration/domain/InteropTransactionRole.java → ...ration/domain/InteropTransactionRole.java b/...ration/domain/InteropTransactionRole.java → ...ration/domain/InteropTransactionRole.java
diff --git a/...on/domain/InteropTransactionScenario.java → ...on/domain/InteropTransactionScenario.java b/...on/domain/InteropTransactionScenario.java → ...on/domain/InteropTransactionScenario.java
diff --git a/...ion/domain/InteropTransferActionType.java → ...ion/domain/InteropTransferActionType.java b/...ion/domain/InteropTransferActionType.java → ...ion/domain/InteropTransferActionType.java
diff --git a/...provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java b/...provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java
@@ -64,7 +64,6 @@
 import org.apache.fineract.interoperation.data.InteropQuoteRequestData;
 import org.apache.fineract.interoperation.data.InteropQuoteResponseData;
 import org.apache.fineract.interoperation.data.InteropRequestData;
-import org.apache.fineract.interoperation.data.InteropTransactionData;
 import org.apache.fineract.interoperation.data.InteropTransactionRequestData;
 import org.apache.fineract.interoperation.data.InteropTransactionRequestResponseData;
 import org.apache.fineract.interoperation.data.InteropTransactionsData;
@@ -219,27 +218,7 @@ public InteropTransactionsData getAccountTransactions(@NotNull String accountId,
             return (transactionsTo == null || transactionsTo.compareTo(transactionDate) > 0) && (transactionsFrom == null
                     || transactionsFrom.compareTo(transactionDate.withHour(23).withMinute(59).withSecond(59)) <= 0);
         };
-        InteropTransactionsData interopTransactionsData = InteropTransactionsData.build(savingsAccount, transFilter);
-        for (InteropTransactionData interopTransactionData : interopTransactionsData.getTransactions()) {
-            final List<Note> transactionNotes = noteRepository
-                    .findBySavingsTransactionId(Long.valueOf(interopTransactionData.getTransactionId()));
-            StringBuilder sb = new StringBuilder();
-            for (final Note note : transactionNotes) {
-                String s = note.getNote();
-                if (s == null) {
-                    continue;
-                }
-                sb.append(s + " ");
-            }
-            if (sb.toString().length() > 0) {
-                String text = interopTransactionData.getNote() + " " + sb.toString();
-                if (text.length() > 500) {
-                    text = text.substring(0, 500);
-                }
-                interopTransactionData.updateNote(text);
-            }
-        }
-        return interopTransactionsData;
+        return InteropTransactionsData.build(savingsAccount, transFilter);
     }
 
     @NotNull

diff --git a/...untdetails/data/SavingsSummaryCustom.java → ...untdetails/data/SavingsSummaryCustom.java b/...untdetails/data/SavingsSummaryCustom.java → ...untdetails/data/SavingsSummaryCustom.java
diff --git a/...ion/ChargeCannotBeAppliedToException.java → ...ion/ChargeCannotBeAppliedToException.java b/...ion/ChargeCannotBeAppliedToException.java → ...ion/ChargeCannotBeAppliedToException.java
diff --git a/...AccountChargeCannotBeWaivedException.java → ...AccountChargeCannotBeWaivedException.java b/...AccountChargeCannotBeWaivedException.java → ...AccountChargeCannotBeWaivedException.java
diff --git a/...avingsAccountChargeNotFoundException.java → ...avingsAccountChargeNotFoundException.java b/...avingsAccountChargeNotFoundException.java → ...avingsAccountChargeNotFoundException.java
diff --git a/...ChargeWithoutMandatoryFieldException.java → ...ChargeWithoutMandatoryFieldException.java b/...ChargeWithoutMandatoryFieldException.java → ...ChargeWithoutMandatoryFieldException.java
diff --git a/...ectionsheet/CollectionSheetConstants.java → ...ectionsheet/CollectionSheetConstants.java b/...ectionsheet/CollectionSheetConstants.java → ...ectionsheet/CollectionSheetConstants.java
diff --git a/...ortfolio/common/domain/ConditionType.java → ...ortfolio/common/domain/ConditionType.java b/...ortfolio/common/domain/ConditionType.java → ...ortfolio/common/domain/ConditionType.java
diff --git a/...io/common/service/CommonEnumerations.java → ...io/common/service/CommonEnumerations.java b/...io/common/service/CommonEnumerations.java → ...io/common/service/CommonEnumerations.java
diff --git a/...echart/InterestIncentiveApiConstants.java → ...echart/InterestIncentiveApiConstants.java b/...echart/InterestIncentiveApiConstants.java → ...echart/InterestIncentiveApiConstants.java
diff --git a/...echart/InterestRateChartApiConstants.java → ...echart/InterestRateChartApiConstants.java b/...echart/InterestRateChartApiConstants.java → ...echart/InterestRateChartApiConstants.java
diff --git a/...rt/InterestRateChartSlabApiConstants.java → ...rt/InterestRateChartSlabApiConstants.java b/...rt/InterestRateChartSlabApiConstants.java → ...rt/InterestRateChartSlabApiConstants.java
diff --git a/...ratechart/data/InterestIncentiveData.java → ...ratechart/data/InterestIncentiveData.java b/...ratechart/data/InterestIncentiveData.java → ...ratechart/data/InterestIncentiveData.java
diff --git a/...ratechart/data/InterestRateChartData.java → ...ratechart/data/InterestRateChartData.java b/...ratechart/data/InterestRateChartData.java → ...ratechart/data/InterestRateChartData.java
diff --git a/...chart/data/InterestRateChartSlabData.java → ...chart/data/InterestRateChartSlabData.java b/...chart/data/InterestRateChartSlabData.java → ...chart/data/InterestRateChartSlabData.java
diff --git a/...tratechart/domain/InterestIncentives.java → ...tratechart/domain/InterestIncentives.java b/...tratechart/domain/InterestIncentives.java → ...tratechart/domain/InterestIncentives.java
diff --git a/...hart/domain/InterestIncentivesFields.java → ...hart/domain/InterestIncentivesFields.java b/...hart/domain/InterestIncentivesFields.java → ...hart/domain/InterestIncentivesFields.java
diff --git a/...stratechart/domain/InterestRateChart.java → ...stratechart/domain/InterestRateChart.java b/...stratechart/domain/InterestRateChart.java → ...stratechart/domain/InterestRateChart.java
diff --git a/...chart/domain/InterestRateChartFields.java → ...chart/domain/InterestRateChartFields.java b/...chart/domain/InterestRateChartFields.java → ...chart/domain/InterestRateChartFields.java
diff --git a/...t/domain/InterestRateChartRepository.java → ...t/domain/InterestRateChartRepository.java b/...t/domain/InterestRateChartRepository.java → ...t/domain/InterestRateChartRepository.java
diff --git a/...n/InterestRateChartRepositoryWrapper.java → ...n/InterestRateChartRepositoryWrapper.java b/...n/InterestRateChartRepositoryWrapper.java → ...n/InterestRateChartRepositoryWrapper.java
diff --git a/...techart/domain/InterestRateChartSlab.java → ...techart/domain/InterestRateChartSlab.java b/...techart/domain/InterestRateChartSlab.java → ...techart/domain/InterestRateChartSlab.java
diff --git a/...main/InterestRateChartSlabComparator.java → ...main/InterestRateChartSlabComparator.java b/...main/InterestRateChartSlabComparator.java → ...main/InterestRateChartSlabComparator.java
diff --git a/...t/domain/InterestRateChartSlabFields.java → ...t/domain/InterestRateChartSlabFields.java b/...t/domain/InterestRateChartSlabFields.java → ...t/domain/InterestRateChartSlabFields.java
diff --git a/...main/InterestRateChartSlabRepository.java → ...main/InterestRateChartSlabRepository.java b/...main/InterestRateChartSlabRepository.java → ...main/InterestRateChartSlabRepository.java
diff --git a/...terestRateChartSlabRepositoryWrapper.java → ...terestRateChartSlabRepositoryWrapper.java b/...terestRateChartSlabRepositoryWrapper.java → ...terestRateChartSlabRepositoryWrapper.java
diff --git a/...n/InterestRateChartNotFoundException.java → ...n/InterestRateChartNotFoundException.java b/...n/InterestRateChartNotFoundException.java → ...n/InterestRateChartNotFoundException.java
diff --git a/...terestRateChartSlabNotFoundException.java → ...terestRateChartSlabNotFoundException.java b/...terestRateChartSlabNotFoundException.java → ...terestRateChartSlabNotFoundException.java
diff --git a/...entive/AttributeIncentiveCalculation.java → ...entive/AttributeIncentiveCalculation.java b/...entive/AttributeIncentiveCalculation.java → ...entive/AttributeIncentiveCalculation.java
diff --git a/...AttributeIncentiveCalculationFactory.java → ...AttributeIncentiveCalculationFactory.java b/...AttributeIncentiveCalculationFactory.java → ...AttributeIncentiveCalculationFactory.java
diff --git a/.../ClientAttributeIncentiveCalculation.java → .../ClientAttributeIncentiveCalculation.java b/.../ClientAttributeIncentiveCalculation.java → .../ClientAttributeIncentiveCalculation.java
diff --git a/...restratechart/incentive/IncentiveDTO.java → ...restratechart/incentive/IncentiveDTO.java b/...restratechart/incentive/IncentiveDTO.java → ...restratechart/incentive/IncentiveDTO.java
diff --git a/...ntive/InterestIncentiveAttributeName.java → ...ntive/InterestIncentiveAttributeName.java b/...ntive/InterestIncentiveAttributeName.java → ...ntive/InterestIncentiveAttributeName.java
diff --git a/...ncentive/InterestIncentiveEntityType.java → ...ncentive/InterestIncentiveEntityType.java b/...ncentive/InterestIncentiveEntityType.java → ...ncentive/InterestIncentiveEntityType.java
diff --git a/...hart/incentive/InterestIncentiveType.java → ...hart/incentive/InterestIncentiveType.java b/...hart/incentive/InterestIncentiveType.java → ...hart/incentive/InterestIncentiveType.java
diff --git a/...t/service/InterestIncentiveAssembler.java → ...t/service/InterestIncentiveAssembler.java b/...t/service/InterestIncentiveAssembler.java → ...t/service/InterestIncentiveAssembler.java
diff --git a/...t/service/InterestRateChartAssembler.java → ...t/service/InterestRateChartAssembler.java b/...t/service/InterestRateChartAssembler.java → ...t/service/InterestRateChartAssembler.java
diff --git a/...rvice/InterestRateChartSlabAssembler.java → ...rvice/InterestRateChartSlabAssembler.java b/...rvice/InterestRateChartSlabAssembler.java → ...rvice/InterestRateChartSlabAssembler.java
diff --git a/...ovider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java b/...ovider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java
@@ -39,7 +39,6 @@
 import org.apache.fineract.organisation.holiday.domain.Holiday;
 import org.apache.fineract.organisation.holiday.domain.HolidayRepository;
 import org.apache.fineract.organisation.holiday.domain.HolidayStatusType;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.organisation.staff.domain.Staff;
 import org.apache.fineract.organisation.staff.domain.StaffRepository;
 import org.apache.fineract.organisation.staff.exception.StaffNotFoundException;
@@ -82,6 +81,7 @@
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRepository;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.loanproduct.exception.LinkedAccountRequiredException;
 import org.apache.fineract.portfolio.loanproduct.exception.LoanProductNotFoundException;
 import org.apache.fineract.portfolio.rate.domain.Rate;

diff --git a/...org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImpl.java b/...org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImpl.java
@@ -60,7 +60,6 @@
 import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.account.PortfolioAccountType;
 import org.apache.fineract.portfolio.account.data.AccountTransferDTO;
 import org.apache.fineract.portfolio.account.data.PortfolioAccountData;
@@ -126,6 +125,7 @@
 import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.ScheduledDateGenerator;
 import org.apache.fineract.portfolio.loanaccount.serialization.LoanChargeApiJsonValidator;
 import org.apache.fineract.portfolio.loanproduct.data.LoanOverdueDTO;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.loanproduct.exception.LinkedAccountRequiredException;
 import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.note.domain.NoteRepository;

diff --git a/...y/exception/InvalidCurrencyException.java → ...t/exception/InvalidCurrencyException.java b/...y/exception/InvalidCurrencyException.java → ...t/exception/InvalidCurrencyException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.organisation.monetary.exception;
+package org.apache.fineract.portfolio.loanproduct.exception;
 
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 

diff --git a/...eract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java b/...eract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
@@ -40,7 +40,6 @@
 import org.apache.fineract.infrastructure.event.business.domain.loan.product.LoanProductCreateBusinessEvent;
 import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper;
 import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket;
@@ -58,6 +57,7 @@
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule;
 import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRepository;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.loanproduct.exception.LoanProductCannotBeModifiedDueToNonClosedLoansException;
 import org.apache.fineract.portfolio.loanproduct.exception.LoanProductDateException;
 import org.apache.fineract.portfolio.loanproduct.exception.LoanProductNotFoundException;

diff --git a/...ract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java b/...ract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java
@@ -26,8 +26,6 @@
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 public interface NoteRepository extends JpaRepository<Note, Long>, JpaSpecificationExecutor<Note> {
 
@@ -48,8 +46,4 @@ public interface NoteRepository extends JpaRepository<Note, Long>, JpaSpecificat
     List<Note> findBySavingsAccount(SavingsAccount savingAccount);
 
     Note findBySavingsAccountAndId(SavingsAccount savingAccount, Long id);
-
-    @Query("select note from Note note where note.savingsTransaction.id = :savingsTransactionId")
-    List<Note> findBySavingsTransactionId(@Param("savingsTransactionId") Long savingsTransactionId);
-
 }
diff --git a/...ortfolio/savings/DepositAccountUtils.java → ...ortfolio/savings/DepositAccountUtils.java b/...ortfolio/savings/DepositAccountUtils.java → ...ortfolio/savings/DepositAccountUtils.java
diff --git a/...ings/SavingsTransactionBooleanValues.java → ...ings/SavingsTransactionBooleanValues.java b/...ings/SavingsTransactionBooleanValues.java → ...ings/SavingsTransactionBooleanValues.java
diff --git a/...o/savings/api/SavingsApiSetConstants.java → ...o/savings/api/SavingsApiSetConstants.java b/...o/savings/api/SavingsApiSetConstants.java → ...o/savings/api/SavingsApiSetConstants.java
diff --git a/...avings/data/ClosingOfSavingsAccounts.java → ...avings/data/ClosingOfSavingsAccounts.java b/...avings/data/ClosingOfSavingsAccounts.java → ...avings/data/ClosingOfSavingsAccounts.java
diff --git a/...olio/savings/data/DepositAccountData.java → ...olio/savings/data/DepositAccountData.java b/...olio/savings/data/DepositAccountData.java → ...olio/savings/data/DepositAccountData.java
diff --git a/.../DepositAccountInterestIncentiveData.java → .../DepositAccountInterestIncentiveData.java b/.../DepositAccountInterestIncentiveData.java → .../DepositAccountInterestIncentiveData.java
diff --git a/.../DepositAccountInterestRateChartData.java → .../DepositAccountInterestRateChartData.java b/.../DepositAccountInterestRateChartData.java → .../DepositAccountInterestRateChartData.java
diff --git a/...ositAccountInterestRateChartSlabData.java → ...ositAccountInterestRateChartSlabData.java b/...ositAccountInterestRateChartSlabData.java → ...ositAccountInterestRateChartSlabData.java
diff --git a/.../DepositAccountOnHoldTransactionData.java → .../DepositAccountOnHoldTransactionData.java b/.../DepositAccountOnHoldTransactionData.java → .../DepositAccountOnHoldTransactionData.java
diff --git a/...olio/savings/data/DepositProductData.java → ...olio/savings/data/DepositProductData.java b/...olio/savings/data/DepositProductData.java → ...olio/savings/data/DepositProductData.java
diff --git a/...savings/data/FixedDepositAccountData.java → ...savings/data/FixedDepositAccountData.java b/...savings/data/FixedDepositAccountData.java → ...savings/data/FixedDepositAccountData.java
diff --git a/...savings/data/FixedDepositProductData.java → ...savings/data/FixedDepositProductData.java b/...savings/data/FixedDepositProductData.java → ...savings/data/FixedDepositProductData.java
diff --git a/...portfolio/savings/data/GSIMContainer.java → ...portfolio/savings/data/GSIMContainer.java b/...portfolio/savings/data/GSIMContainer.java → ...portfolio/savings/data/GSIMContainer.java
diff --git a/...vingsIndividualMonitoringAccountData.java → ...vingsIndividualMonitoringAccountData.java b/...vingsIndividualMonitoringAccountData.java → ...vingsIndividualMonitoringAccountData.java
diff --git a/...ngs/data/RecurringDepositAccountData.java → ...ngs/data/RecurringDepositAccountData.java b/...ngs/data/RecurringDepositAccountData.java → ...ngs/data/RecurringDepositAccountData.java
diff --git a/...ngs/data/RecurringDepositProductData.java → ...ngs/data/RecurringDepositProductData.java b/...ngs/data/RecurringDepositProductData.java → ...ngs/data/RecurringDepositProductData.java
diff --git a/...ngs/data/SavingsAccountAnnualFeeData.java → ...ngs/data/SavingsAccountAnnualFeeData.java b/...ngs/data/SavingsAccountAnnualFeeData.java → ...ngs/data/SavingsAccountAnnualFeeData.java
diff --git a/...ta/SavingsAccountChargeDataValidator.java → ...ta/SavingsAccountChargeDataValidator.java b/...ta/SavingsAccountChargeDataValidator.java → ...ta/SavingsAccountChargeDataValidator.java
diff --git a/.../savings/data/SavingsAccountConstant.java → .../savings/data/SavingsAccountConstant.java b/.../savings/data/SavingsAccountConstant.java → .../savings/data/SavingsAccountConstant.java
diff --git a/...o/savings/data/SavingsAccountDataDTO.java → ...o/savings/data/SavingsAccountDataDTO.java b/...o/savings/data/SavingsAccountDataDTO.java → ...o/savings/data/SavingsAccountDataDTO.java
diff --git a/...ngs/data/SavingsAccountDataValidator.java → ...ngs/data/SavingsAccountDataValidator.java b/...ngs/data/SavingsAccountDataValidator.java → ...ngs/data/SavingsAccountDataValidator.java
diff --git a/...gs/data/SavingsAccountTransactionDTO.java → ...gs/data/SavingsAccountTransactionDTO.java b/...gs/data/SavingsAccountTransactionDTO.java → ...gs/data/SavingsAccountTransactionDTO.java
diff --git a/...folio/savings/data/SavingsActivation.java → ...folio/savings/data/SavingsActivation.java b/...folio/savings/data/SavingsActivation.java → ...folio/savings/data/SavingsActivation.java
diff --git a/...rtfolio/savings/data/SavingsApproval.java → ...rtfolio/savings/data/SavingsApproval.java b/...rtfolio/savings/data/SavingsApproval.java → ...rtfolio/savings/data/SavingsApproval.java
diff --git a/...ngs/data/SavingsProductDataValidator.java → ...ngs/data/SavingsProductDataValidator.java b/...ngs/data/SavingsProductDataValidator.java → ...ngs/data/SavingsProductDataValidator.java
diff --git a/...lio/savings/data/TransactionDateData.java → ...lio/savings/data/TransactionDateData.java b/...lio/savings/data/TransactionDateData.java → ...lio/savings/data/TransactionDateData.java
diff --git a/...main/DepositAccountInterestIncentive.java → ...main/DepositAccountInterestIncentive.java b/...main/DepositAccountInterestIncentive.java → ...main/DepositAccountInterestIncentive.java
diff --git a/...ain/DepositAccountInterestIncentives.java → ...ain/DepositAccountInterestIncentives.java b/...ain/DepositAccountInterestIncentives.java → ...ain/DepositAccountInterestIncentives.java
diff --git a/...main/DepositAccountInterestRateChart.java → ...main/DepositAccountInterestRateChart.java b/...main/DepositAccountInterestRateChart.java → ...main/DepositAccountInterestRateChart.java
diff --git a/...DepositAccountInterestRateChartSlabs.java → ...DepositAccountInterestRateChartSlabs.java b/...DepositAccountInterestRateChartSlabs.java → ...DepositAccountInterestRateChartSlabs.java
diff --git a/...main/DepositAccountOnHoldTransaction.java → ...main/DepositAccountOnHoldTransaction.java b/...main/DepositAccountOnHoldTransaction.java → ...main/DepositAccountOnHoldTransaction.java
@@ -20,10 +20,12 @@
 
 import static org.apache.fineract.infrastructure.core.service.DateUtils.getSystemZoneId;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -33,6 +35,7 @@
 import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
+import org.apache.fineract.portfolio.loanaccount.guarantor.domain.GuarantorFundingTransaction;
 import org.apache.fineract.portfolio.savings.DepositAccountOnHoldTransactionType;
 
 @Entity
@@ -59,6 +62,9 @@ public class DepositAccountOnHoldTransaction extends AbstractAuditableWithUTCDat
     @Column(name = "created_date", nullable = true)
     private LocalDateTime createdDateToRemove;
 
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "depositAccountOnHoldTransaction", optional = true, orphanRemoval = true)
+    private GuarantorFundingTransaction guarantorFundingTransaction;
+
     protected DepositAccountOnHoldTransaction() {}
 
     private DepositAccountOnHoldTransaction(final SavingsAccount savingsAccount, final BigDecimal amount,

diff --git a/...main/DepositAccountTermAndPreClosure.java → ...main/DepositAccountTermAndPreClosure.java b/...main/DepositAccountTermAndPreClosure.java → ...main/DepositAccountTermAndPreClosure.java
diff --git a/...vings/domain/DepositPreClosureDetail.java → ...vings/domain/DepositPreClosureDetail.java b/...vings/domain/DepositPreClosureDetail.java → ...vings/domain/DepositPreClosureDetail.java
diff --git a/...s/domain/DepositProductAmountDetails.java → ...s/domain/DepositProductAmountDetails.java b/...s/domain/DepositProductAmountDetails.java → ...s/domain/DepositProductAmountDetails.java
diff --git a/...vings/domain/DepositProductAssembler.java → ...vings/domain/DepositProductAssembler.java b/...vings/domain/DepositProductAssembler.java → ...vings/domain/DepositProductAssembler.java
@@ -68,12 +68,12 @@
 import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper;
 import org.apache.fineract.portfolio.charge.exception.ChargeCannotBeAppliedToException;
 import org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart;
 import org.apache.fineract.portfolio.interestratechart.service.InterestRateChartAssembler;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.savings.PreClosurePenalInterestOnType;
 import org.apache.fineract.portfolio.savings.SavingsCompoundingInterestPeriodType;
 import org.apache.fineract.portfolio.savings.SavingsInterestCalculationDaysInYearType;

diff --git a/...domain/DepositProductRecurringDetail.java → ...domain/DepositProductRecurringDetail.java b/...domain/DepositProductRecurringDetail.java → ...domain/DepositProductRecurringDetail.java
diff --git a/...main/DepositProductTermAndPreClosure.java → ...main/DepositProductTermAndPreClosure.java b/...main/DepositProductTermAndPreClosure.java → ...main/DepositProductTermAndPreClosure.java
diff --git a/...avings/domain/DepositRecurringDetail.java → ...avings/domain/DepositRecurringDetail.java b/...avings/domain/DepositRecurringDetail.java → ...avings/domain/DepositRecurringDetail.java
diff --git a/...lio/savings/domain/DepositTermDetail.java → ...lio/savings/domain/DepositTermDetail.java b/...lio/savings/domain/DepositTermDetail.java → ...lio/savings/domain/DepositTermDetail.java
diff --git a/...o/savings/domain/FixedDepositProduct.java → ...o/savings/domain/FixedDepositProduct.java b/...o/savings/domain/FixedDepositProduct.java → ...o/savings/domain/FixedDepositProduct.java
diff --git a/...rtfolio/savings/domain/GSIMRepositoy.java → ...rtfolio/savings/domain/GSIMRepositoy.java b/...rtfolio/savings/domain/GSIMRepositoy.java → ...rtfolio/savings/domain/GSIMRepositoy.java
diff --git a/...ain/GroupSavingsIndividualMonitoring.java → ...ain/GroupSavingsIndividualMonitoring.java b/...ain/GroupSavingsIndividualMonitoring.java → ...ain/GroupSavingsIndividualMonitoring.java
diff --git a/...vings/domain/RecurringDepositProduct.java → ...vings/domain/RecurringDepositProduct.java b/...vings/domain/RecurringDepositProduct.java → ...vings/domain/RecurringDepositProduct.java
diff --git a/...in/RecurringDepositProductRepository.java → ...in/RecurringDepositProductRepository.java b/...in/RecurringDepositProductRepository.java → ...in/RecurringDepositProductRepository.java
diff --git a/...tfolio/savings/domain/SavingsAccount.java → ...tfolio/savings/domain/SavingsAccount.java b/...tfolio/savings/domain/SavingsAccount.java → ...tfolio/savings/domain/SavingsAccount.java
diff --git a/.../savings/domain/SavingsAccountCharge.java → .../savings/domain/SavingsAccountCharge.java b/.../savings/domain/SavingsAccountCharge.java → .../savings/domain/SavingsAccountCharge.java
diff --git a/...domain/SavingsAccountChargeAssembler.java → ...domain/SavingsAccountChargeAssembler.java b/...domain/SavingsAccountChargeAssembler.java → ...domain/SavingsAccountChargeAssembler.java
diff --git a/...gs/domain/SavingsAccountChargePaidBy.java → ...gs/domain/SavingsAccountChargePaidBy.java b/...gs/domain/SavingsAccountChargePaidBy.java → ...gs/domain/SavingsAccountChargePaidBy.java
diff --git a/...omain/SavingsAccountChargeRepository.java → ...omain/SavingsAccountChargeRepository.java b/...omain/SavingsAccountChargeRepository.java → ...omain/SavingsAccountChargeRepository.java
diff --git a/...avingsAccountChargeRepositoryWrapper.java → ...avingsAccountChargeRepositoryWrapper.java b/...avingsAccountChargeRepositoryWrapper.java → ...avingsAccountChargeRepositoryWrapper.java
diff --git a/...s/domain/SavingsAccountDomainService.java → ...s/domain/SavingsAccountDomainService.java b/...s/domain/SavingsAccountDomainService.java → ...s/domain/SavingsAccountDomainService.java
diff --git a/...savings/domain/SavingsAccountSummary.java → ...savings/domain/SavingsAccountSummary.java b/...savings/domain/SavingsAccountSummary.java → ...savings/domain/SavingsAccountSummary.java
diff --git a/...ngs/domain/SavingsAccountTransaction.java → ...ngs/domain/SavingsAccountTransaction.java b/...ngs/domain/SavingsAccountTransaction.java → ...ngs/domain/SavingsAccountTransaction.java
@@ -46,6 +46,7 @@
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.organisation.office.domain.Office;
+import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
 import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
@@ -126,6 +127,10 @@ public final class SavingsAccountTransaction extends AbstractAuditableWithUTCDat
     @Column(name = "reason_for_block", nullable = true)
     private String reasonForBlock;
 
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    @JoinColumn(name = "savings_account_transaction_id", referencedColumnName = "id")
+    private List<Note> notes = new ArrayList<>();
+
     @Column(name = "is_reversal", nullable = false)
     private boolean reversalTransaction;
 
@@ -423,6 +428,10 @@ public List<SavingsAccountTransactionTaxDetails> getTaxDetails() {
         return this.taxDetails;
     }
 
+    public List<Note> getNotes() {
+        return notes;
+    }
+
     public Integer getTypeOf() {
         return this.typeOf;
     }

diff --git a/.../SavingsAccountTransactionComparator.java → .../SavingsAccountTransactionComparator.java b/.../SavingsAccountTransactionComparator.java → .../SavingsAccountTransactionComparator.java
diff --git a/...ingsAccountTransactionDataComparator.java → ...ingsAccountTransactionDataComparator.java b/...ingsAccountTransactionDataComparator.java → ...ingsAccountTransactionDataComparator.java
diff --git a/.../SavingsAccountTransactionRepository.java → .../SavingsAccountTransactionRepository.java b/.../SavingsAccountTransactionRepository.java → .../SavingsAccountTransactionRepository.java
diff --git a/...ingsAccountTransactionSummaryWrapper.java → ...ingsAccountTransactionSummaryWrapper.java b/...ingsAccountTransactionSummaryWrapper.java → ...ingsAccountTransactionSummaryWrapper.java
diff --git a/.../SavingsAccountTransactionTaxDetails.java → .../SavingsAccountTransactionTaxDetails.java b/.../SavingsAccountTransactionTaxDetails.java → .../SavingsAccountTransactionTaxDetails.java
diff --git a/...ortfolio/savings/domain/SavingsEvent.java → ...ortfolio/savings/domain/SavingsEvent.java b/...ortfolio/savings/domain/SavingsEvent.java → ...ortfolio/savings/domain/SavingsEvent.java
diff --git a/...main/SavingsOfficerAssignmentHistory.java → ...main/SavingsOfficerAssignmentHistory.java b/...main/SavingsOfficerAssignmentHistory.java → ...main/SavingsOfficerAssignmentHistory.java
diff --git a/...tfolio/savings/domain/SavingsProduct.java → ...tfolio/savings/domain/SavingsProduct.java b/...tfolio/savings/domain/SavingsProduct.java → ...tfolio/savings/domain/SavingsProduct.java
diff --git a/...vings/domain/SavingsProductAssembler.java → ...vings/domain/SavingsProductAssembler.java b/...vings/domain/SavingsProductAssembler.java → ...vings/domain/SavingsProductAssembler.java
@@ -59,10 +59,10 @@
 import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper;
 import org.apache.fineract.portfolio.charge.exception.ChargeCannotBeAppliedToException;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.savings.SavingsCompoundingInterestPeriodType;
 import org.apache.fineract.portfolio.savings.SavingsInterestCalculationDaysInYearType;
 import org.apache.fineract.portfolio.savings.SavingsInterestCalculationType;

diff --git a/...domain/SavingsProductChargeAssembler.java → ...domain/SavingsProductChargeAssembler.java b/...domain/SavingsProductChargeAssembler.java → ...domain/SavingsProductChargeAssembler.java
diff --git a/...ings/domain/SavingsProductRepository.java → ...ings/domain/SavingsProductRepository.java b/...ings/domain/SavingsProductRepository.java → ...ings/domain/SavingsProductRepository.java
diff --git a/...ntInterestRateChartNotFoundException.java → ...ntInterestRateChartNotFoundException.java b/...ntInterestRateChartNotFoundException.java → ...ntInterestRateChartNotFoundException.java
diff --git a/...tion/DepositAccountNotFoundException.java → ...tion/DepositAccountNotFoundException.java b/...tion/DepositAccountNotFoundException.java → ...tion/DepositAccountNotFoundException.java
diff --git a/...ccountTransactionNotAllowedException.java → ...ccountTransactionNotAllowedException.java b/...ccountTransactionNotAllowedException.java → ...ccountTransactionNotAllowedException.java
diff --git a/...FixedDepositProductNotFoundException.java → ...FixedDepositProductNotFoundException.java b/...FixedDepositProductNotFoundException.java → ...FixedDepositProductNotFoundException.java
diff --git a/.../InsufficientAccountBalanceException.java → .../InsufficientAccountBalanceException.java b/.../InsufficientAccountBalanceException.java → .../InsufficientAccountBalanceException.java
diff --git a/...eption/PostInterestAsOnDateException.java → ...eption/PostInterestAsOnDateException.java b/...eption/PostInterestAsOnDateException.java → ...eption/PostInterestAsOnDateException.java
diff --git a/...ion/PostInterestClosingDateException.java → ...ion/PostInterestClosingDateException.java b/...ion/PostInterestClosingDateException.java → ...ion/PostInterestClosingDateException.java
diff --git a/...rringDepositProductNotFoundException.java → ...rringDepositProductNotFoundException.java b/...rringDepositProductNotFoundException.java → ...rringDepositProductNotFoundException.java
diff --git a/...ption/SavingsAccountBlockedException.java → ...ption/SavingsAccountBlockedException.java b/...ption/SavingsAccountBlockedException.java → ...ption/SavingsAccountBlockedException.java
diff --git a/...ngsAccountClosingNotAllowedException.java → ...ngsAccountClosingNotAllowedException.java b/...ngsAccountClosingNotAllowedException.java → ...ngsAccountClosingNotAllowedException.java
diff --git a/...avingsAccountCreditsBlockedException.java → ...avingsAccountCreditsBlockedException.java b/...avingsAccountCreditsBlockedException.java → ...avingsAccountCreditsBlockedException.java
diff --git a/...SavingsAccountDebitsBlockedException.java → ...SavingsAccountDebitsBlockedException.java b/...SavingsAccountDebitsBlockedException.java → ...SavingsAccountDebitsBlockedException.java
diff --git a/...tion/SavingsAccountNotFoundException.java → ...tion/SavingsAccountNotFoundException.java b/...tion/SavingsAccountNotFoundException.java → ...tion/SavingsAccountNotFoundException.java
diff --git a/...sAccountTransactionNotFoundException.java → ...sAccountTransactionNotFoundException.java b/...sAccountTransactionNotFoundException.java → ...sAccountTransactionNotFoundException.java
diff --git a/...tivityPriorToClientTransferException.java → ...tivityPriorToClientTransferException.java b/...tivityPriorToClientTransferException.java → ...tivityPriorToClientTransferException.java
diff --git a/...avingsOfficerAssignmentDateException.java → ...avingsOfficerAssignmentDateException.java b/...avingsOfficerAssignmentDateException.java → ...avingsOfficerAssignmentDateException.java
diff --git a/...on/SavingsOfficerAssignmentException.java → ...on/SavingsOfficerAssignmentException.java b/...on/SavingsOfficerAssignmentException.java → ...on/SavingsOfficerAssignmentException.java
diff --git a/...ingsOfficerUnassignmentDateException.java → ...ingsOfficerUnassignmentDateException.java b/...ingsOfficerUnassignmentDateException.java → ...ingsOfficerUnassignmentDateException.java
diff --git a/.../SavingsOfficerUnassignmentException.java → .../SavingsOfficerUnassignmentException.java b/.../SavingsOfficerUnassignmentException.java → .../SavingsOfficerUnassignmentException.java
diff --git a/...tion/SavingsProductNotFoundException.java → ...tion/SavingsProductNotFoundException.java b/...tion/SavingsProductNotFoundException.java → ...tion/SavingsProductNotFoundException.java
diff --git a/...rTransactionsCannotBeUndoneException.java → ...rTransactionsCannotBeUndoneException.java b/...rTransactionsCannotBeUndoneException.java → ...rTransactionsCannotBeUndoneException.java
diff --git a/...TransactionBeforePivotDateNotAllowed.java → ...TransactionBeforePivotDateNotAllowed.java b/...TransactionBeforePivotDateNotAllowed.java → ...TransactionBeforePivotDateNotAllowed.java
diff --git a/...TransactionUpdateNotAllowedException.java → ...TransactionUpdateNotAllowedException.java b/...TransactionUpdateNotAllowedException.java → ...TransactionUpdateNotAllowedException.java
diff --git a/...InterestRateChartReadPlatformService.java → ...InterestRateChartReadPlatformService.java b/...InterestRateChartReadPlatformService.java → ...InterestRateChartReadPlatformService.java
diff --git a/...OnHoldTransactionReadPlatformService.java → ...OnHoldTransactionReadPlatformService.java b/...OnHoldTransactionReadPlatformService.java → ...OnHoldTransactionReadPlatformService.java
diff --git a/...tPreMatureCalculationPlatformService.java → ...tPreMatureCalculationPlatformService.java b/...tPreMatureCalculationPlatformService.java → ...tPreMatureCalculationPlatformService.java
diff --git a/...e/DepositAccountWritePlatformService.java → ...e/DepositAccountWritePlatformService.java b/...e/DepositAccountWritePlatformService.java → ...e/DepositAccountWritePlatformService.java
diff --git a/...plicationProcessWritePlatformService.java → ...plicationProcessWritePlatformService.java b/...plicationProcessWritePlatformService.java → ...plicationProcessWritePlatformService.java
diff --git a/...ce/DepositProductReadPlatformService.java → ...ce/DepositProductReadPlatformService.java b/...ce/DepositProductReadPlatformService.java → ...ce/DepositProductReadPlatformService.java
diff --git a/.../DepositsDropdownReadPlatformService.java → .../DepositsDropdownReadPlatformService.java b/.../DepositsDropdownReadPlatformService.java → .../DepositsDropdownReadPlatformService.java
diff --git a/...edDepositProductWritePlatformService.java → ...edDepositProductWritePlatformService.java b/...edDepositProductWritePlatformService.java → ...edDepositProductWritePlatformService.java
diff --git a/...ings/service/GSIMReadPlatformService.java → ...ings/service/GSIMReadPlatformService.java b/...ings/service/GSIMReadPlatformService.java → ...ings/service/GSIMReadPlatformService.java
diff --git a/.../service/GSIMReadPlatformServiceImpl.java → .../service/GSIMReadPlatformServiceImpl.java b/.../service/GSIMReadPlatformServiceImpl.java → .../service/GSIMReadPlatformServiceImpl.java
diff --git a/...ngDepositProductWritePlatformService.java → ...ngDepositProductWritePlatformService.java b/...ngDepositProductWritePlatformService.java → ...ngDepositProductWritePlatformService.java
diff --git a/...ingsAccountChargeReadPlatformService.java → ...ingsAccountChargeReadPlatformService.java b/...ingsAccountChargeReadPlatformService.java → ...ingsAccountChargeReadPlatformService.java
diff --git a/...SavingsAccountInterestPostingService.java → ...SavingsAccountInterestPostingService.java b/...SavingsAccountInterestPostingService.java → ...SavingsAccountInterestPostingService.java
diff --git a/...ce/SavingsAccountReadPlatformService.java → ...ce/SavingsAccountReadPlatformService.java b/...ce/SavingsAccountReadPlatformService.java → ...ce/SavingsAccountReadPlatformService.java
diff --git a/...e/SavingsAccountWritePlatformService.java → ...e/SavingsAccountWritePlatformService.java b/...e/SavingsAccountWritePlatformService.java → ...e/SavingsAccountWritePlatformService.java
diff --git a/...plicationProcessWritePlatformService.java → ...plicationProcessWritePlatformService.java b/...plicationProcessWritePlatformService.java → ...plicationProcessWritePlatformService.java
diff --git a/...e/SavingsDropdownReadPlatformService.java → ...e/SavingsDropdownReadPlatformService.java b/...e/SavingsDropdownReadPlatformService.java → ...e/SavingsDropdownReadPlatformService.java
diff --git a/...ce/SavingsProductReadPlatformService.java → ...ce/SavingsProductReadPlatformService.java b/...ce/SavingsProductReadPlatformService.java → ...ce/SavingsProductReadPlatformService.java
diff --git a/...e/SavingsProductWritePlatformService.java → ...e/SavingsProductWritePlatformService.java b/...e/SavingsProductWritePlatformService.java → ...e/SavingsProductWritePlatformService.java
diff --git a/...rvice/SavingsSchedularInterestPoster.java → ...rvice/SavingsSchedularInterestPoster.java b/...rvice/SavingsSchedularInterestPoster.java → ...rvice/SavingsSchedularInterestPoster.java
diff --git a/...e/SavingsSchedularInterestPosterTask.java → ...e/SavingsSchedularInterestPosterTask.java b/...e/SavingsSchedularInterestPosterTask.java → ...e/SavingsSchedularInterestPosterTask.java
diff --git a/...vingsAccountTransactionSearchService.java → ...vingsAccountTransactionSearchService.java b/...vingsAccountTransactionSearchService.java → ...vingsAccountTransactionSearchService.java
diff --git a/...ineract/portfolio/savings/service/search/SavingsAccountTransactionsSearchServiceImpl.java b/...ineract/portfolio/savings/service/search/SavingsAccountTransactionsSearchServiceImpl.java
@@ -39,7 +39,7 @@
 import org.apache.fineract.infrastructure.dataqueries.data.EntityTables;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetColumnHeaderData;
 import org.apache.fineract.infrastructure.dataqueries.service.GenericDataService;
-import org.apache.fineract.infrastructure.dataqueries.service.ReadWriteNonCoreDataService;
+import org.apache.fineract.infrastructure.dataqueries.service.ReadWriteNonCoreDataServiceImpl;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.savings.SavingsAccountTransactionType;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionData;
@@ -66,7 +66,7 @@ public class SavingsAccountTransactionsSearchServiceImpl implements SavingsAccou
     private final PlatformSecurityContext context;
     private final GenericDataService genericDataService;
     private final DatabaseSpecificSQLGenerator sqlGenerator;
-    private final ReadWriteNonCoreDataService datatableService;
+    private final ReadWriteNonCoreDataServiceImpl datatableService;
     private final DataTableValidator dataTableValidator;
     private final JdbcTemplate jdbcTemplate;
 

diff --git a/...act/portfolio/search/SearchConstants.java → ...act/portfolio/search/SearchConstants.java b/...act/portfolio/search/SearchConstants.java → ...act/portfolio/search/SearchConstants.java
diff --git a/.../search/data/AdHocQueryDataValidator.java → .../search/data/AdHocQueryDataValidator.java b/.../search/data/AdHocQueryDataValidator.java → .../search/data/AdHocQueryDataValidator.java
diff --git a/...arch/data/AdHocQuerySearchConditions.java → ...arch/data/AdHocQuerySearchConditions.java b/...arch/data/AdHocQuerySearchConditions.java → ...arch/data/AdHocQuerySearchConditions.java
diff --git a/...earch/data/AdHocQuerySearchConstants.java → ...earch/data/AdHocQuerySearchConstants.java b/...earch/data/AdHocQuerySearchConstants.java → ...earch/data/AdHocQuerySearchConstants.java
diff --git a/...tfolio/search/data/AdvancedQueryData.java → ...tfolio/search/data/AdvancedQueryData.java b/...tfolio/search/data/AdvancedQueryData.java → ...tfolio/search/data/AdvancedQueryData.java
diff --git a/...lio/search/data/AdvancedQueryRequest.java → ...lio/search/data/AdvancedQueryRequest.java b/...lio/search/data/AdvancedQueryRequest.java → ...lio/search/data/AdvancedQueryRequest.java
diff --git a/...rtfolio/search/data/ColumnFilterData.java → ...rtfolio/search/data/ColumnFilterData.java b/...rtfolio/search/data/ColumnFilterData.java → ...rtfolio/search/data/ColumnFilterData.java
diff --git a/...act/portfolio/search/data/FilterData.java → ...act/portfolio/search/data/FilterData.java b/...act/portfolio/search/data/FilterData.java → ...act/portfolio/search/data/FilterData.java
diff --git a/...rtfolio/search/data/SearchConditions.java → ...rtfolio/search/data/SearchConditions.java b/...rtfolio/search/data/SearchConditions.java → ...rtfolio/search/data/SearchConditions.java
diff --git a/...act/portfolio/search/data/SearchData.java → ...act/portfolio/search/data/SearchData.java b/...act/portfolio/search/data/SearchData.java → ...act/portfolio/search/data/SearchData.java
diff --git a/...portfolio/search/data/TableQueryData.java → ...portfolio/search/data/TableQueryData.java b/...portfolio/search/data/TableQueryData.java → ...portfolio/search/data/TableQueryData.java
diff --git a/...search/data/TransactionSearchRequest.java → ...search/data/TransactionSearchRequest.java b/...search/data/TransactionSearchRequest.java → ...search/data/TransactionSearchRequest.java
diff --git a/.../portfolio/search/service/SearchUtil.java → .../portfolio/search/service/SearchUtil.java b/.../portfolio/search/service/SearchUtil.java → .../portfolio/search/service/SearchUtil.java
diff --git a/...org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java b/...org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
@@ -46,7 +46,6 @@
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.accounts.constants.ShareAccountApiConstants;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType;
@@ -55,6 +54,7 @@
 import org.apache.fineract.portfolio.client.domain.Client;
 import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper;
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.savings.DepositAccountType;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper;

diff --git a/...org/apache/fineract/portfolio/shareproducts/serialization/ShareProductDataSerializer.java b/...org/apache/fineract/portfolio/shareproducts/serialization/ShareProductDataSerializer.java
@@ -44,10 +44,10 @@
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
-import org.apache.fineract.organisation.monetary.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper;
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
+import org.apache.fineract.portfolio.loanproduct.exception.InvalidCurrencyException;
 import org.apache.fineract.portfolio.shareproducts.constants.ShareProductApiConstants;
 import org.apache.fineract.portfolio.shareproducts.data.ShareProductMarketPriceData;
 import org.apache.fineract.portfolio.shareproducts.domain.ShareProduct;

diff --git a/...io/tax/domain/TaxComponentRepository.java → ...io/tax/domain/TaxComponentRepository.java b/...io/tax/domain/TaxComponentRepository.java → ...io/tax/domain/TaxComponentRepository.java
diff --git a/...domain/TaxComponentRepositoryWrapper.java → ...domain/TaxComponentRepositoryWrapper.java b/...domain/TaxComponentRepositoryWrapper.java → ...domain/TaxComponentRepositoryWrapper.java
diff --git a/...tfolio/tax/domain/TaxGroupRepository.java → ...tfolio/tax/domain/TaxGroupRepository.java b/...tfolio/tax/domain/TaxGroupRepository.java → ...tfolio/tax/domain/TaxGroupRepository.java
diff --git a/...tax/domain/TaxGroupRepositoryWrapper.java → ...tax/domain/TaxGroupRepositoryWrapper.java b/...tax/domain/TaxGroupRepositoryWrapper.java → ...tax/domain/TaxGroupRepositoryWrapper.java
diff --git a/...eption/TaxComponentNotFoundException.java → ...eption/TaxComponentNotFoundException.java b/...eption/TaxComponentNotFoundException.java → ...eption/TaxComponentNotFoundException.java
diff --git a/.../exception/TaxGroupNotFoundException.java → .../exception/TaxGroupNotFoundException.java b/.../exception/TaxGroupNotFoundException.java → .../exception/TaxGroupNotFoundException.java
diff --git a/...eract/portfolio/tax/service/TaxUtils.java → ...eract/portfolio/tax/service/TaxUtils.java b/...eract/portfolio/tax/service/TaxUtils.java → ...eract/portfolio/tax/service/TaxUtils.java