-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MODINVSTOR-1262 Merge ecs-tlr-feature into master (#1113)
* MODINVSTOR-1179 Add ecsRequestRouting field to service point schema (#1010) * MODINVSTOR-1179 Add ecsRequestRouting field to service point schema * MODINVSTOR-1179 Add ecsRequestRouting field to service point schema * MODINVSTOR-1179 Add ecsRequestRouting field to service point schema * MODINVSTOR-1179 Bump service-point.raml version --------- Co-authored-by: alexanderkurash <[email protected]> * MODINVSTOR-1219: Do not return routing service points by default (#1022) * MODINVSTOR-1219 Do not return routing service points by default * MODINVSTOR-1219 Fix formatting * MODINVSTOR-1219 Extend test * MODINVSTOR-1219 Update query parameter description * MODINVSTOR-1219 Fix checkstyle violations * MODINVSTOR-1219 Test refactoring * MODINVSTOR-1219 Test refactoring * MODINVSTOR-1219 Put filter in front of original query, update tests * MODINVSTOR-1219 Minor refactoring * MODINVSTOR-1245: Implement synchronization operation for service point events (#1088) * MODINVSTOR-1245: Implement synchronization operation for service point event * MODINVSTOR-1245: Fix from code review * MODINVSTOR-1245: Comply with check style * MODINVSTOR-1245: Comply with check style * MODINVSTOR-1245: Add api test * MODINVSTOR-1245: Rename service point event * MODINVSTOR-1245: Rename tests * MODINVSTOR-1245: Replace service point creation with service implementation * MODINVSTOR-1245: Add validation for hold shelf expiry and pick up location * MODINVSTOR-1245: Replace system-stubs-junit4 instead of hard-coded env variable * MODINVSTOR-1245: Fix from code review * MODINVSTOR-1245: Fix from code review * MODINVSTOR-1245: Add logs * Fix mockConsortiumTenants after merge * Disable canRequestOaiPmhViewWhenEmptyDb test * MODINVSTOR-1262 Re-enable disabled tests * MODINVSTOR-1262 Update NEWS * MODINVSTOR-1262 Remove unneeded dependency * MODINVSTOR-1262 improve test coverage, update readme * MODINVSTOR-1262 improve test coverage * MODINVSTOR-1262 improve test coverage * MODINVSTOR-1262 improve test coverage * MODINVSTOR-1262 add missing permission * MODINVSTOR-1262 add test coverage * MODINVSTOR-1262 add test coverage * MODINVSTOR-1262 fix code smell * MODINVSTOR-1262 fix code smell * MODINVSTOR-1262 Move ECS TLR news to In progress --------- Co-authored-by: Magzhan <[email protected]> Co-authored-by: OleksandrVidinieiev <[email protected]> Co-authored-by: Oleksandr Vidinieiev <[email protected]> Co-authored-by: Maksat <[email protected]> Co-authored-by: Roman_Barannyk <[email protected]> Co-authored-by: Roman Barannyk <[email protected]> (cherry picked from commit 810764f)
- Loading branch information
1 parent
9b8de2b
commit ba9ed6e
Showing
25 changed files
with
1,172 additions
and
31 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
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
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
111 changes: 111 additions & 0 deletions
111
src/main/java/org/folio/services/consortium/ServicePointSynchronizationVerticle.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,111 @@ | ||
| package org.folio.services.consortium; | ||
|
|
||
| import static org.folio.rest.tools.utils.ModuleName.getModuleName; | ||
| import static org.folio.rest.tools.utils.ModuleName.getModuleVersion; | ||
| import static org.folio.services.domainevent.ServicePointEventType.SERVICE_POINT_CREATED; | ||
| import static org.folio.services.domainevent.ServicePointEventType.SERVICE_POINT_DELETED; | ||
| import static org.folio.services.domainevent.ServicePointEventType.SERVICE_POINT_UPDATED; | ||
|
|
||
| import io.vertx.core.AbstractVerticle; | ||
| import io.vertx.core.Future; | ||
| import io.vertx.core.Promise; | ||
| import io.vertx.core.http.HttpClient; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.folio.kafka.AsyncRecordHandler; | ||
| import org.folio.kafka.GlobalLoadSensor; | ||
| import org.folio.kafka.KafkaConfig; | ||
| import org.folio.kafka.KafkaConsumerWrapper; | ||
| import org.folio.kafka.SubscriptionDefinition; | ||
| import org.folio.kafka.services.KafkaEnvironmentProperties; | ||
| import org.folio.kafka.services.KafkaTopic; | ||
| import org.folio.services.caches.ConsortiumDataCache; | ||
| import org.folio.services.consortium.handler.ServicePointSynchronizationCreateHandler; | ||
| import org.folio.services.consortium.handler.ServicePointSynchronizationDeleteHandler; | ||
| import org.folio.services.consortium.handler.ServicePointSynchronizationUpdateHandler; | ||
| import org.folio.services.domainevent.ServicePointEventType; | ||
|
|
||
| public class ServicePointSynchronizationVerticle extends AbstractVerticle { | ||
|
|
||
| private static final Logger log = LogManager.getLogger(ServicePointSynchronizationVerticle.class); | ||
| private static final String TENANT_PATTERN = "\\w{1,}"; | ||
| private static final String MODULE_ID = getModuleId(); | ||
| private static final int DEFAULT_LOAD_LIMIT = 5; | ||
| private final ConsortiumDataCache consortiumDataCache; | ||
|
|
||
| private final List<KafkaConsumerWrapper<String, String>> consumers = new ArrayList<>(); | ||
|
|
||
| public ServicePointSynchronizationVerticle(final ConsortiumDataCache consortiumDataCache) { | ||
| this.consortiumDataCache = consortiumDataCache; | ||
| } | ||
|
|
||
| @Override | ||
| public void start(Promise<Void> startPromise) throws Exception { | ||
| var httpClient = vertx.createHttpClient(); | ||
|
|
||
| createConsumers(httpClient) | ||
| .onSuccess(v -> log.info("start:: verticle started")) | ||
| .onFailure(t -> log.error("start:: verticle start failed", t)) | ||
| .onComplete(startPromise); | ||
| } | ||
|
|
||
| private Future<Void> createConsumers(HttpClient httpClient) { | ||
| final var config = getKafkaConfig(); | ||
|
|
||
| return createEventConsumer(SERVICE_POINT_CREATED, config, | ||
| new ServicePointSynchronizationCreateHandler(consortiumDataCache, httpClient, vertx)) | ||
| .compose(r -> createEventConsumer(SERVICE_POINT_UPDATED, config, | ||
| new ServicePointSynchronizationUpdateHandler(consortiumDataCache, httpClient, vertx))) | ||
| .compose(r -> createEventConsumer(SERVICE_POINT_DELETED, config, | ||
| new ServicePointSynchronizationDeleteHandler(consortiumDataCache, httpClient, vertx))) | ||
| .mapEmpty(); | ||
| } | ||
|
|
||
| private Future<KafkaConsumerWrapper<String, String>> createEventConsumer( | ||
| ServicePointEventType eventType, KafkaConfig kafkaConfig, | ||
| AsyncRecordHandler<String, String> handler) { | ||
|
|
||
| var subscriptionDefinition = SubscriptionDefinition.builder() | ||
| .eventType(eventType.name()) | ||
| .subscriptionPattern(buildSubscriptionPattern(eventType.getKafkaTopic(), kafkaConfig)) | ||
| .build(); | ||
|
|
||
| return createConsumer(kafkaConfig, subscriptionDefinition, handler); | ||
| } | ||
|
|
||
| private Future<KafkaConsumerWrapper<String, String>> createConsumer(KafkaConfig kafkaConfig, | ||
| SubscriptionDefinition subscriptionDefinition, | ||
| AsyncRecordHandler<String, String> recordHandler) { | ||
|
|
||
| var consumer = KafkaConsumerWrapper.<String, String>builder() | ||
| .context(context) | ||
| .vertx(vertx) | ||
| .kafkaConfig(kafkaConfig) | ||
| .loadLimit(DEFAULT_LOAD_LIMIT) | ||
| .globalLoadSensor(new GlobalLoadSensor()) | ||
| .subscriptionDefinition(subscriptionDefinition) | ||
| .build(); | ||
|
|
||
| return consumer.start(recordHandler, MODULE_ID) | ||
| .onSuccess(v -> consumers.add(consumer)) | ||
| .map(consumer); | ||
| } | ||
|
|
||
| private static String buildSubscriptionPattern(KafkaTopic kafkaTopic, KafkaConfig kafkaConfig) { | ||
| return kafkaTopic.fullTopicName(kafkaConfig, TENANT_PATTERN); | ||
| } | ||
|
|
||
| private static String getModuleId() { | ||
| return getModuleName().replace("_", "-") + "-" + getModuleVersion(); | ||
| } | ||
|
|
||
| private KafkaConfig getKafkaConfig() { | ||
| return KafkaConfig.builder() | ||
| .envId(KafkaEnvironmentProperties.environment()) | ||
| .kafkaHost(KafkaEnvironmentProperties.host()) | ||
| .kafkaPort(KafkaEnvironmentProperties.port()) | ||
| .build(); | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
.../java/org/folio/services/consortium/handler/ServicePointSynchronizationCreateHandler.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,26 @@ | ||
| package org.folio.services.consortium.handler; | ||
|
|
||
| import io.vertx.core.Vertx; | ||
| import io.vertx.core.http.HttpClient; | ||
| import org.folio.rest.jaxrs.model.Servicepoint; | ||
| import org.folio.services.caches.ConsortiumDataCache; | ||
| import org.folio.services.consortium.processor.ServicePointSynchronizationCreateEventProcessor; | ||
| import org.folio.services.consortium.processor.ServicePointSynchronizationEventProcessor; | ||
| import org.folio.services.domainevent.DomainEvent; | ||
|
|
||
| public class ServicePointSynchronizationCreateHandler extends ServicePointSynchronizationHandler { | ||
|
|
||
| public ServicePointSynchronizationCreateHandler(ConsortiumDataCache consortiumDataCache, | ||
| HttpClient httpClient, Vertx vertx) { | ||
|
|
||
| super(consortiumDataCache, httpClient, vertx); | ||
| } | ||
|
|
||
| @Override | ||
| protected ServicePointSynchronizationEventProcessor getServicePointSynchronizationProcessor( | ||
| DomainEvent<Servicepoint> domainEvent) { | ||
|
|
||
| return new ServicePointSynchronizationCreateEventProcessor(domainEvent); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.