Expert filter properties #106
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: maissa SOUISSI <[email protected]>
Signed-off-by: maissa SOUISSI <[email protected]>
Signed-off-by: maissa SOUISSI <[email protected]>
thangqp
reviewed
Apr 15, 2024
| } | ||
| return ruleBuilder.build(); | ||
| } | ||
| default -> throw new PowsyblException("Unknown rule data type: " + filterEntity.getDataType() + ", supported data types are: COMBINATOR, BOOLEAN, NUMBER, STRING, ENUM"); |
There was a problem hiding this comment.
could you add FILTER_UUID and PROPERTIES in the list? or make something more generic like: Arrays.stream(DataType.values()).map(Enum::name).collect(Collectors.joining(", "))
Comment on lines
210
to
211
| } else if (filter.getDataType() == DataType.BOOLEAN || filter.getDataType() == DataType.NUMBER || filter.getDataType() == DataType.STRING || filter.getDataType() == DataType.ENUM || filter.getDataType() == DataType.FILTER_UUID) { | ||
| expertRuleEntityBuilder = ExpertRuleValueEntity.builder() |
There was a problem hiding this comment.
so long, should line by line
Comment on lines
68
to
78
| if (filterEntity instanceof ExpertRuleValueEntity booleanFilterEntity) { | ||
| return BooleanExpertRule.builder() | ||
| .field(booleanFilterEntity.getField()) | ||
| .operator(booleanFilterEntity.getOperator()) | ||
| .value(Boolean.parseBoolean(booleanFilterEntity.getValue())) | ||
| .build(); | ||
| } else { | ||
| throw new PowsyblException("Invalid entity type for BOOLEAN rule"); | ||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
In my opinion, we can use casting directly, this situation does normally never occur.. idem for others
Comment on lines
190
to
221
| ExpertRuleEntity.ExpertRuleEntityBuilder<?, ?> expertRuleEntityBuilder = null; | ||
| if (filter.getDataType() == DataType.COMBINATOR) { | ||
| expertRuleEntityBuilder = ExpertRuleEntity.builder() | ||
| .id(UUID.randomUUID()) | ||
| .combinator(filter.getCombinator()) | ||
| .operator(filter.getOperator()) | ||
| .dataType(filter.getDataType()) | ||
| .field(filter.getField()); | ||
| } | ||
| if (filter.getDataType() == DataType.PROPERTIES) { | ||
| PropertiesExpertRule propertiesRule = (PropertiesExpertRule) filter; | ||
| expertRuleEntityBuilder = ExpertRulePropertiesEntity.builder() | ||
| .id(UUID.randomUUID()) | ||
| .combinator(filter.getCombinator()) | ||
| .operator(filter.getOperator()) | ||
| .dataType(filter.getDataType()) | ||
| .field(filter.getField()) | ||
| .propertyValues(propertiesRule.getPropertyValues()) | ||
| .propertyName(propertiesRule.getPropertyName()); | ||
|
|
||
| } else if (filter.getDataType() == DataType.BOOLEAN || filter.getDataType() == DataType.NUMBER || filter.getDataType() == DataType.STRING || filter.getDataType() == DataType.ENUM || filter.getDataType() == DataType.FILTER_UUID) { | ||
| expertRuleEntityBuilder = ExpertRuleValueEntity.builder() | ||
| .id(UUID.randomUUID()) | ||
| .combinator(filter.getCombinator()) | ||
| .operator(filter.getOperator()) | ||
| .dataType(filter.getDataType()) | ||
| .field(filter.getField()) | ||
| .value(filter.getStringValue()); | ||
| } | ||
| if (expertRuleEntityBuilder == null) { | ||
| throw new PowsyblException("Unsupported data type: " + filter.getDataType()); | ||
| } |
There was a problem hiding this comment.
In my opinion, we can extract to a method: getBuilder(rule) which return a builder in order to reuse in dtoToEntity and in the map() in dtoToEntities.
public static ExpertRuleEntity.ExpertRuleEntityBuilder<?, ?> getBuilder(AbstractExpertRule filter) {
ExpertRuleEntity.ExpertRuleEntityBuilder<?, ?> expertRuleEntityBuilder = null;
if (filter.getDataType() == DataType.COMBINATOR) {
expertRuleEntityBuilder = ExpertRuleEntity.builder()
.id(UUID.randomUUID())
.combinator(filter.getCombinator())
.operator(filter.getOperator())
.dataType(filter.getDataType())
.field(filter.getField());
}
if (filter.getDataType() == DataType.PROPERTIES) {
PropertiesExpertRule propertiesRule = (PropertiesExpertRule) filter;
expertRuleEntityBuilder = ExpertRulePropertiesEntity.builder()
.id(UUID.randomUUID())
.combinator(filter.getCombinator())
.operator(filter.getOperator())
.dataType(filter.getDataType())
.field(filter.getField())
.propertyValues(propertiesRule.getPropertyValues())
.propertyName(propertiesRule.getPropertyName());
} else if (filter.getDataType() == DataType.BOOLEAN || filter.getDataType() == DataType.NUMBER || filter.getDataType() == DataType.STRING || filter.getDataType() == DataType.ENUM || filter.getDataType() == DataType.FILTER_UUID) {
expertRuleEntityBuilder = ExpertRuleValueEntity.builder()
.id(UUID.randomUUID())
.combinator(filter.getCombinator())
.operator(filter.getOperator())
.dataType(filter.getDataType())
.field(filter.getField())
.value(filter.getStringValue());
}
if (expertRuleEntityBuilder == null) {
throw new PowsyblException("Unsupported data type: " + filter.getDataType());
}
return expertRuleEntityBuilder;
}
That can avoid duplication of code
Comment on lines
236
to
256
| ExpertRuleEntity.ExpertRuleEntityBuilder<?, ?> expertRuleEntityBuilder; | ||
| if (rule.getDataType().equals(DataType.PROPERTIES)) { | ||
| expertRuleEntityBuilder = ExpertRulePropertiesEntity.builder() | ||
| .propertyValues(((PropertiesExpertRule) rule).getPropertyValues()) | ||
| .propertyName(((PropertiesExpertRule) rule).getPropertyName()) | ||
| .id(UUID.randomUUID()) | ||
| .combinator(rule.getCombinator()) | ||
| .operator(rule.getOperator()) | ||
| .dataType(rule.getDataType()) | ||
| .field(rule.getField()) | ||
| .parentRule(parentRuleEntity); | ||
| } else { | ||
| expertRuleEntityBuilder = ExpertRuleValueEntity.builder() | ||
| .id(UUID.randomUUID()) | ||
| .combinator(rule.getCombinator()) | ||
| .operator(rule.getOperator()) | ||
| .dataType(rule.getDataType()) | ||
| .field(rule.getField()) | ||
| .value(rule.getStringValue()) | ||
| .parentRule(parentRuleEntity); | ||
| } |
There was a problem hiding this comment.
= getBuilder(rule).parentRule(parentRuleEntity)
Signed-off-by: maissa SOUISSI <[email protected]>
Signed-off-by: maissa SOUISSI <[email protected]>
thangqp
approved these changes
Apr 15, 2024
ayolab
approved these changes
Apr 17, 2024
Signed-off-by: maissa SOUISSI <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.