From 7e2e56c6dd54375f3f5b680ccd5139412fbc5531 Mon Sep 17 00:00:00 2001
From: Thang PHAM <phamthang37@gmail.com>
Date: Thu, 30 May 2024 12:09:22 +0200
Subject: [PATCH 1/3] [Expert filter] - Support for Static Var Compensator
 equipment type

---
 .../proxies/expertfiler/ExpertFilterRepositoryProxy.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java b/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
index 3795171e..a65a4501 100644
--- a/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
+++ b/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
@@ -62,6 +62,8 @@ public static AbstractExpertRule entityToDto(ExpertRuleEntity filterEntity) {
             case COMBINATOR -> {
                 return CombinatorExpertRule.builder()
                         .combinator(filterEntity.getCombinator())
+                        .field(filterEntity.getField())
+                        .operator(filterEntity.getOperator())
                         .rules(entitiesToDto(filterEntity.getRules()))
                         .build();
             }

From 42cd656434642531aba0d73663708c750220cff6 Mon Sep 17 00:00:00 2001
From: Thang PHAM <phamthang37@gmail.com>
Date: Fri, 14 Jun 2024 14:59:31 +0200
Subject: [PATCH 2/3] Regulating terminal and automaton as Boolean data type

---
 .../expertfiler/ExpertFilterRepositoryProxy.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java b/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
index a65a4501..5d44d15f 100644
--- a/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
+++ b/src/main/java/org/gridsuite/filter/server/repositories/proxies/expertfiler/ExpertFilterRepositoryProxy.java
@@ -69,11 +69,13 @@ public static AbstractExpertRule entityToDto(ExpertRuleEntity filterEntity) {
             }
             case BOOLEAN -> {
                 ExpertRuleValueEntity booleanFilterEntity = (ExpertRuleValueEntity) filterEntity;
-                return BooleanExpertRule.builder()
+                BooleanExpertRule.BooleanExpertRuleBuilder<?, ?> ruleBuilder = BooleanExpertRule.builder()
                         .field(booleanFilterEntity.getField())
-                        .operator(booleanFilterEntity.getOperator())
-                        .value(Boolean.parseBoolean(booleanFilterEntity.getValue()))
-                        .build();
+                        .operator(booleanFilterEntity.getOperator());
+                if (booleanFilterEntity.getValue() != null) {
+                    ruleBuilder.value(Boolean.parseBoolean(booleanFilterEntity.getValue()));
+                }
+                return ruleBuilder.build();
             }
             case NUMBER -> {
                 ExpertRuleValueEntity numberFilterEntity = (ExpertRuleValueEntity) filterEntity;

From fe373803447c013dee2c790e7c0967b1797fc9ef Mon Sep 17 00:00:00 2001
From: Thang PHAM <phamthang37@gmail.com>
Date: Tue, 18 Jun 2024 13:45:20 +0200
Subject: [PATCH 3/3] Update to filter library 1.0.8

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8ed16254..654f3fc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,11 @@
 
     <dependencies>
         <!-- Compilation dependencies -->
+        <!-- FIXME: gridsuite-filter modules' version is overloaded in the dependencies section. The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
         <dependency>
             <groupId>org.gridsuite</groupId>
             <artifactId>gridsuite-filter</artifactId>
+            <version>1.0.8</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>