-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/master' into MSEARCH-762
- Loading branch information
Showing
11 changed files
with
236 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/main/java/org/folio/search/model/dto/locationunit/CampusDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.folio.search.model.dto.locationunit; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.With; | ||
| import lombok.extern.jackson.Jacksonized; | ||
|
|
||
| /** | ||
| * Describes Campus object that comes from external channels. | ||
| */ | ||
| @Data | ||
| @With | ||
| @Builder | ||
| @Jacksonized | ||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) | ||
| public class CampusDto { | ||
|
|
||
| @JsonProperty("id") | ||
| private String id; | ||
| @JsonProperty("name") | ||
| private String name; | ||
| @JsonProperty("code") | ||
| private String code; | ||
| @JsonProperty("institutionId") | ||
| private String institutionId; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "index": { | ||
| "number_of_shards": 4, | ||
| "number_of_replicas": 2, | ||
| "refresh_interval": "1s", | ||
| "codec": "best_compression", | ||
| "mapping.total_fields.limit": 1000 | ||
| }, | ||
| "analysis": { | ||
| "normalizer": { | ||
| "keyword_lowercase": { | ||
| "filter": [ | ||
| "lowercase", | ||
| "icu_folding" | ||
| ], | ||
| "type": "custom" | ||
| } | ||
| }, | ||
| "tokenizers": {} | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "name": "campus", | ||
| "eventBodyJavaClass": "org.folio.search.model.dto.locationunit.CampusDto", | ||
| "reindexSupported": false, | ||
| "fields": { | ||
| "id": { | ||
| "index": "keyword_lowercase", | ||
| "showInResponse": [ "search" ] | ||
| }, | ||
| "tenantId": { | ||
| "index": "keyword_lowercase", | ||
| "showInResponse": [ "search" ], | ||
| "isTenant": true | ||
| }, | ||
| "name": { | ||
| "index": "keyword_lowercase", | ||
| "showInResponse": [ "search" ] | ||
| }, | ||
| "code": { | ||
| "index": "keyword_lowercase", | ||
| "showInResponse": [ "search" ] | ||
| }, | ||
| "institutionId": { | ||
| "index": "keyword_lowercase" | ||
| } | ||
| } | ||
| } |
144 changes: 144 additions & 0 deletions
144
src/test/java/org/folio/search/controller/CampusesIndexingConsortiumIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package org.folio.search.controller; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.awaitility.Awaitility.await; | ||
| import static org.awaitility.Durations.ONE_MINUTE; | ||
| import static org.awaitility.Durations.ONE_SECOND; | ||
| import static org.folio.search.domain.dto.ResourceEventType.CREATE; | ||
| import static org.folio.search.domain.dto.ResourceEventType.DELETE; | ||
| import static org.folio.search.domain.dto.ResourceEventType.DELETE_ALL; | ||
| import static org.folio.search.domain.dto.ResourceEventType.UPDATE; | ||
| import static org.folio.search.utils.SearchUtils.CAMPUS_RESOURCE; | ||
| import static org.folio.search.utils.SearchUtils.getIndexName; | ||
| import static org.folio.search.utils.TestConstants.CENTRAL_TENANT_ID; | ||
| import static org.folio.search.utils.TestConstants.MEMBER_TENANT_ID; | ||
| import static org.folio.search.utils.TestConstants.inventoryCampusTopic; | ||
| import static org.folio.search.utils.TestUtils.kafkaResourceEvent; | ||
| import static org.folio.search.utils.TestUtils.randomId; | ||
| import static org.folio.search.utils.TestUtils.toMap; | ||
| import static org.opensearch.index.query.QueryBuilders.boolQuery; | ||
| import static org.opensearch.search.builder.SearchSourceBuilder.searchSource; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.search.domain.dto.ResourceEvent; | ||
| import org.folio.search.model.dto.locationunit.CampusDto; | ||
| import org.folio.search.support.base.BaseConsortiumIntegrationTest; | ||
| import org.folio.spring.testing.type.IntegrationTest; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.opensearch.action.search.SearchRequest; | ||
| import org.opensearch.client.RequestOptions; | ||
| import org.opensearch.index.query.QueryBuilders; | ||
|
|
||
| @Log4j2 | ||
| @IntegrationTest | ||
| class CampusesIndexingConsortiumIT extends BaseConsortiumIntegrationTest { | ||
|
|
||
| @BeforeAll | ||
| static void prepare() { | ||
| setUpTenant(CENTRAL_TENANT_ID); | ||
| setUpTenant(MEMBER_TENANT_ID); | ||
| } | ||
|
|
||
| @AfterAll | ||
| static void cleanUp() { | ||
| removeTenant(CENTRAL_TENANT_ID); | ||
| removeTenant(MEMBER_TENANT_ID); | ||
| } | ||
|
|
||
| @AfterEach | ||
| void tearDown() throws IOException { | ||
| cleanUpIndex(CAMPUS_RESOURCE, CENTRAL_TENANT_ID); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldIndexAndRemoveCampus() { | ||
| var campus = campus(); | ||
| var createEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, CREATE, toMap(campus), null); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createEvent); | ||
|
|
||
| awaitAssertCampusCount(1); | ||
|
|
||
| var deleteEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, DELETE, null, toMap(campus)); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), deleteEvent); | ||
|
|
||
| awaitAssertCampusCount(0); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldIndexAndUpdateCampus() { | ||
| var campus = campus(); | ||
| var createEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, CREATE, toMap(campus), null); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createEvent); | ||
|
|
||
| awaitAssertCampusCount(1); | ||
|
|
||
| var campusUpdated = campus.withName("nameUpdated"); | ||
| var updateEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, UPDATE, toMap(campusUpdated), toMap(campus)); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), updateEvent); | ||
|
|
||
| awaitAssertCampusCountAfterUpdate(1, campusUpdated); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldIndexSameCampusFromDifferentTenantsAsSeparateDocs() { | ||
| var campus = campus(); | ||
| var createCentralEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, CREATE, toMap(campus), null); | ||
| var createMemberEvent = kafkaResourceEvent(MEMBER_TENANT_ID, CREATE, toMap(campus), null); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createCentralEvent); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createMemberEvent); | ||
|
|
||
| awaitAssertCampusCount(2); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldRemoveAllDocumentsByTenantIdOnDeleteAllEvent() { | ||
| var campus = campus(); | ||
| var createCentralEvent = kafkaResourceEvent(CENTRAL_TENANT_ID, CREATE, toMap(campus), null); | ||
| var createMemberEvent = kafkaResourceEvent(MEMBER_TENANT_ID, CREATE, toMap(campus), null); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createCentralEvent); | ||
| kafkaTemplate.send(inventoryCampusTopic(CENTRAL_TENANT_ID), createMemberEvent); | ||
|
|
||
| awaitAssertCampusCount(2); | ||
|
|
||
| var deleteAllMemberEvent = new ResourceEvent().type(DELETE_ALL).tenant(MEMBER_TENANT_ID); | ||
| kafkaTemplate.send(inventoryCampusTopic(MEMBER_TENANT_ID), deleteAllMemberEvent); | ||
|
|
||
| awaitAssertCampusCount(1); | ||
| } | ||
|
|
||
| private static CampusDto campus() { | ||
| return CampusDto.builder().id(randomId()) | ||
| .name("name") | ||
| .code("code") | ||
| .build(); | ||
| } | ||
|
|
||
| public static void awaitAssertCampusCount(int expected) { | ||
| await().atMost(ONE_MINUTE).pollInterval(ONE_SECOND).untilAsserted(() -> { | ||
| var totalHits = countIndexDocument(CAMPUS_RESOURCE, CENTRAL_TENANT_ID); | ||
|
|
||
| assertThat(totalHits).isEqualTo(expected); | ||
| }); | ||
| } | ||
|
|
||
| public static void awaitAssertCampusCountAfterUpdate(int expected, CampusDto campusUpdated) { | ||
| await().atMost(ONE_MINUTE).pollInterval(ONE_SECOND).untilAsserted(() -> { | ||
| var idQuery = QueryBuilders.matchQuery("id", campusUpdated.getId()); | ||
| var nameQuery = QueryBuilders.matchQuery("name", campusUpdated.getName()); | ||
|
|
||
| var searchRequest = new SearchRequest() | ||
| .source(searchSource().query(boolQuery().must(idQuery).must(nameQuery)) | ||
| .trackTotalHits(true).from(0).size(1)) | ||
| .indices(getIndexName(CAMPUS_RESOURCE, CENTRAL_TENANT_ID)); | ||
| var searchResponse = elasticClient.search(searchRequest, RequestOptions.DEFAULT); | ||
| var hitCount = Objects.requireNonNull(searchResponse.getHits().getTotalHits()).value; | ||
|
|
||
| assertThat(hitCount).isEqualTo(expected); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters