Skip to content

FINERACT-2455: Extend Datatable support to WC loan entity #5776

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 2 commits into from
Apr 23, 2026
Merged

FINERACT-2455: Extend Datatable support to WC loan entity #5776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39844b3
FINERACT-2455: Extend Datatable support to WC loan entity
oleksii-novikov-onix Apr 16, 2026
278b993
FINERACT-2455: added e2e tests for extending Datatable support to WC …
ruzeynalov Apr 22, 2026
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
33 changes: 18 additions & 15 deletions ...e/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
Expand Down Expand Up @@ -132,10 +133,11 @@ public void validateForCreate(final String json) {
baseDataValidator.reset().parameter(API_PARAM_APPTABLE_NAME).value(apptableName).notBlank().notExceedingLengthOf(50)
.isOneOfTheseStringValues(EntityTables.getEntityNames());

EntityTables entityTable = EntityTables.fromEntityName(apptableName);
validateEntitySubType(baseDataValidator, element, entityTable);
final Optional<EntityTables> entityTable = Optional.ofNullable(EntityTables.fromEntityName(apptableName));
entityTable.ifPresent(et -> validateEntitySubType(baseDataValidator, element, et));

final String fkColumnName = entityTable == null ? null : entityTable.getForeignKeyColumnNameOnDatatable();
final Object[] reservedColumnNames = entityTable.map(et -> new Object[] { TABLE_FIELD_ID, et.getForeignKeyColumnNameOnDatatable() })
.orElseGet(() -> new Object[] { TABLE_FIELD_ID });

final Boolean multiRow = this.fromApiJsonHelper.extractBooleanNamed(API_PARAM_MULTIROW, element);
baseDataValidator.reset().parameter(API_PARAM_MULTIROW).value(multiRow).ignoreIfNull().notBlank().isOneOfTheseValues(true, false);
Expand All @@ -148,8 +150,8 @@ public void validateForCreate(final String json) {
this.fromApiJsonHelper.checkForUnsupportedParameters(column.getAsJsonObject(), SUPPORTED_PARAMETERS_FOR_CREATE_COLUMNS);

final String name = this.fromApiJsonHelper.extractStringNamed(API_FIELD_NAME, column);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank()
.isNotOneOfTheseValues(TABLE_FIELD_ID, fkColumnName).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank().isNotOneOfTheseValues(reservedColumnNames)
.matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);

validateType(baseDataValidator, column);

Expand Down Expand Up @@ -194,10 +196,11 @@ public void validateForUpdate(final String json) {
baseDataValidator.reset().parameter(API_PARAM_APPTABLE_NAME).value(apptableName).ignoreIfNull().notBlank()
.isOneOfTheseStringValues(EntityTables.getEntityNames());

EntityTables entityTable = EntityTables.fromEntityName(apptableName);
validateEntitySubType(baseDataValidator, element, entityTable);
final Optional<EntityTables> entityTable = Optional.ofNullable(EntityTables.fromEntityName(apptableName));
entityTable.ifPresent(et -> validateEntitySubType(baseDataValidator, element, et));

final String fkColumnName = entityTable.getForeignKeyColumnNameOnDatatable();
final Object[] reservedColumnNames = entityTable.map(et -> new Object[] { TABLE_FIELD_ID, et.getForeignKeyColumnNameOnDatatable() })
.orElseGet(() -> new Object[] { TABLE_FIELD_ID });

final JsonArray changeColumns = this.fromApiJsonHelper.extractJsonArrayNamed(API_PARAM_CHANGECOLUMNS, element);
baseDataValidator.reset().parameter(API_PARAM_CHANGECOLUMNS).value(changeColumns).ignoreIfNull().jsonArrayNotEmpty();
Expand All @@ -207,12 +210,12 @@ public void validateForUpdate(final String json) {
this.fromApiJsonHelper.checkForUnsupportedParameters(column.getAsJsonObject(), SUPPORTED_PARAMETERS_FOR_CHANGE_COLUMNS);

final String name = this.fromApiJsonHelper.extractStringNamed(API_FIELD_NAME, column);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank()
.isNotOneOfTheseValues(TABLE_FIELD_ID, fkColumnName).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank().isNotOneOfTheseValues(reservedColumnNames)
.matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);

final String newName = this.fromApiJsonHelper.extractStringNamed(API_FIELD_NEWNAME, column);
baseDataValidator.reset().parameter(API_FIELD_NEWNAME).value(newName).ignoreIfNull().notBlank().notExceedingLengthOf(50)
.isNotOneOfTheseValues(TABLE_FIELD_ID, fkColumnName).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
.isNotOneOfTheseValues(reservedColumnNames).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);

if (this.fromApiJsonHelper.parameterExists(API_FIELD_LENGTH, column)) {
final String lengthStr = this.fromApiJsonHelper.extractStringNamed(API_FIELD_LENGTH, column);
Expand Down Expand Up @@ -262,8 +265,8 @@ public void validateForUpdate(final String json) {
this.fromApiJsonHelper.checkForUnsupportedParameters(column.getAsJsonObject(), SUPPORTED_PARAMETERS_FOR_ADD_COLUMNS);

final String name = this.fromApiJsonHelper.extractStringNamed(API_FIELD_NAME, column);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank()
.isNotOneOfTheseValues(TABLE_FIELD_ID, fkColumnName).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank().isNotOneOfTheseValues(reservedColumnNames)
.matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);

validateType(baseDataValidator, column);

Expand Down Expand Up @@ -292,8 +295,8 @@ public void validateForUpdate(final String json) {
this.fromApiJsonHelper.checkForUnsupportedParameters(column.getAsJsonObject(), SUPPORTED_PARAMETERS_FOR_DROP_COLUMNS);

final String name = this.fromApiJsonHelper.extractStringNamed(API_FIELD_NAME, column);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank()
.isNotOneOfTheseValues(TABLE_FIELD_ID, fkColumnName).matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
baseDataValidator.reset().parameter(API_FIELD_NAME).value(name).notBlank().isNotOneOfTheseValues(reservedColumnNames)
.matchesRegularExpression(DATATABLE_COLUMN_NAME_REGEX_PATTERN);
}
}

Expand Down
2 changes: 2 additions & 0 deletions ...-core/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public enum EntityTables {
SAVINGS("m_savings_account", "savings_account_id", "id", CREATE, APPROVE, ACTIVATE, WITHDRAWN, REJECTED, CLOSE), //
SAVINGS_TRANSACTION("m_savings_account_transaction", "savings_transaction_id", "id"), //
SHARE_PRODUCT("m_share_product", "share_product_id", "id"), //
WC_LOAN_PRODUCT("m_wc_loan_product", "wc_product_loan_id", "id"), //
WC_LOAN("m_wc_loan", "wc_loan_id", "id"), //
;

static final EntityTables[] ENTITY_VALUES = values();
Expand Down
6 changes: 5 additions & 1 deletion ...tests-core/src/test/java/org/apache/fineract/test/data/datatable/DatatableEntityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
@Getter
public enum DatatableEntityType {

LOAN("m_loan");
LOAN("m_loan"), //
LOAN_PRODUCT("m_product_loan"), //
WC_LOAN("m_wc_loan"), //
WC_LOAN_PRODUCT("m_wc_loan_product"), //
;

private final String referencedTableName;

Expand Down
Loading
Loading