Skip to content
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.

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

gh-389 Update SummaryMetadata to support filtering for index queries #390

Merged
merged 1 commit into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class SummaryMetadata implements MultiFacetItemAware, InformationAware, MdmDomai
}

static DetachedCriteria<SummaryMetadata> withFilter(DetachedCriteria<SummaryMetadata> criteria, Map filters) {
if (filters.label) criteria = criteria.ilike('label', "%${filters.name}%")
if (filters.label) criteria = criteria.ilike('label', "%${filters.label}%")
criteria
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class SummaryMetadataService implements MultiFacetItemAwareService<SummaryMetada

@Override
List<SummaryMetadata> findAllByMultiFacetAwareItemId(UUID multiFacetAwareItemId, Map pagination = [:]) {
SummaryMetadata.byMultiFacetAwareItemId(multiFacetAwareItemId).list(pagination)
SummaryMetadata.withFilter(SummaryMetadata.byMultiFacetAwareItemId(multiFacetAwareItemId), pagination).list(pagination)
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,69 @@ abstract class CatalogueItemSummaryMetadataFunctionalSpec extends CatalogueItemF
cleanup:
cleanUpData(id)
}

void 'CISM02: test filtering of summaryMetadata'() {
given: 'Create new summaryMetadata items'
def id1 = createNewItem([
label : 'Summary the first',
summaryMetadataType: SummaryMetadataType.NUMBER
])
def id2 = createNewItem([
label : 'Summary the second',
summaryMetadataType: SummaryMetadataType.NUMBER
])

when: 'No filter used'
GET('')

then: 'Check all summaryMetadata returned'
verifyResponse(HttpStatus.OK, response)
response.body().count == 2

when: 'Filter by label'
GET('?label=sec')

then: 'Check filtered summaryMetadata returned'
verifyResponse(HttpStatus.OK, response)
response.body().count == 1
response.body().items[0].id == id2

cleanup:
cleanUpData(id1)
cleanUpData(id2)
}

void 'CISM03: test sorting of summaryMetadata'() {
given: 'Create new summaryMetadata items'
def id1 = createNewItem([
label : 'A summaryMetadata',
summaryMetadataType: SummaryMetadataType.NUMBER
])
def id2 = createNewItem([
label : 'B summaryMetadata',
summaryMetadataType: SummaryMetadataType.NUMBER
])

when: 'Default sorting by label'
GET('')

then: 'Check summaryMetadata returned in ascending label order'
verifyResponse(HttpStatus.OK, response)
response.body().count == 2
response.body().items[0].id == id1
response.body().items[1].id == id2

when: 'Sort by label descending'
GET('?sort=label&order=desc')

then: 'Check summaryMetadata returned in descending label order'
verifyResponse(HttpStatus.OK, response)
response.body().count == 2
response.body().items[0].id == id2
response.body().items[1].id == id1

cleanup:
cleanUpData(id1)
cleanUpData(id2)
}
}