From 5a0426bb38b6bd76b36087aadbba436eb4ecea3f Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Tue, 13 Oct 2026 13:31:54 +0200 Subject: [PATCH 1/6] feat(packages): show managed and custom subjects in package record Map HoldingsIQ subjectAssociations to a new read-only subjects array on package data attributes. Managed subjects are always included; custom subjects are included only when explicitly assigned. Refs: MODKBEKBJ-853 --- NEWS.md | 1 + .../types/packages/packageDataAttributes.json | 9 ++ ramls/types/packages/packageSubject.json | 40 +++++++++ .../PackageCollectionItemConverter.java | 21 +++++ .../PackageCollectionItemConverterTest.java | 83 +++++++++++++++++++ ...package-collection-with-five-elements.json | 9 ++ 6 files changed, 163 insertions(+) create mode 100644 ramls/types/packages/packageSubject.json create mode 100644 src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java diff --git a/NEWS.md b/NEWS.md index 7ef2525f..07d6b90f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,7 @@ * Add access types to eholdings/providers/{id}/packages response ([MODKBEKBJ-839](https://folio-org.atlassian.net/browse/MODKBEKBJ-839)) * Sanitize HTML content for the package description field ([MODKBEKBJ-860](https://folio-org.atlassian.net/browse/MODKBEKBJ-860)) * Validate blank package url and remove invalid format checks ([MODKBEKBJ-863](https://folio-org.atlassian.net/browse/MODKBEKBJ-863)) +* Add managed and custom subjects to package detail record ([MODKBEKBJ-853](https://folio-org.atlassian.net/browse/MODKBEKBJ-853)) ### Bug fixes * Fix offset handling when retrieving holdings from HoldingsIQ. ([MODKBEKBJ-825](https://folio-org.atlassian.net/browse/MODKBEKBJ-825)) diff --git a/ramls/types/packages/packageDataAttributes.json b/ramls/types/packages/packageDataAttributes.json index 23276bc8..e1e9b160 100644 --- a/ramls/types/packages/packageDataAttributes.json +++ b/ramls/types/packages/packageDataAttributes.json @@ -121,6 +121,15 @@ "example": 0, "type": "integer" }, + "subjects": { + "description": "Managed and custom subjects associated with the package", + "items": { + "$ref": "packageSubject.json", + "type": "object" + }, + "readonly": true, + "type": "array" + }, "tags": { "$ref": "../../raml-util/schemas/tags.schema", "description": "Package tags", diff --git a/ramls/types/packages/packageSubject.json b/ramls/types/packages/packageSubject.json new file mode 100644 index 00000000..a5aecf9f --- /dev/null +++ b/ramls/types/packages/packageSubject.json @@ -0,0 +1,40 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Package Subject Schema", + "description": "Managed or custom subject associated with a package", + "javaType": "org.folio.rest.jaxrs.model.PackageSubject", + "type": "object", + "additionalProperties": false, + "properties": { + "id": { + "description": "Subject id", + "example": 26224, + "type": "integer" + }, + "name": { + "description": "Subject name", + "example": "Science", + "type": "string" + }, + "schemaId": { + "description": "Subject schema id", + "example": 3, + "type": "integer" + }, + "parentId": { + "description": "Parent subject id", + "example": 26224, + "type": "integer" + }, + "isCustom": { + "description": "Whether this subject is custom or managed", + "example": false, + "type": "boolean" + }, + "subjectHierarchy": { + "description": "Full subject hierarchy path", + "example": "Science -- Biology (General)", + "type": "string" + } + } +} diff --git a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java index 8ae6abd1..aa8ac71d 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java @@ -5,14 +5,18 @@ import static org.folio.rest.converter.packages.PackageConverterUtils.createEmptyPackageRelationship; import static org.folio.rest.util.RestConstants.PACKAGES_TYPE; +import java.util.List; import org.folio.holdingsiq.model.AlternateName; import org.folio.holdingsiq.model.PackageData; +import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.holdingsiq.model.Visibility; import org.folio.rest.jaxrs.model.Coverage; import org.folio.rest.jaxrs.model.PackageAltName; import org.folio.rest.jaxrs.model.PackageCollectionItem; import org.folio.rest.jaxrs.model.PackageDataAttributes; +import org.folio.rest.jaxrs.model.PackageSubject; import org.folio.rest.jaxrs.model.PackageVisibility; +import org.jspecify.annotations.Nullable; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -51,11 +55,28 @@ private PackageDataAttributes convertAttributes(PackageData packageData) { .withProviderName(packageData.getVendorName()) .withProxiedUrl(packageData.getProxiedUrl()) .withSelectedCount(packageData.getSelectedCount()) + .withSubjects(convertSubjects(packageData.getSubjectAssociations())) .withTitleCount(packageData.getTitleCount()) .withUrl(packageData.getPackageUrl()) .withVisibility(mapItemsNullable(packageData.getVisibilityDetails(), this::convertVisibility)); } + private @Nullable List convertSubjects(@Nullable List subjects) { + if (subjects == null) { + return null; + } + return subjects.stream() + .filter(subject -> !Boolean.TRUE.equals(subject.isCustom()) || Boolean.TRUE.equals(subject.explicitAssignment())) + .map(subject -> new PackageSubject() + .withId(subject.id()) + .withName(subject.name()) + .withSchemaId(subject.schemaId()) + .withParentId(subject.parentId()) + .withIsCustom(subject.isCustom()) + .withSubjectHierarchy(subject.subjectHierarchy())) + .toList(); + } + private PackageVisibility convertVisibility(Visibility visibility) { return new PackageVisibility() .withCategory(PackageVisibility.Category.fromValue(visibility.category().toUpperCase())) diff --git a/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java b/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java new file mode 100644 index 00000000..e8d4f1be --- /dev/null +++ b/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java @@ -0,0 +1,83 @@ +package org.folio.rest.converter.packages; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.util.List; +import org.folio.holdingsiq.model.CoverageDates; +import org.folio.holdingsiq.model.PackageData; +import org.folio.holdingsiq.model.SubjectAssociation; +import org.folio.rest.jaxrs.model.PackageCollectionItem; +import org.folio.spring.config.TestConfig; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = TestConfig.class) +class PackageCollectionItemConverterTest { + + @Autowired + private ConversionService conversionService; + + @Test + void shouldKeepManagedAndExplicitCustomSubjectsAndDropCustomPlaceholders() { + var packageData = PackageData.builder() + .packageId(1) + .vendorId(2) + .contentType("EJournal") + .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()) + .subjectAssociations(List.of( + new SubjectAssociation(1, 3, "Science", false, false, "Science", null), + new SubjectAssociation(2, 3, "Biology", true, false, "Science -- Biology", 1), + new SubjectAssociation(3, 3, "Genetics", true, true, "Science -- Biology -- Genetics", 2), + new SubjectAssociation(4, 3, "Botany", true, true, "Science -- Botany", 1))) + .build(); + + var subjects = convert(packageData).getAttributes().getSubjects(); + + assertNotNull(subjects); + assertEquals(List.of("Science", "Genetics", "Botany"), + subjects.stream().map(s -> s.getName()).toList()); + var genetics = subjects.get(1); + assertEquals(3, genetics.getId()); + assertEquals(3, genetics.getSchemaId()); + assertEquals(2, genetics.getParentId()); + assertEquals(true, genetics.getIsCustom()); + assertEquals("Science -- Biology -- Genetics", genetics.getSubjectHierarchy()); + } + + @Test + void shouldTreatNullIsCustomAsManaged() { + var packageData = PackageData.builder() + .packageId(1) + .vendorId(2) + .contentType("EJournal") + .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()) + .subjectAssociations(List.of(new SubjectAssociation(1, 3, "Science", null, null, null, null))) + .build(); + + var subjects = convert(packageData).getAttributes().getSubjects(); + + assertEquals(1, subjects.size()); + } + + @Test + void shouldReturnNullSubjectsWhenNoSubjectAssociations() { + var packageData = PackageData.builder().packageId(1).vendorId(2) + .contentType("EJournal") + .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()).build(); + + assertNull(convert(packageData).getAttributes().getSubjects()); + } + + private PackageCollectionItem convert(PackageData packageData) { + var item = conversionService.convert(packageData, PackageCollectionItem.class); + assertNotNull(item); + return item; + } +} diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json index be87270b..78a680bb 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json @@ -33,6 +33,15 @@ "providerId": 392, "providerName": "American Academy of Family Physicians", "selectedCount": 0, + "subjects": [ + { + "id": 35408, + "name": "Technology", + "schemaId": 3, + "parentId": 35407, + "isCustom": false + } + ], "titleCount": 3, "visibility": [ { From 8737658970306cc7d8d5aebf1af8219e9ef68054 Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Tue, 13 Oct 2026 14:25:43 +0200 Subject: [PATCH 2/6] test(packages): cover subjects in package by-id response Add a managed subject to the package by-id RM API stub and expected responses, and to the RAML package example. Refs: MODKBEKBJ-853 --- .../packages/packages_packageId_get_200_response.json | 9 +++++++++ .../packages/expected-package-by-id-with-provider.json | 9 +++++++++ .../kb-ebsco/packages/expected-package-by-id.json | 9 +++++++++ .../packages/get-custom-package-by-id-response.json | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/ramls/examples/packages/packages_packageId_get_200_response.json b/ramls/examples/packages/packages_packageId_get_200_response.json index 2b039efb..12624dbc 100644 --- a/ramls/examples/packages/packages_packageId_get_200_response.json +++ b/ramls/examples/packages/packages_packageId_get_200_response.json @@ -15,6 +15,15 @@ "providerId": 123355, "providerName": "API DEV CORPORATE CUSTOMER", "selectedCount": 0, + "subjects": [ + { + "id": 35408, + "name": "Technology", + "schemaId": 3, + "parentId": 35407, + "isCustom": false + } + ], "titleCount": 0, "vendorId": 123355, "vendorName": "API DEV CORPORATE CUSTOMER", diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json index 371fe06a..4ce81cfc 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json @@ -27,6 +27,15 @@ "inherited": true }, "selectedCount": 6, + "subjects": [ + { + "id": 35408, + "name": "Technology", + "schemaId": 3, + "parentId": 35407, + "isCustom": false + } + ], "tags": { "tagList": [] }, diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json index 95808672..8e11caa5 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json @@ -27,6 +27,15 @@ "inherited": true }, "selectedCount": 6, + "subjects": [ + { + "id": 35408, + "name": "Technology", + "schemaId": 3, + "parentId": 35407, + "isCustom": false + } + ], "tags": { "tagList": [] }, diff --git a/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json b/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json index 59084373..c980b898 100644 --- a/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json +++ b/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json @@ -14,6 +14,15 @@ } ], "selectedCount": 6, + "subjectAssociations": [ + { + "id": 35408, + "parentId": 35407, + "schemaId": 3, + "name": "Technology", + "isCustom": false + } + ], "isTokenNeeded": false, "contentType": "AggregatedFullText", "customCoverage": { From 28c0dbd3f0b637282cc4fefc1783d071af130f05 Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Wed, 14 Oct 2026 17:50:48 +0200 Subject: [PATCH 3/6] test(packages): align subject fixtures with HoldingsIQ response shape Use the by-id subjectAssociations field set (subjectHierarchy, explicitAssignment) in the package by-id stub and add a custom non-explicit subject that must be excluded. Add subjects to the package list RAML example. Refs: MODKBEKBJ-853 --- .../packages/packages_get_200_response.json | 9 +++++++++ .../packages_packageId_get_200_response.json | 3 ++- .../expected-package-by-id-with-provider.json | 3 ++- .../kb-ebsco/packages/expected-package-by-id.json | 3 ++- .../packages/get-custom-package-by-id-response.json | 13 ++++++++++++- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ramls/examples/packages/packages_get_200_response.json b/ramls/examples/packages/packages_get_200_response.json index ec37e485..b6e14fe8 100644 --- a/ramls/examples/packages/packages_get_200_response.json +++ b/ramls/examples/packages/packages_get_200_response.json @@ -17,6 +17,15 @@ "providerId": 583, "providerName": "ABC-CLIO", "selectedCount": 9589, + "subjects": [ + { + "id": 27110, + "name": "History", + "schemaId": 3, + "parentId": 27100, + "isCustom": false + } + ], "titleCount": 9590, "vendorId": 583, "vendorName": "ABC-CLIO", diff --git a/ramls/examples/packages/packages_packageId_get_200_response.json b/ramls/examples/packages/packages_packageId_get_200_response.json index 12624dbc..4862275d 100644 --- a/ramls/examples/packages/packages_packageId_get_200_response.json +++ b/ramls/examples/packages/packages_packageId_get_200_response.json @@ -21,7 +21,8 @@ "name": "Technology", "schemaId": 3, "parentId": 35407, - "isCustom": false + "isCustom": false, + "subjectHierarchy": "Applied Sciences -- Technology" } ], "titleCount": 0, diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json index 4ce81cfc..5ea2417f 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json @@ -33,7 +33,8 @@ "name": "Technology", "schemaId": 3, "parentId": 35407, - "isCustom": false + "isCustom": false, + "subjectHierarchy": "Applied Sciences -- Technology" } ], "tags": { diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json index 8e11caa5..69be5b5e 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json @@ -33,7 +33,8 @@ "name": "Technology", "schemaId": 3, "parentId": 35407, - "isCustom": false + "isCustom": false, + "subjectHierarchy": "Applied Sciences -- Technology" } ], "tags": { diff --git a/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json b/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json index c980b898..7a5031d6 100644 --- a/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json +++ b/src/test/resources/responses/rmapi/packages/get-custom-package-by-id-response.json @@ -20,7 +20,18 @@ "parentId": 35407, "schemaId": 3, "name": "Technology", - "isCustom": false + "isCustom": false, + "subjectHierarchy": "Applied Sciences -- Technology", + "explicitAssignment": true + }, + { + "id": 35410, + "parentId": 35408, + "schemaId": 3, + "name": "Robotics", + "isCustom": true, + "subjectHierarchy": "Applied Sciences -- Technology -- Robotics", + "explicitAssignment": false } ], "isTokenNeeded": false, From 95b409a9dc1b2f62e6e19d56b32a71e11cd4f10f Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Wed, 14 Oct 2026 18:03:07 +0200 Subject: [PATCH 4/6] fix(packages): filter subjects only on package record HoldingsIQ package list responses do not include explicitAssignment, so filtering there dropped every custom subject. Return all subjects in package lists and keep the custom placeholder filter for the package record. Refs: MODKBEKBJ-853 --- .../PackageCollectionItemConverter.java | 22 +----- .../converter/packages/PackageConverter.java | 16 ++++ .../packages/PackageConverterUtils.java | 12 +++ .../PackageCollectionItemConverterTest.java | 46 ++++------- .../packages/PackageConverterTest.java | 76 +++++++++++++++++++ ...package-collection-with-five-elements.json | 7 ++ .../rmapi/packages/get-packages-response.json | 7 ++ 7 files changed, 135 insertions(+), 51 deletions(-) create mode 100644 src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java diff --git a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java index aa8ac71d..f802d733 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java @@ -5,18 +5,14 @@ import static org.folio.rest.converter.packages.PackageConverterUtils.createEmptyPackageRelationship; import static org.folio.rest.util.RestConstants.PACKAGES_TYPE; -import java.util.List; import org.folio.holdingsiq.model.AlternateName; import org.folio.holdingsiq.model.PackageData; -import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.holdingsiq.model.Visibility; import org.folio.rest.jaxrs.model.Coverage; import org.folio.rest.jaxrs.model.PackageAltName; import org.folio.rest.jaxrs.model.PackageCollectionItem; import org.folio.rest.jaxrs.model.PackageDataAttributes; -import org.folio.rest.jaxrs.model.PackageSubject; import org.folio.rest.jaxrs.model.PackageVisibility; -import org.jspecify.annotations.Nullable; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; @@ -55,28 +51,12 @@ private PackageDataAttributes convertAttributes(PackageData packageData) { .withProviderName(packageData.getVendorName()) .withProxiedUrl(packageData.getProxiedUrl()) .withSelectedCount(packageData.getSelectedCount()) - .withSubjects(convertSubjects(packageData.getSubjectAssociations())) + .withSubjects(mapItemsNullable(packageData.getSubjectAssociations(), PackageConverterUtils::convertSubject)) .withTitleCount(packageData.getTitleCount()) .withUrl(packageData.getPackageUrl()) .withVisibility(mapItemsNullable(packageData.getVisibilityDetails(), this::convertVisibility)); } - private @Nullable List convertSubjects(@Nullable List subjects) { - if (subjects == null) { - return null; - } - return subjects.stream() - .filter(subject -> !Boolean.TRUE.equals(subject.isCustom()) || Boolean.TRUE.equals(subject.explicitAssignment())) - .map(subject -> new PackageSubject() - .withId(subject.id()) - .withName(subject.name()) - .withSchemaId(subject.schemaId()) - .withParentId(subject.parentId()) - .withIsCustom(subject.isCustom()) - .withSubjectHierarchy(subject.subjectHierarchy())) - .toList(); - } - private PackageVisibility convertVisibility(Visibility visibility) { return new PackageVisibility() .withCategory(PackageVisibility.Category.fromValue(visibility.category().toUpperCase())) diff --git a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java index fffdb06e..83438e8f 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java @@ -10,6 +10,7 @@ import java.util.Objects; import org.folio.holdingsiq.model.PackageData; import org.folio.holdingsiq.model.Proxy; +import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.holdingsiq.model.Titles; import org.folio.holdingsiq.model.TokenInfo; import org.folio.holdingsiq.model.VendorById; @@ -20,6 +21,7 @@ import org.folio.rest.jaxrs.model.Package; import org.folio.rest.jaxrs.model.PackageCollectionItem; import org.folio.rest.jaxrs.model.PackageRelationship; +import org.folio.rest.jaxrs.model.PackageSubject; import org.folio.rest.jaxrs.model.Provider; import org.folio.rest.jaxrs.model.ProxyDto; import org.folio.rest.jaxrs.model.RelationshipData; @@ -63,6 +65,7 @@ public Package convert(PackageResult result) { .getAttributes() .withProxy(convertToProxy(packageData.getProxy())) .withPackageToken(tokenInfoConverter.convert(packageData.getPackageToken())) + .withSubjects(convertSubjects(packageData.getSubjectAssociations())) .withTags(result.getTags()); addTitlesRelationship(result, packageResult, packageData); @@ -115,6 +118,19 @@ private void addAccessTypeRelationship(PackageResult result, Package packageData } } + /** + * Custom subjects without explicit assignment are hierarchy placeholders and are not shown on the package record. + */ + private @Nullable List convertSubjects(@Nullable List subjects) { + if (subjects == null) { + return null; + } + return subjects.stream() + .filter(subject -> !Boolean.TRUE.equals(subject.isCustom()) || Boolean.TRUE.equals(subject.explicitAssignment())) + .map(PackageConverterUtils::convertSubject) + .toList(); + } + private @Nullable ProxyDto convertToProxy(@Nullable Proxy proxy) { return proxy != null ? new ProxyDto().withId(proxy.getId()).withInherited(proxy.getInherited()) : null; } diff --git a/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java b/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java index 3d860332..b240df39 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java @@ -4,11 +4,13 @@ import java.util.EnumMap; import java.util.Map; +import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.rest.jaxrs.model.ContentType; import org.folio.rest.jaxrs.model.HasManyRelationship; import org.folio.rest.jaxrs.model.HasOneRelationship; import org.folio.rest.jaxrs.model.MetaDataIncluded; import org.folio.rest.jaxrs.model.PackageRelationship; +import org.folio.rest.jaxrs.model.PackageSubject; public final class PackageConverterUtils { @@ -40,4 +42,14 @@ public static PackageRelationship createEmptyPackageRelationship() { .withMeta(new MetaDataIncluded() .withIncluded(false))); } + + public static PackageSubject convertSubject(SubjectAssociation subject) { + return new PackageSubject() + .withId(subject.id()) + .withName(subject.name()) + .withSchemaId(subject.schemaId()) + .withParentId(subject.parentId()) + .withIsCustom(subject.isCustom()) + .withSubjectHierarchy(subject.subjectHierarchy()); + } } diff --git a/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java b/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java index e8d4f1be..c819e65c 100644 --- a/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java +++ b/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java @@ -9,6 +9,7 @@ import org.folio.holdingsiq.model.PackageData; import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.rest.jaxrs.model.PackageCollectionItem; +import org.folio.rest.jaxrs.model.PackageSubject; import org.folio.spring.config.TestConfig; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,25 +26,19 @@ class PackageCollectionItemConverterTest { private ConversionService conversionService; @Test - void shouldKeepManagedAndExplicitCustomSubjectsAndDropCustomPlaceholders() { - var packageData = PackageData.builder() - .packageId(1) - .vendorId(2) - .contentType("EJournal") - .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()) + void shouldKeepAllSubjects() { + var packageData = packageDataBuilder() .subjectAssociations(List.of( - new SubjectAssociation(1, 3, "Science", false, false, "Science", null), - new SubjectAssociation(2, 3, "Biology", true, false, "Science -- Biology", 1), - new SubjectAssociation(3, 3, "Genetics", true, true, "Science -- Biology -- Genetics", 2), - new SubjectAssociation(4, 3, "Botany", true, true, "Science -- Botany", 1))) + new SubjectAssociation(1, 3, "Science", false, null, null, null), + new SubjectAssociation(2, 3, "Biology", true, null, null, 1), + new SubjectAssociation(3, 3, "Genetics", true, false, "Science -- Biology -- Genetics", 2))) .build(); var subjects = convert(packageData).getAttributes().getSubjects(); assertNotNull(subjects); - assertEquals(List.of("Science", "Genetics", "Botany"), - subjects.stream().map(s -> s.getName()).toList()); - var genetics = subjects.get(1); + assertEquals(List.of("Science", "Biology", "Genetics"), subjects.stream().map(PackageSubject::getName).toList()); + var genetics = subjects.get(2); assertEquals(3, genetics.getId()); assertEquals(3, genetics.getSchemaId()); assertEquals(2, genetics.getParentId()); @@ -52,27 +47,18 @@ void shouldKeepManagedAndExplicitCustomSubjectsAndDropCustomPlaceholders() { } @Test - void shouldTreatNullIsCustomAsManaged() { - var packageData = PackageData.builder() - .packageId(1) - .vendorId(2) - .contentType("EJournal") - .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()) - .subjectAssociations(List.of(new SubjectAssociation(1, 3, "Science", null, null, null, null))) - .build(); - - var subjects = convert(packageData).getAttributes().getSubjects(); + void shouldReturnNullSubjectsWhenNoSubjectAssociations() { + var packageData = packageDataBuilder().build(); - assertEquals(1, subjects.size()); + assertNull(convert(packageData).getAttributes().getSubjects()); } - @Test - void shouldReturnNullSubjectsWhenNoSubjectAssociations() { - var packageData = PackageData.builder().packageId(1).vendorId(2) + private PackageData.PackageDataBuilder packageDataBuilder() { + return PackageData.builder() + .packageId(1) + .vendorId(2) .contentType("EJournal") - .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()).build(); - - assertNull(convert(packageData).getAttributes().getSubjects()); + .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()); } private PackageCollectionItem convert(PackageData packageData) { diff --git a/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java b/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java new file mode 100644 index 00000000..5ea03023 --- /dev/null +++ b/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java @@ -0,0 +1,76 @@ +package org.folio.rest.converter.packages; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.util.List; +import org.folio.holdingsiq.model.CoverageDates; +import org.folio.holdingsiq.model.PackageData; +import org.folio.holdingsiq.model.SubjectAssociation; +import org.folio.rest.jaxrs.model.Package; +import org.folio.rest.jaxrs.model.PackageSubject; +import org.folio.rmapi.result.PackageResult; +import org.folio.spring.config.TestConfig; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = TestConfig.class) +class PackageConverterTest { + + @Autowired + private ConversionService conversionService; + + @Test + void shouldKeepManagedAndExplicitCustomSubjectsAndDropCustomPlaceholders() { + var packageData = packageDataBuilder() + .subjectAssociations(List.of( + new SubjectAssociation(1, 3, "Science", false, false, "Science", null), + new SubjectAssociation(2, 3, "Biology", true, false, "Science -- Biology", 1), + new SubjectAssociation(3, 3, "Genetics", true, true, "Science -- Biology -- Genetics", 2), + new SubjectAssociation(4, 3, "Botany", true, true, "Science -- Botany", 1))) + .build(); + + var subjects = convert(packageData).getData().getAttributes().getSubjects(); + + assertNotNull(subjects); + assertEquals(List.of("Science", "Genetics", "Botany"), subjects.stream().map(PackageSubject::getName).toList()); + } + + @Test + void shouldTreatNullIsCustomAsManaged() { + var packageData = packageDataBuilder() + .subjectAssociations(List.of(new SubjectAssociation(1, 3, "Science", null, null, null, null))) + .build(); + + var subjects = convert(packageData).getData().getAttributes().getSubjects(); + + assertEquals(1, subjects.size()); + } + + @Test + void shouldReturnNullSubjectsWhenNoSubjectAssociations() { + var packageData = packageDataBuilder().build(); + + assertNull(convert(packageData).getData().getAttributes().getSubjects()); + } + + private PackageData.PackageDataBuilder packageDataBuilder() { + return PackageData.builder() + .packageId(1) + .vendorId(2) + .contentType("EJournal") + .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()); + } + + private Package convert(PackageData packageData) { + var result = conversionService.convert(new PackageResult(packageData), Package.class); + assertNotNull(result); + return result; + } +} diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json index 78a680bb..aa83f8ec 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json @@ -40,6 +40,13 @@ "schemaId": 3, "parentId": 35407, "isCustom": false + }, + { + "id": 35410, + "name": "Robotics", + "schemaId": 3, + "parentId": 35408, + "isCustom": true } ], "titleCount": 3, diff --git a/src/test/resources/responses/rmapi/packages/get-packages-response.json b/src/test/resources/responses/rmapi/packages/get-packages-response.json index 76faeaa8..c89cfb41 100644 --- a/src/test/resources/responses/rmapi/packages/get-packages-response.json +++ b/src/test/resources/responses/rmapi/packages/get-packages-response.json @@ -34,6 +34,13 @@ "schemaId": 3, "name": "Technology", "isCustom": false + }, + { + "id": 35410, + "parentId": 35408, + "schemaId": 3, + "name": "Robotics", + "isCustom": true } ], "consortia": "string", From 688dc5095e02d3e51b4b130b76bc7e310cfa4788 Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Thu, 15 Oct 2026 11:50:30 +0200 Subject: [PATCH 5/6] fix(packages): return subjects only in single package response Remove subjects from package list responses and keep them on the package record only. Refs: MODKBEKBJ-853 --- .../packages/packages_get_200_response.json | 9 --- .../types/packages/packageDataAttributes.json | 2 +- .../PackageCollectionItemConverter.java | 3 +- .../converter/packages/PackageConverter.java | 12 +++- .../packages/PackageConverterUtils.java | 12 ---- .../PackageCollectionItemConverterTest.java | 69 ------------------- ...package-collection-with-five-elements.json | 16 ----- .../rmapi/packages/get-packages-response.json | 7 -- 8 files changed, 14 insertions(+), 116 deletions(-) delete mode 100644 src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java diff --git a/ramls/examples/packages/packages_get_200_response.json b/ramls/examples/packages/packages_get_200_response.json index b6e14fe8..ec37e485 100644 --- a/ramls/examples/packages/packages_get_200_response.json +++ b/ramls/examples/packages/packages_get_200_response.json @@ -17,15 +17,6 @@ "providerId": 583, "providerName": "ABC-CLIO", "selectedCount": 9589, - "subjects": [ - { - "id": 27110, - "name": "History", - "schemaId": 3, - "parentId": 27100, - "isCustom": false - } - ], "titleCount": 9590, "vendorId": 583, "vendorName": "ABC-CLIO", diff --git a/ramls/types/packages/packageDataAttributes.json b/ramls/types/packages/packageDataAttributes.json index e1e9b160..423a77b6 100644 --- a/ramls/types/packages/packageDataAttributes.json +++ b/ramls/types/packages/packageDataAttributes.json @@ -122,7 +122,7 @@ "type": "integer" }, "subjects": { - "description": "Managed and custom subjects associated with the package", + "description": "Managed and custom subjects associated with the package. Returned only in the single package response", "items": { "$ref": "packageSubject.json", "type": "object" diff --git a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java index f802d733..2dce1356 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageCollectionItemConverter.java @@ -51,7 +51,8 @@ private PackageDataAttributes convertAttributes(PackageData packageData) { .withProviderName(packageData.getVendorName()) .withProxiedUrl(packageData.getProxiedUrl()) .withSelectedCount(packageData.getSelectedCount()) - .withSubjects(mapItemsNullable(packageData.getSubjectAssociations(), PackageConverterUtils::convertSubject)) + // subjects are returned only in the single package response, see PackageConverter + .withSubjects(null) .withTitleCount(packageData.getTitleCount()) .withUrl(packageData.getPackageUrl()) .withVisibility(mapItemsNullable(packageData.getVisibilityDetails(), this::convertVisibility)); diff --git a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java index 83438e8f..40cbdd21 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java @@ -127,10 +127,20 @@ private void addAccessTypeRelationship(PackageResult result, Package packageData } return subjects.stream() .filter(subject -> !Boolean.TRUE.equals(subject.isCustom()) || Boolean.TRUE.equals(subject.explicitAssignment())) - .map(PackageConverterUtils::convertSubject) + .map(this::convertSubject) .toList(); } + private PackageSubject convertSubject(SubjectAssociation subject) { + return new PackageSubject() + .withId(subject.id()) + .withName(subject.name()) + .withSchemaId(subject.schemaId()) + .withParentId(subject.parentId()) + .withIsCustom(subject.isCustom()) + .withSubjectHierarchy(subject.subjectHierarchy()); + } + private @Nullable ProxyDto convertToProxy(@Nullable Proxy proxy) { return proxy != null ? new ProxyDto().withId(proxy.getId()).withInherited(proxy.getInherited()) : null; } diff --git a/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java b/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java index b240df39..3d860332 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageConverterUtils.java @@ -4,13 +4,11 @@ import java.util.EnumMap; import java.util.Map; -import org.folio.holdingsiq.model.SubjectAssociation; import org.folio.rest.jaxrs.model.ContentType; import org.folio.rest.jaxrs.model.HasManyRelationship; import org.folio.rest.jaxrs.model.HasOneRelationship; import org.folio.rest.jaxrs.model.MetaDataIncluded; import org.folio.rest.jaxrs.model.PackageRelationship; -import org.folio.rest.jaxrs.model.PackageSubject; public final class PackageConverterUtils { @@ -42,14 +40,4 @@ public static PackageRelationship createEmptyPackageRelationship() { .withMeta(new MetaDataIncluded() .withIncluded(false))); } - - public static PackageSubject convertSubject(SubjectAssociation subject) { - return new PackageSubject() - .withId(subject.id()) - .withName(subject.name()) - .withSchemaId(subject.schemaId()) - .withParentId(subject.parentId()) - .withIsCustom(subject.isCustom()) - .withSubjectHierarchy(subject.subjectHierarchy()); - } } diff --git a/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java b/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java deleted file mode 100644 index c819e65c..00000000 --- a/src/test/java/org/folio/rest/converter/packages/PackageCollectionItemConverterTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.folio.rest.converter.packages; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - -import java.util.List; -import org.folio.holdingsiq.model.CoverageDates; -import org.folio.holdingsiq.model.PackageData; -import org.folio.holdingsiq.model.SubjectAssociation; -import org.folio.rest.jaxrs.model.PackageCollectionItem; -import org.folio.rest.jaxrs.model.PackageSubject; -import org.folio.spring.config.TestConfig; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.convert.ConversionService; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = TestConfig.class) -class PackageCollectionItemConverterTest { - - @Autowired - private ConversionService conversionService; - - @Test - void shouldKeepAllSubjects() { - var packageData = packageDataBuilder() - .subjectAssociations(List.of( - new SubjectAssociation(1, 3, "Science", false, null, null, null), - new SubjectAssociation(2, 3, "Biology", true, null, null, 1), - new SubjectAssociation(3, 3, "Genetics", true, false, "Science -- Biology -- Genetics", 2))) - .build(); - - var subjects = convert(packageData).getAttributes().getSubjects(); - - assertNotNull(subjects); - assertEquals(List.of("Science", "Biology", "Genetics"), subjects.stream().map(PackageSubject::getName).toList()); - var genetics = subjects.get(2); - assertEquals(3, genetics.getId()); - assertEquals(3, genetics.getSchemaId()); - assertEquals(2, genetics.getParentId()); - assertEquals(true, genetics.getIsCustom()); - assertEquals("Science -- Biology -- Genetics", genetics.getSubjectHierarchy()); - } - - @Test - void shouldReturnNullSubjectsWhenNoSubjectAssociations() { - var packageData = packageDataBuilder().build(); - - assertNull(convert(packageData).getAttributes().getSubjects()); - } - - private PackageData.PackageDataBuilder packageDataBuilder() { - return PackageData.builder() - .packageId(1) - .vendorId(2) - .contentType("EJournal") - .customCoverage(CoverageDates.builder().beginCoverage("").endCoverage("").build()); - } - - private PackageCollectionItem convert(PackageData packageData) { - var item = conversionService.convert(packageData, PackageCollectionItem.class); - assertNotNull(item); - return item; - } -} diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json index aa83f8ec..be87270b 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-collection-with-five-elements.json @@ -33,22 +33,6 @@ "providerId": 392, "providerName": "American Academy of Family Physicians", "selectedCount": 0, - "subjects": [ - { - "id": 35408, - "name": "Technology", - "schemaId": 3, - "parentId": 35407, - "isCustom": false - }, - { - "id": 35410, - "name": "Robotics", - "schemaId": 3, - "parentId": 35408, - "isCustom": true - } - ], "titleCount": 3, "visibility": [ { diff --git a/src/test/resources/responses/rmapi/packages/get-packages-response.json b/src/test/resources/responses/rmapi/packages/get-packages-response.json index c89cfb41..76faeaa8 100644 --- a/src/test/resources/responses/rmapi/packages/get-packages-response.json +++ b/src/test/resources/responses/rmapi/packages/get-packages-response.json @@ -34,13 +34,6 @@ "schemaId": 3, "name": "Technology", "isCustom": false - }, - { - "id": 35410, - "parentId": 35408, - "schemaId": 3, - "name": "Robotics", - "isCustom": true } ], "consortia": "string", From dcee940ce60f023d771220cceb9eadb6be94486c Mon Sep 17 00:00:00 2001 From: viacheslav_kolesnyk Date: Thu, 15 Oct 2026 12:30:13 +0200 Subject: [PATCH 6/6] refactor(packages): limit package subject to id, name and isCustom Refs: MODKBEKBJ-853 --- .../packages_packageId_get_200_response.json | 5 +---- ramls/types/packages/packageSubject.json | 15 --------------- .../rest/converter/packages/PackageConverter.java | 5 +---- .../converter/packages/PackageConverterTest.java | 6 ++++-- .../expected-package-by-id-with-provider.json | 5 +---- .../kb-ebsco/packages/expected-package-by-id.json | 5 +---- 6 files changed, 8 insertions(+), 33 deletions(-) diff --git a/ramls/examples/packages/packages_packageId_get_200_response.json b/ramls/examples/packages/packages_packageId_get_200_response.json index 4862275d..bc1f606a 100644 --- a/ramls/examples/packages/packages_packageId_get_200_response.json +++ b/ramls/examples/packages/packages_packageId_get_200_response.json @@ -19,10 +19,7 @@ { "id": 35408, "name": "Technology", - "schemaId": 3, - "parentId": 35407, - "isCustom": false, - "subjectHierarchy": "Applied Sciences -- Technology" + "isCustom": false } ], "titleCount": 0, diff --git a/ramls/types/packages/packageSubject.json b/ramls/types/packages/packageSubject.json index a5aecf9f..892f4cf5 100644 --- a/ramls/types/packages/packageSubject.json +++ b/ramls/types/packages/packageSubject.json @@ -16,25 +16,10 @@ "example": "Science", "type": "string" }, - "schemaId": { - "description": "Subject schema id", - "example": 3, - "type": "integer" - }, - "parentId": { - "description": "Parent subject id", - "example": 26224, - "type": "integer" - }, "isCustom": { "description": "Whether this subject is custom or managed", "example": false, "type": "boolean" - }, - "subjectHierarchy": { - "description": "Full subject hierarchy path", - "example": "Science -- Biology (General)", - "type": "string" } } } diff --git a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java index 40cbdd21..07e922d5 100644 --- a/src/main/java/org/folio/rest/converter/packages/PackageConverter.java +++ b/src/main/java/org/folio/rest/converter/packages/PackageConverter.java @@ -135,10 +135,7 @@ private PackageSubject convertSubject(SubjectAssociation subject) { return new PackageSubject() .withId(subject.id()) .withName(subject.name()) - .withSchemaId(subject.schemaId()) - .withParentId(subject.parentId()) - .withIsCustom(subject.isCustom()) - .withSubjectHierarchy(subject.subjectHierarchy()); + .withIsCustom(subject.isCustom()); } private @Nullable ProxyDto convertToProxy(@Nullable Proxy proxy) { diff --git a/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java b/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java index 5ea03023..6a40c7f1 100644 --- a/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java +++ b/src/test/java/org/folio/rest/converter/packages/PackageConverterTest.java @@ -38,8 +38,10 @@ void shouldKeepManagedAndExplicitCustomSubjectsAndDropCustomPlaceholders() { var subjects = convert(packageData).getData().getAttributes().getSubjects(); - assertNotNull(subjects); - assertEquals(List.of("Science", "Genetics", "Botany"), subjects.stream().map(PackageSubject::getName).toList()); + assertEquals(List.of( + new PackageSubject().withId(1).withName("Science").withIsCustom(false), + new PackageSubject().withId(3).withName("Genetics").withIsCustom(true), + new PackageSubject().withId(4).withName("Botany").withIsCustom(true)), subjects); } @Test diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json index 5ea2417f..abe07756 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id-with-provider.json @@ -31,10 +31,7 @@ { "id": 35408, "name": "Technology", - "schemaId": 3, - "parentId": 35407, - "isCustom": false, - "subjectHierarchy": "Applied Sciences -- Technology" + "isCustom": false } ], "tags": { diff --git a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json index 69be5b5e..3778467d 100644 --- a/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json +++ b/src/test/resources/responses/kb-ebsco/packages/expected-package-by-id.json @@ -31,10 +31,7 @@ { "id": 35408, "name": "Technology", - "schemaId": 3, - "parentId": 35407, - "isCustom": false, - "subjectHierarchy": "Applied Sciences -- Technology" + "isCustom": false } ], "tags": {