Merge pull request #705 from FgForrest/repeated-fix-701

fix(#701): When fetched references are ordered, implicit request reso…

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

@@ -132,10 +132,7 @@ private static RequirementContext getRequirementContext(
 	) {
 		return new RequirementContext(
 			referenceContent.getManagedReferencesBehaviour(),
-			new AttributeRequest(
-				attributeContent == null ? Collections.emptySet() : attributeContent.getAttributeNamesAsSet(),
-				attributeContent != null
-			),
+			attributeContent,
 			referenceContent.getEntityRequirement().orElse(null),
 			referenceContent.getGroupEntityRequirement().orElse(null),
 			referenceContent.getFilterBy().orElse(null),
@@ -957,21 +954,36 @@ private enum ResultForm {
 	 * and group entity for fast access in this evita request instance.
 	 *
 	 * @param managedReferencesBehaviour controls behaviour of excluding missing managed references
-	 * @param attributeRequest           requested attributes for the entity reference
+	 * @param attributeContent           requested attributes for the entity reference
 	 * @param entityFetch                requirements related to fetching related entity
 	 * @param entityGroupFetch           requirements related to fetching related entity group
 	 * @param filterBy                   filtering constraints for entities
 	 * @param orderBy                    ordering constraints for entities
 	 */
 	public record RequirementContext(
 		@Nonnull ManagedReferencesBehaviour managedReferencesBehaviour,
-		@Nonnull AttributeRequest attributeRequest,
+		@Nullable AttributeContent attributeContent,
 		@Nullable EntityFetch entityFetch,
 		@Nullable EntityGroupFetch entityGroupFetch,
 		@Nullable FilterBy filterBy,
 		@Nullable OrderBy orderBy
 	) {
 
+		/**
+		 * Generates an AttributeRequest based on the current attributeContent.
+		 * If attributeContent is null, an empty set of attributes is created.
+		 * Otherwise, the attribute names from attributeContent are used.
+		 *
+		 * @return an AttributeRequest instance containing the set of attribute names and whether any attributes are required
+		 */
+		@Nonnull
+		public AttributeRequest attributeRequest() {
+			return new AttributeRequest(
+				attributeContent == null ? Collections.emptySet() : attributeContent.getAttributeNamesAsSet(),
+				attributeContent != null
+			);
+		}
+
 		/**
 		 * Returns true if the settings require initialization of referenced entities.
 		 * @return true if the settings require initialization of referenced entities

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

@@ -1043,7 +1043,7 @@ private EvitaRequest prefetchEntities(
 					)
 				);
 
-		final DefaultPrefetchRequirementCollector globalPrefetchCollector = new DefaultPrefetchRequirementCollector(null);
+		final DefaultPrefetchRequirementCollector globalPrefetchCollector = new DefaultPrefetchRequirementCollector();
 		this.fetchedEntities = collectedRequirements
 			.filter(it -> it.getValue().requiresInit())
 			.collect(
@@ -1053,12 +1053,15 @@ private EvitaRequest prefetchEntities(
 						final String referenceName = it.getKey();
 						final RequirementContext requirements = it.getValue();
 						final ReferenceSchemaContract referenceSchema = entitySchema.getReferenceOrThrowException(referenceName);
-						final DefaultPrefetchRequirementCollector localPrefetchCollector = new DefaultPrefetchRequirementCollector(requirements.entityFetch());
+						// initialize requirements with requested attributes
+						if (requirements.attributeContent() != null) {
+							globalPrefetchCollector.addRequirementToPrefetch(requirements.attributeContent());
+						}
 
 						final Optional<OrderingDescriptor> orderingDescriptor = ofNullable(requirements.orderBy())
 							.map(ob -> ReferenceOrderByVisitor.getComparator(
 								executionContext.getQueryContext(),
-								localPrefetchCollector,
+								globalPrefetchCollector,
 								ob,
 								entitySchema,
 								referenceSchema
@@ -1126,17 +1129,14 @@ private EvitaRequest prefetchEntities(
 									)
 								);
 
-							final EntityFetch entityFetch = localPrefetchCollector.getEntityFetch();
-							if (entityFetch != null && !ArrayUtils.isEmpty(filteredReferencedEntityIds)) {
-								// collect global requirements
-								globalPrefetchCollector.addRequirementToPrefetch(entityFetch.getRequirements());
+							if (requirements.entityFetch() != null && !ArrayUtils.isEmpty(filteredReferencedEntityIds)) {
 								// if so, fetch them
 								entityIndex = fetchReferencedEntities(
 									executionContext,
 									referenceSchema,
 									referenceSchema.getReferencedEntityType(),
 									pk -> existingEntityRetriever.getExistingEntity(referenceName, pk),
-									entityFetch,
+									requirements.entityFetch(),
 									filteredReferencedEntityIds
 								);
 							} else {

evita_engine/src/main/java/io/evitadb/core/query/algebra/prefetch/PrefetchFormulaVisitor.java

@@ -71,7 +71,7 @@ public class PrefetchFormulaVisitor implements FormulaVisitor, FormulaPostProces
 	/**
 	 * Contains set of requirements collected from all {@link SelectionFormula} in the tree.
 	 */
-	protected final DefaultPrefetchRequirementCollector requirements = new DefaultPrefetchRequirementCollector(null);
+	protected final DefaultPrefetchRequirementCollector requirements = new DefaultPrefetchRequirementCollector();
 	/**
 	 * Indexes that were used when visitor was created.
 	 */

evita_engine/src/main/java/io/evitadb/core/query/fetch/DefaultPrefetchRequirementCollector.java

@@ -44,6 +44,10 @@
 public class DefaultPrefetchRequirementCollector implements FetchRequirementCollector {
 	private Map<Class<? extends EntityContentRequire>, EntityContentRequire[]> requirements;
 
+	public DefaultPrefetchRequirementCollector() {
+		this(null);
+	}
+
 	public DefaultPrefetchRequirementCollector(@Nullable EntityFetch entityFetch) {
 		if (entityFetch != null) {
 			this.requirements = CollectionUtils.createHashMap(8);

evita_functional_tests/src/test/java/io/evitadb/api/requestResponse/data/structure/predicate/ReferenceContractSerializablePredicateTest.java

@@ -23,6 +23,7 @@
 
 package io.evitadb.api.requestResponse.data.structure.predicate;
 
+import io.evitadb.api.query.require.AttributeContent;
 import io.evitadb.api.query.require.ManagedReferencesBehaviour;
 import io.evitadb.api.requestResponse.EvitaRequest;
 import io.evitadb.api.requestResponse.EvitaRequest.AttributeRequest;
@@ -65,7 +66,7 @@ private static Map<String, RequirementContext> getDefaultRequirementContext(List
 			.stream()
 			.collect(Collectors.toMap(
 					Function.identity(),
-					it -> new RequirementContext(ManagedReferencesBehaviour.ANY, AttributeRequest.EMPTY, null, null, null, null)
+					it -> new RequirementContext(ManagedReferencesBehaviour.ANY, null, null, null, null, null)
 				)
 			);
 	}
@@ -85,7 +86,7 @@ private static Map<String, AttributeRequest> toAttributeRequestIndex(Map<String,
 	@Nonnull
 	private static RequirementContext createRequirementContext(String... attributes) {
 		return new RequirementContext(
-			ManagedReferencesBehaviour.ANY, new AttributeRequest(Set.of(attributes), true),
+			ManagedReferencesBehaviour.ANY, new AttributeContent(attributes),
 			null, null, null, null
 		);
 	}