Fix 157 inconsistent data handling with embedded entities

perplexhub · Sep 11, 2024 · c848608 · c848608
1 parent 20e2cc4
commit c848608
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAContext.java b/rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAContext.java
@@ -2,13 +2,15 @@
 
 import javax.persistence.criteria.Path;
 import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.ManagedType;
 
 import lombok.Value;
 
 @Value(staticConstructor = "of")
 class RSQLJPAContext {
 
-	private Path<?> path;
-	private Attribute<?, ?> attribute;
+	Path<?> path;
+	Attribute<?, ?> attribute;
+	ManagedType<?> managedType;
 
 }
diff --git a/rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAPredicateConverter.java b/rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAPredicateConverter.java
@@ -72,6 +72,7 @@ RSQLJPAContext findPropertyPath(String propertyPath, Path startRoot) {
 				RSQLJPAContext context = findPropertyPath(mappedProperty, root);
 				root = context.getPath();
 				attribute = context.getAttribute();
+				classMetadata = context.getManagedType();
 			} else {
 				if (!hasPropertyName(mappedProperty, classMetadata)) {
 					if (Modifier.isAbstract(classMetadata.getJavaType().getModifiers())) {
@@ -153,7 +154,7 @@ RSQLJPAContext findPropertyPath(String propertyPath, Path startRoot) {
 			accessControl(type, attribute.getName());
 		}
 
-		return RSQLJPAContext.of(root, attribute);
+		return RSQLJPAContext.of(root, attribute, classMetadata);
 	}
 
 	private String getKeyJoin(Path<?> root, String mappedProperty) {