Skip to content

fix: RB search case insensitive #298

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
Jun 2, 2021
Merged

fix: RB search case insensitive #298

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
13 changes: 9 additions & 4 deletions src/services/ResourceBookingService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,8 @@ async function searchResourceBookings (currentUser, criteria, options = { return
const { body } = await esClient.search(esQuery)
const resourceBookings = _.map(body.hits.hits, '_source')
// ESClient will return ResourceBookings with it's all nested WorkPeriods
// We re-apply WorkPeriod filters
_.each(workPeriodFilters, (value, key) => {
// We re-apply WorkPeriod filters except userHandle because all WPs share same userHandle
_.each(_.omit(workPeriodFilters, 'workPeriods.userHandle'), (value, key) => {
key = key.split('.')[1]
_.each(resourceBookings, r => {
r.workPeriods = _.filter(r.workPeriods, { [key]: value })
Expand Down Expand Up @@ -608,11 +608,16 @@ async function searchResourceBookings (currentUser, criteria, options = { return
queryCriteria.include[0].attributes = { exclude: _.map(queryOpt.excludeWP, f => _.split(f, '.')[1]) }
}
// Apply WorkPeriod filters
_.each(_.pick(criteria, ['workPeriods.startDate', 'workPeriods.endDate', 'workPeriods.userHandle', 'workPeriods.paymentStatus']), (value, key) => {
_.each(_.pick(criteria, ['workPeriods.startDate', 'workPeriods.endDate', 'workPeriods.paymentStatus']), (value, key) => {
key = key.split('.')[1]
queryCriteria.include[0].where[Op.and].push({ [key]: value })
queryCriteria.include[0].required = true
})
if (criteria['workPeriods.userHandle']) {
queryCriteria.include[0].where[Op.and].push({ userHandle: { [Op.iLike]: criteria['workPeriods.userHandle'] } })
}
if (queryCriteria.include[0].where[Op.and].length > 0) {
queryCriteria.include[0].required = true
}
}
// Apply sorting criteria
if (!queryOpt.sortByWP) {
Expand Down