Skip to content

Advanced Search Fix #261

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 4 commits into from
Dec 9, 2022
Merged

Advanced Search Fix #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb5e707
first attempt to fix
jchavez137 Dec 7, 2022
2601cab
changing field name reference
jchavez137 Dec 8, 2022
4c44e0c
Removing Constant for field name
jchavez137 Dec 8, 2022
8d698bc
removing buildManualQuery method, changing to use keyword subfield wi…
jchavez137 Dec 9, 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
1 change: 1 addition & 0 deletions api/src/main/kotlin/edu/wgu/osmt/config/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ const val INDEX_RICHSKILL_DOC = "richskill_v1"
const val INDEX_COLLECTION_DOC = "collection_v1"
const val INDEX_JOBCODE_DOC = "jobcode_v1"
const val INDEX_KEYWORD_DOC = "keyword"
const val QUOTED_SEARCH_REGEX_PATTERN = "([\"\'])(?:(?=(\\\\?))\\2.)*?\\1"
8 changes: 4 additions & 4 deletions api/src/main/kotlin/edu/wgu/osmt/richskill/RichSkillEsRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import edu.wgu.osmt.PaginationDefaults
import edu.wgu.osmt.api.model.ApiAdvancedSearch
import edu.wgu.osmt.api.model.ApiSearch
import edu.wgu.osmt.api.model.ApiSimilaritySearch
import edu.wgu.osmt.config.QUOTED_SEARCH_REGEX_PATTERN
import edu.wgu.osmt.db.PublishStatus
import edu.wgu.osmt.elasticsearch.FindsAllByPublishStatus
import edu.wgu.osmt.elasticsearch.OffsetPageable
Expand Down Expand Up @@ -71,13 +72,12 @@ class CustomRichSkillQueriesImpl @Autowired constructor(override val elasticSear
} else {
bq.must(QueryBuilders.matchBoolPrefixQuery(RichSkillDoc::name.name, it))
}

}
category.nullIfEmpty()?.let {
if (it.contains("\"")) {
bq.must(simpleQueryStringQuery(it).field("${RichSkillDoc::category.name}.raw").defaultOperator(Operator.AND))
if (it.matches(Regex(QUOTED_SEARCH_REGEX_PATTERN))) {
bq.must(simpleQueryStringQuery(it).field("${RichSkillDoc::category.name}.keyword").defaultOperator(Operator.AND))
} else {
bq.must(QueryBuilders.matchBoolPrefixQuery(RichSkillDoc::category.name, it))
bq.must(matchBoolPrefixQuery(RichSkillDoc::category.name, it))
}
}
author.nullIfEmpty()?.let {
Expand Down