Skip to content

fix: dot notation projection to nested object #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmarkerink wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: dot notation projection to nested object #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/de/bwaldvogel/mongo/backend/aggregation/stage/ProjectStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ Document projectDocument(Document document) {
.stream()
.map(value -> Expression.evaluateDocument(value, document))
.collect(Collectors.toList());
result.put(field, resolvedProjectionValues);
Utils.changeSubdocumentValue(result, field, resolvedProjectionValues);
} else if (projectionValue == null) {
result.put(field, null);
Utils.changeSubdocumentValue(result, field, null);
} else {
Object value = Expression.evaluateDocument(projectionValue, document);
if (!(value instanceof Missing)) {
result.put(field, value);
Utils.changeSubdocumentValue(result, field, value);
}
}
}
Expand Down
78 changes: 78 additions & 0 deletions test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractAggregationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2714,6 +2714,84 @@ void testAggregateWithRedact() {
.containsOnly(json("_id: 1"));
}

@Test
void dotNotationProjection() {
collection.insertOne(json("""
_id: 1,
companyName: 'Walt Disney',
buildingNumber: 500,
streetName: 'South Buena Vista Street',
city: 'Burbank',
state: 'California',
zipCode: 91502
"""));

assertThat(collection.aggregate(jsonList("""
$project: {
Name: "$companyName",
"Address.City": "$city",
"Address.ZipCode": "$zipCode",
"Address.StreetName": "$streetName",
"Address.BuildingNumber": "$buildingNumber",
}
""")))
.containsExactly(json("""
_id: 1,
Name: 'Walt Disney',
Address: {
City: 'Burbank',
ZipCode: 91502,
StreetName: 'South Buena Vista Street',
BuildingNumber: 500
}
"""));
}

@Test
void dotNotationProjectionDeepNesting() {
collection.insertOne(json("""
_id: 1,
companyName: 'Acme Corp',
country: 'USA',
state: 'California',
city: 'San Francisco',
street: 'Market Street',
buildingNumber: 123,
floor: 5,
unit: 'A'
"""));

assertThat(collection.aggregate(jsonList("""
$project: {
Company: "$companyName",
"Location.Country": "$country",
"Location.Address.State": "$state",
"Location.Address.City": "$city",
"Location.Address.Details.Street": "$street",
"Location.Address.Details.BuildingNumber": "$buildingNumber",
"Location.Address.Details.Floor": "$floor",
"Location.Address.Details.Unit": "$unit"
}
""")))
.containsExactly(json("""
_id: 1,
Company: 'Acme Corp',
Location: {
Country: 'USA',
Address: {
State: 'California',
City: 'San Francisco',
Details: {
Street: 'Market Street',
BuildingNumber: 123,
Floor: 5,
Unit: 'A'
}
}
}
"""));
}

// https://github.com/bwaldvogel/mongo-java-server/issues/191
@Test
void testProjectWithCondition() throws Exception {
Expand Down