Adds nested field tests #150
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduces nested field support and related tests. This commit addresses the need for testing nested fields. It includes a new test file, updates configurations, and adds utilities for generating test data with nested properties. A nested field is also added to the default search fields.
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR introduces improved nested field support for Elasticsearch repositories with comprehensive test coverage. The changes enable testing and functionality for nested field queries, aggregations, and default search configuration.
- Adds a new comprehensive test file for nested field functionality
- Updates the Employee model generator to support peer review data
- Configures default search fields to include nested field properties
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| Employee.cs | Adds peerReviews parameter to the Generate method for creating test data with nested fields |
| EmployeeIndex.cs | Configures default search fields to include employee ID and nested peer review reviewer ID |
| NestedFieldTests.cs | New comprehensive test file covering nested field queries, aggregations, and serialization scenarios |
| AggregationQueryTests.cs | Removes duplicate nested aggregation test and unused import |
Comments suppressed due to low confidence (1)
tests/Foundatio.Repositories.Elasticsearch.Tests/AggregationQueryTests.cs:114
- This line overwrites the first employee's ID with "employee2", which should likely be setting the second employee's ID instead. This should be
employees[1].Id = "employee2";
Age = 30,
Adds tests to verify filtering of nested aggregations using include and exclude. This ensures that aggregations can be filtered based on specific values within nested fields, providing more granular control over the aggregation results. Also improves readability in existing tests.
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
|
|
||
| var nestedPeerReviewsAgg = result.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedPeerReviewsAgg); | ||
| Assert.NotEmpty(nestedPeerReviewsAgg.Aggregations); |
|
|
||
| var termsRatingAgg = nestedReviewRatingAgg.Aggregations["terms_rating"] as BucketAggregate; | ||
| Assert.NotNull(termsRatingAgg); | ||
| Assert.Equal(2, termsRatingAgg.Items.Count); |
|
|
||
| var userFilteredAgg = nestedReviewRatingFilteredAgg.Aggregations["user_" + employees[0].Id] as SingleBucketAggregate; | ||
| Assert.NotNull(userFilteredAgg); | ||
| Assert.Single(userFilteredAgg.Aggregations.Terms("terms_rating").Buckets); |
| var nestedPeerReviewsAgg = result.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedPeerReviewsAgg); | ||
|
|
||
| var reviewerTermsAgg = nestedPeerReviewsAgg.Aggregations.Terms<string>("terms_peerReviews.reviewerEmployeeId"); |
| var nestedPeerReviewsAggWithInclude = resultWithInclude.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedPeerReviewsAggWithInclude); | ||
|
|
||
| var reviewerTermsAggWithInclude = nestedPeerReviewsAggWithInclude.Aggregations.Terms<string>("terms_peerReviews.reviewerEmployeeId"); |
| var nestedPeerReviewsAggWithExclude = resultWithExclude.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedPeerReviewsAggWithExclude); | ||
|
|
||
| var reviewerTermsAggWithExclude = nestedPeerReviewsAggWithExclude.Aggregations.Terms<string>("terms_peerReviews.reviewerEmployeeId"); |
| var nestedPeerReviewsAgg = result.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedPeerReviewsAgg); | ||
|
|
||
| var ratingTermsAgg = nestedPeerReviewsAgg.Aggregations.Terms<int>("terms_peerReviews.rating"); |
| var roundTrippedNestedAgg = roundTripped.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(roundTrippedNestedAgg); | ||
|
|
||
| var roundTrippedRatingTermsAgg = roundTrippedNestedAgg.Aggregations.Terms<int>("terms_peerReviews.rating"); |
| roundTrippedNestedAgg = roundTripped.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(roundTrippedNestedAgg); | ||
|
|
||
| roundTrippedRatingTermsAgg = roundTrippedNestedAgg.Aggregations.Terms<int>("terms_peerReviews.rating"); |
| var nestedReviewRatingAgg = result["nested_reviewRating"] as SingleBucketAggregate; | ||
| Assert.NotNull(nestedReviewRatingAgg); | ||
|
|
||
| var termsRatingAgg = nestedReviewRatingAgg.Aggregations["terms_rating"] as BucketAggregate; |
|
@niemyjski
|
Addresses issues with deserializing nested aggregations in Elasticsearch queries. This change ensures that nested aggregations, particularly those involving terms aggregations on nested fields, are correctly serialized and deserialized. It corrects the format of aggregations expressions in tests and handles the deserialization of SingleBucketAggregates correctly.
| roundTrippedNestedAgg = roundTripped.Aggregations["nested_peerReviews"] as SingleBucketAggregate; | ||
| Assert.NotNull(roundTrippedNestedAgg); | ||
|
|
||
| roundTrippedRatingTermsAgg = roundTrippedNestedAgg.Aggregations.Terms<int>("terms_peerReviews.rating"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduces improved nested field support and related tests.
This commit addresses the need for testing nested fields. It includes a new test file, updates configurations, and adds utilities for generating test data with nested properties. A nested field is also added to the default search fields.