Skip to content

Commit

Permalink
fix(mod-search): fix export of cql files
Browse files Browse the repository at this point in the history
- Edit query in test cases

Closes: MSEARCH-762
  • Loading branch information
viacheslavpoliakov committed Jun 21, 2024
1 parent 702cd8b commit 61ddbf8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public void streamResourceIdsForJob(ResourceIdsJobEntity job, String tenantId) {
idsTemporaryRepository.createTableForIds(tableName);
streamResourceIds(request, idsList -> idsTemporaryRepository.insertIds(idsList, tableName));
job.setStatus(StreamJobStatus.COMPLETED);

} catch (Exception e) {
log.warn("Failed to process resource ids job with id = {}, msg: {}", job.getId(), e.getMessage());
idsTemporaryRepository.dropTableForIds(tableName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ void filterQueryForActiveAffiliation_positive_basicNotConsortiumTenant() {

@Test
void filterQueryActiveAffiliation_filteredByMemberTenant() {
var query = matchAllQuery();
var query = boolQuery()
.filter(termQuery("staffSuppress", false))
.filter(termQuery(SHARED_FIELD_NAME, false));
var expected = boolQuery()
.filter(termQuery("staffSuppress", false))
.filter(termQuery(SHARED_FIELD_NAME, false))
.minimumShouldMatch(1)
.should(termQuery(TENANT_ID_FIELD_NAME, TENANT_ID))
.should(termQuery(SHARED_FIELD_NAME, true));
Expand All @@ -92,8 +96,12 @@ void filterQueryActiveAffiliation_filteredByMemberTenant() {

@Test
void filterQueryActiveAffiliation_notFilteredByMemberTenant() {
var query = matchAllQuery();
var query = boolQuery()
.filter(termQuery("staffSuppress", false))
.filter(termQuery(SHARED_FIELD_NAME, false));
var expected = boolQuery()
.filter(termQuery("staffSuppress", false))
.filter(termQuery(SHARED_FIELD_NAME, false))
.minimumShouldMatch(1)
.should(termQuery(SHARED_FIELD_NAME, true));

Expand Down

0 comments on commit 61ddbf8

Please sign in to comment.