FINERACT-1724: Move product account mapping packages to core

apache · Nov 3, 2023 · f5aa8d2 · f5aa8d2
1 parent a42f469
commit f5aa8d2
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 5 deletions.
diff --git a/...ing/domain/ProductToGLAccountMapping.java → ...ing/domain/ProductToGLAccountMapping.java b/...ing/domain/ProductToGLAccountMapping.java → ...ing/domain/ProductToGLAccountMapping.java
diff --git a/.../ProductToGLAccountMappingRepository.java → .../ProductToGLAccountMappingRepository.java b/.../ProductToGLAccountMappingRepository.java → .../ProductToGLAccountMappingRepository.java
diff --git a/...ctToGLAccountMappingInvalidException.java → ...ctToGLAccountMappingInvalidException.java b/...ctToGLAccountMappingInvalidException.java → ...ctToGLAccountMappingInvalidException.java
diff --git a/...tToGLAccountMappingNotFoundException.java → ...tToGLAccountMappingNotFoundException.java b/...tToGLAccountMappingNotFoundException.java → ...tToGLAccountMappingNotFoundException.java
diff --git a/...ccountMappingFromApiJsonDeserializer.java → ...ccountMappingFromApiJsonDeserializer.java b/...ccountMappingFromApiJsonDeserializer.java → ...ccountMappingFromApiJsonDeserializer.java
@@ -39,7 +39,6 @@
 import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
-import org.apache.fineract.portfolio.loanproduct.domain.LoanProduct;
 import org.apache.fineract.portfolio.savings.DepositAccountType;
 import org.apache.fineract.portfolio.shareproducts.constants.ShareProductApiConstants;
 import org.springframework.stereotype.Component;
@@ -50,8 +49,8 @@
  * Currently, validation of the passed in JSON is done before calling save or update method on the target resource (in
  * our case the loan Product)
  *
- * However, in the case of a loan product it would be difficult to validate the passed in JSON for valid
- * {@link LoanProduct} to {@link GLAccount} mappings during update because of the following scenario
+ * However, in the case of a loan product it would be difficult to validate the passed in JSON for valid LoanProduct to
+ * {@link GLAccount} mappings during update because of the following scenario
  *
  * The accounting rule type may be changed in the update command, so we would have to validate if all required account
  * heads for a particular account type have been passed in (would be different for CASH and Accrual based). However,

diff --git a/...vice/ProductToGLAccountMappingHelper.java → ...vice/ProductToGLAccountMappingHelper.java b/...vice/ProductToGLAccountMappingHelper.java → ...vice/ProductToGLAccountMappingHelper.java
diff --git a/...oGLAccountMappingReadPlatformService.java → ...oGLAccountMappingReadPlatformService.java b/...oGLAccountMappingReadPlatformService.java → ...oGLAccountMappingReadPlatformService.java
diff --git a/...ccountMappingReadPlatformServiceImpl.java → ...ccountMappingReadPlatformServiceImpl.java b/...ccountMappingReadPlatformServiceImpl.java → ...ccountMappingReadPlatformServiceImpl.java
diff --git a/...GLAccountMappingWritePlatformService.java → ...GLAccountMappingWritePlatformService.java b/...GLAccountMappingWritePlatformService.java → ...GLAccountMappingWritePlatformService.java
diff --git a/...vingsProductToGLAccountMappingHelper.java → ...vingsProductToGLAccountMappingHelper.java b/...vingsProductToGLAccountMappingHelper.java → ...vingsProductToGLAccountMappingHelper.java
diff --git a/...ShareProductToGLAccountMappingHelper.java → ...ShareProductToGLAccountMappingHelper.java b/...ShareProductToGLAccountMappingHelper.java → ...ShareProductToGLAccountMappingHelper.java
diff --git a/.../LoanProductToGLAccountMappingHelper.java → .../LoanProductToGLAccountMappingHelper.java b/.../LoanProductToGLAccountMappingHelper.java → .../LoanProductToGLAccountMappingHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.accounting.producttoaccountmapping.service;
+package org.apache.fineract.accounting.productaccountmapping.service;
 
 import com.google.gson.JsonElement;
 import java.util.HashMap;
@@ -33,6 +33,7 @@
 import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType;
 import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMappingRepository;
 import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingInvalidException;
+import org.apache.fineract.accounting.producttoaccountmapping.service.ProductToGLAccountMappingHelper;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.apache.fineract.portfolio.charge.domain.ChargeRepositoryWrapper;

diff --git a/...countMappingWritePlatformServiceImpl.java → ...countMappingWritePlatformServiceImpl.java b/...countMappingWritePlatformServiceImpl.java → ...countMappingWritePlatformServiceImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.accounting.producttoaccountmapping.service;
+package org.apache.fineract.accounting.productaccountmapping.service;
 
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.accountingRuleParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.isDormancyTrackingActiveParamName;
@@ -35,6 +35,9 @@
 import org.apache.fineract.accounting.common.AccountingConstants.SharesProductAccountingParams;
 import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.producttoaccountmapping.serialization.ProductToGLAccountMappingFromApiJsonDeserializer;
+import org.apache.fineract.accounting.producttoaccountmapping.service.ProductToGLAccountMappingWritePlatformService;
+import org.apache.fineract.accounting.producttoaccountmapping.service.SavingsProductToGLAccountMappingHelper;
+import org.apache.fineract.accounting.producttoaccountmapping.service.ShareProductToGLAccountMappingHelper;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.apache.fineract.portfolio.savings.DepositAccountType;