feat(search-authorities): use authority-specific identifier types for LCCN lookups (#924)

Closes: MSEARCH-1193

Author: psmagin

NEWS.md

@@ -25,6 +25,7 @@
 * **Authority Search**
   * Implement two-stage Kafka processing with event aggregation for instance indexing ([MSEARCH-1157](https://folio-org.atlassian.net/browse/MSEARCH-1157))
   * Separate LCCN and Canceled LCCN identifiers search to lccn and canceledLccn options ([MSEARCH-1066](https://folio-org.atlassian.net/browse/MSEARCH-1066))
+  * Use Authority-Specific Identifier Types for LCCN Lookups ([MSEARCH-1193](https://folio-org.atlassian.net/browse/MSEARCH-1193))
 * **Classification Browse**
   * Add title and contributors to classification browse response ([MSEARCH-1045](https://folio-org.atlassian.net/browse/MSEARCH-1045))
   * Add id to classification browse response ([MSEARCH-1093](https://folio-org.atlassian.net/browse/MSEARCH-1093))

descriptors/ModuleDescriptor-template.json

@@ -652,6 +652,10 @@
       "id": "item-storage",
       "version": "11.0"
     },
+    {
+      "id": "authority-identifier-types",
+      "version": "1.0"
+    },
     {
       "id": "authority-reindex",
       "version": "0.1"
@@ -932,6 +936,7 @@
         "perms.users.item.post",
         "perms.users.assign.immutable",
         "perms.users.assign.mutable",
+        "authority-identifier-types.collection.get",
         "inventory-storage.instance.reindex.post",
         "authority-storage.authority.reindex.post",
         "inventory-storage.inventory-view.instances.collection.get",

src/main/java/org/folio/search/client/InventoryReferenceDataClient.java

@@ -27,6 +27,7 @@ public interface InventoryReferenceDataClient {
   @Getter
   enum ReferenceDataType {
 
+    AUTHORITY_IDENTIFIER_TYPES("authority-identifier-types"),
     IDENTIFIER_TYPES("identifier-types"),
     ALTERNATIVE_TITLE_TYPES("alternative-title-types"),
     CALL_NUMBER_TYPES("call-number-types"),

src/main/java/org/folio/search/model/client/CqlQueryParam.java

@@ -7,6 +7,7 @@
 public enum CqlQueryParam {
 
   ID("id"),
+  CODE("code"),
   NAME("name"),
   SOURCE("source"),
   HOLDINGS_ID("holdings.id");

src/main/java/org/folio/search/service/setter/AbstractIdentifierProcessor.java

@@ -56,11 +56,14 @@ protected Set<String> filterIdentifiersValue(List<Identifier> identifiers) {
    * @return {@link List} of {@link String} identifier ids that matches names.
    */
   private Set<String> fetchIdentifierIdsFromCache() {
-    var identifierTypeIds = referenceDataService.fetchReferenceData(IDENTIFIER_TYPES, CqlQueryParam.NAME,
-      getIdentifierNames());
+    var identifierTypeIds = getIdentifierTypeIds();
     if (identifierTypeIds.isEmpty()) {
       log.warn("Failed to provide identifiers for [processor: {}]", this.getClass().getSimpleName());
     }
     return identifierTypeIds;
   }
+
+  protected Set<String> getIdentifierTypeIds() {
+    return referenceDataService.fetchReferenceData(IDENTIFIER_TYPES, CqlQueryParam.NAME, getIdentifierNames());
+  }
 }

src/main/java/org/folio/search/service/setter/authority/AbstractAuthorityIdentifierProcessor.java

@@ -1,17 +1,24 @@
 package org.folio.search.service.setter.authority;
 
+import static org.folio.search.client.InventoryReferenceDataClient.ReferenceDataType.AUTHORITY_IDENTIFIER_TYPES;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import org.folio.search.domain.dto.Authority;
 import org.folio.search.domain.dto.Identifier;
 import org.folio.search.integration.folio.ReferenceDataService;
+import org.folio.search.model.client.CqlQueryParam;
 import org.folio.search.service.setter.AbstractIdentifierProcessor;
 
 public abstract class AbstractAuthorityIdentifierProcessor extends AbstractIdentifierProcessor<Authority> {
 
+  private final ReferenceDataService referenceDataService;
+
   protected AbstractAuthorityIdentifierProcessor(ReferenceDataService referenceDataService) {
     super(referenceDataService);
+    this.referenceDataService = referenceDataService;
   }
 
   @Override
@@ -20,4 +27,12 @@ protected List<Identifier> getIdentifiers(Authority entity) {
       .map(Authority::getIdentifiers)
       .orElse(Collections.emptyList());
   }
+
+  @Override
+  protected Set<String> getIdentifierTypeIds() {
+    return referenceDataService.fetchReferenceData(
+      AUTHORITY_IDENTIFIER_TYPES,
+      CqlQueryParam.CODE,
+      getIdentifierNames());
+  }
 }

src/main/java/org/folio/search/service/setter/authority/CanceledLccnAuthorityProcessor.java

@@ -8,7 +8,7 @@
 @Component
 public class CanceledLccnAuthorityProcessor extends AbstractAuthorityLccnProcessor {
 
-  private static final List<String> IDENTIFIER_NAMES = List.of("Canceled LCCN");
+  private static final List<String> IDENTIFIER_NAMES = List.of("canceled-lccn");
 
   /**
    * Used by dependency injection.

src/main/java/org/folio/search/service/setter/authority/LccnAuthorityProcessor.java

@@ -8,7 +8,7 @@
 @Component
 public class LccnAuthorityProcessor extends AbstractAuthorityLccnProcessor {
 
-  private static final List<String> IDENTIFIER_NAMES = List.of("LCCN");
+  private static final List<String> IDENTIFIER_NAMES = List.of("lccn");
 
   /**
    * Used by dependency injection.

src/test/java/org/folio/search/service/setter/authority/LccnAuthorityProcessorTest.java

@@ -2,7 +2,7 @@
 
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.folio.search.client.InventoryReferenceDataClient.ReferenceDataType.IDENTIFIER_TYPES;
+import static org.folio.search.client.InventoryReferenceDataClient.ReferenceDataType.AUTHORITY_IDENTIFIER_TYPES;
 import static org.folio.support.TestConstants.LCCN_IDENTIFIER_TYPE_ID;
 import static org.folio.support.utils.TestUtils.authorityWithIdentifiers;
 import static org.folio.support.utils.TestUtils.identifier;
@@ -82,7 +82,7 @@ private static Identifier lccn(String value) {
   }
 
   private void mockFetchReferenceData(Set<String> referenceData) {
-    when(referenceDataService.fetchReferenceData(IDENTIFIER_TYPES, CqlQueryParam.NAME,
+    when(referenceDataService.fetchReferenceData(AUTHORITY_IDENTIFIER_TYPES, CqlQueryParam.CODE,
       lccnProcessor.getIdentifierNames()))
       .thenReturn(referenceData);
   }

src/test/resources/mappings/authorities.json

@@ -0,0 +1,46 @@
+{
+  "mappings": [
+    {
+      "request": {
+        "method": "GET",
+        "url": "/authority-identifier-types?query=code%3D%3D(%22lccn%22)&limit=100"
+      },
+      "response": {
+        "status": 200,
+        "jsonBody": {
+          "identifierTypes": [
+            {
+              "id": "c858e4f2-2b6b-4385-842b-60732ee14abb",
+              "code": "lccn",
+              "name": "LCCN"
+            }
+          ]
+        },
+        "headers": {
+          "Content-Type": "application/json"
+        }
+      }
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": "/authority-identifier-types?query=code%3D%3D(%22canceled-lccn%22)&limit=100"
+      },
+      "response": {
+        "status": 200,
+        "jsonBody": {
+          "identifierTypes": [
+            {
+              "id": "3fb87c8e-d0d2-4c3a-821a-b481f32f48a9",
+              "code": "canceled-lccn",
+              "name": "Canceled LCCN"
+            }
+          ]
+        },
+        "headers": {
+          "Content-Type": "application/json"
+        }
+      }
+    }
+  ]
+}