diff --git a/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java b/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java index 35f5ec13ac7..1ee3ccaaf1e 100644 --- a/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java +++ b/fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java @@ -736,7 +736,7 @@ public CommandWrapperBuilder deleteWorkingCapitalLoanProduct(final Long productI return this; } - public CommandWrapperBuilder createWorkingCapitalBreach() { + public CommandWrapperBuilder createWorkingCapitalLoanBreach() { this.actionName = "CREATE"; this.entityName = "WORKINGCAPITALBREACH"; this.entityId = null; @@ -744,7 +744,7 @@ public CommandWrapperBuilder createWorkingCapitalBreach() { return this; } - public CommandWrapperBuilder updateWorkingCapitalBreach(final Long breachId) { + public CommandWrapperBuilder updateWorkingCapitalLoanBreach(final Long breachId) { this.actionName = "UPDATE"; this.entityName = "WORKINGCAPITALBREACH"; this.entityId = breachId; @@ -752,7 +752,7 @@ public CommandWrapperBuilder updateWorkingCapitalBreach(final Long breachId) { return this; } - public CommandWrapperBuilder deleteWorkingCapitalBreach(final Long breachId) { + public CommandWrapperBuilder deleteWorkingCapitalLoanBreach(final Long breachId) { this.actionName = "DELETE"; this.entityName = "WORKINGCAPITALBREACH"; this.entityId = breachId; @@ -760,7 +760,7 @@ public CommandWrapperBuilder deleteWorkingCapitalBreach(final Long breachId) { return this; } - public CommandWrapperBuilder createWorkingCapitalNearBreach() { + public CommandWrapperBuilder createWorkingCapitalLoanNearBreach() { this.actionName = "CREATE"; this.entityName = "WORKINGCAPITALNEARBREACH"; this.entityId = null; @@ -768,7 +768,7 @@ public CommandWrapperBuilder createWorkingCapitalNearBreach() { return this; } - public CommandWrapperBuilder updateWorkingCapitalNearBreach(final Long breachId) { + public CommandWrapperBuilder updateWorkingCapitalLoanNearBreach(final Long breachId) { this.actionName = "UPDATE"; this.entityName = "WORKINGCAPITALNEARBREACH"; this.entityId = breachId; @@ -776,7 +776,7 @@ public CommandWrapperBuilder updateWorkingCapitalNearBreach(final Long breachId) return this; } - public CommandWrapperBuilder deleteWorkingCapitalNearBreach(final Long breachId) { + public CommandWrapperBuilder deleteWorkingCapitalLoanNearBreach(final Long breachId) { this.actionName = "DELETE"; this.entityName = "WORKINGCAPITALNEARBREACH"; this.entityId = breachId; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachCalculationType.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachCalculationType.java similarity index 95% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachCalculationType.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachCalculationType.java index b90f3de78be..eb768a7ccf6 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachCalculationType.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachCalculationType.java @@ -24,7 +24,7 @@ @Getter @RequiredArgsConstructor -public enum WorkingCapitalBreachCalculationType { +public enum WorkingCapitalLoanBreachCalculationType { FLAT(0L, "FLAT", "Flat"), // PERCENTAGE(1L, "PERCENTAGE", "Percentage"); // diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachFrequencyType.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachFrequencyType.java similarity index 95% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachFrequencyType.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachFrequencyType.java index 331e23c7e81..f4a07951859 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalBreachFrequencyType.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/data/workingcapitalproduct/WorkingCapitalLoanBreachFrequencyType.java @@ -24,7 +24,7 @@ @Getter @RequiredArgsConstructor -public enum WorkingCapitalBreachFrequencyType { +public enum WorkingCapitalLoanBreachFrequencyType { DAYS(0L, "DAYS", "Days"), // MONTHS(1L, "MONTHS", "Months"), // diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/WorkingCapitalRequestFactory.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/WorkingCapitalRequestFactory.java index 02db6285451..f047bbb58c4 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/WorkingCapitalRequestFactory.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/WorkingCapitalRequestFactory.java @@ -42,10 +42,10 @@ import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest.AccountingRuleEnum; import org.apache.fineract.client.models.PostWorkingCapitalLoanTransactionsRequest; import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.test.data.DelinquencyBucket; import org.apache.fineract.test.data.accounttype.AccountTypeResolver; import org.apache.fineract.test.data.accounttype.DefaultAccountType; @@ -53,8 +53,8 @@ import org.apache.fineract.test.data.delinquency.DelinquencyBucketType; import org.apache.fineract.test.data.delinquency.DelinquencyFrequencyType; import org.apache.fineract.test.data.delinquency.DelinquencyMinimumPayment; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachCalculationType; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachFrequencyType; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachCalculationType; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachFrequencyType; import org.apache.fineract.test.helper.Utils; import org.springframework.stereotype.Component; @@ -79,12 +79,12 @@ public class WorkingCapitalRequestFactory { public static final String IN_ADVANCE_PRINCIPAL = "IN_ADVANCE_PRINCIPAL"; public static final Integer DEFAULT_WC_BREACH_FREQUENCY = 2; - public static final String DEFAULT_WC_BREACH_FREQUENCY_TYPE = WorkingCapitalBreachFrequencyType.MONTHS.getCode(); - public static final String DEFAULT_WC_BREACH_AMOUNT_CALCULATION_TYPE = WorkingCapitalBreachCalculationType.PERCENTAGE.getCode(); + public static final String DEFAULT_WC_BREACH_FREQUENCY_TYPE = WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode(); + public static final String DEFAULT_WC_BREACH_AMOUNT_CALCULATION_TYPE = WorkingCapitalLoanBreachCalculationType.PERCENTAGE.getCode(); public static final BigDecimal DEFAULT_WC_BREACH_AMOUNT = new BigDecimal("1.23"); public static final String DEFAULT_WC_BREACH_NAME_PREFIX = "WCB-"; public static final Integer DEFAULT_WC_NEAR_BREACH_FREQUENCY = 12; - public static final String DEFAULT_WC_NEAR_BREACH_FREQUENCY_TYPE = WorkingCapitalBreachFrequencyType.DAYS.getCode(); + public static final String DEFAULT_WC_NEAR_BREACH_FREQUENCY_TYPE = WorkingCapitalLoanBreachFrequencyType.DAYS.getCode(); public static final BigDecimal DEFAULT_WC_NEAR_BREACH_THRESHOLD = new BigDecimal("70.23"); public PostWorkingCapitalLoanProductsRequest defaultWorkingCapitalLoanProductRequestWithAccrualAccounting() { @@ -284,8 +284,8 @@ public DelinquencyBucketRequest defaultWorkingCapitalDelinquencyBucketRequest() .minimumPayment(new BigDecimal("1.23"))); } - public WorkingCapitalBreachRequest defaultWorkingCapitalBreachRequest() { - return new WorkingCapitalBreachRequest() // + public WorkingCapitalLoanBreachRequest defaultWorkingCapitalLoanBreachRequest() { + return new WorkingCapitalLoanBreachRequest() // .name(Utils.randomStringGenerator(DEFAULT_WC_BREACH_NAME_PREFIX, 12)) // .breachFrequency(DEFAULT_WC_BREACH_FREQUENCY) // .breachFrequencyType(DEFAULT_WC_BREACH_FREQUENCY_TYPE) // @@ -293,8 +293,8 @@ public WorkingCapitalBreachRequest defaultWorkingCapitalBreachRequest() { .breachAmount(DEFAULT_WC_BREACH_AMOUNT); } - public WorkingCapitalNearBreachRequest defaultWorkingCapitalNearBreachRequest() { - return new WorkingCapitalNearBreachRequest() // + public WorkingCapitalLoanNearBreachRequest defaultWorkingCapitalLoanNearBreachRequest() { + return new WorkingCapitalLoanNearBreachRequest() // .nearBreachName("NearBreach-WCL-" + Utils.randomStringGenerator(8)) // .nearBreachFrequency(DEFAULT_WC_NEAR_BREACH_FREQUENCY) // .nearBreachFrequencyType(DEFAULT_WC_NEAR_BREACH_FREQUENCY_TYPE) // @@ -309,22 +309,23 @@ public PostWorkingCapitalLoanTransactionsRequest defaultWorkingCapitalLoanRepaym private Long getWCBreachIdByName(String breachName) { try { - List breaches = fineractClient.workingCapitalBreaches().retrieveAllWorkingCapitalBreaches(Map.of()); - return breaches.stream().filter(b -> breachName.equals(b.getName())).findFirst().map(WorkingCapitalBreachData::getId) + List breaches = fineractClient.workingCapitalBreaches() + .retrieveAllWorkingCapitalLoanBreaches(Map.of()); + return breaches.stream().filter(b -> breachName.equals(b.getName())).findFirst().map(WorkingCapitalLoanBreachData::getId) .orElseThrow(() -> new RuntimeException("Working Capital Breach not found with name: " + breachName)); } catch (Exception e) { - throw new RuntimeException("Failed to fetch Working Capital Breacht by name: " + breachName, e); + throw new RuntimeException("Failed to fetch Working Capital Breach by name: " + breachName, e); } } private Long getWCNearBreachIdByName(String breachName) { try { - List breaches = fineractClient.workingCapitalNearBreaches() - .retrieveAllWorkingCapitalNearBreaches(Map.of()); - return breaches.stream().filter(b -> breachName.equals(b.getName())).findFirst().map(WorkingCapitalNearBreachData::getId) + List breaches = fineractClient.workingCapitalNearBreaches() + .retrieveAllWorkingCapitalLoanNearBreaches(Map.of()); + return breaches.stream().filter(b -> breachName.equals(b.getName())).findFirst().map(WorkingCapitalLoanNearBreachData::getId) .orElseThrow(() -> new RuntimeException("Working Capital Breach not found with name: " + breachName)); } catch (Exception e) { - throw new RuntimeException("Failed to fetch Working Capital Breacht by name: " + breachName, e); + throw new RuntimeException("Failed to fetch Working Capital Breach by name: " + breachName, e); } } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/WorkingCapitalLoanProductAdvancedAccountingTestHelper.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/WorkingCapitalLoanProductAdvancedAccountingTestHelper.java index ca91660bcb9..762fbe0e256 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/WorkingCapitalLoanProductAdvancedAccountingTestHelper.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/WorkingCapitalLoanProductAdvancedAccountingTestHelper.java @@ -40,9 +40,9 @@ import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest; import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest; import org.apache.fineract.client.models.WorkingCapitalLoanPaymentChannelToFundSourceMappings; +import org.apache.fineract.client.models.WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings; +import org.apache.fineract.client.models.WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings; import org.apache.fineract.client.models.WorkingCapitalLoanProductChargeToGLAccountMapper; -import org.apache.fineract.client.models.WorkingCapitalPostChargeOffReasonToExpenseAccountMappings; -import org.apache.fineract.client.models.WorkingCapitalPostWriteOffReasonToExpenseAccountMappings; import org.apache.fineract.test.data.ChargeCalculationType; import org.apache.fineract.test.data.ChargePaymentMode; import org.apache.fineract.test.data.ChargeTimeType; @@ -100,8 +100,8 @@ private static AdvancedAccountingExpectation prepareAdvancedMappingsInternal(fin final Consumer> setPaymentChannelMappings, final Consumer> setFeeMappings, final Consumer> setPenaltyMappings, - final Consumer> setChargeOffMappings, - final Consumer> setWriteOffMappings, + final Consumer> setChargeOffMappings, + final Consumer> setWriteOffMappings, final PaymentTypeResolver paymentTypeResolver, final FineractFeignClient fineractFeignClient) { final Long fundSourceAccountId = resolveOrCreateGLAccount(fineractFeignClient, "WC E2E Mapping Fund Source", "WCE2EFS1", GLAType.ASSET.value); @@ -129,9 +129,9 @@ private static AdvancedAccountingExpectation prepareAdvancedMappingsInternal(fin List.of(new WorkingCapitalLoanProductChargeToGLAccountMapper().chargeId(feeChargeId).incomeAccountId(feeIncomeAccountId))); setPenaltyMappings.accept(List.of( new WorkingCapitalLoanProductChargeToGLAccountMapper().chargeId(penaltyChargeId).incomeAccountId(penaltyIncomeAccountId))); - setChargeOffMappings.accept(List.of(new WorkingCapitalPostChargeOffReasonToExpenseAccountMappings() + setChargeOffMappings.accept(List.of(new WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings() .chargeOffReasonCodeValueId(chargeOffReasonId).expenseAccountId(writeOffExpenseAccountId))); - setWriteOffMappings.accept(List.of(new WorkingCapitalPostWriteOffReasonToExpenseAccountMappings() + setWriteOffMappings.accept(List.of(new WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings() .writeOffReasonCodeValueId(writeOffReasonId).expenseAccountId(writeOffExpenseAccountId))); return buildExpectation(paymentTypeId, fundSourceAccountId, feeChargeId, feeIncomeAccountId, penaltyChargeId, diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/base/FineractInitializer.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/base/FineractInitializer.java index 13d16d9127c..a34e1ad7273 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/base/FineractInitializer.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/base/FineractInitializer.java @@ -26,9 +26,11 @@ import org.apache.fineract.test.initializer.scenario.FineractScenarioInitializerStep; import org.apache.fineract.test.initializer.suite.FineractSuiteInitializerStep; import org.springframework.beans.factory.InitializingBean; +import org.springframework.core.annotation.Order; @Slf4j @RequiredArgsConstructor +@Order() public class FineractInitializer implements InitializingBean { public static final String DATE_FORMAT = "dd MMMM yyyy"; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java index 99aa90d340c..ccd9f5f64d1 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java @@ -72,9 +72,9 @@ import org.apache.fineract.client.models.PostLoansLoanIdResponse; import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse; import org.apache.fineract.client.models.PostLoansResponse; -import org.apache.fineract.client.models.WorkingCapitalCollection; -import org.apache.fineract.client.models.WorkingCapitalCollectionDelinquencyPausePeriod; -import org.apache.fineract.client.models.WorkingCapitalCollectionRangeScheduleDelinquency; +import org.apache.fineract.client.models.WorkingCapitalLoanCollection; +import org.apache.fineract.client.models.WorkingCapitalLoanCollectionDelinquencyPausePeriod; +import org.apache.fineract.client.models.WorkingCapitalLoanCollectionRangeScheduleDelinquency; import org.apache.fineract.test.data.AssetExternalizationTransferStatus; import org.apache.fineract.test.data.AssetExternalizationTransferStatusReason; import org.apache.fineract.test.data.TransactionType; @@ -753,7 +753,7 @@ public void workingCapitalLoanDelinquencyRangeChangeEventCheck(final Long loanId assertWorkingCapitalLoanAccountData(event, body); final WorkingCapitalLoanCollectionDataV1 eventDelinquent = event.getDelinquent(); - final WorkingCapitalCollection bodyDelinquent = body.getDelinquent(); + final WorkingCapitalLoanCollection bodyDelinquent = body.getDelinquent(); assertThat(eventDelinquent).isNotNull(); assertThat(bodyDelinquent).isNotNull(); assertAmountEquals("delinquent.delinquentAmount", eventDelinquent.getDelinquentAmount(), bodyDelinquent.getDelinquentAmount()); @@ -768,7 +768,7 @@ public void workingCapitalLoanDelinquencyRangeChangeEventNamesRangeCheck(final L assertWorkingCapitalLoanAccountData(event, body); final WorkingCapitalLoanCollectionDataV1 eventDelinquent = event.getDelinquent(); - final WorkingCapitalCollection bodyDelinquent = body.getDelinquent(); + final WorkingCapitalLoanCollection bodyDelinquent = body.getDelinquent(); assertThat(eventDelinquent).isNotNull(); assertThat(bodyDelinquent).isNotNull(); assertAmountEquals("delinquent.delinquentAmount", eventDelinquent.getDelinquentAmount(), bodyDelinquent.getDelinquentAmount()); @@ -787,19 +787,19 @@ public void workingCapitalLoanDelinquencyRangeChangeEventNamesRangeCheck(final L .toList(); assertThat(eventTags).as("delinquent.delinquencySchedule[].tags").isNotEmpty(); - final List apiTags = Optional + final List apiTags = Optional .ofNullable(bodyDelinquent.getInstallmentLevelDelinquency()).orElse(List.of()).stream() .sorted(Comparator - .comparing(WorkingCapitalCollectionRangeScheduleDelinquency::getRangeId, + .comparing(WorkingCapitalLoanCollectionRangeScheduleDelinquency::getRangeId, Comparator.nullsFirst(Comparator.naturalOrder())) - .thenComparing(WorkingCapitalCollectionRangeScheduleDelinquency::getDelinquentAmount, + .thenComparing(WorkingCapitalLoanCollectionRangeScheduleDelinquency::getDelinquentAmount, Comparator.nullsFirst(Comparator.naturalOrder()))) .toList(); assertThat(eventTags).as("delinquent.delinquencySchedule[].tags vs API delinquent.installmentLevelDelinquency") .hasSize(apiTags.size()); IntStream.range(0, eventTags.size()).forEach(i -> { final WorkingCapitalLoanDelinquencyScheduleTagDataV1 actual = eventTags.get(i); - final WorkingCapitalCollectionRangeScheduleDelinquency expected = apiTags.get(i); + final WorkingCapitalLoanCollectionRangeScheduleDelinquency expected = apiTags.get(i); assertThat(actual.getRangeId()).as("tags[%s].rangeId", i).isEqualTo(expected.getRangeId()); assertThat(actual.getClassification()).as("tags[%s].classification", i).isNotBlank() .isEqualTo(expected.getClassification()); @@ -932,11 +932,12 @@ public void workingCapitalLoanBalanceChangedEventPausePeriodsCheck(final Long lo final List eventPausePeriods = event.getDelinquent().getDelinquencyPausePeriods(); assertThat(eventPausePeriods).isNotNull().isNotEmpty(); assertThat(body.getDelinquent()).isNotNull(); - final List bodyPausePeriods = body.getDelinquent().getDelinquencyPausePeriods(); + final List bodyPausePeriods = body.getDelinquent() + .getDelinquencyPausePeriods(); assertThat(bodyPausePeriods).isNotNull().hasSize(eventPausePeriods.size()); IntStream.range(0, eventPausePeriods.size()).forEach(i -> { final DelinquencyPausePeriodV1 actual = eventPausePeriods.get(i); - final WorkingCapitalCollectionDelinquencyPausePeriod expected = bodyPausePeriods.get(i); + final WorkingCapitalLoanCollectionDelinquencyPausePeriod expected = bodyPausePeriods.get(i); assertThat(actual.getActive()).as("delinquencyPausePeriods[%s].active", i).isEqualTo(expected.getActive()); assertEventDateEqualsApiDate("delinquencyPausePeriods[" + i + "].pausePeriodStart", actual.getPausePeriodStart(), expected.getPausePeriodStart()); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalDelinquencyRescheduleStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalDelinquencyRescheduleStepDef.java index 6ed430a1dac..9bf31d7ec22 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalDelinquencyRescheduleStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalDelinquencyRescheduleStepDef.java @@ -47,7 +47,7 @@ import org.apache.fineract.client.models.PostWorkingCapitalLoansDelinquencyActionRequest; import org.apache.fineract.client.models.PostWorkingCapitalLoansDelinquencyActionResponse; import org.apache.fineract.client.models.PostWorkingCapitalLoansResponse; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; import org.apache.fineract.client.models.WorkingCapitalLoanDelinquencyActionData; import org.apache.fineract.client.models.WorkingCapitalLoanDelinquencyRangeScheduleData; import org.apache.fineract.test.factory.WorkingCapitalRequestFactory; @@ -88,12 +88,12 @@ public void createProductWithDelinquencyBucketAndCustomBreachConfig(final DataTa final Map data = table.asMaps().getFirst(); final String breachName = "WC Breach " + Utils.randomStringGenerator("", 10); - final WorkingCapitalBreachRequest breachRequest = new WorkingCapitalBreachRequest().name(breachName) + final WorkingCapitalLoanBreachRequest breachRequest = new WorkingCapitalLoanBreachRequest().name(breachName) .breachFrequency(Integer.valueOf(data.get("breachFrequency"))).breachFrequencyType(data.get("breachFrequencyType")) .breachAmountCalculationType(data.get("breachAmountCalculationType")) .breachAmount(new BigDecimal(data.get("breachAmount"))); final CommandProcessingResult breachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(breachRequest)); + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(breachRequest)); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID, breachId); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java index 39f54925ed1..6d7de090489 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java @@ -2788,14 +2788,14 @@ public void verifyCreateWorkingCapitalLoanAccountFailure(PostWorkingCapitalLoans private Long createBreachAndGetId() { final CommandProcessingResult breachResponse = ok(() -> fineractClient.workingCapitalBreaches() - .createWorkingCapitalBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalBreachRequest())); + .createWorkingCapitalLoanBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanBreachRequest())); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID, breachResponse.getResourceId()); return breachResponse.getResourceId(); } private Long createBreachOverrideAndGetId() { final CommandProcessingResult breachResponse = ok(() -> fineractClient.workingCapitalBreaches() - .createWorkingCapitalBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalBreachRequest())); + .createWorkingCapitalLoanBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanBreachRequest())); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID_OVERRIDE, breachResponse.getResourceId()); return breachResponse.getResourceId(); } @@ -2809,23 +2809,23 @@ private Long createBreachOverrideAndGetId(int breachFrequency, String breachFreq } private Long createBreachOverrideAndGetId(String breachIdLink, int breachFrequency, String breachFrequencyType) { - final CommandProcessingResult breachResponse = ok( - () -> fineractClient.workingCapitalBreaches().createWorkingCapitalBreach(workingCapitalProductRequestFactory - .defaultWorkingCapitalBreachRequest().breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType))); + final CommandProcessingResult breachResponse = ok(() -> fineractClient.workingCapitalBreaches() + .createWorkingCapitalLoanBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanBreachRequest() + .breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType))); testContext().set(breachIdLink, breachResponse.getResourceId()); return breachResponse.getResourceId(); } private Long createNearBreachAndGetId() { final CommandProcessingResult nearBreachResponse = ok(() -> fineractClient.workingCapitalNearBreaches() - .createWorkingCapitalNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalNearBreachRequest())); + .createWorkingCapitalLoanNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanNearBreachRequest())); testContext().set(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID, nearBreachResponse.getResourceId()); return nearBreachResponse.getResourceId(); } private Long createNearBreachOverrideAndGetId() { final CommandProcessingResult nearBreachResponse = ok(() -> fineractClient.workingCapitalNearBreaches() - .createWorkingCapitalNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalNearBreachRequest())); + .createWorkingCapitalLoanNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanNearBreachRequest())); testContext().set(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_OVERRIDE, nearBreachResponse.getResourceId()); return nearBreachResponse.getResourceId(); } @@ -2841,7 +2841,7 @@ private Long createNearBreachOverrideAndGetId(int nearBreachFrequency, String ne private Long createNearBreachAndGetId(String nearBreachIdLink, int nearBreachFrequency, String nearBreachFrequencyType) { final CommandProcessingResult nearBreachResponse = ok(() -> fineractClient.workingCapitalNearBreaches() - .createWorkingCapitalNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalNearBreachRequest() + .createWorkingCapitalLoanNearBreach(workingCapitalProductRequestFactory.defaultWorkingCapitalLoanNearBreachRequest() .nearBreachFrequency(nearBreachFrequency).nearBreachFrequencyType(nearBreachFrequencyType))); testContext().set(nearBreachIdLink, nearBreachResponse.getResourceId()); return nearBreachResponse.getResourceId(); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachActionStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachActionStepDef.java similarity index 99% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachActionStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachActionStepDef.java index 32f04701d39..d214cc7d418 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachActionStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachActionStepDef.java @@ -48,7 +48,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalBreachActionStepDef extends AbstractStepDef { +public class WorkingCapitalLoanBreachActionStepDef extends AbstractStepDef { private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd MMMM yyyy"); private static final Long NON_EXISTENT_LOAN_ID = 999999999L; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachConfigStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachConfigStepDef.java similarity index 78% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachConfigStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachConfigStepDef.java index 91fb857e9a4..82bced7a8dc 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachConfigStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachConfigStepDef.java @@ -31,11 +31,11 @@ import org.apache.fineract.client.feign.util.CallFailedRuntimeException; import org.apache.fineract.client.models.CommandProcessingResult; import org.apache.fineract.client.models.StringEnumOptionData; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachTemplateResponse; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachCalculationType; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachFrequencyType; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachTemplateResponse; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachCalculationType; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachFrequencyType; import org.apache.fineract.test.factory.WorkingCapitalRequestFactory; import org.apache.fineract.test.helper.ErrorMessageHelper; import org.apache.fineract.test.helper.Utils; @@ -47,7 +47,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalBreachConfigStepDef extends AbstractStepDef { +public class WorkingCapitalLoanBreachConfigStepDef extends AbstractStepDef { @Autowired private WorkingCapitalRequestFactory workingCapitalRequestFactory; @@ -56,18 +56,19 @@ public class WorkingCapitalBreachConfigStepDef extends AbstractStepDef { @When("Admin Calls Breach Template") public void adminCallsBreachTemplate() { - final WorkingCapitalBreachTemplateResponse template = ok( - () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalBreachTemplate()); + final WorkingCapitalLoanBreachTemplateResponse template = ok( + () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalLoanBreachTemplate()); assertThat(template).isNotNull(); assertThat(template.getBreachFrequencyTypeOptions()).isNotNull().isNotEmpty(); assertThat(template.getBreachAmountCalculationTypeOptions()).isNotNull().isNotEmpty(); - log.info("Template WorkingCapitalBreach: {}", template); + log.info("Template WorkingCapitalLoanBreach: {}", template); } @When("Admin creates WC Breach With Values") public void adminCreatesWCBreachWithValues() { - final WorkingCapitalBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest(); - final CommandProcessingResult response = ok(() -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(request)); + final WorkingCapitalLoanBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest(); + final CommandProcessingResult response = ok( + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(request)); assertThat(response).isNotNull(); assertThat(response.getResourceId()).isNotNull(); TestContext.INSTANCE.set(TestContextKey.WORKING_CAPITAL_BREACH_ID, response.getResourceId()); @@ -76,13 +77,14 @@ public void adminCreatesWCBreachWithValues() { @When("Admin creates WC Breach With Values for update") public void adminCreatesWCBreachWithValuesForUpdate() { - final WorkingCapitalBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest() + final WorkingCapitalLoanBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest() .name("Breach-WC-" + Utils.randomStringGenerator(12)) // .breachFrequency(5) // - .breachFrequencyType(WorkingCapitalBreachFrequencyType.YEARS.getCode()) // - .breachAmountCalculationType(WorkingCapitalBreachCalculationType.FLAT.getCode()) // + .breachFrequencyType(WorkingCapitalLoanBreachFrequencyType.YEARS.getCode()) // + .breachAmountCalculationType(WorkingCapitalLoanBreachCalculationType.FLAT.getCode()) // .breachAmount(new BigDecimal("2.34")); // - final CommandProcessingResult response = ok(() -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(request)); + final CommandProcessingResult response = ok( + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(request)); assertThat(response).isNotNull(); assertThat(response.getResourceId()).isNotNull(); TestContext.INSTANCE.set(TestContextKey.WORKING_CAPITAL_BREACH_ID_FOR_UPDATE, response.getResourceId()); @@ -92,10 +94,10 @@ public void adminCreatesWCBreachWithValuesForUpdate() { @When("Admin failed to create WC Breach With duplicated name") public void adminCreateWCBreachWithDuplicateNameFailure() { Long existingBreachId = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID_FOR_UPDATE); - WorkingCapitalBreachRequest breachRequestForUpdate = TestContext.INSTANCE + WorkingCapitalLoanBreachRequest breachRequestForUpdate = TestContext.INSTANCE .get(TestContextKey.WORKING_CAPITAL_BREACH_CREATE_REQUEST_FOR_UPDATE); String name = breachRequestForUpdate.getName(); - WorkingCapitalBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest().name(name); // + WorkingCapitalLoanBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest().name(name); // String errorMessage = ErrorMessageHelper.workingCapitalBreachDuplicateNameFailure(existingBreachId); checkCreateWCBreachWithInvalidDataFailure(breachRequest, errorMessage, 403); } @@ -103,20 +105,21 @@ public void adminCreateWCBreachWithDuplicateNameFailure() { @Then("Check created Breach has the following values") public void checkCreatedBreachHasTheFollowingValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); - final WorkingCapitalBreachData data = ok(() -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalBreach(id)); - final WorkingCapitalBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_CREATE_REQUEST); + final WorkingCapitalLoanBreachData data = ok( + () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalLoanBreach(id)); + final WorkingCapitalLoanBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_CREATE_REQUEST); checkBreachData(request, data); } @When("Admin modifies WC Breach With Values") public void adminModifiesWCBreachWithValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); - final WorkingCapitalBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest() // + final WorkingCapitalLoanBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest() // .breachFrequency(4) // - .breachFrequencyType(WorkingCapitalBreachFrequencyType.DAYS.getCode()) // - .breachAmountCalculationType(WorkingCapitalBreachCalculationType.FLAT.getCode()) // + .breachFrequencyType(WorkingCapitalLoanBreachFrequencyType.DAYS.getCode()) // + .breachAmountCalculationType(WorkingCapitalLoanBreachCalculationType.FLAT.getCode()) // .breachAmount(new BigDecimal("7.89")); - ok(() -> fineractFeignClient.workingCapitalBreaches().updateWorkingCapitalBreach(id, request)); + ok(() -> fineractFeignClient.workingCapitalBreaches().updateWorkingCapitalLoanBreach(id, request)); TestContext.INSTANCE.set(TestContextKey.WORKING_CAPITAL_BREACH_UPDATE_REQUEST, request); } @@ -124,9 +127,10 @@ public void adminModifiesWCBreachWithValues() { public void adminUpdateWCBreachWithDuplicateNameFailure() { Long breachIdForUpdate = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID_FOR_UPDATE); Long existingBreachId = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); - WorkingCapitalBreachRequest breachRequestForUpdate = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_CREATE_REQUEST); + WorkingCapitalLoanBreachRequest breachRequestForUpdate = TestContext.INSTANCE + .get(TestContextKey.WORKING_CAPITAL_BREACH_CREATE_REQUEST); String name = breachRequestForUpdate.getName(); - WorkingCapitalBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest() // + WorkingCapitalLoanBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest() // .name(name); // String errorMessage = ErrorMessageHelper.workingCapitalBreachDuplicateNameFailure(existingBreachId); checkUpdateWCBreachWithInvalidDataFailure(breachIdForUpdate, breachRequest, errorMessage, 403); @@ -135,33 +139,34 @@ public void adminUpdateWCBreachWithDuplicateNameFailure() { @Then("Check updated Breach has the following values") public void checkUpdatedBreachHasTheFollowingValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); - final WorkingCapitalBreachData data = ok(() -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalBreach(id)); - final WorkingCapitalBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_UPDATE_REQUEST); + final WorkingCapitalLoanBreachData data = ok( + () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalLoanBreach(id)); + final WorkingCapitalLoanBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_UPDATE_REQUEST); checkBreachData(request, data); } @When("Admin deletes WC Breach With Values") public void adminDeletesWCBreachWithValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); - ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); } @When("Admin deletes WC Breach override") public void adminDeletesWCBreachOverride() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID_OVERRIDE); - ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); } @When("Admin deletes WC Breach With Values for update") public void adminDeletesWCBreachWithValuesForUpdate() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID_FOR_UPDATE); - ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + ok(() -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); } @Then("Admin failed to create a new WC Breach for field {string} with invalid data {string} results with an error {}") public void createWCBreachWithInvalidDataFailed(final String fieldName, final String value, final String errorMessage) { - final WorkingCapitalBreachRequest request = setWCBreachFieldValue(workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest(), - fieldName, value); + final WorkingCapitalLoanBreachRequest request = setWCBreachFieldValue( + workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest(), fieldName, value); checkCreateWCBreachWithInvalidDataFailure(request, errorMessage, 400); } @@ -172,8 +177,8 @@ public void updateWCBreachWithInvalidDataFailed(final String fieldName, final St adminCreatesWCBreachWithValuesForUpdate(); id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID_FOR_UPDATE); } - final WorkingCapitalBreachRequest request = setWCBreachFieldValue(workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest(), - fieldName, value); + final WorkingCapitalLoanBreachRequest request = setWCBreachFieldValue( + workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest(), fieldName, value); checkUpdateWCBreachWithInvalidDataFailure(id, request, errorMessage, 400); } @@ -199,25 +204,25 @@ public void adminRetrieveWCBreachWithIncorrectIdFailure(final Integer id) { checkRetrieveWCBreachNotFoundFailure(Long.valueOf(id)); } - private void checkCreateWCBreachWithInvalidDataFailure(final WorkingCapitalBreachRequest request, final String errorMessage, + private void checkCreateWCBreachWithInvalidDataFailure(final WorkingCapitalLoanBreachRequest request, final String errorMessage, final int errorCode) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(request)); + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(request)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(errorCode); assertThat(exception.getDeveloperMessage()).contains(errorMessage); } - private void checkUpdateWCBreachWithInvalidDataFailure(final Long id, final WorkingCapitalBreachRequest request, + private void checkUpdateWCBreachWithInvalidDataFailure(final Long id, final WorkingCapitalLoanBreachRequest request, final String errorMessage, final int errorCode) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().updateWorkingCapitalBreach(id, request)); + () -> fineractFeignClient.workingCapitalBreaches().updateWorkingCapitalLoanBreach(id, request)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(errorCode); assertThat(exception.getDeveloperMessage()).contains(errorMessage); } private void checkDeleteWCBreachNotFoundFailure(final Long id) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); assertThat(exception.getStatus()).isEqualTo(404); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.workingCapitalBreachNotFoundFailure(id)); } @@ -225,7 +230,7 @@ private void checkDeleteWCBreachNotFoundFailure(final Long id) { public void deleteWCBreachAssignedToLoanEntityFailure(Long id, String errorCode, String errorMessage) { // final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(403); assertThat(exception.getUserMessageGlobalisationCode()).isEqualTo(errorCode); @@ -239,7 +244,7 @@ public void deleteWCBreachAssignedToLoanEntityFailure(Long id, String errorCode, public void adminFailedToDeleteWCBreachAssignedToLoanProduct() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(403); assertThat(exception.getUserMessageGlobalisationCode()).isEqualTo(ErrorMessageHelper.DATA_INTEGRITY_ISSUE_ENTITY_LINKED_CODE); @@ -254,7 +259,7 @@ public void adminFailedToDeleteWCBreachAssignedToLoanAccount() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_BREACH_ID); String errorMessage = "The request caused a data integrity issue to be fired by the database."; final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalBreach(id)); + () -> fineractFeignClient.workingCapitalBreaches().deleteWorkingCapitalLoanBreach(id)); assertThat(exception.getStatus()).isEqualTo(403); assertThat(exception.getMessage()).contains(errorMessage); @@ -262,12 +267,12 @@ public void adminFailedToDeleteWCBreachAssignedToLoanAccount() { private void checkRetrieveWCBreachNotFoundFailure(final Long id) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalBreach(id)); + () -> fineractFeignClient.workingCapitalBreaches().retrieveWorkingCapitalLoanBreach(id)); assertThat(exception.getStatus()).isEqualTo(404); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.workingCapitalBreachNotFoundFailure(id)); } - private WorkingCapitalBreachRequest setWCBreachFieldValue(final WorkingCapitalBreachRequest request, final String fieldName, + private WorkingCapitalLoanBreachRequest setWCBreachFieldValue(final WorkingCapitalLoanBreachRequest request, final String fieldName, String fieldValue) { if ("null".equals(fieldValue)) { fieldValue = null; @@ -296,7 +301,7 @@ private WorkingCapitalBreachRequest setWCBreachFieldValue(final WorkingCapitalBr return request; } - private void checkBreachData(final WorkingCapitalBreachRequest request, final WorkingCapitalBreachData response) { + private void checkBreachData(final WorkingCapitalLoanBreachRequest request, final WorkingCapitalLoanBreachData response) { final SoftAssertions assertions = new SoftAssertions(); assertions.assertThat(response.getName()).isEqualTo(request.getName()); assertions.assertThat(response.getBreachFrequency()).isEqualTo(request.getBreachFrequency()); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachDisableStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachDisableStepDef.java similarity index 99% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachDisableStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachDisableStepDef.java index cb8f700fae1..cc06fc294b8 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachDisableStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachDisableStepDef.java @@ -43,7 +43,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalBreachDisableStepDef extends AbstractStepDef { +public class WorkingCapitalLoanBreachDisableStepDef extends AbstractStepDef { private static final Set DISABLE_ENABLE_ACTIONS = Set.of("DISABLE", "ENABLE"); diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachScheduleStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachScheduleStepDef.java similarity index 99% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachScheduleStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachScheduleStepDef.java index 86b75994e8a..801bbd425b2 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalBreachScheduleStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanBreachScheduleStepDef.java @@ -40,7 +40,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalBreachScheduleStepDef extends AbstractStepDef { +public class WorkingCapitalLoanBreachScheduleStepDef extends AbstractStepDef { private final FineractFeignClient fineractClient; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachActionStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachActionStepDef.java similarity index 99% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachActionStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachActionStepDef.java index a87136fb963..ac84d6b037f 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachActionStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachActionStepDef.java @@ -40,7 +40,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalNearBreachActionStepDef extends AbstractStepDef { +public class WorkingCapitalLoanNearBreachActionStepDef extends AbstractStepDef { private final FineractFeignClient fineractClient; diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachConfigStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachConfigStepDef.java similarity index 81% rename from fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachConfigStepDef.java rename to fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachConfigStepDef.java index b3201f78d10..bb95960c6a1 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalNearBreachConfigStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanNearBreachConfigStepDef.java @@ -30,9 +30,9 @@ import org.apache.fineract.client.feign.FineractFeignClient; import org.apache.fineract.client.feign.util.CallFailedRuntimeException; import org.apache.fineract.client.models.CommandProcessingResult; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachFrequencyType; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachFrequencyType; import org.apache.fineract.test.factory.WorkingCapitalRequestFactory; import org.apache.fineract.test.helper.ErrorMessageHelper; import org.apache.fineract.test.helper.Utils; @@ -44,7 +44,7 @@ @Slf4j @RequiredArgsConstructor -public class WorkingCapitalNearBreachConfigStepDef extends AbstractStepDef { +public class WorkingCapitalLoanNearBreachConfigStepDef extends AbstractStepDef { @Autowired private WorkingCapitalRequestFactory workingCapitalRequestFactory; @@ -53,9 +53,9 @@ public class WorkingCapitalNearBreachConfigStepDef extends AbstractStepDef { @When("Admin creates WC Near Breach With Values") public void adminCreatesWCNearBreachWithValues() { - final WorkingCapitalNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest(); + final WorkingCapitalLoanNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest(); final CommandProcessingResult response = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(request)); + () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalLoanNearBreach(request)); assertThat(response).isNotNull(); assertThat(response.getResourceId()).isNotNull(); @@ -66,27 +66,28 @@ public void adminCreatesWCNearBreachWithValues() { @Then("Check created Near Breach has the following values") public void checkCreatedNearBreachHasTheFollowingValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); - final WorkingCapitalNearBreachData data = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalNearBreach(id)); - final WorkingCapitalNearBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_CREATE_REQUEST); + final WorkingCapitalLoanNearBreachData data = ok( + () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalLoanNearBreach(id)); + final WorkingCapitalLoanNearBreachRequest request = TestContext.INSTANCE + .get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_CREATE_REQUEST); checkNearBreachData(request, data); } @Then("Admin failed to create a new WC Near Breach for field {string} with invalid data {string} results with an error {}") public void createWCBreachWithInvalidDataFailed(final String fieldName, final String value, final String errorMessage) { - final WorkingCapitalNearBreachRequest request = setWCNearBreachFieldValue( - workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest(), fieldName, value); + final WorkingCapitalLoanNearBreachRequest request = setWCNearBreachFieldValue( + workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest(), fieldName, value); checkCreateWCNearBreachWithInvalidDataFailure(request, errorMessage, 400); } @When("Admin creates WC Near Breach With Values for update") public void adminCreatesWCNearBreachWithValuesForUpdate() { - final WorkingCapitalNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest() + final WorkingCapitalLoanNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest() .nearBreachFrequency(4) // - .nearBreachFrequencyType(WorkingCapitalBreachFrequencyType.YEARS.getCode()) // + .nearBreachFrequencyType(WorkingCapitalLoanBreachFrequencyType.YEARS.getCode()) // .nearBreachThreshold(new BigDecimal("82.34")); // final CommandProcessingResult response = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(request)); + () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalLoanNearBreach(request)); assertThat(response).isNotNull(); assertThat(response.getResourceId()).isNotNull(); TestContext.INSTANCE.set(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_FOR_UPDATE, response.getResourceId()); @@ -96,10 +97,10 @@ public void adminCreatesWCNearBreachWithValuesForUpdate() { @When("Admin failed to create WC Near Breach With duplicated name") public void adminCreateWCNearBreachWithDuplicateNameFailure() { Long existingBearBreachId = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_FOR_UPDATE); - WorkingCapitalNearBreachRequest nearBreachRequestForUpdate = TestContext.INSTANCE + WorkingCapitalLoanNearBreachRequest nearBreachRequestForUpdate = TestContext.INSTANCE .get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_CREATE_REQUEST_FOR_UPDATE); String name = nearBreachRequestForUpdate.getNearBreachName(); - WorkingCapitalNearBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest() + WorkingCapitalLoanNearBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest() .nearBreachName(name); // String errorMessage = ErrorMessageHelper.workingCapitalBreachDuplicateNameFailure(existingBearBreachId); checkCreateWCNearBreachWithInvalidDataFailure(breachRequest, errorMessage, 403); @@ -108,21 +109,22 @@ public void adminCreateWCNearBreachWithDuplicateNameFailure() { @When("Admin modifies WC Near Breach With Values") public void adminModifiesWCBreachWithValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); - final WorkingCapitalNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest() + final WorkingCapitalLoanNearBreachRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest() .nearBreachName("NearBreach-WCL-" + Utils.randomStringGenerator(8)) // .nearBreachFrequency(4) // .nearBreachFrequencyType("MONTHS") // .nearBreachThreshold(new BigDecimal("59.8")); // - ok(() -> fineractFeignClient.workingCapitalNearBreaches().updateWorkingCapitalNearBreach(id, request)); + ok(() -> fineractFeignClient.workingCapitalNearBreaches().updateWorkingCapitalLoanNearBreach(id, request)); TestContext.INSTANCE.set(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_UPDATE_REQUEST, request); } @Then("Check updated Near Breach has the following values") public void checkUpdatedBreachHasTheFollowingValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); - final WorkingCapitalNearBreachData data = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalNearBreach(id)); - final WorkingCapitalNearBreachRequest request = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_UPDATE_REQUEST); + final WorkingCapitalLoanNearBreachData data = ok( + () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalLoanNearBreach(id)); + final WorkingCapitalLoanNearBreachRequest request = TestContext.INSTANCE + .get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_UPDATE_REQUEST); checkNearBreachData(request, data); } @@ -133,8 +135,8 @@ public void updateWCBreachWithInvalidDataFailed(final String fieldName, final St adminCreatesWCNearBreachWithValuesForUpdate(); id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_FOR_UPDATE); } - final WorkingCapitalNearBreachRequest request = setWCNearBreachFieldValue( - workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest(), fieldName, value); + final WorkingCapitalLoanNearBreachRequest request = setWCNearBreachFieldValue( + workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest(), fieldName, value); checkUpdateWCNearBreachWithInvalidDataFailure(id, request, errorMessage, 400); } @@ -142,10 +144,10 @@ public void updateWCBreachWithInvalidDataFailed(final String fieldName, final St public void adminUpdateWCBreachWithDuplicateNameFailure() { Long nearBreachIdForUpdate = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_FOR_UPDATE); Long existingNearBreachId = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); - WorkingCapitalNearBreachRequest nearBreachRequestForUpdate = TestContext.INSTANCE + WorkingCapitalLoanNearBreachRequest nearBreachRequestForUpdate = TestContext.INSTANCE .get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_CREATE_REQUEST); String name = nearBreachRequestForUpdate.getNearBreachName(); - WorkingCapitalNearBreachRequest nearBreachRequest = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest() // + WorkingCapitalLoanNearBreachRequest nearBreachRequest = workingCapitalRequestFactory.defaultWorkingCapitalLoanNearBreachRequest() // .nearBreachName(name); // String errorMessage = ErrorMessageHelper.workingCapitalBreachDuplicateNameFailure(existingNearBreachId); checkUpdateWCNearBreachWithInvalidDataFailure(nearBreachIdForUpdate, nearBreachRequest, errorMessage, 403); @@ -154,19 +156,19 @@ public void adminUpdateWCBreachWithDuplicateNameFailure() { @When("Admin deletes WC Near Breach With Values") public void adminDeletesWCNearBreachWithValues() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); - ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalNearBreach(id)); + ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalLoanNearBreach(id)); } @When("Admin deletes WC Near Breach override") public void adminDeletesWCNearBreachOverride() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_OVERRIDE); - ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalNearBreach(id)); + ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalLoanNearBreach(id)); } @When("Admin deletes WC Near Breach With Values for update") public void adminDeletesWCBreachWithValuesForUpdate() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID_FOR_UPDATE); - ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalNearBreach(id)); + ok(() -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalLoanNearBreach(id)); } @Then("Admin failed to delete WC Near Breach that is already deleted") @@ -196,12 +198,12 @@ public void adminDeleteWCBreachAssignedToWCLPFailure() { final Long id = TestContext.INSTANCE.get(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID); String errorMessage = "The request caused a data integrity issue to be fired by the database."; final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalNearBreach(id)); + () -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalLoanNearBreach(id)); assertThat(exception.getStatus()).isEqualTo(403); assertThat(exception.getMessage()).contains(errorMessage); } - private void checkNearBreachData(final WorkingCapitalNearBreachRequest request, final WorkingCapitalNearBreachData response) { + private void checkNearBreachData(final WorkingCapitalLoanNearBreachRequest request, final WorkingCapitalLoanNearBreachData response) { final SoftAssertions assertions = new SoftAssertions(); assertions.assertThat(response.getName()).isEqualTo(request.getNearBreachName()); assert response.getFrequency() != null; @@ -213,8 +215,8 @@ private void checkNearBreachData(final WorkingCapitalNearBreachRequest request, assertions.assertAll(); } - private WorkingCapitalNearBreachRequest setWCNearBreachFieldValue(final WorkingCapitalNearBreachRequest request, final String fieldName, - String fieldValue) { + private WorkingCapitalLoanNearBreachRequest setWCNearBreachFieldValue(final WorkingCapitalLoanNearBreachRequest request, + final String fieldName, String fieldValue) { if ("null".equals(fieldValue)) { fieldValue = null; } @@ -239,18 +241,18 @@ private WorkingCapitalNearBreachRequest setWCNearBreachFieldValue(final WorkingC return request; } - private void checkCreateWCNearBreachWithInvalidDataFailure(final WorkingCapitalNearBreachRequest request, final String errorMessage, + private void checkCreateWCNearBreachWithInvalidDataFailure(final WorkingCapitalLoanNearBreachRequest request, final String errorMessage, final int errorCode) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(request)); + () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalLoanNearBreach(request)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(errorCode); assertThat(exception.getDeveloperMessage()).contains(errorMessage); } - private void checkUpdateWCNearBreachWithInvalidDataFailure(final Long id, final WorkingCapitalNearBreachRequest request, + private void checkUpdateWCNearBreachWithInvalidDataFailure(final Long id, final WorkingCapitalLoanNearBreachRequest request, final String errorMessage, final int errorCode) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalNearBreaches().updateWorkingCapitalNearBreach(id, request)); + () -> fineractFeignClient.workingCapitalNearBreaches().updateWorkingCapitalLoanNearBreach(id, request)); assertThat(exception.getStatus()).as(ErrorMessageHelper.incorrectExpectedValueInResponse()).isEqualTo(errorCode); assertThat(exception.getDeveloperMessage()).contains(errorMessage); } @@ -262,14 +264,14 @@ private void checkDeleteWCNearBreachNotFoundFailure(final Long id) { private void checkDeleteWCNearBreachFailure(final Long id, int statusCode, String errorMessage) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalNearBreach(id)); + () -> fineractFeignClient.workingCapitalNearBreaches().deleteWorkingCapitalLoanNearBreach(id)); assertThat(exception.getStatus()).isEqualTo(statusCode); assertThat(exception.getDeveloperMessage()).contains(errorMessage); } private void checkRetrieveWCNearBreachNotFoundFailure(final Long id) { final CallFailedRuntimeException exception = fail( - () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalNearBreach(id)); + () -> fineractFeignClient.workingCapitalNearBreaches().retrieveWorkingCapitalLoanNearBreach(id)); assertThat(exception.getStatus()).isEqualTo(404); assertThat(exception.getDeveloperMessage()).contains(ErrorMessageHelper.workingCapitalNearBreachNotFoundFailure(id)); } diff --git a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java index b34f9517481..0b0ffb1365c 100644 --- a/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java +++ b/fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalStepDef.java @@ -58,11 +58,11 @@ import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest; import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdResponse; import org.apache.fineract.client.models.StringEnumOptionData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.client.models.WorkingCapitalLoanPaymentChannelToFundSourceMappings; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalPostChargeOffReasonToExpenseAccountMappings; -import org.apache.fineract.client.models.WorkingCapitalPostWriteOffReasonToExpenseAccountMappings; +import org.apache.fineract.client.models.WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings; +import org.apache.fineract.client.models.WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings; import org.apache.fineract.test.data.accounttype.AccountTypeResolver; import org.apache.fineract.test.data.accounttype.DefaultAccountType; import org.apache.fineract.test.data.codevalue.CodeNames; @@ -72,7 +72,7 @@ import org.apache.fineract.test.data.paymenttype.PaymentTypeResolver; import org.apache.fineract.test.data.workingcapitalproduct.DefaultWorkingCapitalLoanProduct; import org.apache.fineract.test.data.workingcapitalproduct.WCGLAccountMapping; -import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalBreachFrequencyType; +import org.apache.fineract.test.data.workingcapitalproduct.WorkingCapitalLoanBreachFrequencyType; import org.apache.fineract.test.factory.LoanProductsRequestFactory; import org.apache.fineract.test.factory.WorkingCapitalRequestFactory; import org.apache.fineract.test.helper.ErrorMessageHelper; @@ -149,8 +149,8 @@ public void createWorkingCapitalLoanProduct() { @When("Admin creates a new Working Capital Loan Product with breach and near breach") public void createWorkingCapitalLoanProductWithBreachAndNearBreach() { - final Long breachId = getWcBreachIdForFrequency(2, WorkingCapitalBreachFrequencyType.MONTHS.getCode()); - final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalBreachFrequencyType.MONTHS.getCode()); + final Long breachId = getWcBreachIdForFrequency(2, WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode()); + final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode()); final String name = DefaultWorkingCapitalLoanProduct.WCLP.getName() + Utils.randomStringGenerator("_", RANDOM_NAME_SUFFIX_LENGTH); final PostWorkingCapitalLoanProductsRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanProductRequest() // @@ -184,7 +184,7 @@ public void createWorkingCapitalLoanProductWithBreachAndNearBreach(int breachFre @When("Admin failed to create Working Capital Loan Product without breach, but with near breach specified") public void createWorkingCapitalLoanProductWithoutBreachButNearBreachFailure() { - final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalBreachFrequencyType.MONTHS.getCode()); + final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode()); final String name = DefaultWorkingCapitalLoanProduct.WCLP.getName() + Utils.randomStringGenerator("_", RANDOM_NAME_SUFFIX_LENGTH); final PostWorkingCapitalLoanProductsRequest request = workingCapitalRequestFactory.defaultWorkingCapitalLoanProductRequest() // @@ -218,8 +218,8 @@ public void createWCLPWithBreachFrequencyLowerThenNearBreachFailure(int breachFr @When("Admin updates a Working Capital Loan Product with breach and near breach") public void updateWorkingCapitalLoanProductWithBreachAndNearBreach() throws JsonProcessingException { - final Long breachId = getWcBreachIdForFrequency(1, WorkingCapitalBreachFrequencyType.YEARS.getCode()); - final Long nearBreachId = getWcNearBreachIdForFrequency(10, WorkingCapitalBreachFrequencyType.DAYS.getCode()); + final Long breachId = getWcBreachIdForFrequency(1, WorkingCapitalLoanBreachFrequencyType.YEARS.getCode()); + final Long nearBreachId = getWcNearBreachIdForFrequency(10, WorkingCapitalLoanBreachFrequencyType.DAYS.getCode()); updateWorkingCapitalLoanProductWithBreachAndNearBreach(breachId, nearBreachId); } @@ -229,7 +229,7 @@ public void updateWorkingCapitalLoanProductWithNearBreach() throws JsonProcessin PostWorkingCapitalLoanProductsRequest workingCapitalLoanProductsRequest = testContext() .get(TestContextKey.WORKING_CAPITAL_LOAN_PRODUCT_CREATE_REQUEST); final Long breachId = workingCapitalLoanProductsRequest.getBreachId(); - final Long nearBreachId = getWcNearBreachIdForFrequency(10, WorkingCapitalBreachFrequencyType.DAYS.getCode()); + final Long nearBreachId = getWcNearBreachIdForFrequency(10, WorkingCapitalLoanBreachFrequencyType.DAYS.getCode()); updateWorkingCapitalLoanProductWithBreachAndNearBreach(breachId, nearBreachId); } @@ -273,7 +273,7 @@ public void updateWCLPWithBreachFrequencyLowerThenNearBreachFailure(int breachFr @When("Admin failed to update Working Capital Loan Product without breach, but with near breach specified") public void updateWorkingCapitalLoanProductWithoutBreachButNearBreachFailure() { - final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalBreachFrequencyType.MONTHS.getCode()); + final Long nearBreachId = getWcNearBreachIdForFrequency(1, WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode()); final String name = DefaultWorkingCapitalLoanProduct.WCLP.getName() + Utils.randomStringGenerator("_", RANDOM_NAME_SUFFIX_LENGTH); PutWorkingCapitalLoanProductsProductIdRequest defaultWorkingCapitalLoanProductUpdateRequest = new PutWorkingCapitalLoanProductsProductIdRequest() @@ -291,7 +291,7 @@ public void updateWorkingCapitalLoanProductWithoutBreachButNearBreachFailure() { @When("Admin creates a new Working Capital Loan Product with breachId") public void createWorkingCapitalLoanProductWithBreachId() { final CommandProcessingResult breachCreateResponse = ok(() -> fineractFeignClient.workingCapitalBreaches() - .createWorkingCapitalBreach(workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest())); + .createWorkingCapitalLoanBreach(workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest())); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(WORKING_CAPITAL_BREACH_ID, breachId); @@ -309,7 +309,7 @@ public void createWorkingCapitalLoanProductWithBreachId() { @When("Admin creates a new Working Capital Loan Product with breachId and overrides enabled") public void createWorkingCapitalLoanProductWithBreachIdAndOverrides() { final CommandProcessingResult breachCreateResponse = ok(() -> fineractFeignClient.workingCapitalBreaches() - .createWorkingCapitalBreach(workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest())); + .createWorkingCapitalLoanBreach(workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest())); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID, breachId); @@ -330,12 +330,12 @@ public void createWorkingCapitalLoanProductWithCustomBreachConfig(final DataTabl final Map data = table.asMaps().getFirst(); final String breachName = "WC Breach " + Utils.randomStringGenerator("", 10); - final WorkingCapitalBreachRequest breachRequest = new WorkingCapitalBreachRequest().name(breachName) + final WorkingCapitalLoanBreachRequest breachRequest = new WorkingCapitalLoanBreachRequest().name(breachName) .breachFrequency(Integer.valueOf(data.get("breachFrequency"))).breachFrequencyType(data.get("breachFrequencyType")) .breachAmountCalculationType(data.get("breachAmountCalculationType")) .breachAmount(new BigDecimal(data.get("breachAmount"))); final CommandProcessingResult breachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(breachRequest)); + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(breachRequest)); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID, breachId); @@ -367,22 +367,22 @@ public void createWorkingCapitalLoanProductWithBreachAndNearBreachConfig(final D final Map data = table.asMaps().getFirst(); final String breachName = "WC Breach " + Utils.randomStringGenerator("", 10); - final WorkingCapitalBreachRequest breachRequest = new WorkingCapitalBreachRequest().name(breachName) + final WorkingCapitalLoanBreachRequest breachRequest = new WorkingCapitalLoanBreachRequest().name(breachName) .breachFrequency(Integer.valueOf(data.get("breachFrequency"))).breachFrequencyType(data.get("breachFrequencyType")) .breachAmountCalculationType(data.get("breachAmountCalculationType")) .breachAmount(new BigDecimal(data.get("breachAmount"))); final CommandProcessingResult breachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(breachRequest)); + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(breachRequest)); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(TestContextKey.WORKING_CAPITAL_BREACH_ID, breachId); - final WorkingCapitalNearBreachRequest nearBreachRequest = new WorkingCapitalNearBreachRequest() + final WorkingCapitalLoanNearBreachRequest nearBreachRequest = new WorkingCapitalLoanNearBreachRequest() .nearBreachName("WC Near Breach " + Utils.randomStringGenerator("", 10)) .nearBreachFrequency(Integer.valueOf(data.get("nearBreachFrequency"))) .nearBreachFrequencyType(data.get("nearBreachFrequencyType")) .nearBreachThreshold(new BigDecimal(data.get("nearBreachThreshold"))); final CommandProcessingResult nearBreachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(nearBreachRequest)); + () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalLoanNearBreach(nearBreachRequest)); final Long nearBreachId = nearBreachCreateResponse.getResourceId(); testContext().set(TestContextKey.WORKING_CAPITAL_NEAR_BREACH_ID, nearBreachId); @@ -1490,7 +1490,7 @@ public void createWorkingCapitalLoanProductWithInvalidDataFailure(String fieldNa public void createWorkingCapitalLoanProductWithBreachWithInvalidDataFailure(String fieldName, String value, String errorMessage) { - final Long breachId = getWcBreachIdForFrequency(3, WorkingCapitalBreachFrequencyType.MONTHS.getCode()); + final Long breachId = getWcBreachIdForFrequency(3, WorkingCapitalLoanBreachFrequencyType.MONTHS.getCode()); final String workingCapitalProductDefaultName = DefaultWorkingCapitalLoanProduct.WCLP.getName() + Utils.randomStringGenerator("_", RANDOM_NAME_SUFFIX_LENGTH); @@ -1741,22 +1741,22 @@ public PutWorkingCapitalLoanProductsProductIdRequest setWorkingCapitalLoanProduc } public Long getWcBreachIdForFrequency(Integer breachFrequency, String breachFrequencyType) { - final WorkingCapitalBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalBreachRequest() + final WorkingCapitalLoanBreachRequest breachRequest = workingCapitalRequestFactory.defaultWorkingCapitalLoanBreachRequest() .name("Breach_WC_" + Utils.randomStringGenerator(10)).breachFrequency(breachFrequency) .breachFrequencyType(breachFrequencyType); final CommandProcessingResult breachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalBreach(breachRequest)); + () -> fineractFeignClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(breachRequest)); final Long breachId = breachCreateResponse.getResourceId(); testContext().set(WORKING_CAPITAL_BREACH_ID, breachId); return breachId; } public Long getWcNearBreachIdForFrequency(Integer nearBreachFrequency, String nearBreachFrequencyType) { - final WorkingCapitalNearBreachRequest nearBreachRequest = workingCapitalRequestFactory.defaultWorkingCapitalNearBreachRequest() - .nearBreachName("NearBreach_WC_" + Utils.randomStringGenerator(10)).nearBreachFrequency(nearBreachFrequency) - .nearBreachFrequencyType(nearBreachFrequencyType); + final WorkingCapitalLoanNearBreachRequest nearBreachRequest = workingCapitalRequestFactory + .defaultWorkingCapitalLoanNearBreachRequest().nearBreachName("NearBreach_WC_" + Utils.randomStringGenerator(10)) + .nearBreachFrequency(nearBreachFrequency).nearBreachFrequencyType(nearBreachFrequencyType); final CommandProcessingResult nearBreachCreateResponse = ok( - () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(nearBreachRequest)); + () -> fineractFeignClient.workingCapitalNearBreaches().createWorkingCapitalLoanNearBreach(nearBreachRequest)); final Long nearBreachId = nearBreachCreateResponse.getResourceId(); testContext().set(WORKING_CAPITAL_NEAR_BREACH_ID, nearBreachId); return nearBreachId; @@ -2045,16 +2045,16 @@ public void attemptCreateWithNullFundSourceAccountId() { @When("Admin attempts to create Working Capital Loan Product with null chargeOffReasonCodeValueId in charge-off mappings") public void attemptCreateWithNullChargeOffReasonCodeValueId() { - List chargeOffMappings = List - .of(new WorkingCapitalPostChargeOffReasonToExpenseAccountMappings().chargeOffReasonCodeValueId(null) + List chargeOffMappings = List + .of(new WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings().chargeOffReasonCodeValueId(null) .expenseAccountId(accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT))); attemptCreateWithAdvancedMappings(buildDefaultPaymentChannelMappings(), chargeOffMappings, buildDefaultWriteOffMappings()); } @When("Admin attempts to create Working Capital Loan Product with null expenseAccountId in charge-off mappings") public void attemptCreateWithNullChargeOffExpenseAccountId() { - List chargeOffMappings = List - .of(new WorkingCapitalPostChargeOffReasonToExpenseAccountMappings() + List chargeOffMappings = List + .of(new WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings() .chargeOffReasonCodeValueId( codeValueResolver.resolve(CodeNames.CHARGE_OFF.getValue(), DefaultCodeValue.FRAUD.getName())) .expenseAccountId(null)); @@ -2063,16 +2063,16 @@ public void attemptCreateWithNullChargeOffExpenseAccountId() { @When("Admin attempts to create Working Capital Loan Product with null writeOffReasonCodeValueId in write-off mappings") public void attemptCreateWithNullWriteOffReasonCodeValueId() { - List writeOffMappings = List - .of(new WorkingCapitalPostWriteOffReasonToExpenseAccountMappings().writeOffReasonCodeValueId(null) + List writeOffMappings = List + .of(new WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings().writeOffReasonCodeValueId(null) .expenseAccountId(accountTypeResolver.resolve(DefaultAccountType.WRITTEN_OFF))); attemptCreateWithAdvancedMappings(buildDefaultPaymentChannelMappings(), buildDefaultChargeOffMappings(), writeOffMappings); } @When("Admin attempts to create Working Capital Loan Product with null expenseAccountId in write-off mappings") public void attemptCreateWithNullWriteOffExpenseAccountId() { - List writeOffMappings = List - .of(new WorkingCapitalPostWriteOffReasonToExpenseAccountMappings() + List writeOffMappings = List + .of(new WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings() .writeOffReasonCodeValueId( codeValueResolver.resolve(CodeNames.WRITE_OFF_REASON.getValue(), DefaultCodeValue.BAD_DEBT.getName())) .expenseAccountId(null)); @@ -2124,14 +2124,14 @@ private List buildDefaultP .fundSourceAccountId(accountTypeResolver.resolve(DefaultAccountType.FUND_RECEIVABLES))); } - private List buildDefaultChargeOffMappings() { - return List.of(new WorkingCapitalPostChargeOffReasonToExpenseAccountMappings() + private List buildDefaultChargeOffMappings() { + return List.of(new WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings() .chargeOffReasonCodeValueId(codeValueResolver.resolve(CodeNames.CHARGE_OFF.getValue(), DefaultCodeValue.FRAUD.getName())) .expenseAccountId(accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT))); } - private List buildDefaultWriteOffMappings() { - return List.of(new WorkingCapitalPostWriteOffReasonToExpenseAccountMappings() + private List buildDefaultWriteOffMappings() { + return List.of(new WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings() .writeOffReasonCodeValueId( codeValueResolver.resolve(CodeNames.WRITE_OFF_REASON.getValue(), DefaultCodeValue.BAD_DEBT.getName())) .expenseAccountId(accountTypeResolver.resolve(DefaultAccountType.WRITTEN_OFF))); @@ -2139,8 +2139,8 @@ private List buildDefa private PostWorkingCapitalLoanProductsRequest buildAdvancedMappingsRequest( List paymentChannelMappings, - List chargeOffMappings, - List writeOffMappings) { + List chargeOffMappings, + List writeOffMappings) { final String productName = DefaultWorkingCapitalLoanProduct.WCLP.getName() + Utils.randomStringGenerator("_", RANDOM_NAME_SUFFIX_LENGTH); return workingCapitalRequestFactory.defaultWorkingCapitalLoanProductAllowAttributesOverrideRequest().name(productName) @@ -2163,8 +2163,8 @@ private PostWorkingCapitalLoanProductsRequest buildAdvancedMappingsRequest( } private void attemptCreateWithAdvancedMappings(List paymentChannelMappings, - List chargeOffMappings, - List writeOffMappings) { + List chargeOffMappings, + List writeOffMappings) { PostWorkingCapitalLoanProductsRequest request = buildAdvancedMappingsRequest(paymentChannelMappings, chargeOffMappings, writeOffMappings); try { diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalBreachInitializeStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanBreachInitializeStep.java similarity index 74% rename from fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalBreachInitializeStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanBreachInitializeStep.java index 8ed90461d98..c3e50ff6774 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalBreachInitializeStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanBreachInitializeStep.java @@ -26,16 +26,19 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.client.feign.FineractFeignClient; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor @Component -public class WorkingCapitalBreachInitializeStep implements FineractGlobalInitializerStep { +@Order(Ordered.HIGHEST_PRECEDENCE) +public class WorkingCapitalLoanBreachInitializeStep implements FineractGlobalInitializerStep { public static final String DEFAULT_WC_BREACH_NAME = "Default Working Capital breach"; public static final Integer DEFAULT_WC_BREACH_FREQUENCY = 2; @@ -58,8 +61,8 @@ public void initialize() { public void setDefaultWCBreach() { try { - List existingBuckets = fineractClient.workingCapitalBreaches() - .retrieveAllWorkingCapitalBreaches(Map.of()); + List existingBuckets = fineractClient.workingCapitalBreaches() + .retrieveAllWorkingCapitalLoanBreaches(Map.of()); boolean bucketExists = existingBuckets.stream().anyMatch(b -> DEFAULT_WC_BREACH_NAME.equals(b.getName())); if (bucketExists) { @@ -69,20 +72,21 @@ public void setDefaultWCBreach() { log.debug("Could not retrieve existing working capital breaches, will create default breach", e); } - WorkingCapitalBreachRequest defaultWorkingCapitalBreachRequest = new WorkingCapitalBreachRequest()// + WorkingCapitalLoanBreachRequest defaultWorkingCapitalLoanBreachRequest = new WorkingCapitalLoanBreachRequest()// .name(DEFAULT_WC_BREACH_NAME) // .breachFrequency(DEFAULT_WC_BREACH_FREQUENCY) // .breachFrequencyType(DEFAULT_WC_BREACH_FREQUENCY_TYPE) // .breachAmountCalculationType(DEFAULT_WC_BREACH_AMOUNT_CALCULATION_TYPE) // .breachAmount(DEFAULT_WC_BREACH_AMOUNT); - executeVoid(() -> fineractClient.workingCapitalBreaches().createWorkingCapitalBreach(defaultWorkingCapitalBreachRequest, Map.of())); + executeVoid(() -> fineractClient.workingCapitalBreaches().createWorkingCapitalLoanBreach(defaultWorkingCapitalLoanBreachRequest, + Map.of())); } public void setDefaultWCNearBreach() { try { - List existingBuckets = fineractClient.workingCapitalNearBreaches() - .retrieveAllWorkingCapitalNearBreaches(Map.of()); + List existingBuckets = fineractClient.workingCapitalNearBreaches() + .retrieveAllWorkingCapitalLoanNearBreaches(Map.of()); boolean bucketExists = existingBuckets.stream().anyMatch(b -> DEFAULT_WC_NEAR_BREACH_NAME.equals(b.getName())); if (bucketExists) { @@ -92,13 +96,13 @@ public void setDefaultWCNearBreach() { log.debug("Could not retrieve existing working capital breaches, will create default breach", e); } - WorkingCapitalNearBreachRequest defaultWorkingCapitalNearBreachRequest = new WorkingCapitalNearBreachRequest()// + WorkingCapitalLoanNearBreachRequest defaultWorkingCapitalLoanNearBreachRequest = new WorkingCapitalLoanNearBreachRequest()// .nearBreachName(DEFAULT_WC_NEAR_BREACH_NAME) // .nearBreachFrequency(DEFAULT_WC_NEAR_BREACH_FREQUENCY) // .nearBreachFrequencyType(DEFAULT_WC_NEAR_BREACH_FREQUENCY_TYPE) // .nearBreachThreshold(DEFAULT_WC_NEAR_BREACH_THRESHOLD); // - executeVoid(() -> fineractClient.workingCapitalNearBreaches().createWorkingCapitalNearBreach(defaultWorkingCapitalNearBreachRequest, - Map.of())); + executeVoid(() -> fineractClient.workingCapitalNearBreaches() + .createWorkingCapitalLoanNearBreach(defaultWorkingCapitalLoanNearBreachRequest, Map.of())); } } diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WcpCobBusinessStepInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanCobBusinessStepInitializerStep.java similarity index 95% rename from fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WcpCobBusinessStepInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanCobBusinessStepInitializerStep.java index 2293659b7dd..879c8d86449 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WcpCobBusinessStepInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanCobBusinessStepInitializerStep.java @@ -31,7 +31,7 @@ @RequiredArgsConstructor @Component @Order(Ordered.HIGHEST_PRECEDENCE) -public class WcpCobBusinessStepInitializerStep implements FineractGlobalInitializerStep { +public class WorkingCapitalLoanCobBusinessStepInitializerStep implements FineractGlobalInitializerStep { private static final String WCP_COB_JOB_NAME = "WORKING_CAPITAL_LOAN_CLOSE_OF_BUSINESS"; diff --git a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalInitializerStep.java b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanInitializerStep.java similarity index 98% rename from fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalInitializerStep.java rename to fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanInitializerStep.java index 532f24966fc..a40008be06e 100644 --- a/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalInitializerStep.java +++ b/fineract-e2e-tests-runner/src/test/java/org/apache/fineract/test/initializer/global/WorkingCapitalLoanInitializerStep.java @@ -55,7 +55,7 @@ @Slf4j @RequiredArgsConstructor @Component -public class WorkingCapitalInitializerStep implements FineractGlobalInitializerStep { +public class WorkingCapitalLoanInitializerStep implements FineractGlobalInitializerStep { private final FineractFeignClient fineractClient; private final WorkingCapitalRequestFactory workingCapitalRequestFactory; @@ -137,13 +137,13 @@ public void initialize() throws Exception { .paymentTypeId(paymentTypeResolver.resolve(DefaultPaymentType.MONEY_TRANSFER)) .fundSourceAccountId(accountTypeResolver.resolve(DefaultAccountType.FUND_RECEIVABLES)))) .chargeOffReasonToExpenseAccountMappings(List.of( - new org.apache.fineract.client.models.WorkingCapitalPostChargeOffReasonToExpenseAccountMappings() + new org.apache.fineract.client.models.WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings() .chargeOffReasonCodeValueId( codeValueResolver.resolve(chargeOffReasonCodeId, DefaultCodeValue.valueOf("FRAUD"))) .expenseAccountId( accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT_FRAUD)))) - .writeOffReasonsToExpenseMappings(List - .of(new org.apache.fineract.client.models.WorkingCapitalPostWriteOffReasonToExpenseAccountMappings() + .writeOffReasonsToExpenseMappings(List.of( + new org.apache.fineract.client.models.WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings() .writeOffReasonCodeValueId(codeValueResolver.resolve(writeOffReasonCodeId, DefaultCodeValue.valueOf("BAD_DEBT"))) .expenseAccountId(accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT)))))), diff --git a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/WorkingCapitalLoanOriginatorsApiResource.java b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/WorkingCapitalLoanOriginatorsApiResource.java index ae2d02d2529..77436e1b297 100644 --- a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/WorkingCapitalLoanOriginatorsApiResource.java +++ b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/api/WorkingCapitalLoanOriginatorsApiResource.java @@ -42,10 +42,10 @@ import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorMappingResponse; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorsResponse; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanOriginatorReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanOriginatorReadPlatformService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorReadPlatformServiceImpl.java b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorReadPlatformServiceImpl.java index fcee18d42c2..002d7e5bbd8 100644 --- a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorReadPlatformServiceImpl.java +++ b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorReadPlatformServiceImpl.java @@ -29,7 +29,7 @@ import org.apache.fineract.portfolio.loanorigination.domain.WorkingCapitalLoanOriginatorMappingRepository; import org.apache.fineract.portfolio.loanorigination.exception.LoanOriginatorNotFoundException; import org.apache.fineract.portfolio.loanorigination.mapper.LoanOriginatorMapper; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanOriginatorReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanOriginatorReadPlatformService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorWritePlatformServiceImpl.java b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorWritePlatformServiceImpl.java index 536a837d959..af9fc36c183 100644 --- a/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorWritePlatformServiceImpl.java +++ b/fineract-loan-origination/src/main/java/org/apache/fineract/portfolio/loanorigination/service/WorkingCapitalLoanOriginatorWritePlatformServiceImpl.java @@ -31,9 +31,9 @@ import org.apache.fineract.portfolio.loanorigination.exception.LoanOriginatorNotFoundException; import org.apache.fineract.portfolio.loanorigination.exception.WorkingCapitalLoanNotInSubmittedStatusForOriginationException; import org.apache.fineract.portfolio.loanorigination.exception.WorkingCapitalLoanOriginatorMappingNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoan.java index 58d4008837e..8ad5eecc56c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoan.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoan.java @@ -37,10 +37,10 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelationTypeEnum; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; import org.springframework.stereotype.Component; @Component diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategy.java index f26ac6babe6..7a060d7aef7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategy.java @@ -25,7 +25,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategy.java index 336dd31f8dc..c8686c90899 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategy.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategy.java index 585ecb8643b..184f53d0da9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategy.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java index eadd2c7f959..90929ff2a0a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java @@ -30,7 +30,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategy.java index 8f44f9f51c0..fdcb435d20c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategy.java @@ -29,7 +29,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategy.java index 5aeb6dadf0f..d7de8abb51f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategy.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategy.java index f08d33d0049..6770fa184a9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategy.java @@ -29,8 +29,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategy.java index 088a0af6736..e8ebd0e5dd6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategy.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategy.java index 62cfcd5788d..9bb445e0ebe 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategy.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategy.java index d0bae250ac7..c4889a07619 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategy.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategy.java index 3e260a4c62c..47de70d88fa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategy.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java index c1e025fc8b0..acd27d23d17 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategy.java @@ -32,7 +32,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategy.java index fd95b69dd39..cf1b7290f06 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategy.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategy.java index 1e85ff80e4f..d07558bffe1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategy.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategy.java index 43a165abaf1..a47162362de 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategy.java +++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategy.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/listener/WorkingCapitalChunkProcessingLoanItemListener.java b/fineract-provider/src/main/java/org/apache/fineract/cob/listener/WorkingCapitalChunkProcessingLoanItemListener.java index 110e7092144..76e059c9727 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/listener/WorkingCapitalChunkProcessingLoanItemListener.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/listener/WorkingCapitalChunkProcessingLoanItemListener.java @@ -21,7 +21,7 @@ import org.apache.fineract.cob.conditions.BatchWorkerCondition; import org.apache.fineract.cob.domain.LockOwner; import org.apache.fineract.cob.domain.LockingService; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Conditional; import org.springframework.stereotype.Component; diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalInlineCOBLoanItemReader.java b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalInlineCOBLoanItemReader.java index cea82913a1d..1f7a9b8be34 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalInlineCOBLoanItemReader.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalInlineCOBLoanItemReader.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.concurrent.LinkedBlockingQueue; import org.apache.fineract.cob.COBConstant; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.annotation.BeforeStep; import org.springframework.batch.item.ExecutionContext; diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalLoanInlineCOBConfig.java b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalLoanInlineCOBConfig.java index 2d052e4bb6f..d3b9669672b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalLoanInlineCOBConfig.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/WorkingCapitalLoanInlineCOBConfig.java @@ -33,8 +33,8 @@ import org.apache.fineract.infrastructure.jobs.domain.CustomJobParameterRepository; import org.apache.fineract.infrastructure.jobs.service.JobName; import org.apache.fineract.infrastructure.springbatch.PropertyService; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobScope; diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/service/InlineWorkingCapitalLoanCOBExecutorServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/cob/service/InlineWorkingCapitalLoanCOBExecutorServiceImpl.java index 07104d860f2..28dd24f1690 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/service/InlineWorkingCapitalLoanCOBExecutorServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/service/InlineWorkingCapitalLoanCOBExecutorServiceImpl.java @@ -22,8 +22,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.cob.conditions.LoanCOBEnabledCondition; import org.apache.fineract.cob.domain.LockOwner; -import org.apache.fineract.cob.domain.WorkingCapitalAccountLockRepository; import org.apache.fineract.cob.domain.WorkingCapitalLoanAccountLock; +import org.apache.fineract.cob.domain.WorkingCapitalLoanAccountLockRepository; import org.apache.fineract.cob.workingcapitalloan.WorkingCapitalLoanRetrieveIdService; import org.apache.fineract.infrastructure.core.config.FineractProperties; import org.apache.fineract.infrastructure.jobs.domain.CustomJobParameterRepository; @@ -41,7 +41,7 @@ @Conditional(LoanCOBEnabledCondition.class) public class InlineWorkingCapitalLoanCOBExecutorServiceImpl extends InlineCommonLockableCOBExecutorService { - public InlineWorkingCapitalLoanCOBExecutorServiceImpl(WorkingCapitalAccountLockRepository loanAccountLockRepository, + public InlineWorkingCapitalLoanCOBExecutorServiceImpl(WorkingCapitalLoanAccountLockRepository loanAccountLockRepository, InlineLoanCOBExecutionDataParser dataParser, JobLauncher jobLauncher, JobLocator jobLocator, JobExplorer jobExplorer, @Qualifier("requiresNewTransactionTemplate") TransactionTemplate requiresNewTransactionTemplate, CustomJobParameterRepository customJobParameterRepository, PlatformSecurityContext context, diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanTransactionDataMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanTransactionDataMapper.java index ad4b5a2833c..c1b3e2707e5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanTransactionDataMapper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/mapper/workingcapitalloan/WorkingCapitalLoanTransactionDataMapper.java @@ -20,7 +20,7 @@ import org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanTransactionDataV1; import org.apache.fineract.infrastructure.event.external.service.serialization.mapper.support.AvroMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanTransactionBusinessEventSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanTransactionBusinessEventSerializer.java index ad961290d78..f3ea6c3025a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanTransactionBusinessEventSerializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/workingcapitalloan/WorkingCapitalLoanTransactionBusinessEventSerializer.java @@ -26,8 +26,8 @@ import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction.WorkingCapitalLoanTransactionBusinessEvent; import org.apache.fineract.infrastructure.event.external.service.serialization.mapper.workingcapitalloan.WorkingCapitalLoanTransactionDataMapper; import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.BusinessEventSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanTransactionReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanTransactionReadPlatformService; import org.springframework.stereotype.Component; @Component diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/WorkingCapitalLoanCOBFilterHelperImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/WorkingCapitalLoanCOBFilterHelperImpl.java index bdfa252d898..0e717db5a70 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/WorkingCapitalLoanCOBFilterHelperImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/WorkingCapitalLoanCOBFilterHelperImpl.java @@ -49,7 +49,7 @@ import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.jobs.exception.LoanIdsHardLockedException; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.annotation.Conditional; import org.springframework.http.HttpMethod; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java index 3b3f648fb81..b0fcfc0f907 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountNumberGenerator.java @@ -40,8 +40,8 @@ import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepository; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccount; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Component; /** diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java index a93756c80df..ce76698b26f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java @@ -47,7 +47,7 @@ import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountApplicationTimelineData; import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountStatusEnumData; import org.apache.fineract.portfolio.shareaccounts.service.SharesEnumerations; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Service; diff --git a/fineract-provider/src/test/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoanTest.java b/fineract-provider/src/test/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoanTest.java index bb759bca7ac..c690ac71b7d 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoanTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/accounting/journalentry/service/AccrualWithDeferredRevenueAmortizationAccountingProcessorForWorkingCapitalLoanTest.java @@ -56,13 +56,13 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.paymenttype.domain.PaymentType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelation; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelation; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategyTest.java index 87a6a3d2ea6..52f3ed9b285 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ApplyWorkingCapitalLoanCommandStrategyTest.java @@ -29,7 +29,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategyTest.java index 23a286ed2d8..d2834755a03 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionByLoanExternalIdCommandStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategyTest.java index 654d12cac86..221432f47c9 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/CreateWorkingCapitalTransactionLoanCommandStrategyTest.java @@ -30,7 +30,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java index 7d5a5266d81..80c868a49fd 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategyTest.java index b97b2b95974..0c818decaa8 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/DeleteWorkingCapitalLoanApplicationCommandStrategyTest.java @@ -30,7 +30,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategyTest.java index e447ba512ec..7f9b2608b2b 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByExternalIdCommandStrategyTest.java @@ -31,8 +31,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategyTest.java index 33c8b733f61..d5e59a92d64 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanByIdCommandStrategyTest.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategyTest.java index 70c14e3059b..ca2e8d9f140 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalIdCommandStrategyTest.java @@ -31,8 +31,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategyTest.java index 528371550b7..b60683f1812 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByExternalLoanIdAndTransactionIdCommandStrategyTest.java @@ -31,8 +31,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategyTest.java index c14a703676b..c7946b8cf48 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByIdCommandStrategyTest.java @@ -30,8 +30,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategyTest.java index c8bddc3cdb1..c2ef2800c4d 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/GetWorkingCapitalLoanTransactionByLoanIdAndExternalTransactionIdCommandStrategyTest.java @@ -31,8 +31,8 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanTransactionsApiResource; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.api.WorkingCapitalLoanTransactionsApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java index 27a53d9bf9e..3544fb36fa3 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationByExternalIdCommandStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategyTest.java index 22bdcf871c5..2318a9087cc 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/ModifyWorkingCapitalLoanApplicationCommandStrategyTest.java @@ -30,7 +30,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategyTest.java index 918957a8b35..e7c0550232b 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanByExternalIdCommandStrategyTest.java @@ -31,7 +31,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategyTest.java b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategyTest.java index f353b881d22..e622aed6f76 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategyTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/batch/command/internal/StateTransitionWorkingCapitalLoanCommandStrategyTest.java @@ -30,7 +30,7 @@ import org.apache.fineract.batch.domain.BatchResponse; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; -import org.apache.fineract.portfolio.workingcapitalloan.api.WorkingCapitalLoanApiResource; +import org.apache.fineract.portfolio.workingcapitalloan.loan.api.WorkingCapitalLoanApiResource; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/fineract-provider/src/test/java/org/apache/fineract/portfolio/account/jobs/executestandinginstructions/AccountNumberGeneratorTest.java b/fineract-provider/src/test/java/org/apache/fineract/portfolio/account/jobs/executestandinginstructions/AccountNumberGeneratorTest.java index 64153d9dd11..210fef0617d 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/account/jobs/executestandinginstructions/AccountNumberGeneratorTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/account/jobs/executestandinginstructions/AccountNumberGeneratorTest.java @@ -41,7 +41,7 @@ import org.apache.fineract.portfolio.savings.domain.SavingsProduct; import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccount; import org.apache.fineract.portfolio.shareproducts.domain.ShareProduct; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalAccountLockApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalLoanAccountLockApiResource.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalAccountLockApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalLoanAccountLockApiResource.java index ed9e8fb73d2..9cc1b011484 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalAccountLockApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/api/InternalWorkingCapitalLoanAccountLockApiResource.java @@ -34,8 +34,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.cob.domain.LockOwner; -import org.apache.fineract.cob.domain.WorkingCapitalAccountLockRepository; import org.apache.fineract.cob.domain.WorkingCapitalLoanAccountLock; +import org.apache.fineract.cob.domain.WorkingCapitalLoanAccountLockRepository; import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType; import org.apache.fineract.infrastructure.core.boot.FineractProfiles; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; @@ -50,9 +50,9 @@ @Tag(name = "Working Capital Loan Account Lock") @RequiredArgsConstructor @Slf4j -public class InternalWorkingCapitalAccountLockApiResource implements InitializingBean { +public class InternalWorkingCapitalLoanAccountLockApiResource implements InitializingBean { - private final WorkingCapitalAccountLockRepository workingCapitalAccountLockRepository; + private final WorkingCapitalLoanAccountLockRepository workingCapitalAccountLockRepository; @Override @SuppressFBWarnings("SLF4J_SIGN_ONLY_FORMAT") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalAccountLockRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalLoanAccountLockRepository.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalAccountLockRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalLoanAccountLockRepository.java index a085234a114..a80f0feb452 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalAccountLockRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/domain/WorkingCapitalLoanAccountLockRepository.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Repository; @Repository -public interface WorkingCapitalAccountLockRepository extends AccountLockRepository, +public interface WorkingCapitalLoanAccountLockRepository extends AccountLockRepository, JpaRepository, JpaSpecificationExecutor { @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemProcessor.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemProcessor.java index c89daa9fe20..df19404dbf7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemProcessor.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemProcessor.java @@ -20,7 +20,7 @@ import org.apache.fineract.cob.COBBusinessStepService; import org.apache.fineract.cob.processor.AbstractItemProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public abstract class AbstractWorkingCapitalLoanCOBWorkerItemProcessor extends AbstractItemProcessor { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemWriter.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemWriter.java index 7c71fa59dcb..fd112f30944 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemWriter.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/AbstractWorkingCapitalLoanCOBWorkerItemWriter.java @@ -24,7 +24,7 @@ import org.apache.fineract.cob.domain.LockOwner; import org.apache.fineract.cob.domain.LockingService; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.batch.item.Chunk; import org.springframework.batch.item.data.RepositoryItemWriter; import org.springframework.data.repository.CrudRepository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemListener.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemListener.java index c86c3daafec..0357a27a45d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemListener.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemListener.java @@ -21,7 +21,7 @@ import org.apache.fineract.cob.domain.LockOwner; import org.apache.fineract.cob.domain.LockingService; import org.apache.fineract.cob.listener.AbstractLoanItemListener; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.transaction.support.TransactionTemplate; public class InlineWorkingCapitalLoanCOBWorkerItemListener extends AbstractLoanItemListener { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemWriter.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemWriter.java index 86b919a1096..e0e5ad0d294 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemWriter.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/InlineWorkingCapitalLoanCOBWorkerItemWriter.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.cob.domain.LockOwner; import org.apache.fineract.cob.domain.LockingService; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.data.repository.CrudRepository; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalAccountLockServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountLockServiceImpl.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalAccountLockServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountLockServiceImpl.java index 74d540e86d7..18628cf59b3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalAccountLockServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanAccountLockServiceImpl.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Service; @Service -public class WorkingCapitalAccountLockServiceImpl extends AbstractAccountLockService { +public class WorkingCapitalLoanAccountLockServiceImpl extends AbstractAccountLockService { - public WorkingCapitalAccountLockServiceImpl(final AccountLockRepository loanAccountLockRepository, + public WorkingCapitalLoanAccountLockServiceImpl(final AccountLockRepository loanAccountLockRepository, final CustomLoanAccountLockRepository customLoanAccountLockRepository) { super(loanAccountLockRepository, customLoanAccountLockRepository); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerConfiguration.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerConfiguration.java index 978fd6db012..2bcf63beab7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerConfiguration.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerConfiguration.java @@ -33,8 +33,8 @@ import org.apache.fineract.infrastructure.core.config.FineractProperties; import org.apache.fineract.infrastructure.jobs.service.JobName; import org.apache.fineract.infrastructure.springbatch.PropertyService; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.batch.core.Step; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.SimpleStepBuilder; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java index 103e6af89c9..b1764f7b430 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemReader.java @@ -26,8 +26,8 @@ import org.apache.fineract.cob.exceptions.LockedReadException; import org.apache.fineract.cob.service.BeforeStepLockingItemReaderHelper; import org.apache.fineract.portfolio.loanaccount.exception.LoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.annotation.BeforeStep; import org.springframework.batch.item.ItemReader; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemWriter.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemWriter.java index 4b106121924..f043620e5d1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemWriter.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanCOBWorkerItemWriter.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.cob.domain.LockOwner; import org.apache.fineract.cob.domain.LockingService; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.data.repository.CrudRepository; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdConfiguration.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdConfiguration.java index 1b940cab5b8..ee98119f177 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdConfiguration.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdConfiguration.java @@ -19,7 +19,7 @@ package org.apache.fineract.cob.workingcapitalloan; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdServiceImpl.java index 017a51e7841..dc7c206d837 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/WorkingCapitalLoanRetrieveIdServiceImpl.java @@ -33,7 +33,7 @@ import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/BreachScheduleBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/BreachScheduleBusinessStep.java index ab2031dd2b7..b7b57d24632 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/BreachScheduleBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/BreachScheduleBusinessStep.java @@ -23,10 +23,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanBreachScheduleService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/ChargeAccrualBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/ChargeAccrualBusinessStep.java index 7c8f5de3cf4..c6f0579ea2e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/ChargeAccrualBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/ChargeAccrualBusinessStep.java @@ -20,8 +20,8 @@ import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeAccrualService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeAccrualService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DelinquencyRangeScheduleBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DelinquencyRangeScheduleBusinessStep.java index ad450291381..3d544af36e6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DelinquencyRangeScheduleBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DelinquencyRangeScheduleBusinessStep.java @@ -23,9 +23,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DiscountFeeAmortizationBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DiscountFeeAmortizationBusinessStep.java index 4f5e5e11084..dbb3503076e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DiscountFeeAmortizationBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DiscountFeeAmortizationBusinessStep.java @@ -24,8 +24,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDiscountFeeAmortizationService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanDiscountFeeAmortizationService; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DummyBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DummyBusinessStep.java index 807625866bc..3244d8f00c6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DummyBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/DummyBusinessStep.java @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/NearBreachEvaluationBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/NearBreachEvaluationBusinessStep.java index b69afa766bc..5a992a26946 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/NearBreachEvaluationBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/NearBreachEvaluationBusinessStep.java @@ -22,12 +22,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.NearBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNearBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanNearBreachEvaluationService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.NearBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachEvaluationService; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanCOBBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanCOBBusinessStep.java index d56d72d472a..1043cdd891c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanCOBBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanCOBBusinessStep.java @@ -19,6 +19,6 @@ package org.apache.fineract.cob.workingcapitalloan.businessstep; import org.apache.fineract.cob.COBBusinessStep; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public abstract class WorkingCapitalLoanCOBBusinessStep implements COBBusinessStep {} diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanDelinquencyClassificationBusinessStep.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanDelinquencyClassificationBusinessStep.java index ce94214f627..d65118aa314 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanDelinquencyClassificationBusinessStep.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/cob/workingcapitalloan/businessstep/WorkingCapitalLoanDelinquencyClassificationBusinessStep.java @@ -26,8 +26,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyClassificationService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyClassificationService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.stereotype.Component; @Slf4j diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApplicationModifiedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApplicationModifiedBusinessEvent.java index 137338c1823..8e163ad91a5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApplicationModifiedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApplicationModifiedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanApplicationModifiedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApprovedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApprovedBusinessEvent.java index 09dda04b015..f2205cb3150 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApprovedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanApprovedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanApprovedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBalanceChangedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBalanceChangedBusinessEvent.java index 3042f352d9a..ed18fa51f73 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBalanceChangedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBalanceChangedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanBalanceChangedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBusinessEvent.java index cb43af49c2d..ac9097f4517 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanBusinessEvent.java @@ -19,7 +19,7 @@ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; import org.apache.fineract.infrastructure.event.business.domain.AbstractBusinessEvent; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public abstract class WorkingCapitalLoanBusinessEvent extends AbstractBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanCreatedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanCreatedBusinessEvent.java index ec3b61b8d8c..ec8dc5d305a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanCreatedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanCreatedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanCreatedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDelinquencyRangeChangeBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDelinquencyRangeChangeBusinessEvent.java index 823a960f076..7a1a88f1875 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDelinquencyRangeChangeBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDelinquencyRangeChangeBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanDelinquencyRangeChangeBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDisbursalBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDisbursalBusinessEvent.java index ddbcbe70ccd..8f776556222 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDisbursalBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanDisbursalBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanDisbursalBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanRejectedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanRejectedBusinessEvent.java index 6699dabeb2f..8aa27905260 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanRejectedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanRejectedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanRejectedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanStatusChangedBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanStatusChangedBusinessEvent.java index 9a6119b0fed..c2c44508b48 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanStatusChangedBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanStatusChangedBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanStatusChangedBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoApprovalBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoApprovalBusinessEvent.java index 73a6626b1a6..11e278754e1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoApprovalBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoApprovalBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanUndoApprovalBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoDisbursalBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoDisbursalBusinessEvent.java index f19eedda7cd..6e9f03d5fdd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoDisbursalBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/loan/WorkingCapitalLoanUndoDisbursalBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public class WorkingCapitalLoanUndoDisbursalBusinessEvent extends WorkingCapitalLoanBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPostBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPostBusinessEvent.java index 92cbb5e355c..c218a3e9b4a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPostBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPostBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanChargeAdjustmentPostBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPreBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPreBusinessEvent.java index 8bbb8155446..f19d915619c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPreBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanChargeAdjustmentPreBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanChargeAdjustmentPreBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent.java index 7599fc832be..48aecf5cc71 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanCreditBalanceRefundTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDisbursalTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDisbursalTransactionBusinessEvent.java index 7a4d3fa5cf6..5246e87ad2d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDisbursalTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDisbursalTransactionBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanDisbursalTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeAdjustmentTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeAdjustmentTransactionBusinessEvent.java index e705ad0a38a..1b72b544579 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeAdjustmentTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeAdjustmentTransactionBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanDiscountFeeAdjustmentTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeTransactionBusinessEvent.java index 03b91c8f3f5..86ccacdbb4b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanDiscountFeeTransactionBusinessEvent.java @@ -19,7 +19,7 @@ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanDiscountFeeTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanRepaymentTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanRepaymentTransactionBusinessEvent.java index 6e698d11bf1..30f1abb711b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanRepaymentTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanRepaymentTransactionBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanRepaymentTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanTransactionBusinessEvent.java index d1c20434c28..2191deaffd9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanTransactionBusinessEvent.java @@ -19,7 +19,7 @@ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; import org.apache.fineract.infrastructure.event.business.domain.AbstractBusinessEvent; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public abstract class WorkingCapitalLoanTransactionBusinessEvent extends AbstractBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent.java index 99ccd175bae..ec83684704e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/infrastructure/event/business/domain/workingcapitalloan/transaction/WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent.java @@ -18,7 +18,7 @@ */ package org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.transaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; public class WorkingCapitalLoanUndoDisbursalTransactionBusinessEvent extends WorkingCapitalLoanTransactionBusinessEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResource.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResource.java index 3319888012e..be53240dc27 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResource.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.breach.api; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.ACTION; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.ACTION; import com.google.gson.JsonElement; import io.swagger.v3.oas.annotations.Operation; @@ -49,10 +49,10 @@ import org.apache.fineract.infrastructure.core.service.CommandParameterUtil; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachActionData; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanBreachActionReadService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachActionReadService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java index 1e438267bd9..4960786389a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachActionApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.breach.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/api/WorkingCapitalBreachApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachApiResource.java similarity index 70% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/api/WorkingCapitalBreachApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachApiResource.java index cc6b5182373..db368fd0330 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/api/WorkingCapitalBreachApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.api; +package org.apache.fineract.portfolio.workingcapitalloan.breach.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -42,21 +42,21 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachTemplateResponse; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachTemplateResponse; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; import org.springframework.stereotype.Component; @Component @Path("/v1/working-capital/breach") @Tag(name = "Working Capital Breach", description = "Working Capital Breach") @RequiredArgsConstructor -public class WorkingCapitalBreachApiResource { +public class WorkingCapitalLoanBreachApiResource { private final PlatformSecurityContext context; - private final WorkingCapitalBreachReadPlatformService breachReadPlatformService; + private final WorkingCapitalLoanBreachReadPlatformService breachReadPlatformService; private final PortfolioCommandSourceWritePlatformService commandSourceWritePlatformService; private final DefaultToApiJsonSerializer jsonSerializer; @@ -64,10 +64,10 @@ public class WorkingCapitalBreachApiResource { @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalBreachTemplate", summary = "Retrieve Working Capital Breach template", description = "Returns breach options for frequency type and amount calculation type.") + @Operation(operationId = "retrieveWorkingCapitalLoanBreachTemplate", summary = "Retrieve Working Capital Breach template", description = "Returns breach options for frequency type and amount calculation type.") @ApiResponses({ - @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalBreachTemplateResponse.class))) }) - public WorkingCapitalBreachTemplateResponse retrieveTemplate() { + @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = WorkingCapitalLoanBreachTemplateResponse.class))) }) + public WorkingCapitalLoanBreachTemplateResponse retrieveTemplate() { this.context.authenticatedUser().validateHasReadPermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); return this.breachReadPlatformService.retrieveTemplate(); } @@ -76,8 +76,8 @@ public WorkingCapitalBreachTemplateResponse retrieveTemplate() { @Path("breaches") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveAllWorkingCapitalBreaches", summary = "List Working Capital Breaches") - public List retrieveAll() { + @Operation(operationId = "retrieveAllWorkingCapitalLoanBreaches", summary = "List Working Capital Breaches") + public List retrieveAll() { this.context.authenticatedUser().validateHasReadPermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); return this.breachReadPlatformService.retrieveAll(); } @@ -86,8 +86,8 @@ public List retrieveAll() { @Path("breaches/{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalBreach", summary = "Retrieve Working Capital Breach") - public WorkingCapitalBreachData retrieveOne(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { + @Operation(operationId = "retrieveWorkingCapitalLoanBreach", summary = "Retrieve Working Capital Breach") + public WorkingCapitalLoanBreachData retrieveOne(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { this.context.authenticatedUser().validateHasReadPermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); return this.breachReadPlatformService.retrieveOne(breachId); } @@ -96,10 +96,10 @@ public WorkingCapitalBreachData retrieveOne(@PathParam("breachId") @Parameter(de @Path("breaches") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "createWorkingCapitalBreach", summary = "Create Working Capital Breach") - public CommandProcessingResult create(final WorkingCapitalBreachRequest request) { + @Operation(operationId = "createWorkingCapitalLoanBreach", summary = "Create Working Capital Breach") + public CommandProcessingResult create(final WorkingCapitalLoanBreachRequest request) { this.context.authenticatedUser().validateHasCreatePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().createWorkingCapitalBreach() + final CommandWrapper commandRequest = new CommandWrapperBuilder().createWorkingCapitalLoanBreach() .withJson(jsonSerializer.serialize(request)).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } @@ -108,11 +108,11 @@ public CommandProcessingResult create(final WorkingCapitalBreachRequest request) @Path("breaches/{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "updateWorkingCapitalBreach", summary = "Update Working Capital Breach") + @Operation(operationId = "updateWorkingCapitalLoanBreach", summary = "Update Working Capital Breach") public CommandProcessingResult update(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId, - final WorkingCapitalBreachRequest request) { + final WorkingCapitalLoanBreachRequest request) { this.context.authenticatedUser().validateHasUpdatePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().updateWorkingCapitalBreach(breachId) + final CommandWrapper commandRequest = new CommandWrapperBuilder().updateWorkingCapitalLoanBreach(breachId) .withJson(jsonSerializer.serialize(request)).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } @@ -121,10 +121,10 @@ public CommandProcessingResult update(@PathParam("breachId") @Parameter(descript @Path("breaches/{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "deleteWorkingCapitalBreach", summary = "Delete Working Capital Breach") + @Operation(operationId = "deleteWorkingCapitalLoanBreach", summary = "Delete Working Capital Breach") public CommandProcessingResult delete(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { this.context.authenticatedUser().validateHasDeletePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteWorkingCapitalBreach(breachId).build(); + final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteWorkingCapitalLoanBreach(breachId).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachScheduleApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachScheduleApiResource.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachScheduleApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachScheduleApiResource.java index 0afcf6545bf..a814e923fec 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanBreachScheduleApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/api/WorkingCapitalLoanBreachScheduleApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.breach.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -30,8 +30,8 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanBreachScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachScheduleService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans/{loanId}/breach-schedule") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachActionData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachActionData.java similarity index 71% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachActionData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachActionData.java index 235b5623182..6f40d37e34d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachActionData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachActionData.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.breach.data; import java.math.BigDecimal; import java.time.LocalDate; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; public record WorkingCapitalLoanBreachActionData(Long id, WorkingCapitalLoanBreachActionType action, LocalDate startDate, LocalDate endDate, - LocalDate effectiveEndDate, BigDecimal minimumPayment, WorkingCapitalBreachAmountCalculationType minimumPaymentType, + LocalDate effectiveEndDate, BigDecimal minimumPayment, WorkingCapitalLoanBreachAmountCalculationType minimumPaymentType, Integer frequency, WorkingCapitalLoanPeriodFrequencyType frequencyType) { } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachData.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachData.java index 0f9041700b0..d13d27750dd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.data; +package org.apache.fineract.portfolio.workingcapitalloan.breach.data; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; @@ -28,7 +28,7 @@ @Getter @Builder @AllArgsConstructor -public class WorkingCapitalBreachData { +public class WorkingCapitalLoanBreachData { private Long id; @Schema(example = "Default WCL Breach") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachRequest.java similarity index 85% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachRequest.java index e3c2d4e9aac..f4d467ca73a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachRequest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.data; +package org.apache.fineract.portfolio.workingcapitalloan.breach.data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -public record WorkingCapitalBreachRequest(String name, Integer breachFrequency, String breachFrequencyType, +public record WorkingCapitalLoanBreachRequest(String name, Integer breachFrequency, String breachFrequencyType, String breachAmountCalculationType, BigDecimal breachAmount) implements Serializable { @Serial diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachScheduleData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachScheduleData.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachScheduleData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachScheduleData.java index c7aeeef5931..5e36f0809c3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBreachScheduleData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachScheduleData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.breach.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachTemplateResponse.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachTemplateResponse.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachTemplateResponse.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachTemplateResponse.java index 932e75888b6..c1bb245310d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/data/WorkingCapitalBreachTemplateResponse.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/data/WorkingCapitalLoanBreachTemplateResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.data; +package org.apache.fineract.portfolio.workingcapitalloan.breach.data; import java.util.List; import lombok.AllArgsConstructor; @@ -29,7 +29,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class WorkingCapitalBreachTemplateResponse { +public class WorkingCapitalLoanBreachTemplateResponse { private List breachFrequencyTypeOptions; private List breachAmountCalculationTypeOptions; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/domain/WorkingCapitalBreach.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreach.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/domain/WorkingCapitalBreach.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreach.java index 123576f2c52..a85882db63a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/domain/WorkingCapitalBreach.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreach.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -29,8 +29,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; @Entity @Table(name = "m_wc_breach_configuration", uniqueConstraints = { @@ -38,7 +38,7 @@ @Getter @Setter @NoArgsConstructor -public class WorkingCapitalBreach extends AbstractPersistableCustom { +public class WorkingCapitalLoanBreach extends AbstractPersistableCustom { @Column(name = "name", nullable = false, length = 100) private String name; @@ -52,7 +52,7 @@ public class WorkingCapitalBreach extends AbstractPersistableCustom { @Enumerated(EnumType.STRING) @Column(name = "breach_amount_calculation_type") - private WorkingCapitalBreachAmountCalculationType breachAmountCalculationType; + private WorkingCapitalLoanBreachAmountCalculationType breachAmountCalculationType; @Column(name = "breach_amount", scale = 6, precision = 19) private BigDecimal breachAmount; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachAction.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachAction.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachAction.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachAction.java index 78585aead2e..eb930153378 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachAction.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,7 +32,9 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; @Getter @Setter @@ -60,7 +62,7 @@ public class WorkingCapitalLoanBreachAction extends AbstractAuditableWithUTCDate @Enumerated(EnumType.STRING) @Column(name = "minimum_payment_type") - private WorkingCapitalBreachAmountCalculationType minimumPaymentType; + private WorkingCapitalLoanBreachAmountCalculationType minimumPaymentType; @Column(name = "frequency") private Integer frequency; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachActionType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachActionType.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachActionType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachActionType.java index 279dfa921a5..2c60a1e0fd4 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachActionType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachActionType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; public enum WorkingCapitalLoanBreachActionType { PAUSE, // diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachPauseUtils.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachPauseUtils.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachPauseUtils.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachPauseUtils.java index edb870008d3..177d400a1db 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachPauseUtils.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachPauseUtils.java @@ -16,12 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; import java.time.LocalDate; import java.util.Comparator; import java.util.List; import java.util.Objects; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriod; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; public final class WorkingCapitalLoanBreachPauseUtils { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachSchedule.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachSchedule.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachSchedule.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachSchedule.java index 45dbcd5f4da..8d6cd2ec9a2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachSchedule.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachSchedule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -31,6 +31,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java index 73e91d1b043..fca1f31b683 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/domain/WorkingCapitalLoanBreachScheduleEvaluationUtils.java @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.breach.domain; import java.time.LocalDate; import java.util.Comparator; import java.util.List; import java.util.Optional; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; public final class WorkingCapitalLoanBreachScheduleEvaluationUtils { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/exception/WorkingCapitalBreachNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/exception/WorkingCapitalLoanBreachNotFoundException.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/exception/WorkingCapitalBreachNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/exception/WorkingCapitalLoanBreachNotFoundException.java index e99455b9143..66c3460e220 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/exception/WorkingCapitalBreachNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/exception/WorkingCapitalLoanBreachNotFoundException.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.exception; +package org.apache.fineract.portfolio.workingcapitalloan.breach.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; -public class WorkingCapitalBreachNotFoundException extends AbstractPlatformResourceNotFoundException { +public class WorkingCapitalLoanBreachNotFoundException extends AbstractPlatformResourceNotFoundException { - public WorkingCapitalBreachNotFoundException(final Long breachId) { + public WorkingCapitalLoanBreachNotFoundException(final Long breachId) { super("error.msg.wcl.breach.not.found", "Working Capital Breach with id " + breachId + " was not found.", breachId); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanBreachActionCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachActionCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanBreachActionCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachActionCommandHandler.java index 1ab7d124c9b..8113a281b6d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanBreachActionCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachActionCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.breach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanBreachActionWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachActionWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WC_BREACH_ACTION", action = "CREATE") -public class CreateWorkingCapitalLoanBreachActionCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateBreachActionCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanBreachActionWriteService writeService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/CreateWorkingCapitalBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachCommandHandler.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/CreateWorkingCapitalBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachCommandHandler.java index 2785914e336..340d46d722c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/CreateWorkingCapitalBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanCreateBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.breach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALBREACH", action = "CREATE") -public class CreateWorkingCapitalBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/DeleteWorkingCapitalBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanDeleteBreachCommandHandler.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/DeleteWorkingCapitalBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanDeleteBreachCommandHandler.java index b3aed3c5aed..ac8c82fddaf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/DeleteWorkingCapitalBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanDeleteBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.breach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALBREACH", action = "DELETE") -public class DeleteWorkingCapitalBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanDeleteBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/UpdateWorkingCapitalBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanUpdateBreachCommandHandler.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/UpdateWorkingCapitalBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanUpdateBreachCommandHandler.java index 855e3dcff4d..7a1b4be8f12 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/handler/UpdateWorkingCapitalBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/handler/WorkingCapitalLoanUpdateBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.breach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALBREACH", action = "UPDATE") -public class UpdateWorkingCapitalBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUpdateBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/mapper/WorkingCapitalBreachMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachMapper.java similarity index 75% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/mapper/WorkingCapitalBreachMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachMapper.java index 0af35611966..dc324096133 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/mapper/WorkingCapitalBreachMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachMapper.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.breach.mapper; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; @Mapper(config = MapstructMapperConfig.class) -public interface WorkingCapitalBreachMapper { +public interface WorkingCapitalLoanBreachMapper { @Mapping(target = "id", source = "breach.id") @Mapping(target = "name", source = "breach.name") @@ -37,7 +37,7 @@ public interface WorkingCapitalBreachMapper { @Mapping(target = "breachFrequencyType", source = "breach.breachFrequencyType", qualifiedByName = "breachPeriodFrequencyTypeToStringEnumOptionData") @Mapping(target = "breachAmountCalculationType", source = "breach.breachAmountCalculationType", qualifiedByName = "breachAmountCalculationTypeToStringEnumOptionData") @Mapping(target = "breachAmount", source = "breach.breachAmount") - WorkingCapitalBreachData toData(WorkingCapitalBreach breach); + WorkingCapitalLoanBreachData toData(WorkingCapitalLoanBreach breach); @Named("breachPeriodFrequencyTypeToStringEnumOptionData") default StringEnumOptionData breachPeriodFrequencyTypeToStringEnumOptionData(final WorkingCapitalLoanPeriodFrequencyType value) { @@ -45,7 +45,8 @@ default StringEnumOptionData breachPeriodFrequencyTypeToStringEnumOptionData(fin } @Named("breachAmountCalculationTypeToStringEnumOptionData") - default StringEnumOptionData breachAmountCalculationTypeToStringEnumOptionData(final WorkingCapitalBreachAmountCalculationType value) { + default StringEnumOptionData breachAmountCalculationTypeToStringEnumOptionData( + final WorkingCapitalLoanBreachAmountCalculationType value) { return value != null ? value.getValueAsStringEnumOptionData() : null; } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBreachScheduleMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachScheduleMapper.java similarity index 82% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBreachScheduleMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachScheduleMapper.java index e37b0c13632..59c0f004b8a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBreachScheduleMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/mapper/WorkingCapitalLoanBreachScheduleMapper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.breach.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachActionRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachActionRepository.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachActionRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachActionRepository.java index ebdbdeccf86..08079db3865 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachActionRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachActionRepository.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.breach.repository; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -35,7 +35,7 @@ List findByWorkingCapitalLoanIdAndActionOrderByI @Query(""" SELECT CASE WHEN COUNT(action) > 0 THEN TRUE ELSE FALSE END FROM WorkingCapitalLoanBreachAction action - WHERE action.action = org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType.DISABLE + WHERE action.action = org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType.DISABLE AND action.workingCapitalLoan.id = :loanId AND action.startDate <= :date AND (action.endDate IS NULL OR action.endDate >= :date) """) boolean isBreachDisabledAsOf(@Param("loanId") Long loanId, @Param("date") LocalDate date); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/repository/WorkingCapitalBreachRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachRepository.java similarity index 72% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/repository/WorkingCapitalBreachRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachRepository.java index 49a18185750..3004ea7b910 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/repository/WorkingCapitalBreachRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachRepository.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.repository; +package org.apache.fineract.portfolio.workingcapitalloan.breach.repository; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; import org.springframework.data.jpa.repository.JpaRepository; -public interface WorkingCapitalBreachRepository extends JpaRepository { +public interface WorkingCapitalLoanBreachRepository extends JpaRepository { - Optional findByName(String name); + Optional findByName(String name); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachScheduleRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachScheduleRepository.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachScheduleRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachScheduleRepository.java index 545009c905e..ea5c1150b02 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBreachScheduleRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/repository/WorkingCapitalLoanBreachScheduleRepository.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.breach.repository; import java.time.LocalDate; import java.util.List; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveBreachRescheduleParams.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/EffectiveBreachRescheduleParams.java similarity index 78% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveBreachRescheduleParams.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/EffectiveBreachRescheduleParams.java index d65e70c01d8..c97557fb1fd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveBreachRescheduleParams.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/EffectiveBreachRescheduleParams.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.math.BigDecimal; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; /** * Breach reschedule parameters resolved per group: each group ({@code minimumPayment}+{@code minimumPaymentType}, or * {@code frequency}+{@code frequencyType}) inherits independently from the latest RESCHEDULE action that set it, * falling back to the product breach configuration only if no action ever set it. */ -record EffectiveBreachRescheduleParams(BigDecimal minimumPayment, WorkingCapitalBreachAmountCalculationType minimumPaymentType, +record EffectiveBreachRescheduleParams(BigDecimal minimumPayment, WorkingCapitalLoanBreachAmountCalculationType minimumPaymentType, Integer frequency, WorkingCapitalLoanPeriodFrequencyType frequencyType) { } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanActiveBreachResetResolver.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanActiveBreachResetResolver.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanActiveBreachResetResolver.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanActiveBreachResetResolver.java index 3bcfb34eaa3..b8b6459e587 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanActiveBreachResetResolver.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanActiveBreachResetResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.time.LocalDate; import java.util.ArrayDeque; @@ -25,9 +25,9 @@ import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadService.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadService.java index 955b12b3e65..ece6a2974b0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachActionData; public interface WorkingCapitalLoanBreachActionReadService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadServiceImpl.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadServiceImpl.java index 42b5581f3f0..baeaea8adec 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionReadServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionReadServiceImpl.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.time.LocalDate; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachActionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteService.java index 13423b77529..300bc86230a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java index 0ae394d0511..6a9f3b8c344 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachActionWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.util.List; import lombok.RequiredArgsConstructor; @@ -24,13 +24,13 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformService.java similarity index 61% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformService.java index 64e2fcf1690..d322b22ee1a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformService.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachTemplateResponse; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachTemplateResponse; -public interface WorkingCapitalBreachReadPlatformService { +public interface WorkingCapitalLoanBreachReadPlatformService { - WorkingCapitalBreachTemplateResponse retrieveTemplate(); + WorkingCapitalLoanBreachTemplateResponse retrieveTemplate(); - List retrieveAll(); + List retrieveAll(); - WorkingCapitalBreachData retrieveOne(Long breachId); + WorkingCapitalLoanBreachData retrieveOne(Long breachId); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformServiceImpl.java similarity index 55% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformServiceImpl.java index 371c1def76c..694a593c083 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachReadPlatformServiceImpl.java @@ -16,50 +16,50 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.api.ApiFacingEnum; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachTemplateResponse; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanbreach.exception.WorkingCapitalBreachNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanbreach.repository.WorkingCapitalBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachTemplateResponse; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.exception.WorkingCapitalLoanBreachNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly = true) @RequiredArgsConstructor -public class WorkingCapitalBreachReadPlatformServiceImpl implements WorkingCapitalBreachReadPlatformService { +public class WorkingCapitalLoanBreachReadPlatformServiceImpl implements WorkingCapitalLoanBreachReadPlatformService { - private final WorkingCapitalBreachRepository repository; + private final WorkingCapitalLoanBreachRepository repository; @Override - public WorkingCapitalBreachTemplateResponse retrieveTemplate() { + public WorkingCapitalLoanBreachTemplateResponse retrieveTemplate() { final List breachFrequencyTypeOptions = ApiFacingEnum .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanPeriodFrequencyType.class); - final List breachAmountCalculationTypeOptions = WorkingCapitalBreachAmountCalculationType + final List breachAmountCalculationTypeOptions = WorkingCapitalLoanBreachAmountCalculationType .toStringEnumOptions(); - return new WorkingCapitalBreachTemplateResponse(breachFrequencyTypeOptions, breachAmountCalculationTypeOptions); + return new WorkingCapitalLoanBreachTemplateResponse(breachFrequencyTypeOptions, breachAmountCalculationTypeOptions); } @Override - public List retrieveAll() { + public List retrieveAll() { return repository.findAll().stream().map(this::map).toList(); } @Override - public WorkingCapitalBreachData retrieveOne(final Long breachId) { - return repository.findById(breachId).map(this::map).orElseThrow(() -> new WorkingCapitalBreachNotFoundException(breachId)); + public WorkingCapitalLoanBreachData retrieveOne(final Long breachId) { + return repository.findById(breachId).map(this::map).orElseThrow(() -> new WorkingCapitalLoanBreachNotFoundException(breachId)); } - private WorkingCapitalBreachData map(final WorkingCapitalBreach item) { - return WorkingCapitalBreachData.builder().id(item.getId()).name(item.getName()).breachFrequency(item.getBreachFrequency()) + private WorkingCapitalLoanBreachData map(final WorkingCapitalLoanBreach item) { + return WorkingCapitalLoanBreachData.builder().id(item.getId()).name(item.getName()).breachFrequency(item.getBreachFrequency()) .breachFrequencyType(item.getBreachFrequencyType() != null ? item.getBreachFrequencyType().toStringEnumOptionData() : null) .breachAmountCalculationType(item.getBreachAmountCalculationType() != null ? item.getBreachAmountCalculationType().getValueAsStringEnumOptionData() diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetService.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetService.java index 7334503e5f4..d6bd69bfa08 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanBreachResetService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImpl.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImpl.java index 4cde3f9a309..088456320c9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImpl.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.stereotype.Service; @RequiredArgsConstructor diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleService.java similarity index 82% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleService.java index 1f5fff6da6c..599f8a5e444 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleService.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanBreachScheduleService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImpl.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImpl.java index b0674abfb55..24e2ecc5494 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -31,30 +31,30 @@ import org.apache.fineract.organisation.monetary.domain.Money; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionDateAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachPauseUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachScheduleEvaluationUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriod; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriodUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodBounds; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanBreachScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachPauseUtils; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachScheduleEvaluationUtils; +import org.apache.fineract.portfolio.workingcapitalloan.breach.mapper.WorkingCapitalLoanBreachScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriod; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodBounds; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionDateAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Service; @RequiredArgsConstructor @@ -71,7 +71,7 @@ public class WorkingCapitalLoanBreachScheduleServiceImpl implements WorkingCapit @Override public void generateInitialPeriod(final WorkingCapitalLoan loan) { - final Optional breachOpt = getBreachConfig(loan); + final Optional breachOpt = getBreachConfig(loan); if (breachOpt.isEmpty()) { return; } @@ -101,7 +101,7 @@ public boolean hasSchedule(final Long loanId) { @Override public void generateNextPeriodIfNeeded(final WorkingCapitalLoan loan, final LocalDate businessDate) { - final Optional breachOpt = getBreachConfig(loan); + final Optional breachOpt = getBreachConfig(loan); if (breachOpt.isEmpty()) { return; } @@ -227,7 +227,7 @@ public List retrieveBreachSchedule(final L @Override public void rescheduleMinimumPayment(final WorkingCapitalLoan loan, final WorkingCapitalLoanBreachAction action) { final LocalDate businessDate = DateUtils.getBusinessLocalDate(); - final Optional breachOpt = getBreachConfig(loan); + final Optional breachOpt = getBreachConfig(loan); if (breachOpt.isEmpty()) { log.warn("No breach configuration found for WC loan {}, skipping reschedule", loan.getId()); return; @@ -271,7 +271,7 @@ private LocalDate resolveRescheduledToDate(final Long loanId, final WorkingCapit @Override public void recalculatePeriodsForPauses(final WorkingCapitalLoan loan) { - final Optional breachOpt = getBreachConfig(loan); + final Optional breachOpt = getBreachConfig(loan); if (breachOpt.isEmpty()) { return; } @@ -386,7 +386,7 @@ private WorkingCapitalLoanBreachSchedule createPeriod(final WorkingCapitalLoan l return period; } - private Optional getBreachConfig(final WorkingCapitalLoan loan) { + private Optional getBreachConfig(final WorkingCapitalLoan loan) { final WorkingCapitalLoanProductRelatedDetails details = loan.getLoanProductRelatedDetails(); if (details == null) { return Optional.empty(); @@ -415,7 +415,7 @@ private BigDecimal calculateMinPaymentAmount(final WorkingCapitalLoan loan, fina if (breachAmount == null) { return BigDecimal.ZERO; } - if (WorkingCapitalBreachAmountCalculationType.FLAT.equals(params.minimumPaymentType())) { + if (WorkingCapitalLoanBreachAmountCalculationType.FLAT.equals(params.minimumPaymentType())) { return breachAmount; } final BigDecimal principal = loan.getApprovedPrincipal(); @@ -428,7 +428,7 @@ private BigDecimal calculateMinPaymentAmount(final WorkingCapitalLoan loan, fina return Money.of(loan.getLoanProductRelatedDetails().getCurrency(), rawAmount).getAmount(); } - private EffectiveBreachRescheduleParams resolveEffectiveRescheduleParams(final Long loanId, final WorkingCapitalBreach breach) { + private EffectiveBreachRescheduleParams resolveEffectiveRescheduleParams(final Long loanId, final WorkingCapitalLoanBreach breach) { final List reschedules = breachActionRepository .findByWorkingCapitalLoanIdAndActionOrderByIdDesc(loanId, WorkingCapitalLoanBreachActionType.RESCHEDULE); final Optional latestWithPayment = reschedules.stream() @@ -440,7 +440,7 @@ private EffectiveBreachRescheduleParams resolveEffectiveRescheduleParams(final L latestWithPayment.map(WorkingCapitalLoanBreachAction::getMinimumPayment).orElse(breach.getBreachAmount()), latestWithPayment.map(WorkingCapitalLoanBreachAction::getMinimumPaymentType) .or(() -> Optional.ofNullable(breach.getBreachAmountCalculationType())) - .orElse(WorkingCapitalBreachAmountCalculationType.PERCENTAGE), + .orElse(WorkingCapitalLoanBreachAmountCalculationType.PERCENTAGE), latestWithFrequency.map(WorkingCapitalLoanBreachAction::getFrequency).orElse(breach.getBreachFrequency()), latestWithFrequency.map(WorkingCapitalLoanBreachAction::getFrequencyType).orElse(breach.getBreachFrequencyType())); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformService.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformService.java index 76843aeb2bf..d821f54e32e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -public interface WorkingCapitalBreachWritePlatformService { +public interface WorkingCapitalLoanBreachWritePlatformService { CommandProcessingResult create(JsonCommand command); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformServiceImpl.java similarity index 68% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformServiceImpl.java index 930c7a7d0ef..2c831ac6b74 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/service/WorkingCapitalBreachWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachWritePlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import java.math.BigDecimal; import java.util.HashMap; @@ -28,23 +28,23 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.portfolio.common.service.Validator; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanbreach.exception.WorkingCapitalBreachNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanbreach.repository.WorkingCapitalBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.validator.WorkingCapitalBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.exception.WorkingCapitalLoanBreachNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor -public class WorkingCapitalBreachWritePlatformServiceImpl implements WorkingCapitalBreachWritePlatformService { +public class WorkingCapitalLoanBreachWritePlatformServiceImpl implements WorkingCapitalLoanBreachWritePlatformService { - private final WorkingCapitalBreachRepository workingCapitalBreachRepository; - private final WorkingCapitalBreachParseAndValidator dataValidator; + private final WorkingCapitalLoanBreachRepository workingCapitalBreachRepository; + private final WorkingCapitalLoanBreachParseAndValidator dataValidator; private final WorkingCapitalLoanProductRepository workingCapitalLoanProductRepository; private static final String BREACH_FREQUENCY_PARAM = "breachFrequency"; @@ -57,20 +57,20 @@ public class WorkingCapitalBreachWritePlatformServiceImpl implements WorkingCapi @Transactional public CommandProcessingResult create(final JsonCommand command) { final Map changes = new HashMap<>(); - final WorkingCapitalBreachRequest data = dataValidator.validateAndParse(command); - final WorkingCapitalBreach created = createAndPersistBreach(data, changes); + final WorkingCapitalLoanBreachRequest data = dataValidator.validateAndParse(command); + final WorkingCapitalLoanBreach created = createAndPersistBreach(data, changes); return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(created.getId()).with(changes).build(); } @Override @Transactional public CommandProcessingResult update(final Long breachId, final JsonCommand command) { - final WorkingCapitalBreach existing = workingCapitalBreachRepository.findById(breachId) - .orElseThrow(() -> new WorkingCapitalBreachNotFoundException(breachId)); + final WorkingCapitalLoanBreach existing = workingCapitalBreachRepository.findById(breachId) + .orElseThrow(() -> new WorkingCapitalLoanBreachNotFoundException(breachId)); - final WorkingCapitalBreachRequest data = dataValidator.validateAndParse(command); + final WorkingCapitalLoanBreachRequest data = dataValidator.validateAndParse(command); final Map changes = new HashMap<>(); - final WorkingCapitalBreach updated = updateAndPersistBreach(existing, data, changes); + final WorkingCapitalLoanBreach updated = updateAndPersistBreach(existing, data, changes); return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(updated.getId()).with(changes).build(); } @@ -79,8 +79,8 @@ public CommandProcessingResult update(final Long breachId, final JsonCommand com @Transactional public CommandProcessingResult delete(final JsonCommand command) { final Long breachId = command.entityId(); - final WorkingCapitalBreach breach = workingCapitalBreachRepository.findById(breachId) - .orElseThrow(() -> new WorkingCapitalBreachNotFoundException(breachId)); + final WorkingCapitalLoanBreach breach = workingCapitalBreachRepository.findById(breachId) + .orElseThrow(() -> new WorkingCapitalLoanBreachNotFoundException(breachId)); if (workingCapitalLoanProductRepository.existsByBreach(breach)) { throw new PlatformDataIntegrityException("error.msg.data.integrity.issue.entity.linked", String.format("Data integrity issue with resource: %d", breachId)); @@ -89,10 +89,10 @@ public CommandProcessingResult delete(final JsonCommand command) { return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(breachId).build(); } - private WorkingCapitalBreach createAndPersistBreach(final String name, final Integer breachFrequency, + private WorkingCapitalLoanBreach createAndPersistBreach(final String name, final Integer breachFrequency, final WorkingCapitalLoanPeriodFrequencyType breachFrequencyType, - final WorkingCapitalBreachAmountCalculationType breachAmountCalculationType, final BigDecimal breachAmount) { - final WorkingCapitalBreach breach = new WorkingCapitalBreach(); + final WorkingCapitalLoanBreachAmountCalculationType breachAmountCalculationType, final BigDecimal breachAmount) { + final WorkingCapitalLoanBreach breach = new WorkingCapitalLoanBreach(); breach.setName(name); breach.setBreachFrequency(breachFrequency); breach.setBreachFrequencyType(breachFrequencyType); @@ -101,16 +101,17 @@ private WorkingCapitalBreach createAndPersistBreach(final String name, final Int return workingCapitalBreachRepository.saveAndFlush(breach); } - private WorkingCapitalBreach createAndPersistBreach(final WorkingCapitalBreachRequest request, final Map changes) { + private WorkingCapitalLoanBreach createAndPersistBreach(final WorkingCapitalLoanBreachRequest request, + final Map changes) { validateDuplicateName(request.name(), null); final WorkingCapitalLoanPeriodFrequencyType breachFrequencyType = request.breachFrequencyType() != null ? WorkingCapitalLoanPeriodFrequencyType.fromString(request.breachFrequencyType()) : null; - final WorkingCapitalBreachAmountCalculationType breachAmountCalculationType = request.breachAmountCalculationType() != null - ? WorkingCapitalBreachAmountCalculationType.valueOf(request.breachAmountCalculationType()) + final WorkingCapitalLoanBreachAmountCalculationType breachAmountCalculationType = request.breachAmountCalculationType() != null + ? WorkingCapitalLoanBreachAmountCalculationType.valueOf(request.breachAmountCalculationType()) : null; - final WorkingCapitalBreach created = createAndPersistBreach(request.name(), request.breachFrequency(), breachFrequencyType, + final WorkingCapitalLoanBreach created = createAndPersistBreach(request.name(), request.breachFrequency(), breachFrequencyType, breachAmountCalculationType, request.breachAmount()); changes.put(NAME_PARAM, created.getName()); @@ -122,15 +123,15 @@ private WorkingCapitalBreach createAndPersistBreach(final WorkingCapitalBreachRe return created; } - private WorkingCapitalBreach updateAndPersistBreach(final WorkingCapitalBreach item, final WorkingCapitalBreachRequest request, - final Map changes) { + private WorkingCapitalLoanBreach updateAndPersistBreach(final WorkingCapitalLoanBreach item, + final WorkingCapitalLoanBreachRequest request, final Map changes) { final Integer breachFrequency = request.breachFrequency(); final String name = request.name(); final WorkingCapitalLoanPeriodFrequencyType breachFrequencyType = request.breachFrequencyType() != null ? WorkingCapitalLoanPeriodFrequencyType.fromString(request.breachFrequencyType()) : null; - final WorkingCapitalBreachAmountCalculationType breachAmountCalculationType = request.breachAmountCalculationType() != null - ? WorkingCapitalBreachAmountCalculationType.valueOf(request.breachAmountCalculationType()) + final WorkingCapitalLoanBreachAmountCalculationType breachAmountCalculationType = request.breachAmountCalculationType() != null + ? WorkingCapitalLoanBreachAmountCalculationType.valueOf(request.breachAmountCalculationType()) : null; final BigDecimal breachAmount = request.breachAmount(); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParameters.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParameters.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParameters.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParameters.java index 1c2d89f2260..beb087af877 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParameters.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParameters.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.validator; +package org.apache.fineract.portfolio.workingcapitalloan.breach.validator; public final class WorkingCapitalLoanBreachActionParameters { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParseAndValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParseAndValidator.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParseAndValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParseAndValidator.java index aed37e1c5df..9e56281a1a2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanBreachActionParseAndValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachActionParseAndValidator.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.validator; - -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.ACTION; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.DATE_FORMAT; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.END_DATE; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.FREQUENCY; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.FREQUENCY_TYPE; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.LOCALE; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.MINIMUM_PAYMENT; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.MINIMUM_PAYMENT_TYPE; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.RESTART_PERIOD_FROM_RESET_DATE; -import static org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanBreachActionParameters.START_DATE; +package org.apache.fineract.portfolio.workingcapitalloan.breach.validator; + +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.ACTION; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.DATE_FORMAT; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.END_DATE; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.FREQUENCY; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.FREQUENCY_TYPE; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.LOCALE; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.MINIMUM_PAYMENT; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.MINIMUM_PAYMENT_TYPE; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.RESTART_PERIOD_FROM_RESET_DATE; +import static org.apache.fineract.portfolio.workingcapitalloan.breach.validator.WorkingCapitalLoanBreachActionParameters.START_DATE; import com.google.gson.JsonElement; import java.math.BigDecimal; @@ -46,21 +46,21 @@ import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.validator.ParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachPauseUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachScheduleEvaluationUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriodUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanActiveBreachResetResolver; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachPauseUtils; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachScheduleEvaluationUtils; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanActiveBreachResetResolver; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; import org.springframework.stereotype.Component; @RequiredArgsConstructor @@ -317,14 +317,14 @@ private Boolean extractBoolean(final JsonElement json, final String paramName) { return false; } - private WorkingCapitalBreachAmountCalculationType extractMinimumPaymentType(final JsonElement json, + private WorkingCapitalLoanBreachAmountCalculationType extractMinimumPaymentType(final JsonElement json, final DataValidatorBuilder dataValidator) { final String value = jsonHelper.extractStringNamed(MINIMUM_PAYMENT_TYPE, json); if (StringUtils.isEmpty(value)) { return null; } try { - return WorkingCapitalBreachAmountCalculationType.valueOf(value.toUpperCase(Locale.ROOT)); + return WorkingCapitalLoanBreachAmountCalculationType.valueOf(value.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { failParameterValidation(dataValidator, MINIMUM_PAYMENT_TYPE, "invalid.minimumPaymentType", "Invalid minimum payment type: " + value + ". Supported: PERCENTAGE, FLAT"); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/validator/WorkingCapitalBreachParseAndValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachParseAndValidator.java similarity index 78% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/validator/WorkingCapitalBreachParseAndValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachParseAndValidator.java index 570f77f55ca..8fb1ddbbfe8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanbreach/validator/WorkingCapitalBreachParseAndValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/breach/validator/WorkingCapitalLoanBreachParseAndValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanbreach.validator; +package org.apache.fineract.portfolio.workingcapitalloan.breach.validator; import com.google.gson.JsonObject; import jakarta.validation.constraints.NotNull; @@ -29,14 +29,14 @@ import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.validator.ParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; import org.springframework.stereotype.Component; @RequiredArgsConstructor @Component -public class WorkingCapitalBreachParseAndValidator extends ParseAndValidator { +public class WorkingCapitalLoanBreachParseAndValidator extends ParseAndValidator { private final FromJsonHelper jsonHelper; @@ -46,15 +46,15 @@ public class WorkingCapitalBreachParseAndValidator extends ParseAndValidator { private static final String BREACH_AMOUNT_PARAM = "breachAmount"; private static final String NAME_PARAM = "name"; - public WorkingCapitalBreachRequest validateAndParse(@NotNull final JsonCommand command) { + public WorkingCapitalLoanBreachRequest validateAndParse(@NotNull final JsonCommand command) { final DataValidatorBuilder dataValidator = new DataValidatorBuilder(new ArrayList<>()).resource("workingCapitalBreach.create"); final JsonObject element = extractJsonObject(jsonHelper, command); - final WorkingCapitalBreachRequest result = validateAndParse(dataValidator, element, jsonHelper); + final WorkingCapitalLoanBreachRequest result = validateAndParse(dataValidator, element, jsonHelper); throwExceptionIfValidationWarningsExist(dataValidator); return result; } - private WorkingCapitalBreachRequest validateAndParse(final DataValidatorBuilder dataValidator, final JsonObject element, + private WorkingCapitalLoanBreachRequest validateAndParse(final DataValidatorBuilder dataValidator, final JsonObject element, final FromJsonHelper jsonHelper) { if (element == null) { return null; @@ -75,13 +75,13 @@ private WorkingCapitalBreachRequest validateAndParse(final DataValidatorBuilder final String breachAmountCalculationTypeValue = jsonHelper.extractStringNamed(BREACH_AMOUNT_CALCULATION_TYPE_PARAM, element); dataValidator.reset().parameter(BREACH_AMOUNT_CALCULATION_TYPE_PARAM).value(breachAmountCalculationTypeValue).notNull() - .isOneOfEnumValues(WorkingCapitalBreachAmountCalculationType.class); + .isOneOfEnumValues(WorkingCapitalLoanBreachAmountCalculationType.class); final BigDecimal breachAmount = jsonHelper.extractBigDecimalNamed(BREACH_AMOUNT_PARAM, element, new HashSet<>()); dataValidator.reset().parameter(BREACH_AMOUNT_PARAM).value(breachAmount).notNull().zeroOrPositiveAmount(); return dataValidator.hasError() ? null - : new WorkingCapitalBreachRequest(name, breachFrequency, breachFrequencyTypeValue, breachAmountCalculationTypeValue, + : new WorkingCapitalLoanBreachRequest(name, breachFrequency, breachFrequencyTypeValue, breachAmountCalculationTypeValue, breachAmount); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResource.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResource.java index 10b620d715c..a3a9da515ec 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.charge.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -50,12 +50,12 @@ import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.charge.data.ChargeData; import org.apache.fineract.portfolio.charge.service.ChargeReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanChargeConstants; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.serialization.WorkingCapitalLoanChargeConstants; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResourceSwagger.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResourceSwagger.java index f70462dadb3..0beb1acb0b2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanChargesApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/api/WorkingCapitalLoanChargesApiResourceSwagger.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.charge.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ChargeIdAndAmountHolder.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/ChargeIdAndAmountHolder.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ChargeIdAndAmountHolder.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/ChargeIdAndAmountHolder.java index 45e32505b6b..6efb93af039 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ChargeIdAndAmountHolder.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/ChargeIdAndAmountHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.charge.data; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargeData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargeData.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargeData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargeData.java index 3a4c115c28c..4a49f1b1021 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargeData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargeData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.charge.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargePaidByData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargePaidByData.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargePaidByData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargePaidByData.java index 097b3719d6a..0f329c8f55b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanChargePaidByData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/data/WorkingCapitalLoanChargePaidByData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.charge.data; import java.io.Serializable; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanCharge.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanCharge.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanCharge.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanCharge.java index f788273f846..0c1ec68f0ef 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanCharge.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanCharge.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.charge.domain; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -41,7 +41,8 @@ import org.apache.fineract.portfolio.charge.domain.ChargePaymentModeConverter; import org.apache.fineract.portfolio.charge.domain.ChargeTimeType; import org.apache.fineract.portfolio.charge.domain.ChargeTimeTypeConverter; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Setter @Getter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanChargePaidBy.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanChargePaidBy.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanChargePaidBy.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanChargePaidBy.java index f6602168bb9..c126a87895a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanChargePaidBy.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/domain/WorkingCapitalLoanChargePaidBy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.charge.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -29,6 +29,7 @@ import lombok.Getter; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; /** * Records that a specific working capital loan {@link WorkingCapitalLoanTransaction} settled a specific diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/exception/WorkingCapitalLoanChargeNotFoundException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/exception/WorkingCapitalLoanChargeNotFoundException.java index c47d112610e..2bad7acf0b2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/exception/WorkingCapitalLoanChargeNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.charge.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanCreateChargeCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/handler/WorkingCapitalLoanCreateChargeCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanCreateChargeCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/handler/WorkingCapitalLoanCreateChargeCommandHandler.java index ed696921b0d..8566ef63ddf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanCreateChargeCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/handler/WorkingCapitalLoanCreateChargeCommandHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.charge.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; @@ -25,7 +25,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanChargePaidByMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/mapper/WorkingCapitalLoanChargePaidByMapper.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanChargePaidByMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/mapper/WorkingCapitalLoanChargePaidByMapper.java index 30984a4d3d6..cb3e7bab5b5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanChargePaidByMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/mapper/WorkingCapitalLoanChargePaidByMapper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.charge.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargePaidByData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargePaidByData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargePaidByRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargePaidByRepository.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargePaidByRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargePaidByRepository.java index 923c696fb3b..93a1239acac 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargePaidByRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargePaidByRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.charge.repository; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargeRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargeRepository.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargeRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargeRepository.java index 0fe350b9304..1e835e68cd8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanChargeRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/repository/WorkingCapitalLoanChargeRepository.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.charge.repository; import java.time.LocalDate; import java.time.OffsetDateTime; import java.util.List; import org.apache.fineract.infrastructure.core.domain.ExternalId; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; @@ -39,12 +39,12 @@ public interface WorkingCapitalLoanChargeRepository List findByLoanIdAndActiveTrueOrderByDueDateAscIdAsc(Long loanId); - @Query("select new org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData(" + @Query("select new org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData(" + "lc.id, c.id, c.name, lc.chargeTimeType, lc.submittedOnDate, lc.dueDate, lc.chargeCalculationType, oc.code, oc.name, oc.decimalPlaces, oc.inMultiplesOf, oc.displaySymbol," + " oc.nameCode, lc.amount, lc.amountPaid, lc.penaltyCharge, lc.chargePaymentMode, lc.paid, l.id, lc.externalId, l.externalId) from WorkingCapitalLoanCharge lc join fetch lc.charge c join OrganisationCurrency oc on c.currencyCode = oc.code join fetch lc.loan l where l.id = :loanId and lc.id = :id") WorkingCapitalLoanChargeData retrieveLoanChargeDetails(@Param("id") Long id, @Param("loanId") Long loanId); - @Query("select new org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData(" + @Query("select new org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData(" + "lc.id, c.id, c.name, lc.chargeTimeType, lc.submittedOnDate, lc.dueDate, lc.chargeCalculationType, oc.code, oc.name, oc.decimalPlaces, oc.inMultiplesOf, oc.displaySymbol," + " oc.nameCode, lc.amount, lc.amountPaid, lc.penaltyCharge, lc.chargePaymentMode, lc.paid, l.id, lc.externalId, l.externalId) from WorkingCapitalLoanCharge lc join fetch lc.charge c join OrganisationCurrency oc on c.currencyCode = oc.code join fetch lc.loan l where l.id = :loanId and lc.active = true order by lc.chargeTimeType asc, lc.dueDate asc, lc.penaltyCharge asc") List retrieveLoanCharges(@Param("loanId") Long loanId); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeConstants.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeConstants.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeConstants.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeConstants.java index 68bb4bbef79..e95ebb6e683 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeConstants.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeConstants.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.charge.serialization; public final class WorkingCapitalLoanChargeConstants { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidator.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidator.java index 73e1a0a1c47..c148052d5d2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.charge.serialization; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/OverpaymentFunder.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/OverpaymentFunder.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/OverpaymentFunder.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/OverpaymentFunder.java index 1a2d1426096..5aae70038bb 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/OverpaymentFunder.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/OverpaymentFunder.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.math.BigDecimal; import lombok.Getter; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; /** * One repayment's still-unallocated remainder, offered up to settle a charge when an overpayment is consumed. diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeAccrualService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeAccrualService.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeAccrualService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeAccrualService.java index af64913b1c2..4da46acca90 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeAccrualService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeAccrualService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.time.LocalDate; import java.util.List; @@ -27,16 +27,16 @@ import org.apache.fineract.infrastructure.core.service.MathUtil; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelationTypeEnum; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Service; @Service diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaidByReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaidByReadService.java similarity index 80% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaidByReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaidByReadService.java index e79443628e4..5223fc058c9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaidByReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaidByReadService.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargePaidByData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanChargePaidByMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargePaidByRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargePaidByData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.mapper.WorkingCapitalLoanChargePaidByMapper; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargePaidByRepository; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandler.java similarity index 76% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandler.java index 07ba06998f1..33bcca3823a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandler.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.math.BigDecimal; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; import org.springframework.stereotype.Component; /** @@ -33,9 +33,10 @@ *

* The handler mutates only the charge in place and accumulates (never overwrites), and builds the * {@link WorkingCapitalLoanChargePaidBy} row recording which transaction paid which charge for how much. The matching - * fee/penalty bucket on the {@link org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance} - * is refreshed separately by {@link WorkingCapitalLoanBalanceUpdater}; persistence of both the charge and the returned - * paid-by row is the caller's responsibility. + * fee/penalty bucket on the + * {@link org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance} is refreshed + * separately by {@link WorkingCapitalLoanBalanceUpdater}; persistence of both the charge and the returned paid-by row + * is the caller's responsibility. */ @Component public class WorkingCapitalLoanChargePaymentHandler { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformService.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformService.java index 460c09d942b..6e1a6f3f0d2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformService.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; public interface WorkingCapitalLoanChargeReadPlatformService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java index bcacb4b4b96..71ff7b7f553 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeReadPlatformServiceImpl.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.portfolio.charge.exception.LoanChargeNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.stereotype.Service; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformService.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformService.java index a2cdfc360bf..9bd4e9e621e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java index e9a16e37f2e..3a4a004954e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargeWritePlatformServiceImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import com.google.gson.JsonElement; import java.math.BigDecimal; @@ -54,33 +54,41 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanEvent; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanLifecycleStateMachine; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNote; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanChargeAdjustmentException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanChargeNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargePaidByRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNoteRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanChargeConstants; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanChargeDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.exception.WorkingCapitalLoanChargeNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargePaidByRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.serialization.WorkingCapitalLoanChargeConstants; +import org.apache.fineract.portfolio.workingcapitalloan.charge.serialization.WorkingCapitalLoanChargeDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanEvent; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanLifecycleStateMachine; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanNote; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanNoteRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.ProjectedAmortizationScheduleRepositoryWrapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanCurrencyResolver; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.exception.WorkingCapitalLoanChargeAdjustmentException; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanAllocationRequestFactory; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanBalanceUpdater; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanPaymentAllocationProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanTransactionProcessor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResource.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResource.java index e44ec47c77b..700a4a4c7c7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.api; import static org.apache.fineract.portfolio.delinquency.validator.DelinquencyActionParameters.ACTION; @@ -48,10 +48,10 @@ import org.apache.fineract.infrastructure.core.service.CommandParameterUtil; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyActionData; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyActionReadService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyActionData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyActionReadService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java index f92b31edecd..5202960039e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyActionApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java index 1fe9c530dbb..712319abea0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/api/WorkingCapitalLoanDelinquencyRangeScheduleApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -35,8 +35,8 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans/{loanId}/delinquency-range-schedule") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyActionData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyActionData.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyActionData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyActionData.java index eb87177935e..f81fba6f9ab 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyActionData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyActionData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java index 24de0ff701c..4bd8676d0b5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyRangeScheduleData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyTagHistoryData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyTagHistoryData.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyTagHistoryData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyTagHistoryData.java index 774f31ccf33..50dc36ecf2e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDelinquencyTagHistoryData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanDelinquencyTagHistoryData.java @@ -36,7 +36,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.data; import java.io.Serializable; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java index 18ac9fdf817..2ac39d83e3c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/data/WorkingCapitalLoanRangeScheduleDelinquencyData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.data; import java.math.BigDecimal; import lombok.AllArgsConstructor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyAction.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyAction.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyAction.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyAction.java index d1fe8051dd3..56f8064cf1e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyAction.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -35,6 +35,7 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyFrequencyType; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyPauseUtils.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyPauseUtils.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyPauseUtils.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyPauseUtils.java index 3998a116177..ba84741d261 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyPauseUtils.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyPauseUtils.java @@ -16,13 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain; import java.time.LocalDate; import java.util.Comparator; import java.util.List; import java.util.Objects; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriod; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; public final class WorkingCapitalLoanDelinquencyPauseUtils { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java index c5ddd694202..4a12ba8be0b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeSchedule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,6 +32,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java index 079e6791d3c..88d2834b2a8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain; import java.time.LocalDate; import java.util.List; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java index 7fe708a928f..ad021f617d6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/domain/WorkingCapitalLoanDelinquencyRangeScheduleTagHistory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,6 +32,7 @@ import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanDelinquencyActionCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/handler/WorkingCapitalLoanCreateDelinquencyActionCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanDelinquencyActionCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/handler/WorkingCapitalLoanCreateDelinquencyActionCommandHandler.java index d3642c522b0..ee344b475a6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateWorkingCapitalLoanDelinquencyActionCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/handler/WorkingCapitalLoanCreateDelinquencyActionCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyActionWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyActionWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WC_DELINQUENCY_ACTION", action = "CREATE") -public class CreateWorkingCapitalLoanDelinquencyActionCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateDelinquencyActionCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanDelinquencyActionWriteService writeService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java similarity index 81% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java index 6dfdbc8dbac..15b955a6ed7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleMapper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java index 7bf71bc92bd..642c8c38816 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/mapper/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.portfolio.delinquency.mapper.DelinquencyRangeMapper; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyTagHistoryData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanRangeScheduleDelinquencyData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyTagHistoryData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanRangeScheduleDelinquencyData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyActionRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyActionRepository.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyActionRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyActionRepository.java index b6dc3fc7c46..224856427e5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyActionRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyActionRepository.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository; import java.time.LocalDate; import java.util.List; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java index 0590942d444..d2ba7c922b1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleRepository.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java index a27c98cba34..a7ba97eebbd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/repository/WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveDelinquencyRescheduleParams.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/EffectiveDelinquencyRescheduleParams.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveDelinquencyRescheduleParams.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/EffectiveDelinquencyRescheduleParams.java index 3ad2390b7a5..9bcf882c01f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/EffectiveDelinquencyRescheduleParams.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/EffectiveDelinquencyRescheduleParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.math.BigDecimal; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyFrequencyType; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadService.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadService.java index a5a6ec0aa5a..50729f206e6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyActionData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyActionData; public interface WorkingCapitalLoanDelinquencyActionReadService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java index 8a33e420465..b21b94ce15c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionReadServiceImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.time.LocalDate; import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyActionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyActionData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteService.java index 60c2f5d9437..f12250af03c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java index 91fadbec05b..85e20fa1335 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyActionWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.time.LocalDate; import java.util.List; @@ -27,12 +27,12 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanDelinquencyActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.validator.WorkingCapitalLoanDelinquencyActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationService.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationService.java index 70bf17cf009..042f0b5fd16 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationService.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.time.LocalDate; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanDelinquencyClassificationService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java index 245e6b6923c..28763a8823b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyClassificationServiceImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import static org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants.ENABLE_INSTANT_DELINQUENCY_CALCULATION; @@ -35,12 +35,12 @@ import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.stereotype.Service; @RequiredArgsConstructor diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java index 8843222eed3..4b9f0fbc559 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleService.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanDelinquencyRangeScheduleService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java index 6cff1c22ded..29ec2f31206 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -37,25 +37,25 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentPeriodAndRuleRepository; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionDateAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyPauseUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriod; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriodUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodBounds; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyPauseUtils; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriod; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodBounds; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionDateAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Service; @RequiredArgsConstructor diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformService.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformService.java index f69d7f9c761..ac63bc52b9a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformService.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCollectionData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyTagHistoryData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyTagHistoryData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanCollectionData; public interface WorkingCapitalLoanDelinquencyReadPlatformService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java index d646604fab8..1ff05534a81 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReadPlatformServiceImpl.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; -import static org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyPauseUtils.isPauseActiveOnDate; -import static org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyPauseUtils.resolveEffectivePauseEnd; +import static org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyPauseUtils.isPauseActiveOnDate; +import static org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyPauseUtils.resolveEffectivePauseEnd; import java.math.BigDecimal; import java.time.LocalDate; @@ -32,16 +32,16 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; import org.apache.fineract.portfolio.loanaccount.data.DelinquencyPausePeriod; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCollectionData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyTagHistoryData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanRangeScheduleDelinquencyData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyTagHistoryData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanRangeScheduleDelinquencyData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleTagHistory; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanCollectionData; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java index 64913534d68..3c710645786 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyActionParseAndValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.validator; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.validator; import static org.apache.fineract.portfolio.delinquency.validator.DelinquencyActionParameters.ACTION; import static org.apache.fineract.portfolio.delinquency.validator.DelinquencyActionParameters.DATE_FORMAT; @@ -45,14 +45,14 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyFrequencyType; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyPauseUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPausePeriodUtils; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyPauseUtils; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeScheduleEvaluationUtils; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPausePeriodUtils; import org.springframework.stereotype.Component; @RequiredArgsConstructor diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/WorkingCapitalLoanConstants.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/WorkingCapitalLoanConstants.java index f0cda81a535..8161cd6932b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/WorkingCapitalLoanConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan; +package org.apache.fineract.portfolio.workingcapitalloan.loan; public final class WorkingCapitalLoanConstants { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/InternalWorkingCapitalLoanApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/InternalWorkingCapitalLoanApiResource.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/InternalWorkingCapitalLoanApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/InternalWorkingCapitalLoanApiResource.java index 2ca6c854ecd..ca81c6d71a8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/InternalWorkingCapitalLoanApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/InternalWorkingCapitalLoanApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.loan.api; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.swagger.v3.oas.annotations.Operation; @@ -40,15 +40,15 @@ import org.apache.fineract.infrastructure.core.boot.FineractProfiles; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleGenerateRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanAmortizationScheduleWriteService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleGenerateRequest; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleWriteService; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java index f5c58b31dac..5783abbb056 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanAmortizationScheduleApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.loan.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -31,8 +31,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanAmortizationScheduleReadService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleReadService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResource.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResource.java index 57fc49635b8..0385c074af6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.loan.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -51,16 +51,16 @@ import org.apache.fineract.infrastructure.core.service.CommandParameterUtil; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.data.MarkWorkingCapitalLoanAsFraudRequest; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyTagHistoryData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTemplateData; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanDelinquencyReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanPeriodPaymentRateChangeReadService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyTagHistoryData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.MarkWorkingCapitalLoanAsFraudRequest; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanPeriodPaymentRateChangeReadService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResourceSwagger.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResourceSwagger.java index 40fc2fc0baa..99cf0c0b2e0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/api/WorkingCapitalLoanApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.loan.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; @@ -29,7 +29,7 @@ import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.delinquency.data.DelinquencyRangeData; import org.apache.fineract.portfolio.fund.data.FundData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.api.WorkingCapitalLoanProductApiResourceSwagger; +import org.apache.fineract.portfolio.workingcapitalloan.product.api.WorkingCapitalLoanProductApiResourceSwagger; /** * Swagger documentation classes for Working Capital Loans API. @@ -341,7 +341,7 @@ private GetWorkingCapitalLoanSummary() {} } @Schema(description = "Working Capital Delinquency Collection Data") - public WorkingCapitalCollection delinquent; + public WorkingCapitalLoanCollection delinquent; @Schema(description = "Installment-level delinquency flag (Term-compatible name). True when the loan has a delinquency " + "bucket configured (Working Capital tracks delinquency at the period level); false otherwise", example = "true") public Boolean enableInstallmentLevelDelinquency; @@ -758,9 +758,9 @@ private PutWorkingCapitalLoansLoanIdDiscountRequest() {} } @Schema(description = "Working Capital Delinquency Collection Data") - public static final class WorkingCapitalCollection { + public static final class WorkingCapitalLoanCollection { - private WorkingCapitalCollection() {} + private WorkingCapitalLoanCollection() {} @Schema(description = "Days the oldest unmet minimum-payment period is past due (measured from its toDate); 0 when not past due", example = "0") public Long pastDueDays; @@ -771,16 +771,16 @@ private WorkingCapitalCollection() {} @Schema(description = "Total delinquent amount", example = "1234.56") public BigDecimal delinquentAmount; @Schema(description = "Pause periods during which delinquency is not counted") - public Collection delinquencyPausePeriods; + public Collection delinquencyPausePeriods; @Schema(description = "Delinquency amounts grouped by age range (installment-level delinquency; Term-compatible name)") - public Collection installmentLevelDelinquency; + public Collection installmentLevelDelinquency; @Schema(description = "Delinquent principal amount", example = "1000.00") public BigDecimal delinquentPrincipal; @Schema(description = "Delinquency amount for a specific age range") - public static final class WorkingCapitalCollectionRangeScheduleDelinquency { + public static final class WorkingCapitalLoanCollectionRangeScheduleDelinquency { - private WorkingCapitalCollectionRangeScheduleDelinquency() {} + private WorkingCapitalLoanCollectionRangeScheduleDelinquency() {} @Schema(description = "Delinquency range id", example = "1") public Long rangeId; @@ -795,9 +795,9 @@ private WorkingCapitalCollectionRangeScheduleDelinquency() {} } @Schema(description = "Pause period during which delinquency tracking is paused") - public static final class WorkingCapitalCollectionDelinquencyPausePeriod { + public static final class WorkingCapitalLoanCollectionDelinquencyPausePeriod { - private WorkingCapitalCollectionDelinquencyPausePeriod() {} + private WorkingCapitalLoanCollectionDelinquencyPausePeriod() {} @Schema(description = "Whether the pause period is active", example = "true") public boolean active; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleModel.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleModel.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleModel.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleModel.java index a0d72f9f806..78239165a1a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleModel.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.calc; +package org.apache.fineract.portfolio.workingcapitalloan.loan.calc; import com.google.gson.annotations.SerializedName; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedPayment.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedPayment.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedPayment.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedPayment.java index ed0c62ad18f..7c423f16be8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedPayment.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedPayment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.calc; +package org.apache.fineract.portfolio.workingcapitalloan.loan.calc; import com.google.gson.annotations.SerializedName; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/TvmFunctions.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/TvmFunctions.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/TvmFunctions.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/TvmFunctions.java index e19c7620d8e..eb9fd8e15d5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/calc/TvmFunctions.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/TvmFunctions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.calc; +package org.apache.fineract.portfolio.workingcapitalloan.loan.calc; import java.math.BigDecimal; import java.math.MathContext; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/MarkWorkingCapitalLoanAsFraudRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/MarkWorkingCapitalLoanAsFraudRequest.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/MarkWorkingCapitalLoanAsFraudRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/MarkWorkingCapitalLoanAsFraudRequest.java index 8c7762a4f92..635b1b02b53 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/MarkWorkingCapitalLoanAsFraudRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/MarkWorkingCapitalLoanAsFraudRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleData.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleData.java index 2c80370489d..b6cf2ff107c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleGenerateRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleGenerateRequest.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleGenerateRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleGenerateRequest.java index 5f1be3c01ca..e40f7209b45 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationScheduleGenerateRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationScheduleGenerateRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationSchedulePaymentData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationSchedulePaymentData.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationSchedulePaymentData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationSchedulePaymentData.java index 607a80c47b6..ce1698b2ce1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/ProjectedAmortizationSchedulePaymentData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/ProjectedAmortizationSchedulePaymentData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBalanceData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanBalanceData.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBalanceData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanBalanceData.java index b17318a6f84..4e92713c02c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanBalanceData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanBalanceData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.io.Serializable; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCollectionData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanCollectionData.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCollectionData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanCollectionData.java index 3d5bfff3c8d..7fe8317bcef 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCollectionData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanCollectionData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; @@ -26,6 +26,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import org.apache.fineract.portfolio.loanaccount.data.DelinquencyPausePeriod; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanRangeScheduleDelinquencyData; @Data @AllArgsConstructor diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanData.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanData.java index 507ff288333..859fb06ddc3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.io.Serializable; import java.math.BigDecimal; @@ -36,10 +36,11 @@ import org.apache.fineract.portfolio.loanaccount.data.LoanApplicationTimelineData; import org.apache.fineract.portfolio.loanaccount.data.LoanStatusEnumData; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalPaymentAllocationData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanPaymentAllocationData; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; /** * Data Transfer Object for Working Capital Loan (application/summary). @@ -88,10 +89,10 @@ public class WorkingCapitalLoanData implements Serializable { private BigDecimal dailyEir; private BigDecimal calculatedAnnualEir; private DelinquencyBucketData delinquencyBucket; - private WorkingCapitalBreachData breach; - private WorkingCapitalNearBreachData nearBreach; + private WorkingCapitalLoanBreachData breach; + private WorkingCapitalLoanNearBreachData nearBreach; private LocalDate lastClosedBusinessDate; - private List paymentAllocation; + private List paymentAllocation; private LoanApplicationTimelineData timeline; private List disbursementDetails; private WorkingCapitalLoanBalanceData balance; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDisbursementDetailData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanDisbursementDetailData.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDisbursementDetailData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanDisbursementDetailData.java index 7d626c45ca3..a2514b4d5cf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanDisbursementDetailData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanDisbursementDetailData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java index 1046c9f84c4..79a210f4d67 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanPeriodPaymentRateChangeData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanSummaryData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanSummaryData.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanSummaryData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanSummaryData.java index 93e4c69f106..aa7eebcaf7b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanSummaryData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanSummaryData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.io.Serializable; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTemplateData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanTemplateData.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTemplateData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanTemplateData.java index a7e11d25cbb..dc4ee731a67 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTemplateData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/data/WorkingCapitalLoanTemplateData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.loan.data; import java.util.Collection; import java.util.List; @@ -28,9 +28,9 @@ import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData; import org.apache.fineract.portfolio.fund.data.FundData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; /** * DTO for Working Capital Loan template response: loan details plus dropdown options (productOptions, fundOptions, @@ -50,7 +50,7 @@ public class WorkingCapitalLoanTemplateData { private List periodFrequencyTypeOptions; private List delinquencyStartTypeOptions; private List breachStartTypeOptions; - private List breachOptions; + private List breachOptions; private List delinquencyMinimumPaymentTypeOptions; - private List nearBreachOptions; + private List nearBreachOptions; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/ProjectedAmortizationLoanModel.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/ProjectedAmortizationLoanModel.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/ProjectedAmortizationLoanModel.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/ProjectedAmortizationLoanModel.java index 4ea373f47f6..642280032a3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/ProjectedAmortizationLoanModel.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/ProjectedAmortizationLoanModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoan.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoan.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoan.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoan.java index 7ac4249400d..c98f5295ae7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoan.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoan.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -44,8 +44,9 @@ import org.apache.fineract.portfolio.fund.domain.Fund; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanPaymentAllocationRule; import org.apache.fineract.useradministration.domain.AppUser; @Entity diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBalance.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanBalance.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBalance.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanBalance.java index dd6dbc3d613..1e170a48882 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanBalance.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanBalance.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,7 +32,7 @@ import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; /** * Stores all balances of a working capital loan (one row per loan). Updated from allocations; accounting depends on diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDisbursementDetails.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanDisbursementDetails.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDisbursementDetails.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanDisbursementDetails.java index e188f7523ad..0fcf9b76652 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanDisbursementDetails.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanDisbursementDetails.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanEvent.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanEvent.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanEvent.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanEvent.java index 3ca17af6f42..8ca6a3109ae 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanEvent.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanEvent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; public enum WorkingCapitalLoanEvent { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanLifecycleStateMachine.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanLifecycleStateMachine.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanLifecycleStateMachine.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanLifecycleStateMachine.java index 9c94086a1f9..e13ed3c7a38 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanLifecycleStateMachine.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanLifecycleStateMachine.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNote.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanNote.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNote.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanNote.java index 4cf88b8a2f3..67468983099 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNote.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanNote.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriod.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriod.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriod.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriod.java index f73f4557dcd..77bd511a575 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriod.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriod.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriodUtils.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriodUtils.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriodUtils.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriodUtils.java index efabd6a7a5e..550f35ca067 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPausePeriodUtils.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPausePeriodUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import java.time.LocalDate; import java.time.temporal.ChronoUnit; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodBounds.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodBounds.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodBounds.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodBounds.java index b174cb3707e..7258107fa38 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodBounds.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodBounds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodFrequencyType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodFrequencyType.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodFrequencyType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodFrequencyType.java index 4e331dad940..f84db36e548 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodFrequencyType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodFrequencyType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java index 71957075f81..f92fddfa964 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateChange.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java index 097b4304070..23913cb1270 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/domain/WorkingCapitalLoanPeriodPaymentRateHistoryHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.loan.domain; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/ProjectedAmortizationScheduleNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/ProjectedAmortizationScheduleNotFoundException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/ProjectedAmortizationScheduleNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/ProjectedAmortizationScheduleNotFoundException.java index 7742ce3da21..b61fcbf3ea1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/ProjectedAmortizationScheduleNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/ProjectedAmortizationScheduleNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationDateException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationDateException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationDateException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationDateException.java index 27cf18228d7..dfbb09de61e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationDateException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationDateException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java index f9e02f80e7c..4a64d1bc007 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java index df801f3b770..9ca646d6e3d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanEirNotCalculableException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanEirNotCalculableException.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanEirNotCalculableException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanEirNotCalculableException.java index 83c0f70d111..c5505681845 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanEirNotCalculableException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanEirNotCalculableException.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; /** * Thrown when the stored Working Capital Loan inputs yield a Total Days / EIR that cannot be validly calculated, so an diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanNotFoundException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanNotFoundException.java index a2392702030..965a5c53250 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/exception/WorkingCapitalLoanNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.loan.exception; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java index a3a9593d5e8..23ed0c445a0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationDeletionCommandHandler.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java index d669917e3f4..541dbea0a56 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationModificationCommandHandler.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java index 4d4bf018d7e..d51f3e95bd3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApplicationSubmittalCommandHandler.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.AllArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/ApproveWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApproveCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/ApproveWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApproveCommandHandler.java index ca08d912181..57f53955b41 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/ApproveWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanApproveCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "APPROVE") -public class ApproveWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanApproveCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/MarkWorkingCapitalLoanAsFraudCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanMarkAsFraudCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/MarkWorkingCapitalLoanAsFraudCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanMarkAsFraudCommandHandler.java index 2fe5f67a582..4386adaf72a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/MarkWorkingCapitalLoanAsFraudCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanMarkAsFraudCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanFraudWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanFraudWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "SETFRAUD") -public class MarkWorkingCapitalLoanAsFraudCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanMarkAsFraudCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanFraudWriteService writeService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RejectWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanRejectCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RejectWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanRejectCommandHandler.java index 4573053f9c9..2f130443032 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RejectWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanRejectCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "REJECT") -public class RejectWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanRejectCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoApproveWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUndoApproveCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoApproveWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUndoApproveCommandHandler.java index d1bd9d0162c..ac80064acf3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoApproveWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUndoApproveCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "APPROVALUNDO") -public class UndoApproveWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUndoApproveCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UpdateRateWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUpdateRateCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UpdateRateWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUpdateRateCommandHandler.java index 416bcaa4662..45e29633ce6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UpdateRateWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/handler/WorkingCapitalLoanUpdateRateCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.loan.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "UPDATERATE") -public class UpdateRateWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUpdateRateCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/ProjectedAmortizationScheduleMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/ProjectedAmortizationScheduleMapper.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/ProjectedAmortizationScheduleMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/ProjectedAmortizationScheduleMapper.java index 4dda58bd2bf..f7071bc48ba 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/ProjectedAmortizationScheduleMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/ProjectedAmortizationScheduleMapper.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; import org.apache.fineract.organisation.monetary.domain.Money; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedPayment; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationSchedulePaymentData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedPayment; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationSchedulePaymentData; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBalanceMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanBalanceMapper.java similarity index 81% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBalanceMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanBalanceMapper.java index b2e35ecf22b..5ee1027c1bd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanBalanceMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanBalanceMapper.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBalanceData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanBalanceData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java index 9cbff13aae6..ad518b5f20d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanDisbursementDetailMapper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDisbursementDetailData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanDisbursementDetailData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanMapper.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanMapper.java index 1365d7b817a..21a6746d787 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.time.LocalDate; import java.util.List; @@ -30,20 +30,21 @@ import org.apache.fineract.portfolio.loanaccount.data.LoanStatusEnumData; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanproduct.service.LoanEnumerations; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloanbreach.mapper.WorkingCapitalBreachMapper; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.mapper.WorkingCapitalNearBreachMapper; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; -import org.apache.fineract.portfolio.workingcapitalloanproduct.mapper.WorkingCapitalLoanProductMapper; +import org.apache.fineract.portfolio.workingcapitalloan.breach.mapper.WorkingCapitalLoanBreachMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper.WorkingCapitalLoanNearBreachMapper; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.product.mapper.WorkingCapitalLoanProductMapper; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.mapper.WorkingCapitalLoanTransactionMapper; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; @Mapper(config = MapstructMapperConfig.class, uses = { DelinquencyBucketMapper.class, WorkingCapitalLoanProductMapper.class, WorkingCapitalLoanBalanceMapper.class, WorkingCapitalLoanDisbursementDetailMapper.class, WorkingCapitalLoanTransactionMapper.class, - WorkingCapitalBreachMapper.class, WorkingCapitalNearBreachMapper.class, WorkingCapitalLoanSummaryDataMapper.class, + WorkingCapitalLoanBreachMapper.class, WorkingCapitalLoanNearBreachMapper.class, WorkingCapitalLoanSummaryDataMapper.class, WorkingCapitalLoanPaymentAllocationMapper.class }) public interface WorkingCapitalLoanMapper { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java similarity index 60% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java index b17a47fa458..1f0f0e6bce9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanPaymentAllocationMapper.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalPaymentAllocationData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanPaymentAllocationData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanPaymentAllocationRule; import org.mapstruct.Mapper; import org.mapstruct.Named; @@ -32,21 +32,21 @@ public interface WorkingCapitalLoanPaymentAllocationMapper { @Named("paymentAllocationRulesToData") - default List paymentAllocationRulesToData( + default List paymentAllocationRulesToData( final List rules) { if (rules == null || rules.isEmpty()) { return null; } - final List result = new ArrayList<>(); + final List result = new ArrayList<>(); for (WorkingCapitalLoanPaymentAllocationRule rule : rules) { final AtomicInteger counter = new AtomicInteger(1); - final List orders = new ArrayList<>(); + final List orders = new ArrayList<>(); if (rule.getAllocationTypes() != null) { - for (WorkingCapitalPaymentAllocationType type : rule.getAllocationTypes()) { - orders.add(new WorkingCapitalPaymentAllocationData.PaymentAllocationOrder(type.name(), counter.getAndIncrement())); + for (WorkingCapitalLoanPaymentAllocationType type : rule.getAllocationTypes()) { + orders.add(new WorkingCapitalLoanPaymentAllocationData.PaymentAllocationOrder(type.name(), counter.getAndIncrement())); } } - result.add(new WorkingCapitalPaymentAllocationData(rule.getTransactionType(), orders)); + result.add(new WorkingCapitalLoanPaymentAllocationData(rule.getTransactionType(), orders)); } return result; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryDataMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryDataMapper.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryDataMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryDataMapper.java index d8d916c7edb..10f1313a4ab 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryDataMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryDataMapper.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.math.BigDecimal; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.infrastructure.core.service.MathUtil; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanSummaryData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanSummaryData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryMapper.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryMapper.java index a3b4a7a4766..3d5ae9507e5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanSummaryMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/mapper/WorkingCapitalLoanSummaryMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.mapper; import java.time.LocalDate; import java.util.List; @@ -28,8 +28,8 @@ import org.apache.fineract.portfolio.loanaccount.data.LoanStatusEnumData; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanproduct.service.LoanEnumerations; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/ProjectedAmortizationLoanModelRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/ProjectedAmortizationLoanModelRepository.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/ProjectedAmortizationLoanModelRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/ProjectedAmortizationLoanModelRepository.java index 5177341e25d..af58c89537e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/ProjectedAmortizationLoanModelRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/ProjectedAmortizationLoanModelRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.loan.repository; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.ProjectedAmortizationLoanModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.ProjectedAmortizationLoanModel; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBalanceRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanBalanceRepository.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBalanceRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanBalanceRepository.java index cf5e11bd301..89146f1c183 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanBalanceRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanBalanceRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.loan.repository; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; import org.springframework.data.jpa.repository.JpaRepository; public interface WorkingCapitalLoanBalanceRepository extends JpaRepository { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNoteRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanNoteRepository.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNoteRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanNoteRepository.java index 5b0bc403f78..09c4e411332 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNoteRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanNoteRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.loan.repository; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNote; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanNote; import org.springframework.data.jpa.repository.JpaRepository; public interface WorkingCapitalLoanNoteRepository extends JpaRepository { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java index 94aa13279be..b4ffc79e1ce 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanPeriodPaymentRateChangeRepository.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.loan.repository; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateChange; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateChange; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanRepository.java similarity index 97% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanRepository.java index fa29d89567d..2eb5be814eb 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/repository/WorkingCapitalLoanRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.loan.repository; import java.time.LocalDate; import java.util.Collection; @@ -26,7 +26,7 @@ import org.apache.fineract.cob.data.COBIdAndLastClosedBusinessDate; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanApplicationDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanApplicationDataValidator.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanApplicationDataValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanApplicationDataValidator.java index 423c163396e..313096df4f8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanApplicationDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanApplicationDataValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; @@ -55,24 +55,24 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanaccount.exception.InvalidLoanStateTransitionException; import org.apache.fineract.portfolio.loanaccount.exception.LoanApplicationDateException; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanApplicationDateException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.validator.WorkingCapitalNearBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductConfigurableAttributes; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.serialization.WorkingCapitalPaymentAllocationDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanApplicationDateException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeModifiedException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator.WorkingCapitalLoanNearBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductConfigurableAttributes; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.serialization.WorkingCapitalLoanPaymentAllocationDataValidator; import org.springframework.stereotype.Component; /** @@ -103,12 +103,12 @@ public class WorkingCapitalLoanApplicationDataValidator { private static final String EIR_NOT_CALCULABLE_CODE = "unable.to.calculate.valid.eir"; private final FromJsonHelper fromApiJsonHelper; - private final WorkingCapitalPaymentAllocationDataValidator paymentAllocationDataValidator; + private final WorkingCapitalLoanPaymentAllocationDataValidator paymentAllocationDataValidator; private final WorkingCapitalLoanProductRepository productRepository; private final ClientRepository clientRepository; private final WorkingCapitalLoanRepository workingCapitalLoanRepository; private final ExpectedDisbursementDateValidator expectedDisbursementDateValidator; - private final WorkingCapitalNearBreachParseAndValidator workingCapitalNearBreachValidator; + private final WorkingCapitalLoanNearBreachParseAndValidator workingCapitalNearBreachValidator; /** * Validates the create loan application request. Mandatory: clientId, productId, principal (disbursement amount), @@ -362,7 +362,7 @@ private void validateEirCalculable(final List dataValidationE /** * The discount the created loan will actually carry — must mirror - * {@link org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanAssemblerImpl}: requested + * {@link org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAssemblerImpl}: requested * discount, else the product's non-overridable positive default, else zero. */ private BigDecimal resolveEffectiveDiscount(final BigDecimal requestedDiscount, final WorkingCapitalLoanProduct product) { @@ -675,8 +675,8 @@ private boolean existsAnyOverridableParameter(final JsonElement element) { } private void validateOverridables(final JsonElement element, final DataValidatorBuilder baseDataValidator, - final WorkingCapitalLoanProductConfigurableAttributes config, final WorkingCapitalBreach currentBreach, - final WorkingCapitalNearBreach currentNearBreach) { + final WorkingCapitalLoanProductConfigurableAttributes config, final WorkingCapitalLoanBreach currentBreach, + final WorkingCapitalLoanNearBreach currentNearBreach) { if (this.fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName, element)) { if (config.isDelinquencyBucketClassification()) { final Long bucketId = this.fromApiJsonHelper diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidator.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidator.java index a25b4cfcb15..e77ea2aadbf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -48,17 +48,17 @@ import org.apache.fineract.portfolio.loanaccount.domain.ExpectedDisbursementDateValidator; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.NearBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionFinder; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetail; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.NearBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetail; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionFinder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java index aaf5e315754..27ad3397284 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.mapper; import java.math.BigDecimal; import java.math.RoundingMode; @@ -30,14 +30,14 @@ import org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanDisbursementDetailDataV1; import org.apache.fineract.avro.workingcapitalloan.v1.WorkingCapitalLoanSummaryDataV1; import org.apache.fineract.infrastructure.event.external.service.serialization.mapper.support.AvroMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCollectionData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDisbursementDetailData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanRangeScheduleDelinquencyData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanSummaryData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanRangeScheduleDelinquencyData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanCollectionData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanDisbursementDetailData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanSummaryData; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java index 18308f62bed..b78541fd51a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanBusinessEventSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization.serializer; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.serializer; import java.math.BigDecimal; import java.nio.ByteBuffer; @@ -42,21 +42,21 @@ import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.BusinessEventSerializer; import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.ExternalEventCustomDataSerializer; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.ChargeIdAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionTypeTotalHolder; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanBreachScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.mapper.WorkingCapitalLoanAccountDataMapper; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.mapper.WorkingCapitalLoanBreachScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.ChargeIdAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleTagHistoryRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.mapper.WorkingCapitalLoanAccountDataMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionTypeTotalHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java index 79251aff7de..ae3868f9bbf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/serializer/WorkingCapitalLoanChargeExternalEventCustomDataSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization.serializer; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.serializer; import java.nio.ByteBuffer; import org.apache.fineract.infrastructure.event.business.domain.workingcapitalloan.loan.WorkingCapitalLoanBusinessEvent; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserService.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserService.java index b983065213c..54b68906dce 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserService.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.MathContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java index a905b5dc16f..c76b68f168e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -32,7 +32,7 @@ import org.apache.fineract.infrastructure.core.serialization.gson.LocalDateAdapter; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.Money; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapper.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapper.java index fa2fc4c4e99..42a922b4fe0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapper.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.MathContext; import java.util.Optional; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.springframework.lang.NonNull; public interface ProjectedAmortizationScheduleRepositoryWrapper { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java index e4f54607494..66e158f14e2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleRepositoryWrapperImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.MathContext; import java.util.Optional; @@ -24,10 +24,10 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.domain.ProjectedAmortizationLoanModel; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.ProjectedAmortizationLoanModelRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.ProjectedAmortizationLoanModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.ProjectedAmortizationLoanModelRepository; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadService.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadService.java index 137a1bd30f9..a2fda781689 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadService.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleData; public interface WorkingCapitalLoanAmortizationScheduleReadService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java similarity index 73% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java index ba888ecbd8f..4a8553b4295 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleReadServiceImpl.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.MathContext; import lombok.RequiredArgsConstructor; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.exception.ProjectedAmortizationScheduleNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.ProjectedAmortizationScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.ProjectedAmortizationScheduleNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.mapper.ProjectedAmortizationScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java index cfdb521335c..d079b4d77f8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteService.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.BigDecimal; import java.time.LocalDate; import java.time.OffsetDateTime; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleGenerateRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleGenerateRequest; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanAmortizationScheduleWriteService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java index 6e30faf7acc..9f6154ec4df 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAmortizationScheduleWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.math.BigDecimal; import java.math.MathContext; @@ -31,15 +31,15 @@ import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.data.ProjectedAmortizationScheduleGenerateRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateChange; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanEirNotCalculableException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.ProjectedAmortizationScheduleGenerateRequest; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateChange; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanEirNotCalculableException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformService.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformService.java index 9e94c6461ca..b78caaeaf6d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformService.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.util.List; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.portfolio.accountdetails.data.WorkingCapitalLoanAccountSummaryData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanTemplateData; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java index cd1ce68f679..537102da230 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationReadPlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import jakarta.persistence.criteria.Predicate; import java.math.BigDecimal; @@ -45,25 +45,27 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentType; import org.apache.fineract.portfolio.delinquency.service.DelinquencyReadPlatformService; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCollectionData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTemplateData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanMapper; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanSummaryMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.service.WorkingCapitalLoanProductReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanCollectionData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.mapper.WorkingCapitalLoanMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.mapper.WorkingCapitalLoanSummaryMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.service.WorkingCapitalLoanProductReadPlatformService; import org.apache.fineract.useradministration.domain.AppUserRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -83,9 +85,9 @@ public class WorkingCapitalLoanApplicationReadPlatformServiceImpl implements Wor private final ClientReadPlatformService clientReadPlatformService; private final DelinquencyReadPlatformService delinquencyReadPlatformService; private final WorkingCapitalLoanSummaryMapper workingCapitalLoanSummaryMapper; - private final WorkingCapitalBreachReadPlatformService breachReadPlatformService; + private final WorkingCapitalLoanBreachReadPlatformService breachReadPlatformService; private final WorkingCapitalLoanDelinquencyReadPlatformService workingCapitalLoanDelinquencyReadPlatformService; - private final WorkingCapitalNearBreachReadPlatformService nearBreachReadPlatformService; + private final WorkingCapitalLoanNearBreachReadPlatformService nearBreachReadPlatformService; private final ProjectedAmortizationScheduleRepositoryWrapper scheduleRepositoryWrapper; private final WorkingCapitalLoanBreachScheduleRepository breachScheduleRepository; private final WorkingCapitalLoanDelinquencyRangeScheduleRepository delinquencyRangeScheduleRepository; @@ -102,8 +104,8 @@ public WorkingCapitalLoanTemplateData retrieveTemplate(final Long productId, fin .retrieveAllDelinquencyBuckets(); final List periodFrequencyTypeOptions = ApiFacingEnum .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanPeriodFrequencyType.class); - final List breachOptions = breachReadPlatformService.retrieveAll(); - final List nearBreachOptions = nearBreachReadPlatformService.retrieveAll(); + final List breachOptions = breachReadPlatformService.retrieveAll(); + final List nearBreachOptions = nearBreachReadPlatformService.retrieveAll(); final List delinquencyStartTypeOptions = ApiFacingEnum .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanDelinquencyStartType.class); final List breachStartTypeOptions = ApiFacingEnum diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformService.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformService.java index 6e68fe7ccf5..520b5876b65 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java index 5e567229def..ea9d1ae3c7f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanApplicationWritePlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import com.google.gson.JsonArray; import jakarta.persistence.PersistenceException; @@ -33,15 +33,15 @@ import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanaccount.service.LoanOriginatorLinkingService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNote; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.ProjectedAmortizationLoanModelRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNoteRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanApplicationDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanNote; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanApplicationNotInSubmittedStateCannotBeDeletedException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.ProjectedAmortizationLoanModelRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanNoteRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.WorkingCapitalLoanApplicationDataValidator; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.orm.jpa.JpaSystemException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssembler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssembler.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssembler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssembler.java index e14291f1de0..a8f11485845 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssembler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssembler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.util.Map; import org.apache.fineract.infrastructure.core.api.JsonCommand; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; /** * Assembles {@link WorkingCapitalLoan} from repository (by id or external id) or from API JSON command. diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssemblerImpl.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssemblerImpl.java index b8ba4a1785d..65d005f8a53 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanAssemblerImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import com.google.gson.JsonElement; import java.math.BigDecimal; @@ -49,29 +49,29 @@ import org.apache.fineract.portfolio.fund.exception.FundNotFoundException; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; import org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanPaymentAllocationMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanbreach.repository.WorkingCapitalBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.repository.WorkingCapitalNearBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalPaymentAllocationData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAdvancedPaymentAllocationsJsonParser; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetail; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.mapper.WorkingCapitalLoanPaymentAllocationMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanPaymentAllocationData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductPaymentAllocationRule; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetail; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanPaymentAllocationRule; import org.springframework.stereotype.Component; @Component @@ -84,12 +84,12 @@ public class WorkingCapitalLoanAssemblerImpl implements WorkingCapitalLoanAssemb private final FundRepository fundRepository; private final DelinquencyBucketRepository delinquencyBucketRepository; private final ExternalIdFactory externalIdFactory; - private final WorkingCapitalAdvancedPaymentAllocationsJsonParser paymentAllocationParser; + private final WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser paymentAllocationParser; private final AccountNumberFormatLookup accountNumberFormatLookup; private final AccountNumberGeneratorService accountNumberGeneratorService; private final WorkingCapitalLoanRepository workingCapitalLoanRepository; - private final WorkingCapitalBreachRepository breachRepository; - private final WorkingCapitalNearBreachRepository nearBreachRepository; + private final WorkingCapitalLoanBreachRepository breachRepository; + private final WorkingCapitalLoanNearBreachRepository nearBreachRepository; private final WorkingCapitalLoanPaymentAllocationMapper workingCapitalLoanPaymentAllocationMapper; @Override @@ -243,8 +243,8 @@ private WorkingCapitalLoanProductRelatedDetails buildLoanProductRelatedDetails(f return detail; } - private List copyPaymentAllocationRules(final WorkingCapitalLoan loan, final JsonCommand command, - final WorkingCapitalLoanProduct product) { + private List copyPaymentAllocationRules(final WorkingCapitalLoan loan, + final JsonCommand command, final WorkingCapitalLoanProduct product) { final List rules; if (command.arrayOfParameterNamed(WorkingCapitalLoanProductConstants.paymentAllocationParamName) != null) { rules = paymentAllocationParser.assembleWCPaymentAllocationRules(command); @@ -475,7 +475,7 @@ public Map updateFrom(final JsonCommand command, final WorkingCa } if (command.arrayOfParameterNamed(WorkingCapitalLoanProductConstants.paymentAllocationParamName) != null) { - List newPaymentAllocationRules = copyPaymentAllocationRules(loan, command, + List newPaymentAllocationRules = copyPaymentAllocationRules(loan, command, loan.getLoanProduct()); changes.put(WorkingCapitalLoanProductConstants.paymentAllocationParamName, newPaymentAllocationRules); } @@ -499,13 +499,13 @@ public void accountNumberGeneration(final JsonCommand command, final WorkingCapi loan.setAccountNumber(generated); } - private WorkingCapitalBreach findBreachById(final Long breachId) { + private WorkingCapitalLoanBreach findBreachById(final Long breachId) { return breachRepository.findById(breachId) .orElseThrow(() -> new GeneralPlatformDomainRuleException("error.msg.wclp.breach.not.found", "Working Capital Breach with id " + breachId + " was not found.", breachId)); } - private WorkingCapitalNearBreach findNearBreachById(final Long nearBreachId) { + private WorkingCapitalLoanNearBreach findNearBreachById(final Long nearBreachId) { return nearBreachRepository.findById(nearBreachId) .orElseThrow(() -> new GeneralPlatformDomainRuleException("error.msg.wclp.nearbreach.not.found", "Working Capital Near Breach with id " + nearBreachId + " was not found.", nearBreachId)); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanCurrencyResolver.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanCurrencyResolver.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanCurrencyResolver.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanCurrencyResolver.java index 49592ac419a..269636f80df 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanCurrencyResolver.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanCurrencyResolver.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public final class WorkingCapitalLoanCurrencyResolver { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteService.java index 94890796dab..133a1b6c7af 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteServiceImpl.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteServiceImpl.java index f88babe4775..295fb7845a8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanFraudWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanFraudWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; @@ -35,10 +35,10 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanOriginatorReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanOriginatorReadPlatformService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanOriginatorReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanOriginatorReadPlatformService.java index 8d64a762eef..f705aca7cc4 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanOriginatorReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanOriginatorReadPlatformService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.util.List; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorData; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java index bd7cec07918..69dbe8c37ba 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; public interface WorkingCapitalLoanPeriodPaymentRateChangeReadService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java similarity index 77% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java index 3f1372536e1..0aaad7feb6e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanPeriodPaymentRateChangeReadServiceImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateChange; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanPeriodPaymentRateChangeData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateChange; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformService.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformService.java index e4665850f8f..12f363c4b46 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformServiceImpl.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformServiceImpl.java index b2a5d23e3d6..ca9faff1f55 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/WorkingCapitalLoanWritePlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import com.google.gson.JsonElement; import java.math.BigDecimal; @@ -66,29 +66,35 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDisbursementDetails; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanEvent; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanLifecycleStateMachine; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNote; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateChange; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNoteRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeAccrualService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanDisbursementDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanEvent; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanLifecycleStateMachine; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanNote; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateChange; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodPaymentRateHistoryHelper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanNoteRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanDiscountFeeAmortizationService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanTransactionProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanTransactionReprocessingService; import org.apache.fineract.useradministration.domain.AppUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResource.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResource.java index 2183e7d6b8d..1cd7a1d51aa 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -39,10 +39,10 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanNearBreachActionData; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanNearBreachActionReadService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachActionReadService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loans") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java index ea61ce6befd..8d626303e92 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachActionApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/api/WorkingCapitalNearBreachApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachApiResource.java similarity index 71% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/api/WorkingCapitalNearBreachApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachApiResource.java index 0bd33e615b1..382c92b76ed 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/api/WorkingCapitalNearBreachApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/api/WorkingCapitalLoanNearBreachApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.api; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -38,28 +38,28 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; import org.springframework.stereotype.Component; @Component @Path("/v1/working-capital/near-breach") @Tag(name = "Working Capital Near Breach", description = "Working Capital Near Breach") @RequiredArgsConstructor -public class WorkingCapitalNearBreachApiResource { +public class WorkingCapitalLoanNearBreachApiResource { private final PlatformSecurityContext context; - private final WorkingCapitalNearBreachReadPlatformService breachReadPlatformService; + private final WorkingCapitalLoanNearBreachReadPlatformService breachReadPlatformService; private final PortfolioCommandSourceWritePlatformService commandSourceWritePlatformService; private final DefaultToApiJsonSerializer jsonSerializer; @GET @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveAllWorkingCapitalNearBreaches", summary = "List Working Capital Near Breaches") - public List retrieveAll() { + @Operation(operationId = "retrieveAllWorkingCapitalLoanNearBreaches", summary = "List Working Capital Near Breaches") + public List retrieveAll() { this.context.authenticatedUser().validateHasReadPermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); return this.breachReadPlatformService.retrieveAll(); } @@ -68,8 +68,8 @@ public List retrieveAll() { @Path("{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "retrieveWorkingCapitalNearBreach", summary = "Retrieve Working Capital Near Breach") - public WorkingCapitalNearBreachData retrieveOne(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { + @Operation(operationId = "retrieveWorkingCapitalLoanNearBreach", summary = "Retrieve Working Capital Near Breach") + public WorkingCapitalLoanNearBreachData retrieveOne(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { this.context.authenticatedUser().validateHasReadPermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); return this.breachReadPlatformService.retrieveOne(breachId); } @@ -77,10 +77,10 @@ public WorkingCapitalNearBreachData retrieveOne(@PathParam("breachId") @Paramete @POST @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "createWorkingCapitalNearBreach", summary = "Create Working Capital Near Breach") - public CommandProcessingResult create(final WorkingCapitalNearBreachRequest request) { + @Operation(operationId = "createWorkingCapitalLoanNearBreach", summary = "Create Working Capital Near Breach") + public CommandProcessingResult create(final WorkingCapitalLoanNearBreachRequest request) { this.context.authenticatedUser().validateHasCreatePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().createWorkingCapitalNearBreach() + final CommandWrapper commandRequest = new CommandWrapperBuilder().createWorkingCapitalLoanNearBreach() .withJson(jsonSerializer.serialize(request)).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } @@ -89,11 +89,11 @@ public CommandProcessingResult create(final WorkingCapitalNearBreachRequest requ @Path("{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "updateWorkingCapitalNearBreach", summary = "Update Working Capital Near Breach") + @Operation(operationId = "updateWorkingCapitalLoanNearBreach", summary = "Update Working Capital Near Breach") public CommandProcessingResult update(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId, - final WorkingCapitalNearBreachRequest request) { + final WorkingCapitalLoanNearBreachRequest request) { this.context.authenticatedUser().validateHasUpdatePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().updateWorkingCapitalNearBreach(breachId) + final CommandWrapper commandRequest = new CommandWrapperBuilder().updateWorkingCapitalLoanNearBreach(breachId) .withJson(jsonSerializer.serialize(request)).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } @@ -102,10 +102,10 @@ public CommandProcessingResult update(@PathParam("breachId") @Parameter(descript @Path("{breachId}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - @Operation(operationId = "deleteWorkingCapitalNearBreach", summary = "Delete Working Capital Near Breach") + @Operation(operationId = "deleteWorkingCapitalLoanNearBreach", summary = "Delete Working Capital Near Breach") public CommandProcessingResult delete(@PathParam("breachId") @Parameter(description = "breachId") final Long breachId) { this.context.authenticatedUser().validateHasDeletePermission(WorkingCapitalLoanProductConstants.WCLP_RESOURCE_NAME); - final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteWorkingCapitalNearBreach(breachId).build(); + final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteWorkingCapitalLoanNearBreach(breachId).build(); return this.commandSourceWritePlatformService.logCommandSource(commandRequest); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanNearBreachActionData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachActionData.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanNearBreachActionData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachActionData.java index 26f5cbf2260..9ab3ad258f7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanNearBreachActionData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachActionData.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data; import java.math.BigDecimal; import java.time.OffsetDateTime; -import org.apache.fineract.portfolio.workingcapitalloan.domain.NearBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.NearBreachActionType; public record WorkingCapitalLoanNearBreachActionData(Long id, Long loanId, NearBreachActionType action, BigDecimal threshold, Integer frequency, String frequencyType, OffsetDateTime createdDate) { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachData.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachData.java index 29913f512eb..3f9dedd7b29 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.data; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data; import java.math.BigDecimal; import lombok.AllArgsConstructor; @@ -27,7 +27,7 @@ @Getter @Builder @AllArgsConstructor -public class WorkingCapitalNearBreachData { +public class WorkingCapitalLoanNearBreachData { private Long id; private String name; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachRequest.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachRequest.java index a0b5d68ee57..2f6e94534fc 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/data/WorkingCapitalNearBreachRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/data/WorkingCapitalLoanNearBreachRequest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.data; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -public record WorkingCapitalNearBreachRequest(String nearBreachName, Integer nearBreachFrequency, String nearBreachFrequencyType, +public record WorkingCapitalLoanNearBreachRequest(String nearBreachName, Integer nearBreachFrequency, String nearBreachFrequencyType, BigDecimal nearBreachThreshold) implements Serializable { @Serial diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/NearBreachActionType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/NearBreachActionType.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/NearBreachActionType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/NearBreachActionType.java index a3cbdae6c8f..14c85b2d881 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/NearBreachActionType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/NearBreachActionType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain; public enum NearBreachActionType { RESCHEDULE diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/domain/WorkingCapitalNearBreach.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreach.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/domain/WorkingCapitalNearBreach.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreach.java index 3c356f0832e..63c6725715f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/domain/WorkingCapitalNearBreach.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreach.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.domain; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -29,7 +29,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; @Entity @Table(name = "m_wc_near_breach") @@ -37,7 +37,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class WorkingCapitalNearBreach extends AbstractPersistableCustom { +public class WorkingCapitalLoanNearBreach extends AbstractPersistableCustom { @Column(name = "near_breach_name", nullable = false, length = 100) private String name; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNearBreachAction.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreachAction.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNearBreachAction.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreachAction.java index 76f94347920..e0a249a22a9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanNearBreachAction.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/domain/WorkingCapitalLoanNearBreachAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -31,6 +31,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/exception/WorkingCapitalNearBreachNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/exception/WorkingCapitalLoanNearBreachNotFoundException.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/exception/WorkingCapitalNearBreachNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/exception/WorkingCapitalLoanNearBreachNotFoundException.java index d578ac435bf..151e396d87f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/exception/WorkingCapitalNearBreachNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/exception/WorkingCapitalLoanNearBreachNotFoundException.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.exception; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; -public class WorkingCapitalNearBreachNotFoundException extends AbstractPlatformResourceNotFoundException { +public class WorkingCapitalLoanNearBreachNotFoundException extends AbstractPlatformResourceNotFoundException { - public WorkingCapitalNearBreachNotFoundException(final Long breachId) { + public WorkingCapitalLoanNearBreachNotFoundException(final Long breachId) { super("error.msg.wcl.nearbreach.not.found", "Working Capital Near Breach with id " + breachId + " was not found.", breachId); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateNearBreachActionCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachActionCommandHandler.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateNearBreachActionCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachActionCommandHandler.java index acd9df13b81..8f5754f6768 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreateNearBreachActionCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachActionCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanNearBreachActionWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachActionWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WC_NEAR_BREACH_ACTION", action = "CREATE") -public class CreateNearBreachActionCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateNearBreachActionCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanNearBreachActionWriteService writeService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/CreateWorkingCapitalNearBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachCommandHandler.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/CreateWorkingCapitalNearBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachCommandHandler.java index e0de91dee2a..13eed45205e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/CreateWorkingCapitalNearBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanCreateNearBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALNEARBREACH", action = "CREATE") -public class CreateWorkingCapitalNearBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateNearBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalNearBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanNearBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/DeleteWorkingCapitalNearBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanDeleteNearBreachCommandHandler.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/DeleteWorkingCapitalNearBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanDeleteNearBreachCommandHandler.java index 61a51b432c3..6ae8bfb6366 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/DeleteWorkingCapitalNearBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanDeleteNearBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALNEARBREACH", action = "DELETE") -public class DeleteWorkingCapitalNearBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanDeleteNearBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalNearBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanNearBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/UpdateWorkingCapitalNearBreachCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanUpdateNearBreachCommandHandler.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/UpdateWorkingCapitalNearBreachCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanUpdateNearBreachCommandHandler.java index 585357a2b9e..3f4049c0563 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/handler/UpdateWorkingCapitalNearBreachCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/handler/WorkingCapitalLoanUpdateNearBreachCommandHandler.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.handler; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALNEARBREACH", action = "UPDATE") -public class UpdateWorkingCapitalNearBreachCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUpdateNearBreachCommandHandler implements NewCommandSourceHandler { - private final WorkingCapitalNearBreachWritePlatformService writePlatformService; + private final WorkingCapitalLoanNearBreachWritePlatformService writePlatformService; @Transactional @Override diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanNearBreachActionMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachActionMapper.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanNearBreachActionMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachActionMapper.java index 599ab6436b9..71afd7dc851 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanNearBreachActionMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachActionMapper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanNearBreachActionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/mapper/WorkingCapitalNearBreachMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachMapper.java similarity index 70% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/mapper/WorkingCapitalNearBreachMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachMapper.java index 49677adf3e7..3310c6cb3a6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/mapper/WorkingCapitalNearBreachMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/mapper/WorkingCapitalLoanNearBreachMapper.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.infrastructure.core.data.StringEnumOptionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; @Mapper(config = MapstructMapperConfig.class) -public interface WorkingCapitalNearBreachMapper { +public interface WorkingCapitalLoanNearBreachMapper { @Mapping(target = "frequencyType", source = "nearBreach.frequencyType", qualifiedByName = "nearBreachPeriodFrequencyTypeToStringEnumOptionData") - WorkingCapitalNearBreachData toData(WorkingCapitalNearBreach nearBreach); + WorkingCapitalLoanNearBreachData toData(WorkingCapitalLoanNearBreach nearBreach); - List toData(List nearBreachs); + List toData(List nearBreachs); @Named("nearBreachPeriodFrequencyTypeToStringEnumOptionData") default StringEnumOptionData nearBreachPeriodFrequencyTypeToStringEnumOptionData(final WorkingCapitalLoanPeriodFrequencyType value) { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNearBreachActionRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachActionRepository.java similarity index 82% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNearBreachActionRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachActionRepository.java index 456f24c19aa..1c61fa95aa3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanNearBreachActionRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachActionRepository.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository; import java.util.List; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.NearBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.NearBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/repository/WorkingCapitalNearBreachRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachRepository.java similarity index 70% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/repository/WorkingCapitalNearBreachRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachRepository.java index 90fa8eba029..0e2ce8ae69a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/repository/WorkingCapitalNearBreachRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/repository/WorkingCapitalLoanNearBreachRepository.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.repository; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; import org.springframework.data.jpa.repository.JpaRepository; -public interface WorkingCapitalNearBreachRepository extends JpaRepository { +public interface WorkingCapitalLoanNearBreachRepository extends JpaRepository { - Optional findByName(String name); + Optional findByName(String name); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadService.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadService.java index 4371a60aac4..4c37482922c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanNearBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachActionData; public interface WorkingCapitalLoanNearBreachActionReadService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java similarity index 73% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java index b9face3931c..dc121492a7f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionReadServiceImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanNearBreachActionData; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanNearBreachActionMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNearBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachActionData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper.WorkingCapitalLoanNearBreachActionMapper; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachActionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteService.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteService.java index d90d8ea918a..52891942835 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java index 43bc2c8d6cf..b4b45b0896c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachActionWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.math.BigDecimal; import java.util.HashSet; @@ -26,15 +26,15 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.NearBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNearBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.NearBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachActionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationService.java similarity index 78% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationService.java index 675ef1016b1..fe9fd3ef7cd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationService.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.time.LocalDate; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; public interface WorkingCapitalLoanNearBreachEvaluationService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java index 30401348fc6..3d51f509427 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachEvaluationServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -28,13 +28,13 @@ import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.organisation.monetary.domain.Money; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNearBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreachAction; import org.springframework.stereotype.Service; @RequiredArgsConstructor @@ -62,7 +62,7 @@ public void evaluateNearBreach(final WorkingCapitalLoan loan, final WorkingCapit effectiveDate); return; } - final WorkingCapitalNearBreach config = loan.getLoanProductRelatedDetails().getNearBreach(); + final WorkingCapitalLoanNearBreach config = loan.getLoanProductRelatedDetails().getNearBreach(); final BigDecimal effectiveThreshold; final Integer effectiveFrequency; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformService.java similarity index 68% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformService.java index 0fff7faa8ad..0c387f7375b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformService.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; -public interface WorkingCapitalNearBreachReadPlatformService { +public interface WorkingCapitalLoanNearBreachReadPlatformService { - List retrieveAll(); + List retrieveAll(); - WorkingCapitalNearBreachData retrieveOne(Long nearBreachId); + WorkingCapitalLoanNearBreachData retrieveOne(Long nearBreachId); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformServiceImpl.java similarity index 50% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformServiceImpl.java index de3817fa525..f2fbd96c26d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachReadPlatformServiceImpl.java @@ -16,33 +16,33 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.exception.WorkingCapitalNearBreachNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.mapper.WorkingCapitalNearBreachMapper; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.repository.WorkingCapitalNearBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.exception.WorkingCapitalLoanNearBreachNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper.WorkingCapitalLoanNearBreachMapper; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly = true) @RequiredArgsConstructor -public class WorkingCapitalNearBreachReadPlatformServiceImpl implements WorkingCapitalNearBreachReadPlatformService { +public class WorkingCapitalLoanNearBreachReadPlatformServiceImpl implements WorkingCapitalLoanNearBreachReadPlatformService { - private final WorkingCapitalNearBreachRepository repository; - private final WorkingCapitalNearBreachMapper mapper; + private final WorkingCapitalLoanNearBreachRepository repository; + private final WorkingCapitalLoanNearBreachMapper mapper; @Override - public List retrieveAll() { + public List retrieveAll() { return mapper.toData(repository.findAll()); } @Override - public WorkingCapitalNearBreachData retrieveOne(final Long nearBreachId) { - return mapper - .toData(repository.findById(nearBreachId).orElseThrow(() -> new WorkingCapitalNearBreachNotFoundException(nearBreachId))); + public WorkingCapitalLoanNearBreachData retrieveOne(final Long nearBreachId) { + return mapper.toData( + repository.findById(nearBreachId).orElseThrow(() -> new WorkingCapitalLoanNearBreachNotFoundException(nearBreachId))); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformService.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformService.java index 24c28f12508..0609d41fc00 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -public interface WorkingCapitalNearBreachWritePlatformService { +public interface WorkingCapitalLoanNearBreachWritePlatformService { CommandProcessingResult create(JsonCommand command); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformServiceImpl.java similarity index 70% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformServiceImpl.java index 091d88307d3..a4f0d5ff517 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/service/WorkingCapitalNearBreachWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/service/WorkingCapitalLoanNearBreachWritePlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.service; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service; import java.math.BigDecimal; import java.util.HashMap; @@ -28,41 +28,41 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.portfolio.common.service.Validator; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.exception.WorkingCapitalNearBreachNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.repository.WorkingCapitalNearBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.validator.WorkingCapitalNearBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.exception.WorkingCapitalLoanNearBreachNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator.WorkingCapitalLoanNearBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor -public class WorkingCapitalNearBreachWritePlatformServiceImpl implements WorkingCapitalNearBreachWritePlatformService { +public class WorkingCapitalLoanNearBreachWritePlatformServiceImpl implements WorkingCapitalLoanNearBreachWritePlatformService { - private final WorkingCapitalNearBreachRepository repository; - private final WorkingCapitalNearBreachParseAndValidator dataValidator; + private final WorkingCapitalLoanNearBreachRepository repository; + private final WorkingCapitalLoanNearBreachParseAndValidator dataValidator; @Override @Transactional public CommandProcessingResult create(final JsonCommand command) { final Map changes = new HashMap<>(); - final WorkingCapitalNearBreachRequest data = dataValidator.validateAndParse(command); - final WorkingCapitalNearBreach created = createAndPersistNearBreach(data, changes); + final WorkingCapitalLoanNearBreachRequest data = dataValidator.validateAndParse(command); + final WorkingCapitalLoanNearBreach created = createAndPersistNearBreach(data, changes); return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(created.getId()).with(changes).build(); } @Override @Transactional public CommandProcessingResult update(final Long nearBreachId, final JsonCommand command) { - final WorkingCapitalNearBreach existing = repository.findById(nearBreachId) - .orElseThrow(() -> new WorkingCapitalNearBreachNotFoundException(nearBreachId)); + final WorkingCapitalLoanNearBreach existing = repository.findById(nearBreachId) + .orElseThrow(() -> new WorkingCapitalLoanNearBreachNotFoundException(nearBreachId)); - final WorkingCapitalNearBreachRequest data = dataValidator.validateAndParse(command); + final WorkingCapitalLoanNearBreachRequest data = dataValidator.validateAndParse(command); final Map changes = new HashMap<>(); - final WorkingCapitalNearBreach updated = updateAndPersistNearBreach(existing, data, changes); + final WorkingCapitalLoanNearBreach updated = updateAndPersistNearBreach(existing, data, changes); return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(updated.getId()).with(changes).build(); } @@ -72,21 +72,21 @@ public CommandProcessingResult update(final Long nearBreachId, final JsonCommand public CommandProcessingResult delete(final JsonCommand command) { final Long nearBreachId = command.entityId(); if (!repository.existsById(nearBreachId)) { - throw new WorkingCapitalNearBreachNotFoundException(nearBreachId); + throw new WorkingCapitalLoanNearBreachNotFoundException(nearBreachId); } repository.deleteById(nearBreachId); return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(nearBreachId).build(); } - private WorkingCapitalNearBreach createAndPersistNearBreach(final WorkingCapitalNearBreachRequest request, + private WorkingCapitalLoanNearBreach createAndPersistNearBreach(final WorkingCapitalLoanNearBreachRequest request, final Map changes) { validateDuplicateName(request.nearBreachName(), null); final WorkingCapitalLoanPeriodFrequencyType nearBreachFrequencyType = request.nearBreachFrequencyType() != null ? WorkingCapitalLoanPeriodFrequencyType.fromString(request.nearBreachFrequencyType()) : null; - final WorkingCapitalNearBreach created = new WorkingCapitalNearBreach(request.nearBreachName(), request.nearBreachFrequency(), - nearBreachFrequencyType, request.nearBreachThreshold()); + final WorkingCapitalLoanNearBreach created = new WorkingCapitalLoanNearBreach(request.nearBreachName(), + request.nearBreachFrequency(), nearBreachFrequencyType, request.nearBreachThreshold()); repository.saveAndFlush(created); changes.put(WorkingCapitalLoanProductConstants.nearBreachNameParamName, created.getName()); @@ -97,8 +97,8 @@ private WorkingCapitalNearBreach createAndPersistNearBreach(final WorkingCapital return created; } - private WorkingCapitalNearBreach updateAndPersistNearBreach(final WorkingCapitalNearBreach item, - final WorkingCapitalNearBreachRequest request, final Map changes) { + private WorkingCapitalLoanNearBreach updateAndPersistNearBreach(final WorkingCapitalLoanNearBreach item, + final WorkingCapitalLoanNearBreachRequest request, final Map changes) { final String nearBreachName = request.nearBreachName(); final Integer nearBreachFrequency = request.nearBreachFrequency(); final WorkingCapitalLoanPeriodFrequencyType nearBreachFrequencyType = request.nearBreachFrequencyType() != null diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/validator/WorkingCapitalNearBreachParseAndValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/validator/WorkingCapitalLoanNearBreachParseAndValidator.java similarity index 70% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/validator/WorkingCapitalNearBreachParseAndValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/validator/WorkingCapitalLoanNearBreachParseAndValidator.java index dc36a573ed7..af9d6eac2ca 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloannearbreach/validator/WorkingCapitalNearBreachParseAndValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/nearbreach/validator/WorkingCapitalLoanNearBreachParseAndValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloannearbreach.validator; +package org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator; import com.google.gson.JsonObject; import jakarta.validation.constraints.NotNull; @@ -30,32 +30,32 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.service.FrequencyTypeUtil; import org.apache.fineract.infrastructure.core.validator.ParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachRequest; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachRequest; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; import org.springframework.stereotype.Component; @RequiredArgsConstructor @Component -public class WorkingCapitalNearBreachParseAndValidator extends ParseAndValidator { +public class WorkingCapitalLoanNearBreachParseAndValidator extends ParseAndValidator { private final FromJsonHelper jsonHelper; - private final WorkingCapitalBreachReadPlatformService workingCapitalBreachReadPlatformService; - private final WorkingCapitalNearBreachReadPlatformService workingCapitalNearBreachReadPlatformService; + private final WorkingCapitalLoanBreachReadPlatformService workingCapitalBreachReadPlatformService; + private final WorkingCapitalLoanNearBreachReadPlatformService workingCapitalNearBreachReadPlatformService; - public WorkingCapitalNearBreachRequest validateAndParse(@NotNull final JsonCommand command) { + public WorkingCapitalLoanNearBreachRequest validateAndParse(@NotNull final JsonCommand command) { final DataValidatorBuilder dataValidator = new DataValidatorBuilder(new ArrayList<>()).resource("workingCapitalNearBreach.create"); final JsonObject element = extractJsonObject(jsonHelper, command); - final WorkingCapitalNearBreachRequest result = validateAndParse(dataValidator, element, jsonHelper); + final WorkingCapitalLoanNearBreachRequest result = validateAndParse(dataValidator, element, jsonHelper); throwExceptionIfValidationWarningsExist(dataValidator); return result; } - private WorkingCapitalNearBreachRequest validateAndParse(final DataValidatorBuilder dataValidator, final JsonObject element, + private WorkingCapitalLoanNearBreachRequest validateAndParse(final DataValidatorBuilder dataValidator, final JsonObject element, final FromJsonHelper jsonHelper) { if (element == null) { return null; @@ -84,15 +84,15 @@ private WorkingCapitalNearBreachRequest validateAndParse(final DataValidatorBuil .notNull().percentage(); return dataValidator.hasError() ? null - : new WorkingCapitalNearBreachRequest(nearBreachName, nearBreachFrequency, nearBreachFrequencyTypeValue, + : new WorkingCapitalLoanNearBreachRequest(nearBreachName, nearBreachFrequency, nearBreachFrequencyTypeValue, nearBreachThreshold); } public void validateNearBreachAgainstBreach(final DataValidatorBuilder baseDataValidator, final Long breachId, final Long nearBreachId) { if (nearBreachId != null) { - final WorkingCapitalBreachData breachData = workingCapitalBreachReadPlatformService.retrieveOne(breachId); - final WorkingCapitalNearBreachData nearBreachData = workingCapitalNearBreachReadPlatformService.retrieveOne(nearBreachId); + final WorkingCapitalLoanBreachData breachData = workingCapitalBreachReadPlatformService.retrieveOne(breachId); + final WorkingCapitalLoanNearBreachData nearBreachData = workingCapitalNearBreachReadPlatformService.retrieveOne(nearBreachId); if (FrequencyTypeUtil.compareFrequencies(nearBreachData.getFrequency(), nearBreachData.getFrequencyType().getCode(), breachData.getBreachFrequency(), breachData.getBreachFrequencyType().getCode()) >= 0) { baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.nearBreachIdParamName) diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/WorkingCapitalLoanProductConstants.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/WorkingCapitalLoanProductConstants.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/WorkingCapitalLoanProductConstants.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/WorkingCapitalLoanProductConstants.java index 8642f20b6c7..e57194fc63a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/WorkingCapitalLoanProductConstants.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/WorkingCapitalLoanProductConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct; +package org.apache.fineract.portfolio.workingcapitalloan.product; public final class WorkingCapitalLoanProductConstants { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResource.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResource.java index 25ccfe8b4b4..266288223f3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.api; +package org.apache.fineract.portfolio.workingcapitalloan.product.api; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -49,10 +49,10 @@ import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.service.WorkingCapitalLoanProductReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.product.service.WorkingCapitalLoanProductReadPlatformService; import org.springframework.stereotype.Component; @Path("/v1/working-capital-loan-products") diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResourceSwagger.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResourceSwagger.java index d0cb0e7a78a..b45287994f9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/api/WorkingCapitalLoanProductApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/api/WorkingCapitalLoanProductApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.api; +package org.apache.fineract.portfolio.workingcapitalloan.product.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; @@ -34,8 +34,8 @@ import org.apache.fineract.portfolio.charge.data.ChargeData; import org.apache.fineract.portfolio.fund.data.FundData; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; /** * Swagger documentation classes for Working Capital Loan Products API. @@ -179,8 +179,8 @@ private PostWorkingCapitalLoanProductsRequest() {} public List paymentChannelToFundSourceMappings; public List feeToIncomeAccountMappings; public List penaltyToIncomeAccountMappings; - public List chargeOffReasonToExpenseAccountMappings; - public List writeOffReasonsToExpenseMappings; + public List chargeOffReasonToExpenseAccountMappings; + public List writeOffReasonsToExpenseMappings; @Schema(example = "en_GB") public String locale; @@ -245,19 +245,19 @@ private WorkingCapitalLoanProductChargeToGLAccountMapper() {} public Long incomeAccountId; } - @Schema(description = "WorkingCapitalPostChargeOffReasonToExpenseAccountMappings") - public static final class WorkingCapitalPostChargeOffReasonToExpenseAccountMappings { + @Schema(description = "WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings") + public static final class WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings { - private WorkingCapitalPostChargeOffReasonToExpenseAccountMappings() {} + private WorkingCapitalLoanPostChargeOffReasonToExpenseAccountMappings() {} public Long chargeOffReasonCodeValueId; public Long expenseAccountId; } - @Schema(description = "WorkingCapitalPostWriteOffReasonToExpenseAccountMappings") - public static final class WorkingCapitalPostWriteOffReasonToExpenseAccountMappings { + @Schema(description = "WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings") + public static final class WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings { - private WorkingCapitalPostWriteOffReasonToExpenseAccountMappings() {} + private WorkingCapitalLoanPostWriteOffReasonToExpenseAccountMappings() {} public Long writeOffReasonCodeValueId; public Long expenseAccountId; @@ -446,8 +446,8 @@ private GetWorkingCapitalLoanProductsTemplateResponse() {} public List currencyOptions; public List amortizationTypeOptions; public List periodFrequencyTypeOptions; - public List breachOptions; - public List nearBreachOptions; + public List breachOptions; + public List nearBreachOptions; public List advancedPaymentAllocationTypes; public List delinquencyStartTypeOptions; public List breachStartTypeOptions; @@ -656,8 +656,8 @@ private PutWorkingCapitalLoanProductsProductIdRequest() {} public List paymentChannelToFundSourceMappings; public List feeToIncomeAccountMappings; public List penaltyToIncomeAccountMappings; - public List chargeOffReasonToExpenseAccountMappings; - public List writeOffReasonsToExpenseMappings; + public List chargeOffReasonToExpenseAccountMappings; + public List writeOffReasonsToExpenseMappings; @Schema(example = "en_GB") public String locale; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalPaymentAllocationData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanPaymentAllocationData.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalPaymentAllocationData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanPaymentAllocationData.java index 1f3c13ce5da..2445a71957b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalPaymentAllocationData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanPaymentAllocationData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.data; +package org.apache.fineract.portfolio.workingcapitalloan.product.data; import java.io.Serializable; import java.util.List; @@ -29,7 +29,7 @@ */ @Getter @AllArgsConstructor -public class WorkingCapitalPaymentAllocationData implements Serializable { +public class WorkingCapitalLoanPaymentAllocationData implements Serializable { private final PaymentAllocationTransactionType transactionType; private final List paymentAllocationOrder; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductConfigurableAttributesData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductConfigurableAttributesData.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductConfigurableAttributesData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductConfigurableAttributesData.java index 98240cde9b7..33e370d6d3b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductConfigurableAttributesData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductConfigurableAttributesData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.data; +package org.apache.fineract.portfolio.workingcapitalloan.product.data; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductData.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductData.java index e21df489d27..e3de0d6acbc 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/data/WorkingCapitalLoanProductData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/data/WorkingCapitalLoanProductData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.data; +package org.apache.fineract.portfolio.workingcapitalloan.product.data; import java.io.Serializable; import java.math.BigDecimal; @@ -41,8 +41,8 @@ import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData; import org.apache.fineract.portfolio.fund.data.FundData; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; /** * Data Transfer Object for Working Capital Loan Product. @@ -71,10 +71,10 @@ public class WorkingCapitalLoanProductData implements Serializable { // Settings details private StringEnumOptionData amortizationType; private DelinquencyBucketData delinquencyBucket; - private WorkingCapitalBreachData breach; + private WorkingCapitalLoanBreachData breach; private Integer npvDayCount; - private List paymentAllocation; - private WorkingCapitalNearBreachData nearBreach; + private List paymentAllocation; + private WorkingCapitalLoanNearBreachData nearBreach; // Term details private BigDecimal minPrincipal; @@ -117,10 +117,10 @@ public class WorkingCapitalLoanProductData implements Serializable { private List delinquencyMinimumPaymentTypeOptions; private List advancedPaymentAllocationTransactionTypes; private Collection delinquencyBucketOptions; - private List breachOptions; + private List breachOptions; private List accountingRuleOptions; private Map> accountingMappingOptions; - private List nearBreachOptions; + private List nearBreachOptions; private List chargeOffReasonOptions; private List writeOffReasonOptions; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAccountingRuleType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAccountingRuleType.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAccountingRuleType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAccountingRuleType.java index faeb76db942..577a6b6102d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAccountingRuleType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAccountingRuleType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import java.util.Arrays; import java.util.List; @@ -26,7 +26,7 @@ @Getter @RequiredArgsConstructor -public enum WorkingCapitalAccountingRuleType { +public enum WorkingCapitalLoanAccountingRuleType { NONE("wcAccountingRuleType.none", "No accounting"), // ACC_DEF_REV_AM("wcAccountingRuleType.accrual.def.rev.am", "Accrual with deferred revenue amortization"); @@ -35,7 +35,7 @@ public enum WorkingCapitalAccountingRuleType { private final String description; public static List toStringEnumOptions() { - return Arrays.stream(values()).map(WorkingCapitalAccountingRuleType::toData).toList(); + return Arrays.stream(values()).map(WorkingCapitalLoanAccountingRuleType::toData).toList(); } public StringEnumOptionData toData() { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsJsonParser.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsJsonParser.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser.java index 52d197966b5..7f2d3740e0e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsJsonParser.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import com.google.common.base.Enums; import com.google.gson.JsonArray; @@ -33,9 +33,9 @@ @Service @AllArgsConstructor -public class WorkingCapitalAdvancedPaymentAllocationsJsonParser { +public class WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser { - public final WorkingCapitalAdvancedPaymentAllocationsValidator validator; + public final WorkingCapitalLoanAdvancedPaymentAllocationsValidator validator; public List assembleWCPaymentAllocationRules(final JsonCommand command) { final JsonArray paymentAllocations = command.arrayOfParameterNamed("paymentAllocation"); @@ -69,19 +69,19 @@ private void populateTransactionType(final Map map, final W } @NonNull - private List getPaymentAllocationTypes(final JsonArray paymentAllocationOrder) { + private List getPaymentAllocationTypes(final JsonArray paymentAllocationOrder) { if (paymentAllocationOrder != null) { // Validate that paymentAllocationOrder is not empty if (paymentAllocationOrder.isEmpty()) { validator.raiseValidationError("wc-payment-allocation-order.cannot.be.empty", "Payment allocation order cannot be empty"); } - final List> parsedListWithOrder = paymentAllocationOrder.asList().stream() - .map(json -> { + final List> parsedListWithOrder = paymentAllocationOrder.asList() + .stream().map(json -> { final Map map = json.getAsJsonObject().asMap(); - WorkingCapitalPaymentAllocationType paymentAllocationType = null; + WorkingCapitalLoanPaymentAllocationType paymentAllocationType = null; final String paymentAllocationRule = asStringOrNull(map.get("paymentAllocationRule")); if (paymentAllocationRule != null) { - paymentAllocationType = Enums.getIfPresent(WorkingCapitalPaymentAllocationType.class, paymentAllocationRule) + paymentAllocationType = Enums.getIfPresent(WorkingCapitalLoanPaymentAllocationType.class, paymentAllocationRule) .orNull(); } return Pair.of(asIntegerOrNull(map.get("order")), paymentAllocationType); @@ -90,7 +90,7 @@ private List getPaymentAllocationTypes(fina validator.raiseValidationError("wc-payment-allocation-order.order.required", "Each paymentAllocationOrder entry must have an 'order' field."); } - final List> sorted = parsedListWithOrder.stream() + final List> sorted = parsedListWithOrder.stream() .sorted(Comparator.comparing(Pair::getLeft)).toList(); validator.validatePairOfOrderAndPaymentAllocationType(sorted); return sorted.stream().map(Pair::getRight).toList(); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsValidator.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsValidator.java index 5f7f8dc0dc3..ba3c6eb0d43 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAdvancedPaymentAllocationsValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAdvancedPaymentAllocationsValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import java.util.Arrays; import java.util.List; @@ -29,7 +29,7 @@ import org.springframework.stereotype.Service; @Service -public class WorkingCapitalAdvancedPaymentAllocationsValidator { +public class WorkingCapitalLoanAdvancedPaymentAllocationsValidator { public void validate(final List rules) { if (rules == null || rules.isEmpty()) { @@ -52,8 +52,8 @@ public void validate(final List } } - public void validatePairOfOrderAndPaymentAllocationType(final List> rules) { - final int expectedCount = WorkingCapitalPaymentAllocationType.values().length; + public void validatePairOfOrderAndPaymentAllocationType(final List> rules) { + final int expectedCount = WorkingCapitalLoanPaymentAllocationType.values().length; if (rules.size() != expectedCount) { raiseValidationError("wc-payment-allocation-order.must.contain." + expectedCount + ".entries", "Each provided payment allocation must contain exactly " + expectedCount + " allocation rules, but " + rules.size() @@ -67,7 +67,7 @@ public void validatePairOfOrderAndPaymentAllocationType(final List deduced = rules.stream().map(Pair::getRight).distinct().toList(); + final List deduced = rules.stream().map(Pair::getRight).distinct().toList(); if (deduced.size() != expectedCount) { raiseValidationError("wc-payment-allocation.must.not.have.duplicate.allocation.rule", "The list of provided payment allocation rules must not contain any duplicates"); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAmortizationType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAmortizationType.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAmortizationType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAmortizationType.java index 8fd64c4cfff..f211d30118d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalAmortizationType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanAmortizationType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -28,7 +28,7 @@ */ @Getter @RequiredArgsConstructor -public enum WorkingCapitalAmortizationType implements ApiFacingEnum { +public enum WorkingCapitalLoanAmortizationType implements ApiFacingEnum { EIR(1, "EIR", "Effective Interest Rate"), // FLAT(2, "FLAT", "Flat") // @@ -41,7 +41,7 @@ public enum WorkingCapitalAmortizationType implements ApiFacingEnum { +public enum WorkingCapitalLoanBreachAmountCalculationType implements ApiFacingEnum { PERCENTAGE("PERCENTAGE", "Percentage"), FLAT("FLAT", "Flat"); @@ -35,7 +35,7 @@ public enum WorkingCapitalBreachAmountCalculationType implements ApiFacingEnum toStringEnumOptions() { - return Arrays.stream(values()).map(WorkingCapitalBreachAmountCalculationType::toData).toList(); + return Arrays.stream(values()).map(WorkingCapitalLoanBreachAmountCalculationType::toData).toList(); } public StringEnumOptionData toData() { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanBreachStartType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanBreachStartType.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanBreachStartType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanBreachStartType.java index 4266d966452..a800a96410a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanBreachStartType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanBreachStartType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanDelinquencyStartType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanDelinquencyStartType.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanDelinquencyStartType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanDelinquencyStartType.java index a6ae902607a..aeaea5b52fe 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanDelinquencyStartType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanDelinquencyStartType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationType.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationType.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationType.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationType.java index aac9aa414c3..ec1591061b3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationType.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import static org.apache.fineract.portfolio.loanproduct.domain.AllocationType.FEE; import static org.apache.fineract.portfolio.loanproduct.domain.AllocationType.PENALTY; @@ -35,7 +35,7 @@ */ @Getter @RequiredArgsConstructor -public enum WorkingCapitalPaymentAllocationType implements ApiFacingEnum { +public enum WorkingCapitalLoanPaymentAllocationType implements ApiFacingEnum { DUE_PENALTY(DUE, PENALTY, "DUE_PENALTY", "Due Penalty"), // DUE_FEE(DUE, FEE, "DUE_FEE", "Due Fee"), // diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationTypeListConverter.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationTypeListConverter.java similarity index 64% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationTypeListConverter.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationTypeListConverter.java index 6fba1e0f48f..4c65edf47da 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalPaymentAllocationTypeListConverter.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanPaymentAllocationTypeListConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; @@ -24,19 +24,19 @@ import org.apache.fineract.infrastructure.core.data.GenericEnumListConverter; /** - * Converter for WorkingCapitalPaymentAllocationType list to/from comma-separated string. Follows the same pattern as - * PaymentAllocationTypeListConverter in LoanProduct. + * Converter for WorkingCapitalLoanPaymentAllocationType list to/from comma-separated string. Follows the same pattern + * as PaymentAllocationTypeListConverter in LoanProduct. */ @Converter(autoApply = true) -public class WorkingCapitalPaymentAllocationTypeListConverter extends GenericEnumListConverter - implements AttributeConverter, String> { +public class WorkingCapitalLoanPaymentAllocationTypeListConverter extends GenericEnumListConverter + implements AttributeConverter, String> { @Override public boolean isUnique() { return true; } - public WorkingCapitalPaymentAllocationTypeListConverter() { - super(WorkingCapitalPaymentAllocationType.class); + public WorkingCapitalLoanPaymentAllocationTypeListConverter() { + super(WorkingCapitalLoanPaymentAllocationType.class); } } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProduct.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProduct.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProduct.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProduct.java index f7f08e81fc9..42209028dc2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProduct.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProduct.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -43,8 +43,8 @@ import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; import org.apache.fineract.portfolio.fund.domain.Fund; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; /** * Working Capital Loan Product entity. This is a separate entity from the standard LoanProduct to provide flexibility @@ -79,11 +79,11 @@ public class WorkingCapitalLoanProduct extends AbstractPersistableCustom { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "breach_id") - private WorkingCapitalBreach breach; + private WorkingCapitalLoanBreach breach; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "near_breach_id") - private WorkingCapitalNearBreach nearBreach; + private WorkingCapitalLoanNearBreach nearBreach; @Column(name = "start_date") private LocalDate startDate; @@ -97,7 +97,7 @@ public class WorkingCapitalLoanProduct extends AbstractPersistableCustom { // Accounting @Enumerated(EnumType.STRING) @Column(name = "accounting_type", nullable = false) - private WorkingCapitalAccountingRuleType accountingRule; + private WorkingCapitalLoanAccountingRuleType accountingRule; // Currency (MonetaryCurrency is @Embeddable) @Embedded @@ -121,11 +121,11 @@ public class WorkingCapitalLoanProduct extends AbstractPersistableCustom { public WorkingCapitalLoanProduct(final String name, final String shortName, final ExternalId externalId, final Fund fund, final DelinquencyBucket delinquencyBucket, final LocalDate startDate, final LocalDate closeDate, final String description, - final WorkingCapitalAccountingRuleType accountingRule, final MonetaryCurrency currency, + final WorkingCapitalLoanAccountingRuleType accountingRule, final MonetaryCurrency currency, final WorkingCapitalLoanProductRelatedDetail relatedDetail, final WorkingCapitalLoanProductMinMaxConstraints minMaxConstraints, final List paymentAllocationRules, - final WorkingCapitalLoanProductConfigurableAttributes configurableAttributes, final WorkingCapitalBreach breach, - final WorkingCapitalNearBreach nearBreach) { + final WorkingCapitalLoanProductConfigurableAttributes configurableAttributes, final WorkingCapitalLoanBreach breach, + final WorkingCapitalLoanNearBreach nearBreach) { this.name = name; this.shortName = shortName; this.externalId = externalId; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductConfigurableAttributes.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductConfigurableAttributes.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductConfigurableAttributes.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductConfigurableAttributes.java index 831f66272cc..de5130f20bf 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductConfigurableAttributes.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductConfigurableAttributes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductMinMaxConstraints.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductMinMaxConstraints.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductMinMaxConstraints.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductMinMaxConstraints.java index a76b143f4aa..915e3d54601 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductMinMaxConstraints.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductMinMaxConstraints.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductPaymentAllocationRule.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductPaymentAllocationRule.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductPaymentAllocationRule.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductPaymentAllocationRule.java index a451fb9d279..bec06e07673 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductPaymentAllocationRule.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductPaymentAllocationRule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -53,7 +53,7 @@ public class WorkingCapitalLoanProductPaymentAllocationRule extends AbstractAudi @Enumerated(EnumType.STRING) private PaymentAllocationTransactionType transactionType; - @Convert(converter = WorkingCapitalPaymentAllocationTypeListConverter.class) + @Convert(converter = WorkingCapitalLoanPaymentAllocationTypeListConverter.class) @Column(name = "allocation_types", nullable = false) - private List allocationTypes; + private List allocationTypes; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetail.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetail.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetail.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetail.java index 64dfb11d770..2bc216b9171 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetail.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -28,7 +28,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; /** * WorkingCapitalLoanProductRelatedDetail encapsulates the core product parameters of a @@ -44,7 +44,7 @@ public class WorkingCapitalLoanProductRelatedDetail { @Enumerated(EnumType.STRING) @Column(name = "amortization_type", nullable = false) - private WorkingCapitalAmortizationType amortizationType; + private WorkingCapitalLoanAmortizationType amortizationType; @Column(name = "npv_day_count", nullable = false) private Integer npvDayCount; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetails.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetails.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetails.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetails.java index 0e9c3ac3014..f51be478c09 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/domain/WorkingCapitalLoanProductRelatedDetails.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/domain/WorkingCapitalLoanProductRelatedDetails.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.domain; +package org.apache.fineract.portfolio.workingcapitalloan.product.domain; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -31,10 +31,10 @@ import lombok.Setter; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; /** * WCLoanProductRelatedDetail encapsulates all the details of a {@link WorkingCapitalLoanProduct} that are also used and @@ -63,7 +63,7 @@ public class WorkingCapitalLoanProductRelatedDetails { @Enumerated(EnumType.STRING) @Column(name = "amortization_type", nullable = false) - private WorkingCapitalAmortizationType amortizationType; + private WorkingCapitalLoanAmortizationType amortizationType; @Column(name = "npv_day_count", nullable = false) private Integer npvDayCount; @@ -83,11 +83,11 @@ public class WorkingCapitalLoanProductRelatedDetails { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "breach_id") - private WorkingCapitalBreach breach; + private WorkingCapitalLoanBreach breach; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "near_breach_id") - private WorkingCapitalNearBreach nearBreach; + private WorkingCapitalLoanNearBreach nearBreach; @Column(name = "delinquency_grace_days", nullable = false) private Integer delinquencyGraceDays = 0; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductCannotBeDeletedException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductCannotBeDeletedException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductCannotBeDeletedException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductCannotBeDeletedException.java index bc4c05ffbfb..f3febf14b84 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductCannotBeDeletedException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductCannotBeDeletedException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.exception; +package org.apache.fineract.portfolio.workingcapitalloan.product.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java index fdafdcf9a2e..7f563604247 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateExternalIdException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.exception; +package org.apache.fineract.portfolio.workingcapitalloan.product.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateNameException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateNameException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateNameException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateNameException.java index d296d3a63c0..b6f4f850eb7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateNameException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateNameException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.exception; +package org.apache.fineract.portfolio.workingcapitalloan.product.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateShortNameException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateShortNameException.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateShortNameException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateShortNameException.java index 91371b723c1..d8c1b1d51c0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductDuplicateShortNameException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductDuplicateShortNameException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.exception; +package org.apache.fineract.portfolio.workingcapitalloan.product.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductNotFoundException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductNotFoundException.java index f1e11dbbf54..8891fea8881 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/exception/WorkingCapitalLoanProductNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/exception/WorkingCapitalLoanProductNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.exception; +package org.apache.fineract.portfolio.workingcapitalloan.product.exception; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/CreateWorkingCapitalLoanProductCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanCreateProductCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/CreateWorkingCapitalLoanProductCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanCreateProductCommandHandler.java index ebbd1859ad9..b0fc90f5610 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/CreateWorkingCapitalLoanProductCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanCreateProductCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.handler; +package org.apache.fineract.portfolio.workingcapitalloan.product.handler; import lombok.AllArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanproduct.service.WorkingCapitalLoanProductWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.service.WorkingCapitalLoanProductWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @AllArgsConstructor @CommandType(entity = "WORKINGCAPITALLOANPRODUCT", action = "CREATE") -public class CreateWorkingCapitalLoanProductCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreateProductCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanProductWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/DeleteWorkingCapitalLoanProductCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanDeleteProductCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/DeleteWorkingCapitalLoanProductCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanDeleteProductCommandHandler.java index 6d942a1ad6a..e8ff4ea81cc 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/DeleteWorkingCapitalLoanProductCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanDeleteProductCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.handler; +package org.apache.fineract.portfolio.workingcapitalloan.product.handler; import lombok.AllArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanproduct.service.WorkingCapitalLoanProductWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.service.WorkingCapitalLoanProductWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @AllArgsConstructor @CommandType(entity = "WORKINGCAPITALLOANPRODUCT", action = "DELETE") -public class DeleteWorkingCapitalLoanProductCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanDeleteProductCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanProductWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/UpdateWorkingCapitalLoanProductCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanUpdateProductCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/UpdateWorkingCapitalLoanProductCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanUpdateProductCommandHandler.java index e63f7bca971..3c6fa13fa46 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/handler/UpdateWorkingCapitalLoanProductCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/handler/WorkingCapitalLoanUpdateProductCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.handler; +package org.apache.fineract.portfolio.workingcapitalloan.product.handler; import lombok.AllArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloanproduct.service.WorkingCapitalLoanProductWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.service.WorkingCapitalLoanProductWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @AllArgsConstructor @CommandType(entity = "WORKINGCAPITALLOANPRODUCT", action = "UPDATE") -public class UpdateWorkingCapitalLoanProductCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUpdateProductCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanProductWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java index 9dd7fdf87dd..358a3994445 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductBasicDetailsMapper.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.product.mapper; import java.util.List; import org.apache.fineract.infrastructure.core.config.MapstructMapperConfig; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.portfolio.loanproduct.data.LoanProductBasicDetailsData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductMapper.java similarity index 78% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductMapper.java index ff327d1278d..794da3804d4 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/mapper/WorkingCapitalLoanProductMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/mapper/WorkingCapitalLoanProductMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.product.mapper; import java.time.LocalDate; import java.util.ArrayList; @@ -28,26 +28,26 @@ import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.portfolio.delinquency.mapper.DelinquencyBucketMapper; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.mapper.WorkingCapitalBreachMapper; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.mapper.WorkingCapitalNearBreachMapper; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductConfigurableAttributesData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalPaymentAllocationData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductConfigurableAttributes; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.mapper.WorkingCapitalLoanBreachMapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.mapper.WorkingCapitalLoanNearBreachMapper; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanPaymentAllocationData; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductConfigurableAttributesData; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductConfigurableAttributes; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductPaymentAllocationRule; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; -@Mapper(config = MapstructMapperConfig.class, uses = { DelinquencyBucketMapper.class, WorkingCapitalBreachMapper.class, - WorkingCapitalNearBreachMapper.class }) +@Mapper(config = MapstructMapperConfig.class, uses = { DelinquencyBucketMapper.class, WorkingCapitalLoanBreachMapper.class, + WorkingCapitalLoanNearBreachMapper.class }) public interface WorkingCapitalLoanProductMapper { @Mapping(target = "fundId", source = "fund.id") @@ -124,7 +124,7 @@ default CurrencyData monetaryCurrencyToCurrencyData(final MonetaryCurrency curre } @Named("amortizationToStringEnumOptionData") - default StringEnumOptionData amortizationToStringEnumOptionData(final WorkingCapitalAmortizationType amortizationType) { + default StringEnumOptionData amortizationToStringEnumOptionData(final WorkingCapitalLoanAmortizationType amortizationType) { return amortizationType != null ? amortizationType.getValueAsStringEnumOptionData() : null; } @@ -146,25 +146,26 @@ default StringEnumOptionData breachStartTypeToStringEnumOptionData(final Working } @Named("paymentAllocationRulesToData") - default List paymentAllocationRulesToData( + default List paymentAllocationRulesToData( final List rules) { if (rules == null || rules.isEmpty()) { return null; } return rules.stream().map(rule -> { - final List paymentAllocationOrder = new ArrayList<>(); + final List paymentAllocationOrder = new ArrayList<>(); int counter = 1; - for (final WorkingCapitalPaymentAllocationType allocationType : rule.getAllocationTypes()) { - paymentAllocationOrder.add(new WorkingCapitalPaymentAllocationData.PaymentAllocationOrder(allocationType.name(), counter)); + for (final WorkingCapitalLoanPaymentAllocationType allocationType : rule.getAllocationTypes()) { + paymentAllocationOrder + .add(new WorkingCapitalLoanPaymentAllocationData.PaymentAllocationOrder(allocationType.name(), counter)); counter++; } - return new WorkingCapitalPaymentAllocationData(rule.getTransactionType() != null ? rule.getTransactionType() : null, + return new WorkingCapitalLoanPaymentAllocationData(rule.getTransactionType() != null ? rule.getTransactionType() : null, paymentAllocationOrder); }).toList(); } @Named("accountingRuleToStringEnumOptionData") - default StringEnumOptionData accountingRuleToStringEnumOptionData(final WorkingCapitalAccountingRuleType accountingRule) { + default StringEnumOptionData accountingRuleToStringEnumOptionData(final WorkingCapitalLoanAccountingRuleType accountingRule) { if (accountingRule == null) { return null; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java similarity index 85% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java index d22e6bcb8ca..ca39803151a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductPaymentAllocationRuleRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.repository; +package org.apache.fineract.portfolio.workingcapitalloan.product.repository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductPaymentAllocationRule; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductPaymentAllocationRule; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductRepository.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductRepository.java index 79ca719650f..170381a90c4 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/repository/WorkingCapitalLoanProductRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/repository/WorkingCapitalLoanProductRepository.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.repository; +package org.apache.fineract.portfolio.workingcapitalloan.product.repository; import java.time.LocalDate; import java.util.List; import java.util.Optional; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; @@ -77,5 +77,5 @@ public interface WorkingCapitalLoanProductRepository boolean existsByDelinquencyBucket(DelinquencyBucket delinquencyBucket); - boolean existsByBreach(WorkingCapitalBreach breach); + boolean existsByBreach(WorkingCapitalLoanBreach breach); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalPaymentAllocationDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanPaymentAllocationDataValidator.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalPaymentAllocationDataValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanPaymentAllocationDataValidator.java index 5ee84169477..4044f7cf596 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalPaymentAllocationDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanPaymentAllocationDataValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.product.serialization; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; import org.springframework.stereotype.Component; /** @@ -36,7 +36,7 @@ */ @Component @RequiredArgsConstructor -public class WorkingCapitalPaymentAllocationDataValidator { +public class WorkingCapitalLoanPaymentAllocationDataValidator { private static final Set SUPPORTED_PAYMENT_ALLOCATION_RULE_PARAMS = new HashSet<>( Arrays.asList("transactionType", "paymentAllocationOrder")); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanProductDataValidator.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanProductDataValidator.java index c55c8ab9807..b2abb8a75b1 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/serialization/WorkingCapitalLoanProductDataValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.product.serialization; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -43,18 +43,18 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.validator.WorkingCapitalNearBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAdvancedPaymentAllocationsJsonParser; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateExternalIdException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateNameException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateShortNameException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator.WorkingCapitalLoanNearBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateExternalIdException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateNameException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateShortNameException; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; import org.springframework.stereotype.Component; /** @@ -66,9 +66,9 @@ public class WorkingCapitalLoanProductDataValidator { private final FromJsonHelper fromApiJsonHelper; private final WorkingCapitalLoanProductRepository repository; - private final WorkingCapitalAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; - private final WorkingCapitalPaymentAllocationDataValidator paymentAllocationDataValidator; - private final WorkingCapitalNearBreachParseAndValidator workingCapitalNearBreachValidator; + private final WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; + private final WorkingCapitalLoanPaymentAllocationDataValidator paymentAllocationDataValidator; + private final WorkingCapitalLoanNearBreachParseAndValidator workingCapitalNearBreachValidator; /** * The parameters supported for this command. @@ -349,7 +349,8 @@ private void validateSettingsFields(final JsonElement element, final DataValidat baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.amortizationTypeParamName).value(amortizationTypeValue) .notBlank(); if (amortizationTypeValue != null && !amortizationTypeValue.isBlank()) { - final WorkingCapitalAmortizationType amortizationType = WorkingCapitalAmortizationType.fromString(amortizationTypeValue); + final WorkingCapitalLoanAmortizationType amortizationType = WorkingCapitalLoanAmortizationType + .fromString(amortizationTypeValue); if (amortizationType == null) { baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.amortizationTypeParamName) .failWithCode("invalid.amortization.type"); @@ -610,10 +611,10 @@ private void validateAccountingRule(final JsonElement element, final DataValidat final String accountingRuleValue = this.fromApiJsonHelper .extractStringNamed(WorkingCapitalLoanProductConstants.accountingRuleParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanProductConstants.accountingRuleParamName).value(accountingRuleValue) - .notBlank().isOneOfTheseStringValues( - List.of(WorkingCapitalAccountingRuleType.NONE.name(), WorkingCapitalAccountingRuleType.ACC_DEF_REV_AM.name())); + .notBlank().isOneOfTheseStringValues(List.of(WorkingCapitalLoanAccountingRuleType.NONE.name(), + WorkingCapitalLoanAccountingRuleType.ACC_DEF_REV_AM.name())); - if (WorkingCapitalAccountingRuleType.ACC_DEF_REV_AM.name().equals(accountingRuleValue)) { + if (WorkingCapitalLoanAccountingRuleType.ACC_DEF_REV_AM.name().equals(accountingRuleValue)) { // Required GL accounts for accrual with deferred revenue amortization final Long fundSourceAccountId = this.fromApiJsonHelper .extractLongNamed(WorkingCapitalLoanProductConstants.fundSourceAccountIdParamName, element); diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingService.java similarity index 76% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingService.java index c5262610f65..e34c9e96fec 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingService.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import java.util.Map; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.api.JsonCommand; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; -public interface WorkingCapitalProductAccountingMappingService { +public interface WorkingCapitalLoanProductAccountingMappingService { void createAccountMapping(Long wcLoanProductId, JsonCommand command); Map updateAccountMapping(Long wcLoanProductId, JsonCommand command, boolean accountingRuleChanged, - WorkingCapitalAccountingRuleType accountingRuleType); + WorkingCapitalLoanAccountingRuleType accountingRuleType); void deleteAccountMapping(Long wcLoanProductId); - Map fetchAccountMappingDetails(Long wcLoanProductId, WorkingCapitalAccountingRuleType accountingRuleType); + Map fetchAccountMappingDetails(Long wcLoanProductId, WorkingCapitalLoanAccountingRuleType accountingRuleType); } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingServiceImpl.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingServiceImpl.java index 12224c26b1a..0cba77fe877 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalProductAccountingMappingServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductAccountingMappingServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -37,13 +37,13 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.portfolio.PortfolioProductType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor -public class WorkingCapitalProductAccountingMappingServiceImpl implements WorkingCapitalProductAccountingMappingService { +public class WorkingCapitalLoanProductAccountingMappingServiceImpl implements WorkingCapitalLoanProductAccountingMappingService { private final WorkingCapitalLoanProductToGLAccountMappingHelper mappingHelper; private final ProductToGLAccountMappingRepository accountMappingRepository; @@ -73,7 +73,7 @@ private void validateCreateAccountMapping(final JsonElement element, String arra public void createAccountMapping(final Long wcLoanProductId, final JsonCommand command) { final JsonElement element = this.fromApiJsonHelper.parse(command.json()); final String accountingRuleValue = this.fromApiJsonHelper.extractStringNamed("accountingRule", element); - final WorkingCapitalAccountingRuleType accountingRuleType = WorkingCapitalAccountingRuleType.valueOf(accountingRuleValue); + final WorkingCapitalLoanAccountingRuleType accountingRuleType = WorkingCapitalLoanAccountingRuleType.valueOf(accountingRuleValue); validateCreateAccountMapping(element, AccountingConstants.LoanProductAccountingParams.PAYMENT_CHANNEL_FUND_SOURCE_MAPPING.getValue(), @@ -98,7 +98,7 @@ public void createAccountMapping(final Long wcLoanProductId, final JsonCommand c @Override @Transactional public Map updateAccountMapping(final Long wcLoanProductId, final JsonCommand command, - final boolean accountingRuleChanged, final WorkingCapitalAccountingRuleType accountingRuleType) { + final boolean accountingRuleChanged, final WorkingCapitalLoanAccountingRuleType accountingRuleType) { Map changes = new HashMap<>(); final JsonElement element = this.fromApiJsonHelper.parse(command.json()); @@ -126,7 +126,7 @@ public void deleteAccountMapping(final Long wcLoanProductId) { @Override @Transactional(readOnly = true) public Map fetchAccountMappingDetails(final Long wcLoanProductId, - final WorkingCapitalAccountingRuleType accountingRuleType) { + final WorkingCapitalLoanAccountingRuleType accountingRuleType) { final Map accountMappingDetails = new LinkedHashMap<>(8); if (!accountingRuleType.isAccrualWithDeferredRevenueAmortization()) { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java index 526015bb1c2..b1d2d79fc8f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductDelinquencyBucketUsageChecker.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import lombok.RequiredArgsConstructor; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; import org.apache.fineract.portfolio.delinquency.spi.DelinquencyBucketUsageChecker; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java index 1f2e62fd791..5a730120898 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadBasicDetailsServiceImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import java.util.Collection; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.loanproduct.data.LoanProductBasicDetailsData; import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadBasicDetailsService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.mapper.WorkingCapitalLoanProductBasicDetailsMapper; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.mapper.WorkingCapitalLoanProductBasicDetailsMapper; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformService.java similarity index 82% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformService.java index be07492f7ed..9ebb0193eb7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import java.util.List; import org.apache.fineract.infrastructure.core.domain.ExternalId; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; public interface WorkingCapitalLoanProductReadPlatformService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java index 09121e1a459..257bc474fdd 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductReadPlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import java.util.Collection; import java.util.List; @@ -41,22 +41,22 @@ import org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; import org.apache.fineract.portfolio.paymenttype.service.PaymentTypeReadService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.service.WorkingCapitalBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.service.WorkingCapitalNearBreachReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.mapper.WorkingCapitalLoanProductMapper; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.service.WorkingCapitalLoanNearBreachReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.product.data.WorkingCapitalLoanProductData; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.product.mapper.WorkingCapitalLoanProductMapper; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,13 +70,13 @@ public class WorkingCapitalLoanProductReadPlatformServiceImpl implements Working private final FundReadPlatformService fundReadPlatformService; private final CurrencyReadPlatformService currencyReadPlatformService; private final DelinquencyReadPlatformService delinquencyReadPlatformService; - private final WorkingCapitalBreachReadPlatformService breachReadPlatformService; + private final WorkingCapitalLoanBreachReadPlatformService breachReadPlatformService; private final PaymentTypeReadService paymentTypeReadService; private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; private final WorkingCapitalLoanProductAdvancedAccountingReadHelper advancedAccountingReadHelper; private final CodeValueReadPlatformService codeValueReadPlatformService; - private final WorkingCapitalProductAccountingMappingService wcAccountingMappingService; - private final WorkingCapitalNearBreachReadPlatformService nearBreachReadPlatformService; + private final WorkingCapitalLoanProductAccountingMappingService wcAccountingMappingService; + private final WorkingCapitalLoanNearBreachReadPlatformService nearBreachReadPlatformService; @Override public List retrieveAllWorkingCapitalLoanProducts() { @@ -115,12 +115,12 @@ public WorkingCapitalLoanProductData retrieveNewWorkingCapitalLoanProductDetails final Collection fundOptions = this.fundReadPlatformService.retrieveAllFunds(); final Collection currencyOptions = this.currencyReadPlatformService.retrieveAllowedCurrencies(); final List amortizationTypeOptions = ApiFacingEnum - .getValuesAsStringEnumOptionDataList(WorkingCapitalAmortizationType.class); + .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanAmortizationType.class); final List periodFrequencyTypeOptions = ApiFacingEnum .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanPeriodFrequencyType.class); - final List breachOptions = breachReadPlatformService.retrieveAll(); + final List breachOptions = breachReadPlatformService.retrieveAll(); final List advancedPaymentAllocationTypes = ApiFacingEnum - .getValuesAsStringEnumOptionDataList(WorkingCapitalPaymentAllocationType.class); + .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanPaymentAllocationType.class); final List delinquencyStartTypeOptions = ApiFacingEnum .getValuesAsStringEnumOptionDataList(WorkingCapitalLoanDelinquencyStartType.class); final List breachStartTypeOptions = ApiFacingEnum @@ -131,10 +131,10 @@ public WorkingCapitalLoanProductData retrieveNewWorkingCapitalLoanProductDetails .getValuesAsEnumOptionDataList(); final Collection delinquencyBucketOptions = this.delinquencyReadPlatformService .retrieveAllDelinquencyBuckets(); - final List nearBreachOptions = nearBreachReadPlatformService.retrieveAll(); + final List nearBreachOptions = nearBreachReadPlatformService.retrieveAll(); final List paymentTypeOptions = this.paymentTypeReadService.retrieveAllPaymentTypes(); - final List accountingRuleOptions = WorkingCapitalAccountingRuleType.toStringEnumOptions(); + final List accountingRuleOptions = WorkingCapitalLoanAccountingRuleType.toStringEnumOptions(); final Map> accountingMappingOptions = this.accountingDropdownReadPlatformService .retrieveAccountMappingOptionsForLoanProducts(); final List chargeOffReasonOptions = this.codeValueReadPlatformService diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java index 46148e8e185..b926f41c485 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductToGLAccountMappingHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import com.google.gson.JsonElement; import java.util.HashMap; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductUpdateUtil.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductUpdateUtil.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductUpdateUtil.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductUpdateUtil.java index 45c0d2fb19b..c84c4f904f3 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductUpdateUtil.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductUpdateUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import com.google.gson.JsonObject; import java.math.BigDecimal; @@ -26,15 +26,15 @@ import java.util.function.Supplier; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductConfigurableAttributes; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductMinMaxConstraints; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetail; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductConfigurableAttributes; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductMinMaxConstraints; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetail; import org.springframework.stereotype.Component; /** @@ -84,7 +84,7 @@ public Map updateRelatedDetail(final WorkingCapitalLoanProductRe relatedDetail.getAmortizationType().name())) { final String newValue = command.stringValueOfParameterNamed(WorkingCapitalLoanProductConstants.amortizationTypeParamName); changes.put(WorkingCapitalLoanProductConstants.amortizationTypeParamName, newValue); - relatedDetail.setAmortizationType(WorkingCapitalAmortizationType.fromString(newValue)); + relatedDetail.setAmortizationType(WorkingCapitalLoanAmortizationType.fromString(newValue)); } if (command.isChangeInIntegerParameterNamed(WorkingCapitalLoanProductConstants.npvDayCountParamName, relatedDetail.getNpvDayCount())) { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformService.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformService.java index 5bd9869b7b2..a9ca98aa92b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java index 313a91d6849..c683c3a2bd2 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloanproduct/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/product/service/WorkingCapitalLoanProductWritePlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloanproduct.service; +package org.apache.fineract.portfolio.workingcapitalloan.product.service; import com.google.gson.JsonObject; import java.math.BigDecimal; @@ -43,30 +43,30 @@ import org.apache.fineract.portfolio.fund.domain.FundRepository; import org.apache.fineract.portfolio.fund.exception.FundNotFoundException; import org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanbreach.repository.WorkingCapitalBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.repository.WorkingCapitalNearBreachRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAccountingRuleType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAdvancedPaymentAllocationsJsonParser; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductConfigurableAttributes; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductMinMaxConstraints; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetail; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductCannotBeDeletedException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateExternalIdException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateNameException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductDuplicateShortNameException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.exception.WorkingCapitalLoanProductNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.serialization.WorkingCapitalLoanProductDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.domain.WorkingCapitalLoanNearBreach; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.repository.WorkingCapitalLoanNearBreachRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAccountingRuleType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductConfigurableAttributes; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductMinMaxConstraints; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductPaymentAllocationRule; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetail; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductCannotBeDeletedException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateExternalIdException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateNameException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductDuplicateShortNameException; +import org.apache.fineract.portfolio.workingcapitalloan.product.exception.WorkingCapitalLoanProductNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.serialization.WorkingCapitalLoanProductDataValidator; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,10 +80,10 @@ public class WorkingCapitalLoanProductWritePlatformServiceImpl implements Workin private final WorkingCapitalLoanProductUpdateUtil updateUtil; private final FundRepository fundRepository; private final DelinquencyBucketRepository delinquencyBucketRepository; - private final WorkingCapitalAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; - private final WorkingCapitalBreachRepository breachRepository; - private final WorkingCapitalProductAccountingMappingService wcAccountingMappingService; - private final WorkingCapitalNearBreachRepository nearBreachRepository; + private final WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; + private final WorkingCapitalLoanBreachRepository breachRepository; + private final WorkingCapitalLoanProductAccountingMappingService wcAccountingMappingService; + private final WorkingCapitalLoanNearBreachRepository nearBreachRepository; @Transactional @Override @@ -97,11 +97,11 @@ public CommandProcessingResult createWorkingCapitalLoanProduct(final JsonCommand command.parameterExists(WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName) ? command.longValueOfParameterNamed(WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName) : null); - final WorkingCapitalBreach breach = findBreachByIdIfProvided( + final WorkingCapitalLoanBreach breach = findBreachByIdIfProvided( command.parameterExists(WorkingCapitalLoanProductConstants.breachIdParamName) ? command.longValueOfParameterNamed(WorkingCapitalLoanProductConstants.breachIdParamName) : null); - final WorkingCapitalNearBreach nearBreach = (breach == null) ? null + final WorkingCapitalLoanNearBreach nearBreach = (breach == null) ? null : findNearBreachByIdIfProvided(command.parameterExists(WorkingCapitalLoanProductConstants.nearBreachIdParamName) ? command.longValueOfParameterNamed(WorkingCapitalLoanProductConstants.nearBreachIdParamName) : null); @@ -167,7 +167,8 @@ public CommandProcessingResult updateWorkingCapitalLoanProduct(final Long produc "validation.msg.WORKINGCAPITALLOANPRODUCT.accountingRule.cannot.be.blank", "The parameter `accountingRule` is mandatory.", WorkingCapitalLoanProductConstants.accountingRuleParamName))); } - final WorkingCapitalAccountingRuleType newAccountingRule = WorkingCapitalAccountingRuleType.valueOf(newAccountingRuleValue); + final WorkingCapitalLoanAccountingRuleType newAccountingRule = WorkingCapitalLoanAccountingRuleType + .valueOf(newAccountingRuleValue); final boolean accountingRuleChanged = newAccountingRule != product.getAccountingRule(); if (accountingRuleChanged) { @@ -286,7 +287,7 @@ private Map updateProductFields(final WorkingCapitalLoanProduct final Long existingBreachId = product.getBreach() != null ? product.getBreach().getId() : null; if (command.isChangeInLongParameterNamed(WorkingCapitalLoanProductConstants.breachIdParamName, existingBreachId)) { final Long breachId = command.longValueOfParameterNamed(WorkingCapitalLoanProductConstants.breachIdParamName); - final WorkingCapitalBreach breach = findBreachByIdIfProvided(breachId); + final WorkingCapitalLoanBreach breach = findBreachByIdIfProvided(breachId); product.setBreach(breach); changes.put(WorkingCapitalLoanProductConstants.breachIdParamName, breachId); } @@ -294,7 +295,7 @@ private Map updateProductFields(final WorkingCapitalLoanProduct final Long existingNearBreachId = product.getNearBreach() != null ? product.getNearBreach().getId() : null; if (command.isChangeInLongParameterNamed(WorkingCapitalLoanProductConstants.nearBreachIdParamName, existingNearBreachId)) { final Long nearBreachId = command.longValueOfParameterNamed(WorkingCapitalLoanProductConstants.nearBreachIdParamName); - final WorkingCapitalNearBreach nearBreach = findNearBreachByIdIfProvided(nearBreachId); + final WorkingCapitalLoanNearBreach nearBreach = findNearBreachByIdIfProvided(nearBreachId); product.setNearBreach(nearBreach); changes.put(WorkingCapitalLoanProductConstants.nearBreachIdParamName, nearBreachId); } @@ -361,7 +362,7 @@ private void updatePaymentAllocationRules(final WorkingCapitalLoanProduct produc } private WorkingCapitalLoanProduct createProductFromCommand(final Fund fund, final DelinquencyBucket delinquencyBucket, - final WorkingCapitalBreach breach, final WorkingCapitalNearBreach nearBreach, final JsonCommand command, + final WorkingCapitalLoanBreach breach, final WorkingCapitalLoanNearBreach nearBreach, final JsonCommand command, final List paymentAllocationRules) { // Details category final String name = command.stringValueOfParameterNamed(WorkingCapitalLoanProductConstants.nameParamName); @@ -383,7 +384,7 @@ private WorkingCapitalLoanProduct createProductFromCommand(final Fund fund, fina // Related detail (core product parameters) final String amortizationTypeValue = command .stringValueOfParameterNamed(WorkingCapitalLoanProductConstants.amortizationTypeParamName); - final WorkingCapitalAmortizationType amortizationType = WorkingCapitalAmortizationType.fromString(amortizationTypeValue); + final WorkingCapitalLoanAmortizationType amortizationType = WorkingCapitalLoanAmortizationType.fromString(amortizationTypeValue); final Integer npvDayCount = command.integerValueOfParameterNamed(WorkingCapitalLoanProductConstants.npvDayCountParamName); final BigDecimal principal = command.bigDecimalValueOfParameterNamed(WorkingCapitalLoanProductConstants.principalParamName); final BigDecimal periodPaymentRate = command @@ -434,8 +435,8 @@ private WorkingCapitalLoanProduct createProductFromCommand(final Fund fund, fina // Accounting final String accountingRuleValue = command.parameterExists(WorkingCapitalLoanProductConstants.accountingRuleParamName) ? command.stringValueOfParameterNamed(WorkingCapitalLoanProductConstants.accountingRuleParamName) - : WorkingCapitalAccountingRuleType.NONE.name(); - final WorkingCapitalAccountingRuleType accountingRule = WorkingCapitalAccountingRuleType.valueOf(accountingRuleValue); + : WorkingCapitalLoanAccountingRuleType.NONE.name(); + final WorkingCapitalLoanAccountingRuleType accountingRule = WorkingCapitalLoanAccountingRuleType.valueOf(accountingRuleValue); // Configurable attributes final WorkingCapitalLoanProductConfigurableAttributes configurableAttributes = createConfigurableAttributesFromCommand(command); @@ -445,7 +446,7 @@ private WorkingCapitalLoanProduct createProductFromCommand(final Fund fund, fina nearBreach); } - private WorkingCapitalBreach findBreachByIdIfProvided(final Long breachId) { + private WorkingCapitalLoanBreach findBreachByIdIfProvided(final Long breachId) { if (breachId == null) { return null; } @@ -454,7 +455,7 @@ private WorkingCapitalBreach findBreachByIdIfProvided(final Long breachId) { "Working Capital Breach with id " + breachId + " was not found.", breachId)); } - private WorkingCapitalNearBreach findNearBreachByIdIfProvided(final Long nearBreachId) { + private WorkingCapitalLoanNearBreach findNearBreachByIdIfProvided(final Long nearBreachId) { return (nearBreachId == null) ? null : this.nearBreachRepository.findById(nearBreachId) .orElseThrow(() -> new GeneralPlatformDomainRuleException("error.msg.wclp.near.breach.not.found", diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/accounting/WorkingCapitalLoanAccountingProcessor.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/accounting/WorkingCapitalLoanAccountingProcessor.java similarity index 85% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/accounting/WorkingCapitalLoanAccountingProcessor.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/accounting/WorkingCapitalLoanAccountingProcessor.java index 8ccdf3b6f8f..1bbfa163d2f 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/accounting/WorkingCapitalLoanAccountingProcessor.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/accounting/WorkingCapitalLoanAccountingProcessor.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.accounting; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; public interface WorkingCapitalLoanAccountingProcessor { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResource.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResource.java index cf991735e4f..b8c5d968222 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResource.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.api; -import static org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants.CREDIT_BALANCE_REFUND_COMMAND; -import static org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants.GOODWILL_CREDIT_LOAN_COMMAND; -import static org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants.PAYOUT_REFUND_COMMAND; -import static org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants.REPAYMENT_LOAN_COMMAND; +import static org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants.CREDIT_BALANCE_REFUND_COMMAND; +import static org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants.GOODWILL_CREDIT_LOAN_COMMAND; +import static org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants.PAYOUT_REFUND_COMMAND; +import static org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants.REPAYMENT_LOAN_COMMAND; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -52,15 +52,15 @@ import org.apache.fineract.infrastructure.core.service.CommandParameterUtil; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanTransactionNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanTransactionReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanApplicationReadPlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanCommandTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.exception.WorkingCapitalLoanTransactionNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanTransactionReadPlatformService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java similarity index 99% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java index b4af87251a6..e47319ecc3a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/api/WorkingCapitalLoanTransactionsApiResourceSwagger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.api; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.api; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/InternalWorkingCapitalLoanPaymentRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/InternalWorkingCapitalLoanPaymentRequest.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/InternalWorkingCapitalLoanPaymentRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/InternalWorkingCapitalLoanPaymentRequest.java index 445a7404b06..e6dcc8d0749 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/InternalWorkingCapitalLoanPaymentRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/InternalWorkingCapitalLoanPaymentRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionDateAndAmountHolder.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionDateAndAmountHolder.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionDateAndAmountHolder.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionDateAndAmountHolder.java index 1df8a8a5dd4..cd5447d3175 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionDateAndAmountHolder.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionDateAndAmountHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionTypeTotalHolder.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionTypeTotalHolder.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionTypeTotalHolder.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionTypeTotalHolder.java index cd3521b7196..4d936e0e7e6 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/TransactionTypeTotalHolder.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/TransactionTypeTotalHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.math.BigDecimal; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationPlan.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationPlan.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationPlan.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationPlan.java index a2732177e8c..9fc3c0fc9a5 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationPlan.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationPlan.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.math.BigDecimal; import java.util.List; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationRequest.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationRequest.java similarity index 82% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationRequest.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationRequest.java index 8a21b6e8161..f8eb51d3818 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanAllocationRequest.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanAllocationRequest.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; /** * Immutable input to the working capital allocation processor. Carries only the data needed to decide how a @@ -31,7 +31,7 @@ * moment of the decision, so the processor decides against the remaining balance. */ public record WorkingCapitalLoanAllocationRequest(LocalDate transactionDate, BigDecimal amount, - List allocationOrder, BigDecimal principalOutstanding, List charges) { + List allocationOrder, BigDecimal principalOutstanding, List charges) { public record ChargeBalance(Long chargeId, BigDecimal outstanding, LocalDate dueDate, boolean penalty) { } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanCommandTemplateData.java similarity index 96% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanCommandTemplateData.java index 51ea8f42399..f13925de600 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanCommandTemplateData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.io.Serializable; import java.math.BigDecimal; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTransactionData.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanTransactionData.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTransactionData.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanTransactionData.java index fbf1a74827d..4a0a2dd8dbe 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTransactionData.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/data/WorkingCapitalLoanTransactionData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.data; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.data; import java.io.Serializable; import java.math.BigDecimal; @@ -32,6 +32,7 @@ import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.loanaccount.data.LoanTransactionEnumData; import org.apache.fineract.portfolio.paymentdetail.data.PaymentDetailData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargePaidByData; @Getter @Setter diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPaymentAllocationRule.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanPaymentAllocationRule.java similarity index 79% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPaymentAllocationRule.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanPaymentAllocationRule.java index b04c6ff82c8..9921ef2bfb8 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPaymentAllocationRule.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanPaymentAllocationRule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -35,8 +35,9 @@ import lombok.Setter; import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationTypeListConverter; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationTypeListConverter; @Entity @Table(name = "m_wc_loan_payment_allocation_rule", uniqueConstraints = { @@ -55,7 +56,7 @@ public class WorkingCapitalLoanPaymentAllocationRule extends AbstractAuditableWi @Enumerated(EnumType.STRING) private PaymentAllocationTransactionType transactionType; - @Convert(converter = WorkingCapitalPaymentAllocationTypeListConverter.class) + @Convert(converter = WorkingCapitalLoanPaymentAllocationTypeListConverter.class) @Column(name = "allocation_types", nullable = false) - private List allocationTypes; + private List allocationTypes; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransaction.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransaction.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransaction.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransaction.java index 559274418a0..1b51e190534 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransaction.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransaction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -43,6 +43,7 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter; import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; @Entity @Table(name = "m_wc_loan_transaction", uniqueConstraints = { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocation.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocation.java similarity index 98% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocation.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocation.java index a48d530247c..663db500f60 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocation.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionFinder.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionFinder.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionFinder.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionFinder.java index 9d6d58e3cb7..17a822b9e7a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionFinder.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionFinder.java @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import java.time.LocalDate; import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelation.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelation.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelation.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelation.java index b9b40ce7f21..65638ef0944 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelation.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -31,6 +31,7 @@ import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelationTypeEnum; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelationTypeEnumConverter; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; @Getter @Entity diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelationRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelationRepository.java similarity index 91% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelationRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelationRepository.java index 4b5b8009f44..ec210672595 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionRelationRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionRelationRepository.java @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import java.util.List; import java.util.Optional; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.ChargeIdAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.ChargeIdAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAdjustmentException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAdjustmentException.java similarity index 93% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAdjustmentException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAdjustmentException.java index ebc060058d1..5f745dac79c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAdjustmentException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAdjustmentException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.exception; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAllocationMismatchException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAllocationMismatchException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAllocationMismatchException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAllocationMismatchException.java index 8f3d013d870..401fedbe1b9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanChargeAllocationMismatchException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanChargeAllocationMismatchException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.exception; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanTransactionNotFoundException.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanTransactionNotFoundException.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanTransactionNotFoundException.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanTransactionNotFoundException.java index 070715bd88a..23bd40c26d0 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/exception/WorkingCapitalLoanTransactionNotFoundException.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/exception/WorkingCapitalLoanTransactionNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.exception; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.exception; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java index 42e8b1f63e5..0ab878d5d2e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeAdjustmentCommandHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; @@ -24,7 +24,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeOffCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeOffCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeOffCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeOffCommandHandler.java index 750a0f9641e..9344079f0b7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanChargeOffCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanChargeOffCommandHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ACTION_CHARGEOFF; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ENTITY_WORKINGCAPITALLOAN; @@ -26,7 +26,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeOffWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanChargeOffWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreditBalanceRefundWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanCreditBalanceRefundCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreditBalanceRefundWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanCreditBalanceRefundCommandHandler.java index 73f1695c5b0..40d201bb62a 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/CreditBalanceRefundWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanCreditBalanceRefundCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "CREDITBALANCEREFUND") -public class CreditBalanceRefundWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanCreditBalanceRefundCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/DisburseWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDisburseCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/DisburseWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDisburseCommandHandler.java index 015794b9489..0908219b954 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/DisburseWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDisburseCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "DISBURSE") -public class DisburseWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanDisburseCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java index e25f649ec34..b6f807af416 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeAdjustmentCommandHandler.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; @Service diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java index a5b460bd3c6..dc4db1ddcdc 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanDiscountFeeCommandHandler.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; @Service diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java index 74b2ef231aa..5b5dddc7631 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanGoodwillCreditCommandHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; @@ -24,7 +24,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java index 0dd85b88f90..0df25410204 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanPayoutRefundCommandHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; @@ -24,7 +24,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RepaymentWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanRepaymentCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RepaymentWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanRepaymentCommandHandler.java index c6272646ad0..8a66ff18a55 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/RepaymentWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanRepaymentCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "REPAYMENT") -public class RepaymentWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanRepaymentCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java similarity index 90% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java index ba5288c429b..b06027d6937 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoChargeOffCommandHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ACTION_UNDOCHARGEOFF; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ENTITY_WORKINGCAPITALLOAN; @@ -26,7 +26,7 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanChargeOffWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.service.WorkingCapitalLoanChargeOffWriteService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoDisburseWorkingCapitalLoanCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoDisburseCommandHandler.java similarity index 86% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoDisburseWorkingCapitalLoanCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoDisburseCommandHandler.java index 9ac28d5d8d3..1b88564f0c9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoDisburseWorkingCapitalLoanCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoDisburseCommandHandler.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import lombok.RequiredArgsConstructor; import org.apache.fineract.commands.annotation.CommandType; import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @CommandType(entity = "WORKINGCAPITALLOAN", action = "DISBURSALUNDO") -public class UndoDisburseWorkingCapitalLoanCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUndoDisburseCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoWorkingCapitalLoanTransactionCommandHandler.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoTransactionCommandHandler.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoWorkingCapitalLoanTransactionCommandHandler.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoTransactionCommandHandler.java index 866f04e34b5..eccbb05181c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/handler/UndoWorkingCapitalLoanTransactionCommandHandler.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/handler/WorkingCapitalLoanUndoTransactionCommandHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.handler; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.handler; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ACTION_UNDO; import static org.apache.fineract.commands.domain.CommandWrapperConstants.ENTITY_WORKINGCAPITALLOANTRANSACTION; @@ -27,13 +27,13 @@ import org.apache.fineract.commands.handler.NewCommandSourceHandler; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanWritePlatformService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanWritePlatformService; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor @CommandType(entity = ENTITY_WORKINGCAPITALLOANTRANSACTION, action = ACTION_UNDO) -public class UndoWorkingCapitalLoanTransactionCommandHandler implements NewCommandSourceHandler { +public class WorkingCapitalLoanUndoTransactionCommandHandler implements NewCommandSourceHandler { private final WorkingCapitalLoanWritePlatformService writePlatformService; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapper.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapper.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapper.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapper.java index f1138e43c2a..60c0b59754e 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapper.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.mapper; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.domain.CodeValue; @@ -29,9 +29,9 @@ import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; import org.apache.fineract.portfolio.paymenttype.domain.PaymentType; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionAllocationRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionAllocationRepository.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionAllocationRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionAllocationRepository.java index ee2d1370a16..c70fc0f3679 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionAllocationRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionAllocationRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.repository; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; import org.springframework.data.jpa.repository.JpaRepository; public interface WorkingCapitalLoanTransactionAllocationRepository extends JpaRepository {} diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionRepository.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionRepository.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionRepository.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionRepository.java index 7f812ddd72a..a79e1e4d37d 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/repository/WorkingCapitalLoanTransactionRepository.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/repository/WorkingCapitalLoanTransactionRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.repository; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.repository; import java.math.BigDecimal; import java.time.LocalDate; @@ -25,9 +25,9 @@ import java.util.Optional; import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionDateAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionTypeTotalHolder; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionDateAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionTypeTotalHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplier.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplier.java similarity index 83% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplier.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplier.java index 49e5c1cee7f..4d5daf3b808 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplier.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.util.ArrayList; import java.util.List; @@ -25,13 +25,14 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanChargeAllocationMismatchException; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargePaymentHandler; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.exception.WorkingCapitalLoanChargeAllocationMismatchException; import org.springframework.stereotype.Component; /** diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactory.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactory.java similarity index 81% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactory.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactory.java index 63447512031..3a72f1c8d69 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactory.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactory.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPaymentAllocationRule; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanPaymentAllocationRule; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBalanceUpdater.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanBalanceUpdater.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBalanceUpdater.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanBalanceUpdater.java index bde75ac19a1..d25438413d7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBalanceUpdater.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanBalanceUpdater.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; import org.springframework.stereotype.Component; /** diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteService.java similarity index 95% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteService.java index 45db77877b6..eef1bdc141c 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java similarity index 85% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java index 8b723a0027a..804cbd579f7 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanChargeOffWriteServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -35,21 +35,21 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.ExternalIdFactory; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanNote; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionFinder; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanNoteRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanNote; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanNoteRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.WorkingCapitalLoanDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionFinder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.apache.fineract.useradministration.domain.AppUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationService.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationService.java index a2708863afe..8a3e21d1396 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.time.LocalDate; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; public interface WorkingCapitalLoanDiscountFeeAmortizationService { diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java index 51f9f466f67..dd58eb1bedc 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanDiscountFeeAmortizationServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.math.MathContext; @@ -28,12 +28,14 @@ import org.apache.fineract.organisation.monetary.domain.MoneyHelper; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelationTypeEnum; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionRelation; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.ProjectedAmortizationScheduleRepositoryWrapper; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanCurrencyResolver; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionRelation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessor.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessor.java similarity index 88% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessor.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessor.java index 4150d07ae22..8c2969e32c9 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessor.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -24,11 +24,11 @@ import java.util.List; import org.apache.fineract.infrastructure.core.service.MathUtil; import org.apache.fineract.portfolio.loanproduct.domain.DueType; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; import org.springframework.stereotype.Component; /** @@ -56,7 +56,7 @@ public WorkingCapitalLoanAllocationPlan plan(final WorkingCapitalLoanAllocationR BigDecimal penaltyPortion = BigDecimal.ZERO; final List chargeAllocations = new ArrayList<>(); - for (final WorkingCapitalPaymentAllocationType allocationType : request.allocationOrder()) { + for (final WorkingCapitalLoanPaymentAllocationType allocationType : request.allocationOrder()) { if (!MathUtil.isGreaterThanZero(remaining)) { break; } diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionAllocator.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionAllocator.java similarity index 87% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionAllocator.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionAllocator.java index a95c300286d..e1fd9da7501 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionAllocator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionAllocator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.util.List; @@ -25,14 +25,14 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; import org.springframework.stereotype.Component; /** diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionProcessor.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionProcessor.java similarity index 84% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionProcessor.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionProcessor.java index 68f5f65b5ae..6754a41b6fa 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionProcessor.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -25,18 +25,22 @@ import lombok.RequiredArgsConstructor; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.MathUtil; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanLifecycleStateMachine; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargePaidByRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.service.WorkingCapitalLoanBreachScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargePaidByRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargeAccrualService; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.service.WorkingCapitalLoanDelinquencyRangeScheduleService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanLifecycleStateMachine; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Component; @Component diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformService.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformService.java index 18a149ce844..3bfa10b01fb 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformService.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import org.apache.fineract.infrastructure.core.domain.ExternalId; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanCommandTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java similarity index 89% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java index bff3be66107..91884007861 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -27,17 +27,18 @@ import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.paymenttype.service.PaymentTypeReadService; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargePaidByData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanTransactionNotFoundException; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanTransactionMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargePaidByData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargePaidByReadService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.exception.WorkingCapitalLoanNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanCommandTemplateData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.exception.WorkingCapitalLoanTransactionNotFoundException; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.mapper.WorkingCapitalLoanTransactionMapper; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingService.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingService.java similarity index 94% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingService.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingService.java index 95d33300c9c..f794b639d28 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingService.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; /** * Reprocesses transaction allocations for a Working Capital loan after a backdated transaction changes the diff --git a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java similarity index 92% rename from fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java rename to fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java index 498d1fe0f73..46bdae5628b 100644 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanTransactionReprocessingServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import java.math.BigDecimal; import java.time.LocalDate; @@ -31,20 +31,21 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.MathUtil; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.accounting.WorkingCapitalLoanAccountingProcessor; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargePaidByRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanChargeRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionAllocationRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanAmortizationScheduleWriteService.PrincipalAdjustment; -import org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanAmortizationScheduleWriteService.PrincipalPayment; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargePaidByRepository; +import org.apache.fineract.portfolio.workingcapitalloan.charge.repository.WorkingCapitalLoanChargeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleWriteService; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleWriteService.PrincipalAdjustment; +import org.apache.fineract.portfolio.workingcapitalloan.loan.service.WorkingCapitalLoanAmortizationScheduleWriteService.PrincipalPayment; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.accounting.WorkingCapitalLoanAccountingProcessor; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionAllocationRepository; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImplTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImplTest.java similarity index 92% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImplTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImplTest.java index b1fb9c95e6c..db9b8958209 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachResetServiceImplTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachResetServiceImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,11 +28,11 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.Optional; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachActionType; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachAction; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachActionType; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java similarity index 91% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java index 82e99e2634a..2c191a5a512 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/breach/service/WorkingCapitalLoanBreachScheduleServiceImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.breach.service; import static org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType.BUSINESS_DATE; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -37,20 +37,20 @@ import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionDateAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBreachSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanBreachScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBalanceRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanBreachScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; -import org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalBreachAmountCalculationType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreach; +import org.apache.fineract.portfolio.workingcapitalloan.breach.domain.WorkingCapitalLoanBreachSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.breach.mapper.WorkingCapitalLoanBreachScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.breach.repository.WorkingCapitalLoanBreachScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanBalanceRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachAmountCalculationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionDateAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -315,10 +315,10 @@ void applyRepaymentUndo_skipsWhenBreachEvaluationDisabled() { @Test void recalculatePeriodsForPauses_recalculatesPastDueAmount() { - final WorkingCapitalBreach breachConfig = new WorkingCapitalBreach(); + final WorkingCapitalLoanBreach breachConfig = new WorkingCapitalLoanBreach(); breachConfig.setBreachFrequency(7); breachConfig.setBreachFrequencyType(WorkingCapitalLoanPeriodFrequencyType.DAYS); - breachConfig.setBreachAmountCalculationType(WorkingCapitalBreachAmountCalculationType.FLAT); + breachConfig.setBreachAmountCalculationType(WorkingCapitalLoanBreachAmountCalculationType.FLAT); breachConfig.setBreachAmount(BigDecimal.valueOf(100)); final WorkingCapitalLoanProductRelatedDetails details = new WorkingCapitalLoanProductRelatedDetails(); details.setBreach(breachConfig); diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidatorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidatorTest.java similarity index 97% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidatorTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidatorTest.java index bb9de6d1f2e..da6c4e401c8 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanChargeDataValidatorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/serialization/WorkingCapitalLoanChargeDataValidatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.charge.serialization; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandlerTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandlerTest.java similarity index 90% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandlerTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandlerTest.java index 9bdce112eb1..c48035d4dfc 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanChargePaymentHandlerTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/charge/service/WorkingCapitalLoanChargePaymentHandlerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.charge.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -26,9 +26,9 @@ import static org.mockito.Mockito.mock; import java.math.BigDecimal; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java similarity index 91% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java index 42ed2f1af72..ec2eb99ea51 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyDisableWriteServiceTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -37,11 +37,11 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.validator.WorkingCapitalLoanDelinquencyActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.validator.WorkingCapitalLoanDelinquencyActionParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java similarity index 93% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java index d345141cc58..7081708449a 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyRangeScheduleDisableGuardTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -34,11 +34,11 @@ import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentPeriodAndRuleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java similarity index 87% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java index eaddab09d5f..f0cf7f3d0a1 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/service/WorkingCapitalLoanDelinquencyReprocessClassificationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.service; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; @@ -34,13 +34,13 @@ import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyMinimumPaymentPeriodAndRuleRepository; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.TransactionDateAndAmountHolder; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyRangeSchedule; -import org.apache.fineract.portfolio.workingcapitalloan.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanTransactionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyRangeSchedule; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.mapper.WorkingCapitalLoanDelinquencyRangeScheduleMapper; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.TransactionDateAndAmountHolder; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.repository.WorkingCapitalLoanTransactionRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java similarity index 92% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java index 3a6a075a6c1..23171d84d96 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/delinquency/validator/WorkingCapitalLoanDelinquencyDisableValidatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.validator; +package org.apache.fineract.portfolio.workingcapitalloan.delinquency.validator; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -41,11 +41,11 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction; import org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanDelinquencyAction; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyActionRepository; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.domain.WorkingCapitalLoanDelinquencyAction; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyActionRepository; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.repository.WorkingCapitalLoanDelinquencyRangeScheduleRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleCalculatorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleCalculatorTest.java similarity index 99% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleCalculatorTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleCalculatorTest.java index 1a08a6e6fb3..a6d1d81d068 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationScheduleCalculatorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationScheduleCalculatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.calc; +package org.apache.fineract.portfolio.workingcapitalloan.loan.calc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java similarity index 99% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java index 38f0fc72578..503c38dba40 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/calc/ProjectedAmortizationSchedulePrincipalAdjustmentTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.calc; +package org.apache.fineract.portfolio.workingcapitalloan.loan.calc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java similarity index 94% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java index 10d553a0587..a3eb214378a 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/WorkingCapitalLoanDataValidatorUpdateRateTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -41,12 +41,12 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductMinMaxConstraints; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductRelatedDetails; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanPeriodPaymentRateChangeRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductMinMaxConstraints; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductRelatedDetails; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java similarity index 96% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java index 1244be9d6aa..2b8cba3aa96 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/serialization/mapper/WorkingCapitalLoanAccountDataMapperTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.serialization.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.mapper; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -50,15 +50,15 @@ import org.apache.fineract.portfolio.loanaccount.data.LoanApplicationTimelineData; import org.apache.fineract.portfolio.loanaccount.data.LoanStatusEnumData; import org.apache.fineract.portfolio.loanorigination.data.LoanOriginatorData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanBreachScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanChargeData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCollectionData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDelinquencyRangeScheduleData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanDisbursementDetailData; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanSummaryData; -import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachData; +import org.apache.fineract.portfolio.workingcapitalloan.breach.data.WorkingCapitalLoanBreachScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.charge.data.WorkingCapitalLoanChargeData; +import org.apache.fineract.portfolio.workingcapitalloan.delinquency.data.WorkingCapitalLoanDelinquencyRangeScheduleData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanCollectionData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanDisbursementDetailData; +import org.apache.fineract.portfolio.workingcapitalloan.loan.data.WorkingCapitalLoanSummaryData; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.data.WorkingCapitalLoanNearBreachData; import org.junit.jupiter.api.Test; class WorkingCapitalLoanAccountDataMapperTest { @@ -591,14 +591,14 @@ private static WorkingCapitalLoanDisbursementDetailData fullDisbursement() { .expectedDisbursementDate(LocalDate.of(2024, 1, 1)).actualDisbursementDate(LocalDate.of(2024, 1, 2)).build(); } - private static WorkingCapitalBreachData fullBreach() { - return WorkingCapitalBreachData.builder().id(80L).name("Breach rule").breachFrequency(2) + private static WorkingCapitalLoanBreachData fullBreach() { + return WorkingCapitalLoanBreachData.builder().id(80L).name("Breach rule").breachFrequency(2) .breachFrequencyType(stringEnum("1", "breachFrequency.days", "Days")) .breachAmountCalculationType(stringEnum("1", "breachAmount.fixed", "Fixed")).breachAmount(new BigDecimal("500.00")).build(); } - private static WorkingCapitalNearBreachData fullNearBreach() { - return WorkingCapitalNearBreachData.builder().id(81L).name("Near breach rule").frequency(1) + private static WorkingCapitalLoanNearBreachData fullNearBreach() { + return WorkingCapitalLoanNearBreachData.builder().id(81L).name("Near breach rule").frequency(1) .frequencyType(stringEnum("1", "nearBreachFrequency.days", "Days")).threshold(new BigDecimal("450.00")).build(); } diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java similarity index 90% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java index c738bfcd900..f7420231c0d 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/loan/service/ProjectedAmortizationScheduleModelParserServiceGsonImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.loan.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -26,9 +26,9 @@ import java.math.MathContext; import java.time.LocalDate; import org.apache.fineract.organisation.monetary.data.CurrencyData; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedAmortizationScheduleModel.PrincipalAdjustment; -import org.apache.fineract.portfolio.workingcapitalloan.calc.ProjectedPayment; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedAmortizationScheduleModel.PrincipalAdjustment; +import org.apache.fineract.portfolio.workingcapitalloan.loan.calc.ProjectedPayment; import org.junit.jupiter.api.Test; class ProjectedAmortizationScheduleModelParserServiceGsonImplTest { diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java similarity index 98% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java index f48d80127f4..01bd5cda312 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/domain/WorkingCapitalLoanTransactionAllocationLinkTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.domain; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.domain; import static java.math.BigDecimal.ONE; import static java.math.BigDecimal.TEN; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapperTest.java similarity index 90% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapperTest.java index 3daba391b42..35aae115a07 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/mapper/WorkingCapitalLoanTransactionMapperTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/mapper/WorkingCapitalLoanTransactionMapperTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.mapper; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.mapper; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -28,11 +28,11 @@ import org.apache.fineract.infrastructure.core.domain.ExternalId; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanTransactionData; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanTransactionData; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransactionAllocation; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mapstruct.factory.Mappers; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplierTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplierTest.java similarity index 86% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplierTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplierTest.java index 62db2885e11..bb8dc60e704 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationApplierTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationApplierTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -29,12 +29,13 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanCharge; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanChargePaidBy; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction; -import org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanChargeAllocationMismatchException; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanCharge; +import org.apache.fineract.portfolio.workingcapitalloan.charge.domain.WorkingCapitalLoanChargePaidBy; +import org.apache.fineract.portfolio.workingcapitalloan.charge.service.WorkingCapitalLoanChargePaymentHandler; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanTransaction; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.exception.WorkingCapitalLoanChargeAllocationMismatchException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.test.util.ReflectionTestUtils; diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactoryTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactoryTest.java similarity index 72% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactoryTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactoryTest.java index 1e72d33ddd9..c5cdd3efcce 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAllocationRequestFactoryTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanAllocationRequestFactoryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -27,11 +27,11 @@ import java.util.List; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionType; import org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanBalance; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPaymentAllocationRule; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoan; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanBalance; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.domain.WorkingCapitalLoanPaymentAllocationRule; import org.junit.jupiter.api.Test; class WorkingCapitalLoanAllocationRequestFactoryTest { @@ -43,49 +43,49 @@ class WorkingCapitalLoanAllocationRequestFactoryTest { @Test void resolvesTheRuleConfiguredForTheGivenTransactionTypeRatherThanAlwaysUsingRepayment() { final WorkingCapitalLoanPaymentAllocationRule repaymentRule = rule(PaymentAllocationTransactionType.REPAYMENT, - WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL); + WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL); final WorkingCapitalLoanPaymentAllocationRule goodwillCreditRule = rule(PaymentAllocationTransactionType.GOODWILL_CREDIT, - WorkingCapitalPaymentAllocationType.DUE_PENALTY, WorkingCapitalPaymentAllocationType.DUE_FEE); + WorkingCapitalLoanPaymentAllocationType.DUE_PENALTY, WorkingCapitalLoanPaymentAllocationType.DUE_FEE); final WorkingCapitalLoan loan = loanWithRules(repaymentRule, goodwillCreditRule); final WorkingCapitalLoanAllocationRequest request = factory.build(loan, balance("100"), List.of(), TXN_DATE, new BigDecimal("50"), LoanTransactionType.GOODWILL_CREDIT); - assertEquals(List.of(WorkingCapitalPaymentAllocationType.DUE_PENALTY, WorkingCapitalPaymentAllocationType.DUE_FEE), + assertEquals(List.of(WorkingCapitalLoanPaymentAllocationType.DUE_PENALTY, WorkingCapitalLoanPaymentAllocationType.DUE_FEE), request.allocationOrder()); } @Test void fallsBackToDefaultRuleWhenNoTransactionSpecificRuleIsConfigured() { final WorkingCapitalLoanPaymentAllocationRule repaymentRule = rule(PaymentAllocationTransactionType.REPAYMENT, - WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL); + WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL); final WorkingCapitalLoanPaymentAllocationRule defaultRule = rule(PaymentAllocationTransactionType.DEFAULT, - WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL); + WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL); final WorkingCapitalLoan loan = loanWithRules(repaymentRule, defaultRule); final WorkingCapitalLoanAllocationRequest request = factory.build(loan, balance("100"), List.of(), TXN_DATE, new BigDecimal("50"), LoanTransactionType.GOODWILL_CREDIT); // Must fall back to DEFAULT, not silently reuse the REPAYMENT rule. - assertEquals(List.of(WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), + assertEquals(List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), request.allocationOrder()); } @Test void repaymentStillResolvesItsOwnRule() { final WorkingCapitalLoanPaymentAllocationRule repaymentRule = rule(PaymentAllocationTransactionType.REPAYMENT, - WorkingCapitalPaymentAllocationType.DUE_PENALTY, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL); + WorkingCapitalLoanPaymentAllocationType.DUE_PENALTY, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL); final WorkingCapitalLoan loan = loanWithRules(repaymentRule); final WorkingCapitalLoanAllocationRequest request = factory.build(loan, balance("100"), List.of(), TXN_DATE, new BigDecimal("50"), LoanTransactionType.REPAYMENT); - assertEquals(List.of(WorkingCapitalPaymentAllocationType.DUE_PENALTY, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), + assertEquals(List.of(WorkingCapitalLoanPaymentAllocationType.DUE_PENALTY, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), request.allocationOrder()); } private WorkingCapitalLoanPaymentAllocationRule rule(final PaymentAllocationTransactionType transactionType, - final WorkingCapitalPaymentAllocationType... allocationTypes) { + final WorkingCapitalLoanPaymentAllocationType... allocationTypes) { return new WorkingCapitalLoanPaymentAllocationRule(null, transactionType, List.of(allocationTypes)); } diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java similarity index 81% rename from fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java rename to fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java index ec420c527a5..897a0319bf1 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloan/transaction/service/WorkingCapitalLoanPaymentAllocationProcessorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.portfolio.workingcapitalloan.service; +package org.apache.fineract.portfolio.workingcapitalloan.transaction.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -25,11 +25,11 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest; -import org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanPaymentAllocationType; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationPlan.ChargeAllocation; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest; +import org.apache.fineract.portfolio.workingcapitalloan.transaction.data.WorkingCapitalLoanAllocationRequest.ChargeBalance; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ class WorkingCapitalLoanPaymentAllocationProcessorTest { @DisplayName("With no charges and principal-only allocation, the payment settles principal and the excess becomes overpayment") void principalOnlyFallbackAllocatesToPrincipalAndLeavesOverpayment() { final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("120"), - List.of(WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), amount("100"), List.of()); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), amount("100"), List.of()); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -59,8 +59,8 @@ void principalOnlyFallbackAllocatesToPrincipalAndLeavesOverpayment() { void feeThenPrincipalSplitsAmountAcrossChargeAndPrincipal() { final ChargeBalance fee = new ChargeBalance(10L, amount("30"), TXN_DATE, false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("100"), - List.of(WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), amount("200"), - List.of(fee)); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), + amount("200"), List.of(fee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -81,8 +81,8 @@ void penaltyThenFeeThenPrincipalFollowsConfiguredOrder() { final ChargeBalance penalty = new ChargeBalance(1L, amount("15"), TXN_DATE, true); final ChargeBalance fee = new ChargeBalance(2L, amount("25"), TXN_DATE, false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest( - TXN_DATE, amount("100"), List.of(WorkingCapitalPaymentAllocationType.DUE_PENALTY, - WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), + TXN_DATE, amount("100"), List.of(WorkingCapitalLoanPaymentAllocationType.DUE_PENALTY, + WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), amount("200"), List.of(penalty, fee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -100,8 +100,8 @@ void dueBucketSkipsInAdvanceCharges() { final ChargeBalance dueFee = new ChargeBalance(1L, amount("20"), TXN_DATE.minusDays(1), false); final ChargeBalance inAdvanceFee = new ChargeBalance(2L, amount("20"), TXN_DATE.plusDays(5), false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("50"), - List.of(WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), amount("200"), - List.of(dueFee, inAdvanceFee)); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), + amount("200"), List.of(dueFee, inAdvanceFee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -117,7 +117,7 @@ void inAdvanceBucketMatchesOnlyFutureCharges() { final ChargeBalance dueFee = new ChargeBalance(1L, amount("20"), TXN_DATE.minusDays(1), false); final ChargeBalance inAdvanceFee = new ChargeBalance(2L, amount("20"), TXN_DATE.plusDays(5), false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("50"), - List.of(WorkingCapitalPaymentAllocationType.IN_ADVANCE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), + List.of(WorkingCapitalLoanPaymentAllocationType.IN_ADVANCE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), amount("200"), List.of(dueFee, inAdvanceFee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -133,7 +133,7 @@ void inAdvanceBucketMatchesOnlyFutureCharges() { void chargeWithNullDueDateIsTreatedAsDue() { final ChargeBalance fee = new ChargeBalance(1L, amount("20"), null, false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("20"), - List.of(WorkingCapitalPaymentAllocationType.DUE_FEE), amount("200"), List.of(fee)); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE), amount("200"), List.of(fee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -148,7 +148,7 @@ void oldestChargeFirstWithinBucket() { final ChargeBalance newer = new ChargeBalance(2L, amount("30"), TXN_DATE.minusDays(1), false); // amount only covers one charge in full plus part of the next final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("40"), - List.of(WorkingCapitalPaymentAllocationType.DUE_FEE), amount("200"), List.of(older, newer)); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE), amount("200"), List.of(older, newer)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); @@ -165,8 +165,8 @@ void oldestChargeFirstWithinBucket() { void leftoverBecomesOverpaymentWhenEverythingIsSettled() { final ChargeBalance fee = new ChargeBalance(1L, amount("20"), TXN_DATE, false); final WorkingCapitalLoanAllocationRequest request = new WorkingCapitalLoanAllocationRequest(TXN_DATE, amount("100"), - List.of(WorkingCapitalPaymentAllocationType.DUE_FEE, WorkingCapitalPaymentAllocationType.DUE_PRINCIPAL), amount("50"), - List.of(fee)); + List.of(WorkingCapitalLoanPaymentAllocationType.DUE_FEE, WorkingCapitalLoanPaymentAllocationType.DUE_PRINCIPAL), + amount("50"), List.of(fee)); final WorkingCapitalLoanAllocationPlan plan = processor.plan(request); diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanApplicationDataValidatorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanApplicationDataValidatorTest.java index 800c81e3265..c75fa5fe7e7 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanApplicationDataValidatorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanApplicationDataValidatorTest.java @@ -46,13 +46,15 @@ import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.ClientRepository; import org.apache.fineract.portfolio.loanaccount.domain.ExpectedDisbursementDateValidator; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; -import org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository; -import org.apache.fineract.portfolio.workingcapitalloan.serialization.WorkingCapitalLoanApplicationDataValidator; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.validator.WorkingCapitalNearBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.repository.WorkingCapitalLoanRepository; +import org.apache.fineract.portfolio.workingcapitalloan.loan.serialization.WorkingCapitalLoanApplicationDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator.WorkingCapitalLoanNearBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProduct; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanProductMinMaxConstraints; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.serialization.WorkingCapitalLoanPaymentAllocationDataValidator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -78,9 +80,9 @@ class WorkingCapitalLoanApplicationDataValidatorTest { @Mock private ExpectedDisbursementDateValidator expectedDisbursementDateValidator; @Mock - private WorkingCapitalPaymentAllocationDataValidator paymentAllocationDataValidator; + private WorkingCapitalLoanPaymentAllocationDataValidator paymentAllocationDataValidator; @Mock - private WorkingCapitalNearBreachParseAndValidator workingCapitalNearBreachValidator; + private WorkingCapitalLoanNearBreachParseAndValidator workingCapitalNearBreachValidator; private WorkingCapitalLoanApplicationDataValidator validator; @@ -291,8 +293,8 @@ private Client createMockClient() { private WorkingCapitalLoanProduct createMockProduct() { final WorkingCapitalLoanProduct product = org.mockito.Mockito.mock(WorkingCapitalLoanProduct.class); - final org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductMinMaxConstraints minMax = new org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductMinMaxConstraints( - BigDecimal.valueOf(1000), BigDecimal.valueOf(10000), BigDecimal.valueOf(0.5), BigDecimal.valueOf(2.0)); + final WorkingCapitalLoanProductMinMaxConstraints minMax = new WorkingCapitalLoanProductMinMaxConstraints(BigDecimal.valueOf(1000), + BigDecimal.valueOf(10000), BigDecimal.valueOf(0.5), BigDecimal.valueOf(2.0)); when(product.getId()).thenReturn(PRODUCT_ID); when(product.getMinMaxConstraints()).thenReturn(minMax); when(product.getConfigurableAttributes()).thenReturn(null); diff --git a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidatorTest.java b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidatorTest.java index ec5c0b5035a..688ce9e3a1e 100644 --- a/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidatorTest.java +++ b/fineract-working-capital-loan/src/test/java/org/apache/fineract/portfolio/workingcapitalloanproduct/serialization/WorkingCapitalLoanProductDataValidatorTest.java @@ -30,10 +30,12 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.exception.UnsupportedParameterException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.apache.fineract.portfolio.workingcapitalloannearbreach.validator.WorkingCapitalNearBreachParseAndValidator; -import org.apache.fineract.portfolio.workingcapitalloanproduct.WorkingCapitalLoanProductConstants; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAdvancedPaymentAllocationsJsonParser; -import org.apache.fineract.portfolio.workingcapitalloanproduct.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.nearbreach.validator.WorkingCapitalLoanNearBreachParseAndValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.WorkingCapitalLoanProductConstants; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser; +import org.apache.fineract.portfolio.workingcapitalloan.product.repository.WorkingCapitalLoanProductRepository; +import org.apache.fineract.portfolio.workingcapitalloan.product.serialization.WorkingCapitalLoanPaymentAllocationDataValidator; +import org.apache.fineract.portfolio.workingcapitalloan.product.serialization.WorkingCapitalLoanProductDataValidator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -49,12 +51,12 @@ class WorkingCapitalLoanProductDataValidatorTest { @Mock private WorkingCapitalLoanProductRepository repository; @Mock - private WorkingCapitalAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; + private WorkingCapitalLoanAdvancedPaymentAllocationsJsonParser advancedPaymentAllocationsJsonParser; @Mock - private WorkingCapitalPaymentAllocationDataValidator paymentAllocationDataValidator; + private WorkingCapitalLoanPaymentAllocationDataValidator paymentAllocationDataValidator; private WorkingCapitalLoanProductDataValidator validator; @Mock - private WorkingCapitalNearBreachParseAndValidator workingCapitalNearBreachValidator; + private WorkingCapitalLoanNearBreachParseAndValidator workingCapitalNearBreachValidator; @BeforeEach void setUp() { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationCRUDTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationCRUDTest.java index d970656be65..7c4da8b231c 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationCRUDTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationCRUDTest.java @@ -46,8 +46,8 @@ import org.apache.fineract.client.models.GetWorkingCapitalLoansLoanIdTimeline; import org.apache.fineract.client.models.GetWorkingCapitalLoansPagedResponse; import org.apache.fineract.client.models.GetWorkingCapitalLoansTemplateResponse; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.funds.FundsResourceHandler; @@ -55,8 +55,8 @@ import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalNearBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalLoanNearBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.BeforeAll; @@ -69,8 +69,8 @@ public class WorkingCapitalLoanApplicationCRUDTest { private final WorkingCapitalLoanHelper applicationHelper = new WorkingCapitalLoanHelper(); private final WorkingCapitalLoanProductHelper productHelper = new WorkingCapitalLoanProductHelper(); - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); - private final WorkingCapitalNearBreachHelper nearBreachHelper = new WorkingCapitalNearBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); + private final WorkingCapitalLoanNearBreachHelper nearBreachHelper = new WorkingCapitalLoanNearBreachHelper(); @BeforeAll static void initDelinquency() { @@ -152,7 +152,7 @@ public void testSubmitWithoutBreachAndNearBreachParamsUsesProductBreachDefaults( final BigDecimal breachAmount = BigDecimal.valueOf(10); final Long breachId = createBreach(breachName, breachFrequency, breachFrequencyType, breachAmountCalculationType, breachAmount); final String nearBreachName = Utils.randomStringGenerator("NearBreach", 20); - final Long nearBreachId = nearBreachHelper.create(new WorkingCapitalNearBreachRequest() // + final Long nearBreachId = nearBreachHelper.create(new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(nearBreachName) // .nearBreachFrequency(breachFrequency - 10) // .nearBreachFrequencyType(breachFrequencyType)// @@ -202,7 +202,7 @@ public void testNegativeSubmitWithBreachAndNearBreachParams() { final Long productId = createProductWithBreachAndNearBreach(breachId, null, Boolean.TRUE); final Long clientId = createClient(); final String nearBreachName = Utils.randomStringGenerator("NearBreach", 20); - final Long nearBreachId = nearBreachHelper.create(new WorkingCapitalNearBreachRequest() // + final Long nearBreachId = nearBreachHelper.create(new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(nearBreachName) // .nearBreachFrequency(breachFrequency + 10) // .nearBreachFrequencyType(breachFrequencyType)// @@ -1018,7 +1018,7 @@ private Long createProductWithBreachAndNearBreach(final Long breachId, final Lon private Long createBreach(final String name, final Integer breachFrequency, final String breachFrequencyType, final String breachAmountCalculationType, final BigDecimal breachAmount) { return breachHelper.create( - new WorkingCapitalBreachRequest().name(name).breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType) + new WorkingCapitalLoanBreachRequest().name(name).breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType) .breachAmountCalculationType(breachAmountCalculationType).breachAmount(breachAmount)); } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationValidationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationValidationTest.java index b57c2cac887..36e933f470b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationValidationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanApplicationValidationTest.java @@ -36,7 +36,7 @@ import org.apache.fineract.integrationtests.common.products.DelinquencyBucketsHelper; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.BeforeAll; @@ -48,7 +48,7 @@ public class WorkingCapitalLoanApplicationValidationTest { private final WorkingCapitalLoanHelper applicationHelper = new WorkingCapitalLoanHelper(); private final WorkingCapitalLoanProductHelper productHelper = new WorkingCapitalLoanProductHelper(); - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); @BeforeAll static void initDelinquency() { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachActionTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachActionTest.java index 9dee59d250b..a05db8a0460 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachActionTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachActionTest.java @@ -29,16 +29,16 @@ import java.util.ArrayList; import java.util.List; import org.apache.fineract.client.feign.util.CallFailedRuntimeException; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; import org.apache.fineract.client.models.WorkingCapitalLoanBreachActionData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; import org.apache.fineract.integrationtests.common.BusinessDateHelper; import org.apache.fineract.integrationtests.common.ClientHelper; import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachActionHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterEach; @@ -48,7 +48,7 @@ public class WorkingCapitalLoanBreachActionTest { private final WorkingCapitalLoanHelper loanHelper = new WorkingCapitalLoanHelper(); private final WorkingCapitalLoanProductHelper productHelper = new WorkingCapitalLoanProductHelper(); - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); private final WorkingCapitalLoanBreachActionHelper breachActionHelper = new WorkingCapitalLoanBreachActionHelper(); private final List createdLoanIds = new ArrayList<>(); @@ -240,7 +240,7 @@ private Long createProductWithBreach() { final String uniqueName = "WCL Breach Test " + Utils.uniqueRandomStringGenerator("", 8); final String uniqueShortName = Utils.uniqueRandomStringGenerator("", 4); final Long breachId = breachHelper - .create(new WorkingCapitalBreachRequest().name(Utils.randomStringGenerator("Breach", 12)).breachFrequency(60) + .create(new WorkingCapitalLoanBreachRequest().name(Utils.randomStringGenerator("Breach", 12)).breachFrequency(60) .breachFrequencyType("DAYS").breachAmountCalculationType("PERCENTAGE").breachAmount(BigDecimal.valueOf(10))); createdBreachIds.add(breachId); final Long productId = productHelper.createWorkingCapitalLoanProduct(new WorkingCapitalLoanProductTestBuilder().withName(uniqueName) diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachCRUDTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachCRUDTest.java similarity index 74% rename from integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachCRUDTest.java rename to integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachCRUDTest.java index f5ed489acfd..f0dbf202f07 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachCRUDTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachCRUDTest.java @@ -26,19 +26,19 @@ import java.math.BigDecimal; import java.util.List; import java.util.Objects; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachTemplateResponse; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachTemplateResponse; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.junit.jupiter.api.Test; -public class WorkingCapitalBreachCRUDTest { +public class WorkingCapitalLoanBreachCRUDTest { - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); @Test public void testTemplateEndpoint() { - final WorkingCapitalBreachTemplateResponse template = breachHelper.retrieveTemplate(); + final WorkingCapitalLoanBreachTemplateResponse template = breachHelper.retrieveTemplate(); assertNotNull(template.getBreachFrequencyTypeOptions()); assertNotNull(template.getBreachAmountCalculationTypeOptions()); assertFalse(template.getBreachFrequencyTypeOptions().isEmpty()); @@ -47,12 +47,12 @@ public void testTemplateEndpoint() { @Test public void testCreateRetrieveUpdateDeleteAndListEndpoints() { - final WorkingCapitalBreachRequest createBody = breachHelper.createBreachRequest("Default WCL Breach", 15, "DAYS", "PERCENTAGE", + final WorkingCapitalLoanBreachRequest createBody = breachHelper.createBreachRequest("Default WCL Breach", 15, "DAYS", "PERCENTAGE", BigDecimal.valueOf(7.5)); final Long breachId = breachHelper.create(createBody); assertNotNull(breachId); - final WorkingCapitalBreachData created = breachHelper.retrieveOne(breachId); + final WorkingCapitalLoanBreachData created = breachHelper.retrieveOne(breachId); assertEquals("Default WCL Breach", created.getName()); assertEquals(15, created.getBreachFrequency()); assert created.getBreachFrequencyType() != null; @@ -61,9 +61,9 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { assertEquals("PERCENTAGE", created.getBreachAmountCalculationType().getId()); assertEquals(0, BigDecimal.valueOf(7.5).compareTo(created.getBreachAmount())); - final List all = breachHelper.retrieveAll(); + final List all = breachHelper.retrieveAll(); boolean found = false; - for (WorkingCapitalBreachData workingCapitalBreachData : all) { + for (WorkingCapitalLoanBreachData workingCapitalBreachData : all) { if (Objects.equals(workingCapitalBreachData.getId(), breachId)) { assertEquals("Default WCL Breach", workingCapitalBreachData.getName()); found = true; @@ -72,12 +72,12 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { } assertTrue(found); - final WorkingCapitalBreachRequest updateBody = breachHelper.createBreachRequest("Updated WCL Breach", 20, "MONTHS", "FLAT", + final WorkingCapitalLoanBreachRequest updateBody = breachHelper.createBreachRequest("Updated WCL Breach", 20, "MONTHS", "FLAT", BigDecimal.valueOf(111)); final Long updatedId = breachHelper.update(breachId, updateBody); assertEquals(breachId, updatedId); - final WorkingCapitalBreachData updated = breachHelper.retrieveOne(breachId); + final WorkingCapitalLoanBreachData updated = breachHelper.retrieveOne(breachId); assertEquals("Updated WCL Breach", updated.getName()); assertEquals(20, updated.getBreachFrequency()); assert updated.getBreachFrequencyType() != null; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachPastDueAmountTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachPastDueAmountTest.java index 774f48535d4..65da626b87d 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachPastDueAmountTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachPastDueAmountTest.java @@ -31,7 +31,7 @@ import org.apache.fineract.client.models.GetWorkingCapitalLoansLoanIdResponse; import org.apache.fineract.client.models.InlineJobRequest; import org.apache.fineract.client.models.PostWorkingCapitalLoansRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; import org.apache.fineract.client.models.WorkingCapitalLoanBreachScheduleData; import org.apache.fineract.integrationtests.common.BusinessDateHelper; import org.apache.fineract.integrationtests.common.ClientHelper; @@ -40,8 +40,8 @@ import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachActionHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterEach; @@ -53,7 +53,7 @@ public class WorkingCapitalLoanBreachPastDueAmountTest { private final WorkingCapitalLoanHelper loanHelper = new WorkingCapitalLoanHelper(); private final WorkingCapitalLoanProductHelper productHelper = new WorkingCapitalLoanProductHelper(); - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); private final WorkingCapitalLoanBreachActionHelper breachActionHelper = new WorkingCapitalLoanBreachActionHelper(); private final List createdLoanIds = new ArrayList<>(); @@ -323,7 +323,7 @@ private void runInlineCob(final Long loanId) { } private Long createActiveLoanWithBreach(final LocalDate approvalAndDisbursementDate) { - final Long breachId = breachHelper.create(new WorkingCapitalBreachRequest().name(Utils.randomStringGenerator("Breach", 12)) + final Long breachId = breachHelper.create(new WorkingCapitalLoanBreachRequest().name(Utils.randomStringGenerator("Breach", 12)) .breachFrequency(7).breachFrequencyType("DAYS").breachAmountCalculationType("FLAT").breachAmount(BREACH_AMOUNT)); createdBreachIds.add(breachId); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachValidationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachValidationTest.java similarity index 83% rename from integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachValidationTest.java rename to integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachValidationTest.java index f94511bcf8f..8b2f5ab71be 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalBreachValidationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanBreachValidationTest.java @@ -24,18 +24,18 @@ import java.math.BigDecimal; import org.apache.fineract.client.feign.util.CallFailedRuntimeException; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; import org.apache.fineract.integrationtests.common.Utils; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.junit.jupiter.api.Test; -public class WorkingCapitalBreachValidationTest { +public class WorkingCapitalLoanBreachValidationTest { - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); @Test public void testCreateFailsWhenBreachFrequencyIsMissing() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachFrequency(null); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -45,7 +45,7 @@ public void testCreateFailsWhenBreachFrequencyIsMissing() { @Test public void testCreateFailsWhenNameIsMissing() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.name(null); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -55,7 +55,7 @@ public void testCreateFailsWhenNameIsMissing() { @Test public void testCreateFailsWhenNameIsBlank() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.name(" "); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -65,7 +65,7 @@ public void testCreateFailsWhenNameIsBlank() { @Test public void testCreateFailsWhenNameTooLong() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.name("x".repeat(101)); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -75,7 +75,7 @@ public void testCreateFailsWhenNameTooLong() { @Test public void testCreateFailsWhenBreachFrequencyTypeIsMissing() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachFrequencyType(null); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -85,7 +85,7 @@ public void testCreateFailsWhenBreachFrequencyTypeIsMissing() { @Test public void testCreateFailsWhenBreachAmountCalculationTypeIsMissing() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachAmountCalculationType(null); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -95,7 +95,7 @@ public void testCreateFailsWhenBreachAmountCalculationTypeIsMissing() { @Test public void testCreateFailsWhenBreachAmountIsMissing() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachAmount(null); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -105,7 +105,7 @@ public void testCreateFailsWhenBreachAmountIsMissing() { @Test public void testCreateFailsWhenBreachFrequencyIsZero() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachFrequency(0); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -115,7 +115,7 @@ public void testCreateFailsWhenBreachFrequencyIsZero() { @Test public void testCreateFailsWhenBreachFrequencyTypeIsInvalid() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachFrequencyType("HOUR"); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -125,7 +125,7 @@ public void testCreateFailsWhenBreachFrequencyTypeIsInvalid() { @Test public void testCreateFailsWhenBreachAmountCalculationTypeIsInvalid() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachAmountCalculationType("UNKNOWN"); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -135,7 +135,7 @@ public void testCreateFailsWhenBreachAmountCalculationTypeIsInvalid() { @Test public void testCreateFailsWhenBreachAmountIsNegative() { - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachAmount(BigDecimal.valueOf(-1)); final CallFailedRuntimeException ex = breachHelper.runCreateExpectingFailure(request); assertEquals(400, ex.getStatus()); @@ -145,10 +145,10 @@ public void testCreateFailsWhenBreachAmountIsNegative() { @Test public void testUpdateFailsWhenBreachFrequencyTypeIsInvalid() { - final WorkingCapitalBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), 20, + final WorkingCapitalLoanBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), 20, "DAYS", "PERCENTAGE", BigDecimal.valueOf(7.5)); final Long breachId = breachHelper.create(createBody); - final WorkingCapitalBreachRequest request = validBreachRequest(); + final WorkingCapitalLoanBreachRequest request = validBreachRequest(); request.breachFrequencyType("INVALID"); final CallFailedRuntimeException ex = breachHelper.runUpdateExpectingFailure(breachId, request); @@ -183,8 +183,8 @@ public void testDeleteFailsWhenBreachNotFound() { assertNotNull(ex.getDeveloperMessage()); } - private static WorkingCapitalBreachRequest validBreachRequest() { - return new WorkingCapitalBreachRequest() // + private static WorkingCapitalLoanBreachRequest validBreachRequest() { + return new WorkingCapitalLoanBreachRequest() // .name("Default WCL Breach") // .breachFrequency(30) // .breachFrequencyType("DAYS") // diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanDisbursementTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanDisbursementTest.java index 0a82b24b7af..ecaa031da7e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanDisbursementTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanDisbursementTest.java @@ -59,7 +59,7 @@ import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; -import org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants; +import org.apache.fineract.portfolio.workingcapitalloan.loan.WorkingCapitalLoanConstants; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalNearBreachCRUDTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachCRUDTest.java similarity index 81% rename from integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalNearBreachCRUDTest.java rename to integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachCRUDTest.java index ad08b99096f..1b758cadbdf 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalNearBreachCRUDTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachCRUDTest.java @@ -26,20 +26,20 @@ import java.math.BigDecimal; import org.apache.fineract.client.feign.util.CallFailedRuntimeException; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.integrationtests.common.Utils; -import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalNearBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalLoanNearBreachHelper; import org.junit.jupiter.api.Test; -public class WorkingCapitalNearBreachCRUDTest { +public class WorkingCapitalLoanNearBreachCRUDTest { - private final WorkingCapitalNearBreachHelper nearBreachHelper = new WorkingCapitalNearBreachHelper(); + private final WorkingCapitalLoanNearBreachHelper nearBreachHelper = new WorkingCapitalLoanNearBreachHelper(); @Test public void testCreateRetrieveUpdateDeleteAndListEndpoints() { String nearBreachName = Utils.randomStringGenerator("NearBreach", 20); - final WorkingCapitalNearBreachRequest request = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest request = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(nearBreachName) // .nearBreachFrequency(15) // .nearBreachFrequencyType("DAYS") // @@ -47,7 +47,7 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { final Long nearBreachId = nearBreachHelper.create(request).getResourceId(); assertNotNull(nearBreachId); - final WorkingCapitalNearBreachData created = nearBreachHelper.retrieveOne(nearBreachId); + final WorkingCapitalLoanNearBreachData created = nearBreachHelper.retrieveOne(nearBreachId); assertEquals(nearBreachName, created.getName()); assertEquals(15, created.getFrequency()); assertEquals("DAYS", created.getFrequencyType().getId()); @@ -57,7 +57,7 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { assertTrue(found); nearBreachName = Utils.randomStringGenerator("NearBreach", 20); - final WorkingCapitalNearBreachRequest request2 = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest request2 = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(nearBreachName) // .nearBreachFrequency(20) // .nearBreachFrequencyType("MONTHS") // @@ -65,7 +65,7 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { final Long updatedId = nearBreachHelper.update(nearBreachId, request2).getResourceId(); assertEquals(nearBreachId, updatedId); - final WorkingCapitalNearBreachData updated = nearBreachHelper.retrieveOne(nearBreachId); + final WorkingCapitalLoanNearBreachData updated = nearBreachHelper.retrieveOne(nearBreachId); assertEquals(nearBreachName, updated.getName()); assertEquals(20, updated.getFrequency()); assertEquals("MONTHS", updated.getFrequencyType().getId()); @@ -79,7 +79,7 @@ public void testCreateRetrieveUpdateDeleteAndListEndpoints() { public void testNegativeCreateNearBreachWithSameName() { // Given final String nearBreachName = Utils.randomStringGenerator("NearBreach", 20); - final WorkingCapitalNearBreachRequest request = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest request = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(nearBreachName) // .nearBreachFrequency(15) // .nearBreachFrequencyType("DAYS") // diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachConfigTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachConfigTest.java index ccbe6d3ff7a..643f868648a 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachConfigTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanNearBreachConfigTest.java @@ -35,10 +35,10 @@ import org.apache.fineract.client.models.PostWorkingCapitalLoansLoanIdNearBreachActionsRequest; import org.apache.fineract.client.models.PostWorkingCapitalLoansLoanIdNearBreachActionsRequest.NearBreachFrequencyTypeEnum; import org.apache.fineract.client.models.PostWorkingCapitalLoansRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; import org.apache.fineract.client.models.WorkingCapitalLoanBreachScheduleData; import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachActionData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.integrationtests.client.feign.modules.WorkingCapitalLoanRequestBuilders; import org.apache.fineract.integrationtests.common.BusinessDateHelper; import org.apache.fineract.integrationtests.common.ClientHelper; @@ -47,9 +47,9 @@ import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalLoanNearBreachActionsHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalNearBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalLoanNearBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterEach; @@ -59,8 +59,8 @@ public class WorkingCapitalLoanNearBreachConfigTest { private final WorkingCapitalLoanHelper loanHelper = new WorkingCapitalLoanHelper(); private final WorkingCapitalLoanProductHelper productHelper = new WorkingCapitalLoanProductHelper(); - private final WorkingCapitalNearBreachHelper nearBreachHelper = new WorkingCapitalNearBreachHelper(); - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + private final WorkingCapitalLoanNearBreachHelper nearBreachHelper = new WorkingCapitalLoanNearBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); private final WorkingCapitalLoanNearBreachActionsHelper nearBreachActionsHelper = new WorkingCapitalLoanNearBreachActionsHelper(); private final List createdLoanIds = new ArrayList<>(); @@ -374,7 +374,7 @@ private Long createProductWithNearBreach(final Long nearBreachId) { final String uniqueName = "WCL NB Product " + UUID.randomUUID().toString().substring(0, 8); final String uniqueShortName = Utils.uniqueRandomStringGenerator("", 4); final Long breachId = breachHelper - .create(new WorkingCapitalBreachRequest().name(Utils.randomStringGenerator("Breach", 12)).breachFrequency(60) + .create(new WorkingCapitalLoanBreachRequest().name(Utils.randomStringGenerator("Breach", 12)).breachFrequency(60) .breachFrequencyType("DAYS").breachAmountCalculationType("PERCENTAGE").breachAmount(BigDecimal.valueOf(10))); createdBreachIds.add(breachId); final Long productId = productHelper.createWorkingCapitalLoanProduct(new WorkingCapitalLoanProductTestBuilder().withName(uniqueName) @@ -385,8 +385,8 @@ private Long createProductWithNearBreach(final Long nearBreachId) { private Long createNearBreachTemplate(final BigDecimal threshold, final Integer frequency, final String frequencyType) { final String name = Utils.randomStringGenerator("NearBreach", 12); - final Long id = nearBreachHelper.create(new WorkingCapitalNearBreachRequest().nearBreachName(name).nearBreachThreshold(threshold) - .nearBreachFrequency(frequency).nearBreachFrequencyType(frequencyType)).getResourceId(); + final Long id = nearBreachHelper.create(new WorkingCapitalLoanNearBreachRequest().nearBreachName(name) + .nearBreachThreshold(threshold).nearBreachFrequency(frequency).nearBreachFrequencyType(frequencyType)).getResourceId(); createdNearBreachIds.add(id); return id; } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanProductCRUDTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanProductCRUDTest.java index d988cb61b4b..dd810d3726d 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanProductCRUDTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanProductCRUDTest.java @@ -43,25 +43,25 @@ import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest; import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdResponse; import org.apache.fineract.client.models.StringEnumOptionData; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.integrationtests.common.Utils; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalNearBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloannearbreach.WorkingCapitalLoanNearBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanBreachStartType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanDelinquencyStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanBreachStartType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanDelinquencyStartType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class WorkingCapitalLoanProductCRUDTest { private WorkingCapitalLoanProductHelper wclProductHelper; - private final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); - private final WorkingCapitalNearBreachHelper nearBreachHelper = new WorkingCapitalNearBreachHelper(); + private final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); + private final WorkingCapitalLoanNearBreachHelper nearBreachHelper = new WorkingCapitalLoanNearBreachHelper(); @BeforeEach public void setup() { @@ -385,16 +385,16 @@ public void testHappyPath_CreateAndRetrieve_VerifyAllFields() { delinquencyBucketId = expectedBucket.getId(); } - final WorkingCapitalBreachData expectedBreach = getBreachData(template); + final WorkingCapitalLoanBreachData expectedBreach = getBreachData(template); final Long breachId = (expectedBreach != null) ? expectedBreach.getId() : null; // Create a near breach with default values - final WorkingCapitalNearBreachRequest nearBreachRequest = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest nearBreachRequest = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(Utils.randomStringGenerator("NearBreach", 20)) // .nearBreachFrequency(5) // .nearBreachFrequencyType("DAYS") // .nearBreachThreshold(BigDecimal.valueOf(30)); // final Long nearBreachId = nearBreachHelper.create(nearBreachRequest).getResourceId(); - WorkingCapitalNearBreachData nearBreach = nearBreachHelper.retrieveWorkingCapitalNearBreach(nearBreachId); + WorkingCapitalLoanNearBreachData nearBreach = nearBreachHelper.retrieveWorkingCapitalLoanNearBreach(nearBreachId); // All configurable attributes final HashMap allowAttributeOverrides = new HashMap<>(); allowAttributeOverrides.put("delinquencyBucketClassification", false); @@ -561,13 +561,13 @@ public void testHappyPath_CreateAndRetrieve_VerifyAllFields() { @Test public void testNegativeCreateWorkingCapitalLoanProductWithNearBreach() { - final WorkingCapitalBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), 15, + final WorkingCapitalLoanBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), 15, "DAYS", "PERCENTAGE", BigDecimal.valueOf(7.5)); Long breachId = breachHelper.create(createBody); - WorkingCapitalBreachData expectedBreach = breachHelper.retrieveWorkingCapitalBreach(breachId); + WorkingCapitalLoanBreachData expectedBreach = breachHelper.retrieveWorkingCapitalLoanBreach(breachId); assert expectedBreach.getBreachFrequencyType() != null; - final WorkingCapitalNearBreachRequest request = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest request = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(Utils.randomStringGenerator("NearBreach", 20)) // .nearBreachFrequency(expectedBreach.getBreachFrequency()) // .nearBreachFrequencyType(expectedBreach.getBreachFrequencyType().getCode()) // @@ -601,7 +601,7 @@ public void testNegativeCreateWorkingCapitalLoanProductWithNearBreach() { assertThat(exception.getDeveloperMessage()).contains("near.breach.frequency.must.be.lower.than.breach.frequency"); // Given - Higher Frequency between Near Breach and Breach - final WorkingCapitalNearBreachRequest request2 = new WorkingCapitalNearBreachRequest() // + final WorkingCapitalLoanNearBreachRequest request2 = new WorkingCapitalLoanNearBreachRequest() // .nearBreachName(Utils.randomStringGenerator("NearBreach", 20)) // .nearBreachFrequency(expectedBreach.getBreachFrequency() + 2) // .nearBreachFrequencyType(expectedBreach.getBreachFrequencyType().getCode()) // @@ -714,8 +714,8 @@ public void testTemplateExposesBreachStartTypeOptions() { "breachStartTypeOptions should contain LOAN_CREATION and DISBURSEMENT; actual: " + optionCodes); } - private WorkingCapitalBreachData getBreachData(final GetWorkingCapitalLoanProductsTemplateResponse template) { - WorkingCapitalBreachData breach = null; + private WorkingCapitalLoanBreachData getBreachData(final GetWorkingCapitalLoanProductsTemplateResponse template) { + WorkingCapitalLoanBreachData breach = null; if (template.getBreachOptions() != null && !template.getBreachOptions().isEmpty()) { breach = template.getBreachOptions().getFirst(); assertNotNull(breach.getId()); @@ -726,10 +726,10 @@ private WorkingCapitalBreachData getBreachData(final GetWorkingCapitalLoanProduc } if (breach == null) { // Create a breach if not present in template - final WorkingCapitalBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), 20, - "DAYS", "PERCENTAGE", BigDecimal.valueOf(7.5)); + final WorkingCapitalLoanBreachRequest createBody = breachHelper.createBreachRequest(Utils.randomStringGenerator("Breach", 20), + 20, "DAYS", "PERCENTAGE", BigDecimal.valueOf(7.5)); final Long breachId = breachHelper.create(createBody); - breach = breachHelper.retrieveWorkingCapitalBreach(breachId); + breach = breachHelper.retrieveWorkingCapitalLoanBreach(breachId); } return breach; } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanStartDatesTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanStartDatesTest.java index 5b109915a77..1be436c760b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanStartDatesTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/WorkingCapitalLoanStartDatesTest.java @@ -44,7 +44,7 @@ import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDelinquencyRangeScheduleHelper; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.Test; @@ -219,7 +219,7 @@ private Long createDisbursedLoan(final LocalDate submittedOnDate, final String d assertNotNull(bucketResponse); // Breach with a flat amount and a 15-day frequency. - final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); final Long breachId = breachHelper.create(breachHelper.createBreachRequest(Utils.uniqueRandomStringGenerator("WCL_Breach_", 6), BREACH_FREQUENCY_DAYS, "DAYS", "FLAT", BREACH_AMOUNT)); assertNotNull(breachId); @@ -269,7 +269,7 @@ private Long createDisbursedLoanWithBreachStartType(final LocalDate submittedOnD .createWorkingCapitalLoanDelinquencyBucket(rangeIds, DELINQUENCY_FREQUENCY_DAYS, 0, DELINQUENCY_MIN_PAYMENT_PERCENT, 1); assertNotNull(bucketResponse); - final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); final Long breachId = breachHelper.create(breachHelper.createBreachRequest(Utils.uniqueRandomStringGenerator("WCL_Breach_", 6), BREACH_FREQUENCY_DAYS, "DAYS", "FLAT", BREACH_AMOUNT)); assertNotNull(breachId); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanChargeAfterMaturityTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanChargeAfterMaturityTest.java index 91ff893c927..9df95543e5c 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanChargeAfterMaturityTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanChargeAfterMaturityTest.java @@ -50,7 +50,7 @@ import org.apache.fineract.integrationtests.common.accounting.Account; import org.apache.fineract.integrationtests.common.products.DelinquencyRangesHelper; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDelinquencyRangeScheduleHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterAll; @@ -94,7 +94,7 @@ public class FeignWorkingCapitalLoanChargeAfterMaturityTest extends FeignIntegra private FeignClientHelper clientHelper; private FeignBusinessDateHelper businessDateHelper; private WorkingCapitalLoanProductHelper productHelper; - private WorkingCapitalBreachHelper breachHelper; + private WorkingCapitalLoanBreachHelper breachHelper; // GL accounts (only needed for the accrual-with-deferred-revenue product used by the accounting test). private Account fundSourceAccount; @@ -120,7 +120,7 @@ void setupHelpers() { clientHelper = new FeignClientHelper(feignClient); businessDateHelper = new FeignBusinessDateHelper(feignClient); productHelper = new WorkingCapitalLoanProductHelper(); - breachHelper = new WorkingCapitalBreachHelper(); + breachHelper = new WorkingCapitalLoanBreachHelper(); final FeignAccountHelper accountHelper = new FeignAccountHelper(feignClient); fundSourceAccount = accountHelper.createLiabilityAccount("wcChgMatFundSrc"); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanCreditBalanceRefundBreachScheduleTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanCreditBalanceRefundBreachScheduleTest.java index 37cc078e819..2e6f860468b 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanCreditBalanceRefundBreachScheduleTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanCreditBalanceRefundBreachScheduleTest.java @@ -35,7 +35,7 @@ import org.apache.fineract.integrationtests.client.feign.helpers.FeignWorkingCapitalLoanHelper; import org.apache.fineract.integrationtests.client.feign.modules.WorkingCapitalLoanRequestBuilders; import org.apache.fineract.integrationtests.common.Utils; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterAll; @@ -73,7 +73,7 @@ public class FeignWorkingCapitalLoanCreditBalanceRefundBreachScheduleTest extend private FeignClientHelper clientHelper; private FeignBusinessDateHelper businessDateHelper; private WorkingCapitalLoanProductHelper productHelper; - private WorkingCapitalBreachHelper breachHelper; + private WorkingCapitalLoanBreachHelper breachHelper; private final List createdLoanIds = new ArrayList<>(); private final List createdProductIds = new ArrayList<>(); @@ -85,7 +85,7 @@ void setupHelpers() { clientHelper = new FeignClientHelper(feignClient); businessDateHelper = new FeignBusinessDateHelper(feignClient); productHelper = new WorkingCapitalLoanProductHelper(); - breachHelper = new WorkingCapitalBreachHelper(); + breachHelper = new WorkingCapitalLoanBreachHelper(); } @AfterAll diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanPaymentAllocationRuleTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanPaymentAllocationRuleTest.java index 4ff96ca7dc1..cc56f4ef757 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanPaymentAllocationRuleTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanPaymentAllocationRuleTest.java @@ -47,7 +47,7 @@ import org.apache.fineract.integrationtests.common.Utils; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanApplicationTestBuilder; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDisbursementTestBuilder; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterAll; @@ -290,7 +290,7 @@ void testUndoOfChargeAdjustmentTriggersABreach() { final Long[] loanIdHolder = new Long[1]; final Long[] feeLoanChargeIdHolder = new Long[1]; final Long[] adjustmentTransactionIdHolder = new Long[1]; - final WorkingCapitalBreachHelper breachHelper = new WorkingCapitalBreachHelper(); + final WorkingCapitalLoanBreachHelper breachHelper = new WorkingCapitalLoanBreachHelper(); final Long breachId = breachHelper.create(breachHelper.createBreachRequest( "WCL PayAlloc Breach " + Utils.uniqueRandomStringGenerator("", 8), 30, "DAYS", "PERCENTAGE", BigDecimal.TEN)); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanRepaymentBackdatedUndoTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanRepaymentBackdatedUndoTest.java index e0dcf23f4a4..dea9ddf48fe 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanRepaymentBackdatedUndoTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/feign/tests/FeignWorkingCapitalLoanRepaymentBackdatedUndoTest.java @@ -54,7 +54,7 @@ import org.apache.fineract.integrationtests.common.accounting.Account; import org.apache.fineract.integrationtests.common.products.DelinquencyRangesHelper; import org.apache.fineract.integrationtests.common.workingcapitalloan.WorkingCapitalLoanDelinquencyRangeScheduleHelper; -import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalBreachHelper; +import org.apache.fineract.integrationtests.common.workingcapitalloanbreach.WorkingCapitalLoanBreachHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductHelper; import org.apache.fineract.integrationtests.common.workingcapitalloanproduct.WorkingCapitalLoanProductTestBuilder; import org.junit.jupiter.api.AfterAll; @@ -96,7 +96,7 @@ public class FeignWorkingCapitalLoanRepaymentBackdatedUndoTest extends FeignInte private FeignBusinessDateHelper businessDateHelper; private FeignJournalEntryHelper journalHelper; private WorkingCapitalLoanProductHelper productHelper; - private WorkingCapitalBreachHelper breachHelper; + private WorkingCapitalLoanBreachHelper breachHelper; // GL accounts for cash-accounting products (tests 5, 6, 10, 11). private Account fundSourceAccount; @@ -123,7 +123,7 @@ void setupHelpers() { businessDateHelper = new FeignBusinessDateHelper(feignClient); journalHelper = new FeignJournalEntryHelper(feignClient); productHelper = new WorkingCapitalLoanProductHelper(); - breachHelper = new WorkingCapitalBreachHelper(); + breachHelper = new WorkingCapitalLoanBreachHelper(); final FeignAccountHelper accountHelper = new FeignAccountHelper(feignClient); fundSourceAccount = accountHelper.createLiabilityAccount("wcUndoFundSrc"); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalBreachHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalLoanBreachHelper.java similarity index 59% rename from integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalBreachHelper.java rename to integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalLoanBreachHelper.java index 7ac04c0d630..f8655db7e84 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalBreachHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanbreach/WorkingCapitalLoanBreachHelper.java @@ -24,67 +24,67 @@ import org.apache.fineract.client.feign.util.CallFailedRuntimeException; import org.apache.fineract.client.feign.util.FeignCalls; import org.apache.fineract.client.models.CommandProcessingResult; -import org.apache.fineract.client.models.WorkingCapitalBreachData; -import org.apache.fineract.client.models.WorkingCapitalBreachRequest; -import org.apache.fineract.client.models.WorkingCapitalBreachTemplateResponse; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanBreachTemplateResponse; import org.apache.fineract.integrationtests.common.FineractFeignClientHelper; -public class WorkingCapitalBreachHelper { +public class WorkingCapitalLoanBreachHelper { private static WorkingCapitalBreachApi api() { return FineractFeignClientHelper.getFineractFeignClient().workingCapitalBreaches(); } - public Long create(final WorkingCapitalBreachRequest request) { - final CommandProcessingResult response = FeignCalls.ok(() -> api().createWorkingCapitalBreach(request)); + public Long create(final WorkingCapitalLoanBreachRequest request) { + final CommandProcessingResult response = FeignCalls.ok(() -> api().createWorkingCapitalLoanBreach(request)); return response.getResourceId(); } - public Long update(final Long breachId, final WorkingCapitalBreachRequest request) { - final CommandProcessingResult response = FeignCalls.ok(() -> api().updateWorkingCapitalBreach(breachId, request)); + public Long update(final Long breachId, final WorkingCapitalLoanBreachRequest request) { + final CommandProcessingResult response = FeignCalls.ok(() -> api().updateWorkingCapitalLoanBreach(breachId, request)); return response.getResourceId(); } public Long delete(final Long breachId) { - final CommandProcessingResult response = FeignCalls.ok(() -> api().deleteWorkingCapitalBreach(breachId)); + final CommandProcessingResult response = FeignCalls.ok(() -> api().deleteWorkingCapitalLoanBreach(breachId)); return response.getResourceId(); } - public WorkingCapitalBreachTemplateResponse retrieveTemplate() { - return FeignCalls.ok(() -> api().retrieveWorkingCapitalBreachTemplate()); + public WorkingCapitalLoanBreachTemplateResponse retrieveTemplate() { + return FeignCalls.ok(() -> api().retrieveWorkingCapitalLoanBreachTemplate()); } - public List retrieveAll() { - return FeignCalls.ok(() -> api().retrieveAllWorkingCapitalBreaches()); + public List retrieveAll() { + return FeignCalls.ok(() -> api().retrieveAllWorkingCapitalLoanBreaches()); } - public WorkingCapitalBreachData retrieveOne(final Long breachId) { - return FeignCalls.ok(() -> api().retrieveWorkingCapitalBreach(breachId)); + public WorkingCapitalLoanBreachData retrieveOne(final Long breachId) { + return FeignCalls.ok(() -> api().retrieveWorkingCapitalLoanBreach(breachId)); } - public CallFailedRuntimeException runCreateExpectingFailure(final WorkingCapitalBreachRequest request) { - return FeignCalls.fail(() -> api().createWorkingCapitalBreach(request)); + public CallFailedRuntimeException runCreateExpectingFailure(final WorkingCapitalLoanBreachRequest request) { + return FeignCalls.fail(() -> api().createWorkingCapitalLoanBreach(request)); } - public CallFailedRuntimeException runUpdateExpectingFailure(final Long breachId, final WorkingCapitalBreachRequest request) { - return FeignCalls.fail(() -> api().updateWorkingCapitalBreach(breachId, request)); + public CallFailedRuntimeException runUpdateExpectingFailure(final Long breachId, final WorkingCapitalLoanBreachRequest request) { + return FeignCalls.fail(() -> api().updateWorkingCapitalLoanBreach(breachId, request)); } public CallFailedRuntimeException runRetrieveOneExpectingFailure(final Long breachId) { - return FeignCalls.fail(() -> api().retrieveWorkingCapitalBreach(breachId)); + return FeignCalls.fail(() -> api().retrieveWorkingCapitalLoanBreach(breachId)); } public CallFailedRuntimeException runDeleteExpectingFailure(final Long breachId) { - return FeignCalls.fail(() -> api().deleteWorkingCapitalBreach(breachId)); + return FeignCalls.fail(() -> api().deleteWorkingCapitalLoanBreach(breachId)); } - public WorkingCapitalBreachData retrieveWorkingCapitalBreach(final Long breachId) { - return FeignCalls.ok(() -> api().retrieveWorkingCapitalBreach(breachId)); + public WorkingCapitalLoanBreachData retrieveWorkingCapitalLoanBreach(final Long breachId) { + return FeignCalls.ok(() -> api().retrieveWorkingCapitalLoanBreach(breachId)); } - public WorkingCapitalBreachRequest createBreachRequest(final String name, final Integer breachFrequency, + public WorkingCapitalLoanBreachRequest createBreachRequest(final String name, final Integer breachFrequency, final String breachFrequencyType, final String breachAmountCalculationType, final BigDecimal breachAmount) { - return new WorkingCapitalBreachRequest().name(name).breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType) + return new WorkingCapitalLoanBreachRequest().name(name).breachFrequency(breachFrequency).breachFrequencyType(breachFrequencyType) .breachAmountCalculationType(breachAmountCalculationType).breachAmount(breachAmount); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalNearBreachHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalLoanNearBreachHelper.java similarity index 62% rename from integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalNearBreachHelper.java rename to integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalLoanNearBreachHelper.java index 412e383e2a6..6cdf0806cf5 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalNearBreachHelper.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloannearbreach/WorkingCapitalLoanNearBreachHelper.java @@ -22,37 +22,37 @@ import org.apache.fineract.client.feign.services.WorkingCapitalNearBreachApi; import org.apache.fineract.client.feign.util.FeignCalls; import org.apache.fineract.client.models.CommandProcessingResult; -import org.apache.fineract.client.models.WorkingCapitalNearBreachData; -import org.apache.fineract.client.models.WorkingCapitalNearBreachRequest; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachData; +import org.apache.fineract.client.models.WorkingCapitalLoanNearBreachRequest; import org.apache.fineract.integrationtests.common.FineractFeignClientHelper; -public class WorkingCapitalNearBreachHelper { +public class WorkingCapitalLoanNearBreachHelper { private static WorkingCapitalNearBreachApi api() { return FineractFeignClientHelper.getFineractFeignClient().workingCapitalNearBreaches(); } - public CommandProcessingResult create(final WorkingCapitalNearBreachRequest request) { - return FeignCalls.ok(() -> api().createWorkingCapitalNearBreach(request)); + public CommandProcessingResult create(final WorkingCapitalLoanNearBreachRequest request) { + return FeignCalls.ok(() -> api().createWorkingCapitalLoanNearBreach(request)); } - public CommandProcessingResult update(final Long breachId, final WorkingCapitalNearBreachRequest request) { - return FeignCalls.ok(() -> api().updateWorkingCapitalNearBreach(breachId, request)); + public CommandProcessingResult update(final Long breachId, final WorkingCapitalLoanNearBreachRequest request) { + return FeignCalls.ok(() -> api().updateWorkingCapitalLoanNearBreach(breachId, request)); } public CommandProcessingResult delete(final Long breachId) { - return FeignCalls.ok(() -> api().deleteWorkingCapitalNearBreach(breachId)); + return FeignCalls.ok(() -> api().deleteWorkingCapitalLoanNearBreach(breachId)); } - public List retrieveAll() { - return FeignCalls.ok(() -> api().retrieveAllWorkingCapitalNearBreaches()); + public List retrieveAll() { + return FeignCalls.ok(() -> api().retrieveAllWorkingCapitalLoanNearBreaches()); } - public WorkingCapitalNearBreachData retrieveOne(final Long breachId) { - return FeignCalls.ok(() -> api().retrieveWorkingCapitalNearBreach(breachId)); + public WorkingCapitalLoanNearBreachData retrieveOne(final Long breachId) { + return FeignCalls.ok(() -> api().retrieveWorkingCapitalLoanNearBreach(breachId)); } - public WorkingCapitalNearBreachData retrieveWorkingCapitalNearBreach(final Long breachId) { - return FeignCalls.ok(() -> api().retrieveWorkingCapitalNearBreach(breachId)); + public WorkingCapitalLoanNearBreachData retrieveWorkingCapitalLoanNearBreach(final Long breachId) { + return FeignCalls.ok(() -> api().retrieveWorkingCapitalLoanNearBreach(breachId)); } } diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductTestBuilder.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductTestBuilder.java index f61e6086eaa..78a84ffc3d8 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductTestBuilder.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/workingcapitalloanproduct/WorkingCapitalLoanProductTestBuilder.java @@ -30,8 +30,8 @@ import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest; import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest.AccountingRuleEnum; import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest; -import org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanPeriodFrequencyType; -import org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalAmortizationType; +import org.apache.fineract.portfolio.workingcapitalloan.loan.domain.WorkingCapitalLoanPeriodFrequencyType; +import org.apache.fineract.portfolio.workingcapitalloan.product.domain.WorkingCapitalLoanAmortizationType; @Slf4j public class WorkingCapitalLoanProductTestBuilder { @@ -41,7 +41,7 @@ public class WorkingCapitalLoanProductTestBuilder { private static final String DEFAULT_CURRENCY_CODE = "USD"; private static final Integer DEFAULT_DECIMAL_PLACE = 2; private static final Integer DEFAULT_CURRENCY_IN_MULTIPLES_OF = 1; - private static final String DEFAULT_AMORTIZATION = WorkingCapitalAmortizationType.EIR.name(); + private static final String DEFAULT_AMORTIZATION = WorkingCapitalLoanAmortizationType.EIR.name(); private static final Integer DEFAULT_NPV_DAY_COUNT = 360; private static final BigDecimal DEFAULT_PRINCIPAL_AMOUNT = BigDecimal.valueOf(10000); public static final BigDecimal DEFAULT_PERIOD_PAYMENT_RATE_PERCENT = BigDecimal.valueOf(18);