Fix mapping custom field names in downstream stages in TypedAggregation pipelines.

Use the root AggregationOperationContext in nested ExposedFieldsAggregationOperationContext to properly apply mapping for domain properties that use @field.

Closes #4443

Author: sxhinzvc

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java

@@ -60,6 +60,11 @@ public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return rootContext.getMappedObject(document, type);
 	}
 
+	@Override
+	public Document getMappedObject(Document document) {
+		return rootContext.getMappedObject(document);
+	}
+
 	@Override
 	public FieldReference getReference(Field field) {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java

@@ -119,7 +119,7 @@ private void cleanDb() {
 
 		mongoTemplate.flush(Product.class, UserWithLikes.class, DATAMONGO753.class, Data.class, DATAMONGO788.class,
 				User.class, Person.class, Reservation.class, Venue.class, MeterData.class, LineItem.class, InventoryItem.class,
-				Sales.class, Sales2.class, Employee.class, Art.class, Venue.class);
+				Sales.class, Sales2.class, Employee.class, Art.class, Venue.class, Item.class);
 
 		mongoTemplate.dropCollection(INPUT_COLLECTION);
 		mongoTemplate.dropCollection("personQueryTemp");
@@ -2314,19 +2314,21 @@ public String toString() {
 		}
 	}
 
-	// DATAMONGO-1491
+	// DATAMONGO-1491, GH-4443
 	static class Item {
 
 		@org.springframework.data.mongodb.core.mapping.Field("item_id") //
 		String itemId;
 		Integer quantity;
 		Long price;
+		List<String> tags = new ArrayList<>();
 
-		Item(String itemId, Integer quantity, Long price) {
+		Item(String itemId, Integer quantity, Long price, List<String> tags) {
 
 			this.itemId = itemId;
 			this.quantity = quantity;
 			this.price = price;
+			this.tags = tags;
 		}
 
 		public static ItemBuilder builder() {
@@ -2385,6 +2387,7 @@ public static class ItemBuilder {
 			private String itemId;
 			private Integer quantity;
 			private Long price;
+			private List<String> tags;
 
 			ItemBuilder() {}
 
@@ -2403,8 +2406,13 @@ public ItemBuilder price(Long price) {
 				return this;
 			}
 
+			public ItemBuilder tags(List<String> tags) {
+				this.tags = tags;
+				return this;
+			}
+
 			public Item build() {
-				return new Item(itemId, quantity, price);
+				return new Item(itemId, quantity, price, tags);
 			}
 
 			public String toString() {
@@ -2949,4 +2957,22 @@ public String toString() {
 			return "AggregationTests.UserRef(id=" + this.getId() + ", name=" + this.getName() + ")";
 		}
 	}
+
+	@Test // GH-4443
+	void shouldHonorFieldAliasesForFieldReferencesUsingFieldExposingOperation() {
+
+		Item item1 = Item.builder().itemId("1").tags(Arrays.asList("a", "b")).build();
+		Item item2 = Item.builder().itemId("1").tags(Arrays.asList("a", "c")).build();
+		mongoTemplate.insert(Arrays.asList(item1, item2), Item.class);
+
+		TypedAggregation<Item> aggregation = newAggregation(Item.class,
+				match(where("itemId").is("1")),
+				unwind("tags"),
+				match(where("itemId").is("1").and("tags").is("c")));
+		AggregationResults<Document> results = mongoTemplate.aggregate(aggregation, Document.class);
+		List<Document> mappedResults = results.getMappedResults();
+		assertThat(mappedResults).hasSize(1);
+		assertThat(mappedResults.get(0)).containsEntry("item_id", "1");
+	}
+
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java

@@ -31,6 +31,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperationUnitTests.BookWithFieldAnnotation;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -653,6 +654,22 @@ void inheritedFieldsExposingContextShouldNotFailOnUnknownFieldReferenceForRelaxe
 		assertThat(documents.get(2)).isEqualTo("{ $sort : { 'serial_number' : -1, 'label_name' : -1 } }");
 	}
 
+	@Test // GH-4443
+	void fieldsExposingContextShouldUseCustomFieldNameFromRelaxedRootContext() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(
+				WithRetypedIdField.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		TypedAggregation<WithRetypedIdField> agg = newAggregation(WithRetypedIdField.class,
+				unwind("entries"), match(where("foo").is("value 2")));
+		List<Document> pipeline = agg.toPipeline(context);
+
+		Document fields = getAsDocument(pipeline.get(1), "$match");
+		assertThat(fields.get("renamed-field")).isEqualTo("value 2");
+	}
+
 	private Document extractPipelineElement(Document agg, int index, String operation) {
 
 		List<Document> pipeline = (List<Document>) agg.get("pipeline");
@@ -672,5 +689,7 @@ public class WithRetypedIdField {
 
 		@org.springframework.data.mongodb.core.mapping.Field("renamed-field") private String foo;
 
+		private List<String> entries = new ArrayList<>();
+
 	}
 }