Skip to content

FINERACT-2421: WorkingCapital loan delinquency start type null #5775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsaghy merged 1 commit into from
Apr 21, 2026
Merged

FINERACT-2421: WorkingCapital loan delinquency start type null #5775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions ...apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanAssemblerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,15 @@ private WorkingCapitalLoanProductRelatedDetails buildLoanProductRelatedDetails(f
? fromApiJsonHelper.extractIntegerNamed(WorkingCapitalLoanProductConstants.delinquencyGraceDaysParamName, element,
new HashSet<>())
: productDetail.getDelinquencyGraceDays());
detail.setDelinquencyStartType(
fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element)
? WorkingCapitalLoanDelinquencyStartType.valueOf(fromApiJsonHelper
.extractStringNamed(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element))
: productDetail.getDelinquencyStartType());
final String delinquencyStartTypeValue = fromApiJsonHelper
.parameterExists(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element)
? fromApiJsonHelper.extractStringNamed(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element)
: null;
if (delinquencyStartTypeValue != null) {
detail.setDelinquencyStartType(WorkingCapitalLoanDelinquencyStartType.valueOf(delinquencyStartTypeValue));
} else {
detail.setDelinquencyStartType(productDetail.getDelinquencyStartType());
}

if (fromApiJsonHelper.parameterExists(WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName, element)) {
final Long bucketId = fromApiJsonHelper.extractLongNamed(WorkingCapitalLoanProductConstants.delinquencyBucketIdParamName,
Expand Down Expand Up @@ -374,10 +378,17 @@ public Map<String, Object> updateFrom(final JsonCommand command, final WorkingCa
final String existingValue = detail.getDelinquencyStartType() != null ? detail.getDelinquencyStartType().name() : null;
if (command.isChangeInStringParameterNamed(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName,
existingValue)) {
final WorkingCapitalLoanDelinquencyStartType type = WorkingCapitalLoanDelinquencyStartType.valueOf(fromApiJsonHelper
.extractStringNamed(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element));
detail.setDelinquencyStartType(type);
changes.put(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, type.name());
final String delinquencyStartTypeValue = fromApiJsonHelper
.extractStringNamed(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, element);
if (delinquencyStartTypeValue != null) {
final WorkingCapitalLoanDelinquencyStartType type = WorkingCapitalLoanDelinquencyStartType
.valueOf(delinquencyStartTypeValue);
detail.setDelinquencyStartType(type);
changes.put(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, type.getCode());
} else {
detail.setDelinquencyStartType(null);
changes.put(WorkingCapitalLoanProductConstants.delinquencyStartTypeParamName, null);
}
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions .../integrationtests/common/workingcapitalloan/WorkingCapitalLoanApplicationTestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,8 @@ public String buildModifyJson() {
if (delinquencyBucketId != null) {
json.addProperty("delinquencyBucketId", delinquencyBucketId);
}
if (delinquencyGraceDays != null) {
json.addProperty("delinquencyGraceDays", delinquencyGraceDays);
}
if (delinquencyStartType != null) {
json.addProperty("delinquencyStartType", delinquencyStartType);
}
json.addProperty("delinquencyGraceDays", delinquencyGraceDays);
Comment thread
adamsaghy marked this conversation as resolved.
json.addProperty("delinquencyStartType", delinquencyStartType);
if (breachId != null) {
json.addProperty("breachId", breachId);
}
Expand Down
Loading