From c0e89fbbeedbecc48e9e228ead577bb33d0f4624 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 16 May 2025 15:11:25 +0300
Subject: [PATCH] Fix RSQL G2 visitor and referenes (e.g. assignedds) with
 multiple conditions (2) (#2406)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .../repository/jpa/rsql/JpaQueryRsqlVisitorG2.java    |  7 ++++++-
 .../hawkbit/repository/jpa/rsql/RSQLToSQLTest.java    | 11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
index 13537d41a..34c8efe97 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
@@ -298,8 +298,13 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
         if (!attribute.isCollection()) {
             // it is a SingularAttribute and not join if it is of basic or entity persistence type
             final Type.PersistenceType persistenceType = ((SingularAttribute<?, ?>) attribute).getType().getPersistenceType();
-            if (persistenceType.equals(Type.PersistenceType.BASIC) || persistenceType.equals(Type.PersistenceType.ENTITY)) {
+            if (persistenceType == Type.PersistenceType.BASIC) {
                 return root.get(fieldNameSplit);
+            } else if (persistenceType == Type.PersistenceType.ENTITY) {
+                return root.getJoins().stream()
+                        .filter(join -> join.getAttribute().equals(attribute))
+                        .findFirst()
+                        .orElseGet(() -> root.join(fieldNameSplit, JoinType.LEFT));
             }
         } // if a collection - it is a join
         if (inOr && root == this.root) { // try to reuse join of the same "or" level and no subquery
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
index 3a216d704..42d878633 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
@@ -39,14 +39,15 @@ import org.springframework.test.context.ContextConfiguration;
 @SuppressWarnings("java:S2699") // java:S2699 - manual test, don't actually does assertions
 class RSQLToSQLTest {
 
+    private static final boolean FULL = Boolean.getBoolean("full");
     private RSQLToSQL rsqlToSQL;
 
-
     @Test
     void print() {
         print(JpaTarget.class, TargetFields.class, "tag==tag1 and tag==tag2");
         print(JpaTarget.class, TargetFields.class, "tag==tag1 or tag==tag2 or tag==tag3");
         print(JpaTarget.class, TargetFields.class, "targettype.key==type1 and metadata.key1==target1-value1");
+        print(JpaTarget.class, TargetFields.class, "targettype.key==type1 or metadata.key1==target1-value1");
         print(JpaTarget.class, TargetFields.class, "(tag!=TAG1 or tag !=TAG2)");
     }
 
@@ -105,9 +106,9 @@ class RSQLToSQLTest {
     private <T, A extends Enum<A> & RsqlQueryField> void print(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) {
         System.out.println(rsql);
         System.out.println("\tlegacy:\n" +
-                "\t\t" + rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, true));
+                "\t\t" + useStar(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, true)));
         System.out.println("\tG2:\n" +
-                "\t\t" + rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false));
+                "\t\t" + useStar(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false)));
     }
 
     private <T, A extends Enum<A> & RsqlQueryField> void printFrom(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) {
@@ -117,4 +118,8 @@ class RSQLToSQLTest {
         System.out.println("\tG2:\n" +
                 "\t\t" + from(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false)));
     }
+
+    private static String useStar(final String sql) {
+        return FULL ? sql : sql.replaceAll("^SELECT [^(]* FROM", "SELECT * FROM");
+    }
 }
\ No newline at end of file