Skip to content

Fix handling of nested fields in OpenSearch query #1407

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

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Fix handling of nested fields in OpenSearch query #1407

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
4 changes: 4 additions & 0 deletions services/libs/opensearch/src/fieldTranslator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ export default abstract class FieldTranslator {
return value
}

isNestedField(field: string): boolean {
return field.startsWith('nested_')
}

translateObjectToCrowd(object: unknown): unknown {
const translated = {}

Expand Down
13 changes: 12 additions & 1 deletion services/libs/opensearch/src/opensearchQueryParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,18 @@ export class OpensearchQueryParser {
} else if (translator.fieldExists(key)) {
const searchKey: string = translator.crowdToOpensearch(key)

query.bool.must.push(this.parseColumnCondition(filters[key], searchKey))
if (translator.isNestedField(searchKey)) {
// Extract the path to the nested object
const nestedPath = searchKey.split('.')[0]
query.bool.must.push({
nested: {
path: nestedPath,
query: this.parseColumnCondition(filters[key], searchKey),
},
})
} else {
query.bool.must.push(this.parseColumnCondition(filters[key], searchKey))
}
} else {
throw new Error(`Unknown field or operator: ${key}!`)
}
Expand Down