Add expert filter feature #71

antoinebhs · 2023-10-16T07:36:49Z

No description provided.

src/main/java/org/gridsuite/filter/server/ExpertFilterRepositoryProxy.java

src/main/java/org/gridsuite/filter/server/dto/ExpertFilter.java

src/main/java/org/gridsuite/filter/server/dto/expertrule/AbstractExpertRule.java

src/main/java/org/gridsuite/filter/server/dto/expertrule/BooleanExpertRule.java

src/main/java/org/gridsuite/filter/server/utils/FieldType.java

src/main/java/org/gridsuite/filter/server/utils/OperatorType.java

src/main/java/org/gridsuite/filter/server/utils/ExpertFilterUtils.java

src/test/java/org/gridsuite/filter/server/ExpertFilterUtilsTest.java

Improve test coverage.

thangqp · 2023-10-25T13:45:33Z

src/main/java/org/gridsuite/filter/server/dto/expertrule/CombinatorExpertRule.java

+
+    @Override
+    public boolean evaluateRule(String identifiableValue) {
+        return false;


Should implement this method as other single rule? Take the implementation found in ExpertFilterUtils
` public static <I extends Injection> boolean evaluateExpertFilter(AbstractExpertRule filter, Injection injection) {
// As long as there are rules, we go down the tree
if (CombinatorType.AND == (filter.getCombinator())) {
return evaluateAndCombination(filter, injection);
} else if (CombinatorType.OR == filter.getCombinator()) {
return evaluateOrCombination(filter, injection);
} else {
// Evaluate individual filters
return filter.evaluateRule(getFieldValue(filter.getField(), injection));
}
}

private static <I extends Injection<I>> boolean evaluateOrCombination(AbstractExpertRule filter, Injection<I> injection) { for (AbstractExpertRule rule : filter.getRules()) { // Recursively evaluate the rule if (evaluateExpertFilter(rule, injection)) { // If any rule is true, the whole combination is true return true; } } return false; }`

It's not possible with this model to implement what you suggest. Combinator rules are a special type of rules and should be handled separately. The AbstractExpertRule.evaluateRule() function is meant to evaluate a rule with respect to a value not to a combinator. This applies only to boolean, enum, string or number rules. See for example the signature of evaluateRule() compared with public static <I extends Injection> boolean evaluateExpertFilter(AbstractExpertRule filter, Injection injection) that you suggest moving to CombinatorRule.evaluateRule().
We could implement in CombinatorRule.evaluateRule(String combinatorValue) something like getCombinator().toString().equals(combinatorValue) but I don't think it should be used this way as it's a particular type of rule.

src/main/java/org/gridsuite/filter/server/entities/ExpertFilterEntity.java

src/main/java/org/gridsuite/filter/server/entities/ExpertRuleEntity.java

thangqp · 2023-10-25T14:31:52Z

src/main/java/org/gridsuite/filter/server/utils/ExpertFilterUtils.java

+    public static <I extends Injection<I>> boolean evaluateExpertFilter(AbstractExpertRule filter, Injection<I> injection) {
+        // As long as there are rules, we go down the tree
+        if (CombinatorType.AND == (filter.getCombinator())) {
+            return evaluateAndCombination(filter, injection);
+        } else if (CombinatorType.OR == filter.getCombinator()) {
+            return evaluateOrCombination(filter, injection);
+        } else {
+            // Evaluate individual filters
+            return filter.evaluateRule(getFieldValue(filter.getField(), injection));
+        }
+    }
+
+    private static <I extends Injection<I>> boolean evaluateOrCombination(AbstractExpertRule filter, Injection<I> injection) {
+        for (AbstractExpertRule rule : filter.getRules()) {
+            // Recursively evaluate the rule
+            if (evaluateExpertFilter(rule, injection)) {
+                // If any rule is true, the whole combination is true
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static <I extends Injection<I>> boolean evaluateAndCombination(AbstractExpertRule filter, Injection<I> injection) {
+        for (AbstractExpertRule rule : filter.getRules()) {
+            // Recursively evaluate the rule
+            if (!evaluateExpertFilter(rule, injection)) {
+                // If any rule is false, the whole combination is false
+                return false;
+            }
+        }
+        return true;
+    }


move to the implementation of CombinatorExpertRule#evaluateRule

src/main/java/org/gridsuite/filter/server/ExpertFilterRepositoryProxy.java

src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java

antoinebhs · 2023-11-02T11:37:55Z

I created #75 for the reorganization of files by filter type.

Signed-off-by: BOUHOURS Antoine <[email protected]>

sonarqubecloud · 2023-11-02T15:06:38Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

89.3% Coverage
0.0% Duplication

antoinebhs added 3 commits October 16, 2023 09:32

Add expert filter feature

d2263bc

Improve Test coverage and fix code smell.

e8504d2

Improve Test coverage and fix code smell.

b3d7043

antoinebhs requested a review from FranckLecuyer October 16, 2023 09:36

FranckLecuyer requested changes Oct 17, 2023

View reviewed changes

antoinebhs added 3 commits October 17, 2023 16:01

Fix copyrights

21c6421

Improve exception messages.

ae88e31

Improve test coverage.

Add name to foreign key. Use EnumType.STRING.

8e3fa9a

antoinebhs requested a review from FranckLecuyer October 18, 2023 08:22

FranckLecuyer approved these changes Oct 18, 2023

View reviewed changes

Ignore case for string filter.

1dd4108