MSEARCH-617 Ignore hard-delete domain authority events

folio-org · Nov 10, 2023 · 53a21ae · 53a21ae
1 parent ee45bb6
commit 53a21ae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/org/folio/search/integration/ResourceChangeFilterStrategy.java b/src/main/java/org/folio/search/integration/ResourceChangeFilterStrategy.java
@@ -4,8 +4,8 @@
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.folio.search.domain.dto.ResourceDeleteEventSubType;
 import org.folio.search.domain.dto.ResourceEvent;
-import org.folio.search.domain.dto.ResourceEventSubType;
 import org.folio.search.domain.dto.ResourceEventType;
 import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
 
@@ -20,7 +20,7 @@ public boolean filter(ConsumerRecord<String, ResourceEvent> consumerRecord) {
     var resourceEventType = resourceEvent.getType();
     if (ResourceEventType.DELETE == resourceEventType) {
       if (AUTHORITY_RESOURCE.equals(resourceName)
-        && ResourceEventSubType.HARD_DELETE == resourceEvent.getSubType()) {
+        && ResourceDeleteEventSubType.HARD_DELETE == resourceEvent.getDeleteEventSubType()) {
         log.info("Skip hard-delete event. No need to process event for authority resource");
         return true;
       }

diff --git a/...ger.api/schemas/resourceEventSubType.json → ...i/schemas/resourceDeleteEventSubType.json b/...ger.api/schemas/resourceEventSubType.json → ...i/schemas/resourceDeleteEventSubType.json
diff --git a/src/main/resources/swagger.api/schemas/resourceEvent.json b/src/main/resources/swagger.api/schemas/resourceEvent.json
@@ -11,9 +11,9 @@
       "description": "Resource event operation type",
       "$ref": "resourceEventType.json"
     },
-    "subType": {
+    "deleteEventSubType": {
       "description": "Resource event delete operation type",
-      "$ref": "resourceEventSubType.json"
+      "$ref": "resourceDeleteEventSubType.json"
     },
     "tenant": {
       "description": "Tenant id",

diff --git a/src/test/java/org/folio/search/integration/ResourceChangeFilterStrategyTest.java b/src/test/java/org/folio/search/integration/ResourceChangeFilterStrategyTest.java
@@ -6,8 +6,8 @@
 import static org.mockito.Mockito.when;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.folio.search.domain.dto.ResourceDeleteEventSubType;
 import org.folio.search.domain.dto.ResourceEvent;
-import org.folio.search.domain.dto.ResourceEventSubType;
 import org.folio.search.domain.dto.ResourceEventType;
 import org.folio.spring.test.type.UnitTest;
 import org.junit.jupiter.api.Test;
@@ -28,7 +28,7 @@ public class ResourceChangeFilterStrategyTest {
 
   @Test
   void shouldNotFilterResourceEventWithoutName() {
-    var event = createResourceEvent(ResourceEventType.DELETE, ResourceEventSubType.HARD_DELETE, null);
+    var event = createResourceEvent(ResourceEventType.DELETE, ResourceDeleteEventSubType.HARD_DELETE, null);
     mockConsumerRecord(event);
 
     var actual = filterStrategy.filter(consumerRecord);
@@ -39,7 +39,7 @@ void shouldNotFilterResourceEventWithoutName() {
   @ValueSource(strings = {"instance", "contributor", "instance_subject"})
   @ParameterizedTest
   void shouldNotFilterNonAuthResourceEvent(String resourceName) {
-    var event = createResourceEvent(ResourceEventType.DELETE, ResourceEventSubType.HARD_DELETE, resourceName);
+    var event = createResourceEvent(ResourceEventType.DELETE, ResourceDeleteEventSubType.HARD_DELETE, resourceName);
     mockConsumerRecord(event);
 
     var actual = filterStrategy.filter(consumerRecord);
@@ -49,7 +49,8 @@ void shouldNotFilterNonAuthResourceEvent(String resourceName) {
 
   @Test
   void shouldFilterHardDeleteAuthResourceEvent() {
-    var event = createResourceEvent(ResourceEventType.DELETE, ResourceEventSubType.HARD_DELETE, AUTHORITY_RESOURCE);
+    var event = createResourceEvent(ResourceEventType.DELETE, ResourceDeleteEventSubType.HARD_DELETE,
+      AUTHORITY_RESOURCE);
     mockConsumerRecord(event);
     var actual = filterStrategy.filter(consumerRecord);
 
@@ -58,7 +59,8 @@ void shouldFilterHardDeleteAuthResourceEvent() {
 
   @Test
   void shouldNotFilterSoftDeleteAuthResourceEvent() {
-    var event = createResourceEvent(ResourceEventType.DELETE, ResourceEventSubType.SOFT_DELETE, AUTHORITY_RESOURCE);
+    var event = createResourceEvent(ResourceEventType.DELETE, ResourceDeleteEventSubType.SOFT_DELETE,
+      AUTHORITY_RESOURCE);
     mockConsumerRecord(event);
 
     var actual = filterStrategy.filter(consumerRecord);
@@ -68,7 +70,8 @@ void shouldNotFilterSoftDeleteAuthResourceEvent() {
 
   @Test
   void shouldNotFilterNonDeleteAuthResourceEvent() {
-    var event = createResourceEvent(ResourceEventType.CREATE, ResourceEventSubType.HARD_DELETE, AUTHORITY_RESOURCE);
+    var event = createResourceEvent(ResourceEventType.CREATE, ResourceDeleteEventSubType.HARD_DELETE,
+      AUTHORITY_RESOURCE);
     mockConsumerRecord(event);
 
     var actual = filterStrategy.filter(consumerRecord);
@@ -80,12 +83,12 @@ private void mockConsumerRecord(ResourceEvent event) {
     when(consumerRecord.value()).thenReturn(event);
   }
 
-  private ResourceEvent createResourceEvent(ResourceEventType eventType, ResourceEventSubType subType,
+  private ResourceEvent createResourceEvent(ResourceEventType eventType, ResourceDeleteEventSubType subType,
                                             String resourceName) {
     var event = new ResourceEvent();
     event.setId("1");
     event.setType(eventType);
-    event.setSubType(subType);
+    event.setDeleteEventSubType(subType);
     event.setResourceName(resourceName);
     return event;
   }