diff --git a/NEWS.md b/NEWS.md index 66d79aad..04fbf1e5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -27,6 +27,7 @@ * Fix error messages format received from HoldingsIQ. ([MODKBEKBJ-826](https://folio-org.atlassian.net/browse/MODKBEKBJ-826)) * Fix updater not returned on get access-types collection. ([MODKBEKBJ-842](https://folio-org.atlassian.net/browse/MODKBEKBJ-842)) * Return 422 on post package validation errors ([MODKBEKBJ-862](https://folio-org.atlassian.net/browse/MODKBEKBJ-862)) +* Fix missing access status type and tags values when filtering packages. ([MODKBEKBJ-863](https://folio-org.atlassian.net/browse/MODKBEKBJ-873)) ### Tech Dept * Set "permissions: contents: read" in maven.yml ([FOLIO-4553](https://folio-org.atlassian.net/browse/FOLIO-4553)) diff --git a/src/main/java/org/folio/rest/impl/EholdingsProvidersImpl.java b/src/main/java/org/folio/rest/impl/EholdingsProvidersImpl.java index 2ece7131..320b99b3 100644 --- a/src/main/java/org/folio/rest/impl/EholdingsProvidersImpl.java +++ b/src/main/java/org/folio/rest/impl/EholdingsProvidersImpl.java @@ -1,6 +1,5 @@ package org.folio.rest.impl; -import static java.util.Collections.emptyList; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.folio.common.ListUtils.parseByComma; import static org.folio.db.RowSetUtils.toUUID; @@ -15,6 +14,7 @@ import io.vertx.core.Future; import io.vertx.core.Handler; import io.vertx.core.Vertx; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -30,6 +30,8 @@ import org.folio.properties.common.SearchProperties; import org.folio.repository.RecordKey; import org.folio.repository.RecordType; +import org.folio.repository.accesstypes.DbAccessType; +import org.folio.repository.packages.DbPackage; import org.folio.repository.packages.PackageRepository; import org.folio.repository.providers.DbProvider; import org.folio.repository.providers.ProviderRepository; @@ -139,7 +141,7 @@ public void getEholdingsProvidersByProviderId(String providerId, String include, templateFactory.createTemplate(okapiHeaders, asyncResultHandler) .requestAction(context -> context.getProvidersService().retrieveProvider(parseProviderId, include) - .thenCompose(result -> loadTags(result, context)) + .thenCompose(result -> loadProviderTags(result, context)) ) .addErrorMapper(ResourceNotFoundException.class, exception -> GetEholdingsProvidersByProviderIdResponse.respond404WithApplicationVndApiJson( @@ -228,12 +230,13 @@ public void getEholdingsProvidersPackagesByProviderId(String providerId, String var template = templateFactory.createTemplate(okapiHeaders, asyncResultHandler); if (filter.isTagsFilter()) { - template.requestAction( - context -> filteredEntitiesLoader.fetchPackagesByTagFilter(TagFilter.from(filter), context)); + template.requestAction(context -> filteredEntitiesLoader + .fetchPackagesByTagFilter(TagFilter.from(filter), context) + .thenCompose(result -> loadAccessTypes(result, includedObjects, context))); } else if (filter.isAccessTypeFilter()) { template.requestAction(context -> filteredEntitiesLoader .fetchPackagesByAccessTypeFilter(AccessTypeFilter.from(filter), context) - .thenApply(packages -> new PackageCollectionResult(packages, emptyList()))); + .thenCompose(packages -> loadTagsAndAccessTypes(packages, includedObjects, context))); } else { template.requestAction(retrieveFilteredPackages(parsedProviderId, filter, includedObjects)); } @@ -255,23 +258,40 @@ private Function> retrieveFilteredPac .thenCompose(packages -> loadTagsAndAccessTypes(packages, includedObjects, context)); } + private CompletableFuture loadAccessTypes(PackageCollectionResult result, + List includedObjects, + RmApiTemplateContext context) { + return loadAccessTypes(result.packages(), includedObjects, context) + .thenApply(accessTypes -> new PackageCollectionResult(result.packages(), result.dbPackages(), accessTypes)); + } + + private CompletableFuture> loadAccessTypes(Packages packages, + List includedObjects, + RmApiTemplateContext context) { + if (!includedObjects.contains(ACCESS_TYPE_INCLUDE_PARAM)) { + return completedFuture(Collections.emptyMap()); + } + var packageIds = packages.getPackagesList().stream() + .map(packageData -> packageData.getVendorId() + "-" + packageData.getPackageId()) + .toList(); + return relatedEntitiesLoader.loadAccessTypes(packageIds, RecordType.PACKAGE, context); + } + private CompletableFuture loadTagsAndAccessTypes(Packages packages, List includedObjects, RmApiTemplateContext context) { + return loadTags(packages, context) + .thenCombine(loadAccessTypes(packages, includedObjects, context), + (dbPackages, accessTypes) -> new PackageCollectionResult(packages, dbPackages, accessTypes)); + } + + private CompletableFuture> loadTags(Packages packages, RmApiTemplateContext context) { var credentialsId = toUUID(context.getCredentialsId()); - var tagsFuture = packageRepository.findByIds(getPackageIds(packages), credentialsId, + return packageRepository.findByIds(getPackageIds(packages), credentialsId, context.getRequestContext().getTenant()); - if (includedObjects.contains(ACCESS_TYPE_INCLUDE_PARAM)) { - var packageIds = packages.getPackagesList().stream() - .map(packageData -> packageData.getVendorId() + "-" + packageData.getPackageId()) - .toList(); - return tagsFuture.thenCombine(relatedEntitiesLoader.loadAccessTypes(packageIds, RecordType.PACKAGE, context), - (dbPackages, accessTypes) -> new PackageCollectionResult(packages, dbPackages, accessTypes)); - } - return tagsFuture.thenApply(dbPackages -> new PackageCollectionResult(packages, dbPackages)); } - private CompletableFuture loadTags(VendorResult result, RmApiTemplateContext context) { + private CompletableFuture loadProviderTags(VendorResult result, RmApiTemplateContext context) { RecordKey recordKey = RecordKey.builder() .recordId(String.valueOf(result.getVendor().getVendorId())) .recordType(RecordType.PROVIDER) diff --git a/src/test/java/org/folio/rest/impl/EholdingsProvidersImplIntegrationTest.java b/src/test/java/org/folio/rest/impl/EholdingsProvidersImplIntegrationTest.java index 20de3152..966e3b6d 100644 --- a/src/test/java/org/folio/rest/impl/EholdingsProvidersImplIntegrationTest.java +++ b/src/test/java/org/folio/rest/impl/EholdingsProvidersImplIntegrationTest.java @@ -220,6 +220,71 @@ void shouldReturnPackagesOnSearchByProviderIdAndAccessTypeWithPagination() { assertEquals(STUB_PACKAGE_NAME, packages.getFirst().getAttributes().getName()); } + @Test + void shouldReturnTagsAndAccessTypeOnSearchByProviderIdAndAccessTypeWhenIncludeParamPassed() { + var accessTypes = insertAccessTypes(testData(configuration.getId()), vertx); + var expectedAccessTypeId = accessTypes.getFirst().getId(); + insertAccessTypeMapping(FULL_PACKAGE_ID, PACKAGE, expectedAccessTypeId, vertx); + saveTag(vertx, FULL_PACKAGE_ID, PACKAGE, STUB_TAG_VALUE); + + setUpPackage(vertx, configuration.getId(), STUB_PACKAGE_ID, STUB_VENDOR_ID, STUB_PACKAGE_NAME); + + var endpoint = withAccessTypeFilters(PROVIDER_PACKAGES + "?include=accessType", STUB_ACCESS_TYPE_NAME); + var packageItem = getWithOk(endpoint).as(PackageCollection.class).getData().getFirst(); + + assertThat(packageItem.getAttributes().getTags().getTagList(), containsInAnyOrder(STUB_TAG_VALUE)); + assertFalse(packageItem.getIncluded().isEmpty()); + assertEquals(expectedAccessTypeId, packageItem.getRelationships().getAccessType().getData().getId()); + } + + @Test + void shouldReturnTagsButNoAccessTypeOnSearchByProviderIdAndAccessTypeWhenIncludeParamNotPassed() { + var accessTypes = insertAccessTypes(testData(configuration.getId()), vertx); + insertAccessTypeMapping(FULL_PACKAGE_ID, PACKAGE, accessTypes.getFirst().getId(), vertx); + saveTag(vertx, FULL_PACKAGE_ID, PACKAGE, STUB_TAG_VALUE); + + setUpPackage(vertx, configuration.getId(), STUB_PACKAGE_ID, STUB_VENDOR_ID, STUB_PACKAGE_NAME); + + var endpoint = withAccessTypeFilters(PROVIDER_PACKAGES, STUB_ACCESS_TYPE_NAME); + var packageItem = getWithOk(endpoint).as(PackageCollection.class).getData().getFirst(); + + assertThat(packageItem.getAttributes().getTags().getTagList(), containsInAnyOrder(STUB_TAG_VALUE)); + assertTrue(packageItem.getIncluded().isEmpty()); + assertNull(packageItem.getRelationships().getAccessType()); + } + + @Test + void shouldReturnAccessTypeOnSearchByProviderIdAndTagsWhenIncludeParamPassed() { + var accessTypes = insertAccessTypes(testData(configuration.getId()), vertx); + var expectedAccessTypeId = accessTypes.getFirst().getId(); + insertAccessTypeMapping(FULL_PACKAGE_ID, PACKAGE, expectedAccessTypeId, vertx); + saveTag(vertx, FULL_PACKAGE_ID, PACKAGE, STUB_TAG_VALUE); + + setUpPackage(vertx, configuration.getId(), STUB_PACKAGE_ID, STUB_VENDOR_ID, STUB_PACKAGE_NAME); + + var endpoint = withTagFilters(PROVIDER_PACKAGES + "?include=accessType", STUB_TAG_VALUE); + var packageItem = getWithOk(endpoint).as(PackageCollection.class).getData().getFirst(); + + assertThat(packageItem.getAttributes().getTags().getTagList(), containsInAnyOrder(STUB_TAG_VALUE)); + assertFalse(packageItem.getIncluded().isEmpty()); + assertEquals(expectedAccessTypeId, packageItem.getRelationships().getAccessType().getData().getId()); + } + + @Test + void shouldReturnTagsOnUnfilteredProviderPackagesList() { + saveTag(vertx, FULL_PACKAGE_ID, PACKAGE, STUB_TAG_VALUE); + saveTag(vertx, FULL_PACKAGE_ID, PACKAGE, STUB_TAG_VALUE_2); + setUpPackage(vertx, configuration.getId(), STUB_PACKAGE_ID, STUB_VENDOR_ID, STUB_PACKAGE_NAME); + mockGet(matching(providerPackagesRmApi(STUB_VENDOR_ID) + ".*"), + readFile("responses/rmapi/packages/get-packages-by-provider-id.json")); + + var packages = getWithOk(PROVIDER_PACKAGES + "?include=accessType&page=1&count=100") + .as(PackageCollection.class).getData(); + + assertThat(packages.getFirst().getAttributes().getTags().getTagList(), + containsInAnyOrder(STUB_TAG_VALUE, STUB_TAG_VALUE_2)); + } + @Test void shouldReturnEmptyResponseWhenPackagesReturnedWithErrorOnSearchByAccessType() { var accessTypes = insertAccessTypes(testData(configuration.getId()), vertx);