MODLD-582: Rework exception handling in search service

folio-org · Nov 22, 2024 · 97b895c · 97b895c
1 parent 90387f9
commit 97b895c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/org/folio/linked/data/exception/RequestProcessingExceptionBuilder.java b/src/main/java/org/folio/linked/data/exception/RequestProcessingExceptionBuilder.java
@@ -49,8 +49,8 @@ public RequestProcessingException notFoundSourceRecordException(String idType, S
     return requestProcessingException(notFoundError, "Source Record", idType, idValue, "Source Record storage");
   }
 
-  public RequestProcessingException failedDependencyException(String message, Throwable t) {
-    return requestProcessingException(errorResponseConfig.getFailedDependency(), message, t.getMessage());
+  public RequestProcessingException failedDependencyException(String message, String reason) {
+    return requestProcessingException(errorResponseConfig.getFailedDependency(), message, reason);
   }
 
   private RequestProcessingException requestProcessingException(ErrorResponseConfig.Error error, String... arguments) {

diff --git a/src/main/java/org/folio/linked/data/service/search/InstanceSearchServiceImpl.java b/src/main/java/org/folio/linked/data/service/search/InstanceSearchServiceImpl.java
@@ -9,7 +9,6 @@
 import lombok.RequiredArgsConstructor;
 import org.folio.linked.data.client.SearchClient;
 import org.folio.linked.data.domain.dto.SearchResponseTotalOnly;
-import org.folio.linked.data.exception.SearchException;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -36,11 +35,7 @@ public SearchResponseTotalOnly searchByLccnExcludingId(Collection<String> lccn,
   }
 
   private SearchResponseTotalOnly search(String query) {
-    try {
-      return searchClient.searchInstances(query).getBody();
-    } catch (Exception e) {
-      throw new SearchException("Unable to reach search service", e);
-    }
+    return searchClient.searchInstances(query).getBody();
   }
 
   private String getLccnQuery(Collection<String> lccnCol) {

diff --git a/src/main/java/org/folio/linked/data/validation/dto/LccnUniquenessValidator.java b/src/main/java/org/folio/linked/data/validation/dto/LccnUniquenessValidator.java
@@ -58,7 +58,8 @@ private SearchResponseTotalOnly findInstanceWithLccn(List<String> lccn, String i
       return instanceSearchService.searchByLccnExcludingId(lccn, inventoryId);
     } catch (Exception e) {
       log.error(e);
-      throw exceptionBuilder.failedDependencyException("Could not validate LCCN for duplicate", e);
+      throw exceptionBuilder.failedDependencyException(
+        "Could not validate LCCN for duplicate", "Unable to reach search service");
     }
   }
 
@@ -68,6 +69,7 @@ private boolean hasCurrentLccn(InstanceField instance) {
 
   private List<String> getLccnValues(InstanceField instance) {
     return getLccnRequest(instance)
+      .filter(LccnUtils::isCurrent)
       .map(LccnRequest::getValue)
       .flatMap(Collection::stream)
       .toList();

diff --git a/src/test/java/org/folio/linked/data/service/search/InstanceSearchServiceImplTest.java b/src/test/java/org/folio/linked/data/service/search/InstanceSearchServiceImplTest.java
@@ -11,7 +11,6 @@
 import java.util.stream.Stream;
 import org.folio.linked.data.client.SearchClient;
 import org.folio.linked.data.domain.dto.SearchResponseTotalOnly;
-import org.folio.linked.data.exception.SearchException;
 import org.folio.spring.testing.type.UnitTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +44,7 @@ void shouldReturnZeroTotalRecords_ifSearchClientThrowsNotFound() {
     var lccn = List.of("");
 
     // expect
-    assertThrows(SearchException.class, () -> searchService.searchByLccn(lccn));
+    assertThrows(FeignException.NotFound.class, () -> searchService.searchByLccn(lccn));
   }
 
   @Test