Skip to content

RSD consistent sort order fix #264

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
JohnKallies merged 2 commits into from
Dec 14, 2022
Merged

RSD consistent sort order fix #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba65e01
Adding RSD to collection fix
wgu-edwin Dec 11, 2022
2cbe005
removed normalizer from innerField for all except name and category
wgu-edwin Dec 14, 2022
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
8 changes: 6 additions & 2 deletions api/src/main/kotlin/edu/wgu/osmt/api/model/ApiSortEnum.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ interface SortOrderCompanion<T> where T: SortOrder{
*/
enum class SkillSortEnum(override val apiValue: String) : SortOrder {
CategoryAsc("name.asc") {
override val sort = Sort.by("category.keyword").ascending()
override val sort = Sort.by(
Sort.Order.asc("category.sort_insensitive"),
Sort.Order.asc("name.sort_insensitive"))
},
CategoryDesc("name.desc") {
override val sort = Sort.by("category.keyword").descending()
override val sort = Sort.by(
Sort.Order.desc("category.sort_insensitive"),
Sort.Order.asc("name.sort_insensitive"))
},
NameAsc("skill.asc") {
override val sort = Sort.by(nameKeyword).ascending()
Expand Down
6 changes: 4 additions & 2 deletions api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillDoc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ data class RichSkillDoc(
otherFields = [
InnerField(suffix = "", type = Search_As_You_Type),
InnerField(suffix = "raw", analyzer = "whitespace_exact", type = Text),
InnerField(suffix = "keyword", type = Keyword)
InnerField(suffix = "keyword", type = Keyword),
InnerField(suffix = "sort_insensitive", type = Keyword, normalizer = "lowercase_normalizer")
]
)
@get:JsonProperty("skillName")
Expand All @@ -67,7 +68,8 @@ data class RichSkillDoc(
otherFields = [
InnerField(suffix = "", type = Search_As_You_Type),
InnerField(suffix = "raw", analyzer = "whitespace_exact", type = Text),
InnerField(suffix = "keyword", type = Keyword)
InnerField(suffix = "keyword", type = Keyword),
InnerField(suffix = "sort_insensitive", type = Keyword, normalizer = "lowercase_normalizer")
]
)
@get:JsonProperty
Expand Down
7 changes: 7 additions & 0 deletions api/src/main/resources/elasticsearch/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
"lowercase"
]
}
},
"normalizer": {
"lowercase_normalizer": {
"type": "custom",
"char_filter": [],
"filter": ["lowercase"]
}
}
}
}