fix: Missing price list argument. You can use priceList or priceLists parameter for specifying custom price list

Corrected filter / order by unwrapping logic and correctly initializing price related context.

Refs: #953

Author: novoj

evita_api/src/main/java/io/evitadb/api/requestResponse/EvitaRequest.java

@@ -333,6 +333,7 @@ public EvitaRequest(
 				"Query can not contain more than one price in price lists filter constraints!"
 			);
 			if (priceInPriceLists.isEmpty()) {
+				this.priceLists = evitaRequest.priceLists;
 				this.requiresPriceLists = evitaRequest.requiresPriceLists;
 			} else {
 				final Optional<PriceInPriceLists> pricesInPriceList = Optional.of(priceInPriceLists.get(0));

evita_engine/src/main/java/io/evitadb/core/query/ReferencedEntityFetcher.java

@@ -33,12 +33,16 @@
 import com.carrotsearch.hppc.cursors.IntObjectCursor;
 import io.evitadb.api.EntityCollectionContract;
 import io.evitadb.api.EvitaSessionContract;
-import io.evitadb.api.query.Constraint;
 import io.evitadb.api.query.FilterConstraint;
+import io.evitadb.api.query.OrderConstraint;
 import io.evitadb.api.query.filter.EntityHaving;
+import io.evitadb.api.query.filter.EntityLocaleEquals;
 import io.evitadb.api.query.filter.EntityPrimaryKeyInSet;
 import io.evitadb.api.query.filter.FilterBy;
 import io.evitadb.api.query.filter.ReferenceHaving;
+import io.evitadb.api.query.order.EntityPrimaryKeyExact;
+import io.evitadb.api.query.order.EntityPrimaryKeyInFilter;
+import io.evitadb.api.query.order.EntityPrimaryKeyNatural;
 import io.evitadb.api.query.order.EntityProperty;
 import io.evitadb.api.query.order.OrderBy;
 import io.evitadb.api.query.require.DefaultPrefetchRequirementCollector;
@@ -141,6 +145,8 @@
 
 import static io.evitadb.api.query.QueryConstraints.and;
 import static io.evitadb.api.query.QueryConstraints.entityPrimaryKeyInSet;
+import static io.evitadb.api.query.QueryConstraints.filterBy;
+import static io.evitadb.api.query.QueryConstraints.orderBy;
 import static io.evitadb.core.query.extraResult.translator.hierarchyStatistics.AbstractHierarchyTranslator.stopAtConstraintToPredicate;
 import static java.util.Optional.ofNullable;
 
@@ -264,12 +270,17 @@ private static Map<Integer, ServerEntityDecorator> fetchReferencedEntities(
 	private static FilterBy unwrapFilterBy(@Nullable FilterBy entityFilterBy) {
 		final FilterBy unwrappedEntityFilterBy;
 		if (entityFilterBy != null) {
-			final Constraint<?> entityHavingConstraint = FinderVisitor.findConstraint(entityFilterBy, EntityHaving.class::isInstance, EntityHaving.class::isInstance);
-			if (entityHavingConstraint instanceof EntityHaving eh) {
-				unwrappedEntityFilterBy = new FilterBy(eh.getChildren());
-			} else {
-				unwrappedEntityFilterBy = null;
-			}
+			final List<FilterConstraint> entityConstraints = FinderVisitor.findConstraints(
+				entityFilterBy,
+				it -> it instanceof EntityHaving || it instanceof EntityPrimaryKeyInSet || it instanceof EntityLocaleEquals,
+				EntityHaving.class::isInstance
+			);
+			unwrappedEntityFilterBy = filterBy(
+				entityConstraints
+					.stream()
+					.flatMap(it -> it instanceof EntityHaving eh ? Arrays.stream(eh.getChildren()) : Stream.of(it))
+					.toArray(FilterConstraint[]::new)
+			);
 		} else {
 			unwrappedEntityFilterBy = null;
 		}
@@ -288,12 +299,20 @@ private static FilterBy unwrapFilterBy(@Nullable FilterBy entityFilterBy) {
 	private static OrderBy unwrapOrderBy(@Nullable OrderBy entityOrderBy) {
 		final OrderBy unwrappedEntityFilterBy;
 		if (entityOrderBy != null) {
-			final Constraint<?> entityProperty = FinderVisitor.findConstraint(entityOrderBy, EntityProperty.class::isInstance, EntityProperty.class::isInstance);
-			if (entityProperty instanceof EntityProperty ep) {
-				unwrappedEntityFilterBy = new OrderBy(ep.getChildren());
-			} else {
-				unwrappedEntityFilterBy = null;
-			}
+			final List<OrderConstraint> entityConstraints = FinderVisitor.findConstraints(
+				entityOrderBy,
+				it -> it instanceof EntityProperty ||
+					it instanceof EntityPrimaryKeyExact ||
+					it instanceof EntityPrimaryKeyNatural ||
+					it instanceof EntityPrimaryKeyInFilter,
+				EntityProperty.class::isInstance
+			);
+			unwrappedEntityFilterBy = orderBy(
+				entityConstraints
+					.stream()
+					.flatMap(it -> it instanceof EntityProperty eh ? Arrays.stream(eh.getChildren()) : Stream.of(it))
+					.toArray(OrderConstraint[]::new)
+			);
 		} else {
 			unwrappedEntityFilterBy = null;
 		}

evita_engine/src/main/java/module-info.java

@@ -99,8 +99,6 @@
 
 	requires jdk.jfr;
 	requires net.bytebuddy;
-	requires java.sql;
-	requires jdk.jdi;
 	requires proxycian.bytebuddy;
 
 	opens io.evitadb.core.metric.event to evita.common;

evita_functional_tests/src/test/java/io/evitadb/api/functional/fetch/EntityFetchingFunctionalTest.java

@@ -3299,8 +3299,11 @@ void shouldEagerlyDeepFetchReferenceEntityBodiesFilteredAndOrderedViaGetEntity(E
 				final String[] receivedOrderedNames = references.stream()
 					.map(it -> it.getReferencedEntity().orElseThrow())
 					.map(it -> it.getAttribute(ATTRIBUTE_NAME, String.class))
+					.filter(Objects::nonNull)
 					.toArray(String[]::new);
 
+				assertEquals(references.size(), receivedOrderedNames.length);
+
 				final Collator collator = Collator.getInstance(CZECH_LOCALE);
 				assertArrayEquals(
 					Arrays.stream(receivedOrderedNames)