Skip to content

[OSDEV-1346] - Refactor index mapping and sorting for name and address of moderation event #439

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

Closed
VadimKovalenkoSNF wants to merge 3 commits into from
Closed

[OSDEV-1346] - Refactor index mapping and sorting for name and address of moderation event #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74934d2
Refactor index mapping and sorting for name and address of moderation…
VadimKovalenkoSNF Dec 4, 2024
c2f9a23
Merge branch 'main' into OSDEV-1346-fix-name-and-address-mapping
VadimKovalenkoSNF Dec 5, 2024
eb09553
Update release notes
VadimKovalenkoSNF Dec 5, 2024
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
2 changes: 1 addition & 1 deletion doc/release/RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html

### Code/API changes
* [OSDEV-1453](https://opensupplyhub.atlassian.net/browse/OSDEV-1453) - The `detail` keyword instead of `message` has been applied in error response objects for V1 endpoints.
* [OSDEV-1346](https://opensupplyhub.atlassian.net/browse/OSDEV-1346) - Disabled null values from the response of the OpenSearch. Disabled possible null `os_id`, `claim_id` and `source` from `PATCH api/v1/moderation-events/{moderation_id}` response.
* [OSDEV-1346](https://opensupplyhub.atlassian.net/browse/OSDEV-1346) - Disabled null values from the response of the OpenSearch. Disabled possible null `os_id`, `claim_id` and `source` from `PATCH api/v1/moderation-events/{moderation_id}` response. Updated index mapping for `cleaned_data.name` and `cleaned_data.address` for `GET api/v1/moderation-events`. This change fixes the OpenSearch error while sorting by `cleaned_data.name` and `cleaned_data.address`: `Text fields are not optimised for operations that require per-document field data like aggregations and sorting, so these operations are disabled by default. Please use a keyword field instead.`.
* [OSDEV-1410](https://opensupplyhub.atlassian.net/browse/OSDEV-1410) - Introduced new POST `/api/moderation-events/{moderation_id}/production-locations` endpoint
* [OSDEV-1449](https://opensupplyhub.atlassian.net/browse/OSDEV-1449) - **Breaking changes** to the following endpoints:
- GET `v1/moderation-events`
Expand Down
6 changes: 2 additions & 4 deletions src/django/api/views/v1/opensearch_query_builder/moderation_events_query_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,12 @@ def add_sort(self, field, order_by=None):
or field == V1_PARAMETERS_LIST.ADDRESS
):
self.query_body['sort'].append({
'cleaned_data.' + field: {'order': order_by}
f'cleaned_data.{field}.keyword': {'order': order_by}
})
elif field == V1_PARAMETERS_LIST.COUNTRY:
self.query_body['sort'].append(
{
'cleaned_data.' +
field +
'.alpha_2': {'order': order_by}
f'cleaned_data.{field}.alpha_2': {'order': order_by}
}
)
else:
Expand Down
14 changes: 12 additions & 2 deletions src/logstash/indexes/moderation_events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,20 @@
"cleaned_data": {
"properties": {
"name": {
"type": "keyword"
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"address": {
"type": "keyword"
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"country": {
"properties": {
Expand Down