Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify fetching child resources #246

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Simplify fetching child resources #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a98e8a
Remove duplicate repository method
gunnarvelle Apr 16, 2024
1942bdf
Do not fetch all the data at once to offload db cpu
gunnarvelle Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 11 additions & 26 deletions src/main/java/no/ndla/taxonomy/repositories/NodeConnectionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,18 @@ public interface NodeConnectionRepository extends TaxonomyRepository<NodeConnect
@Query(
"""
SELECT DISTINCT nc FROM NodeConnection nc
LEFT JOIN FETCH nc.child child
LEFT JOIN FETCH nc.parent n
LEFT JOIN FETCH child.resourceResourceTypes rrt
LEFT JOIN FETCH nc.relevance rel
LEFT JOIN FETCH rrt.resourceType rt
WHERE n.publicId IN :nodeIds
AND ((:#{#resourceTypePublicIds == null} = true) OR rt.publicId IN :resourceTypePublicIds)
AND (:relevancePublicId IS NULL OR rel.publicId = :relevancePublicId)
AND child.nodeType = 'RESOURCE'
""")
List<NodeConnection> getResourceBy(Set<URI> nodeIds, Set<URI> resourceTypePublicIds, URI relevancePublicId);

@Query(
"""
SELECT DISTINCT nc FROM NodeConnection nc
JOIN FETCH nc.child r
LEFT JOIN FETCH nc.parent n
LEFT JOIN FETCH r.resourceResourceTypes rrt
LEFT JOIN FETCH nc.relevance rel
LEFT JOIN FETCH rrt.resourceType rt
WHERE n.publicId IN :nodeIds
AND r.nodeType = 'RESOURCE'
LEFT JOIN nc.child c
LEFT JOIN nc.parent p
LEFT JOIN c.resourceResourceTypes rrt
LEFT JOIN nc.relevance rel
LEFT JOIN rrt.resourceType rt
WHERE p.publicId IN :nodeIds
AND ((:#{#resourceTypeIds == null} = true) OR rt.publicId IN :resourceTypeIds)
AND (:relevanceId IS NULL OR rel.publicId = :relevanceId)
AND c.nodeType = 'RESOURCE'
""")
List<NodeConnection> getByResourceIds(Collection<URI> nodeIds);

@Query("SELECT nc FROM NodeConnection nc JOIN FETCH nc.parent JOIN FETCH nc.child")
List<NodeConnection> findAllIncludingParentAndChild();
List<NodeConnection> getResourceBy(
Set<URI> nodeIds, Optional<List<URI>> resourceTypeIds, Optional<URI> relevanceId);

@Query(
"SELECT nc FROM NodeConnection nc JOIN FETCH nc.parent JOIN FETCH nc.child c WHERE c.nodeType = :childNodeType")
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/no/ndla/taxonomy/rest/v1/Nodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,20 +377,13 @@ public List<NodeChildDTO> getResources(
"Select by resource type id(s). If not specified, resources of all types will be returned. "
+ "Multiple ids may be separated with comma or the parameter may be repeated for each id.")
@RequestParam(value = "type", required = false)
URI[] resourceTypeIds,
Optional<List<URI>> resourceTypeIds,
@Parameter(description = "Select by relevance. If not specified, all resources will be returned.")
@RequestParam(value = "relevance", required = false)
URI relevance) {
final Set<URI> resourceTypeIdSet;

if (resourceTypeIds == null) {
resourceTypeIdSet = Set.of();
} else {
resourceTypeIdSet = new HashSet<>(Arrays.asList(resourceTypeIds));
}
Optional<URI> relevance) {

return nodeService.getResourcesByNodeId(
nodeId, resourceTypeIdSet, relevance, language, recursive, includeContexts, filterProgrammes);
nodeId, resourceTypeIds, relevance, language, recursive, includeContexts, filterProgrammes);
}

@GetMapping("{id}/full")
Expand Down
14 changes: 5 additions & 9 deletions src/main/java/no/ndla/taxonomy/rest/v1/Subjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,13 @@ public List<NodeChildDTO> getSubjectResources(
description =
"Filter by resource type id(s). If not specified, resources of all types will be returned."
+ "Multiple ids may be separated with comma or the parameter may be repeated for each id.")
@RequestParam(value = "type", required = false, defaultValue = "")
URI[] resourceTypeIds,
@RequestParam(value = "type", required = false)
Optional<List<URI>> resourceTypeIds,
@Parameter(description = "Select by relevance. If not specified, all resources will be returned.")
@RequestParam(value = "relevance", required = false, defaultValue = "")
URI relevance) {
final Set<URI> resourceTypeIdSet = resourceTypeIds != null ? Set.of(resourceTypeIds) : Set.of();

// If null is sent to query it will be ignored, otherwise it will filter by relevance
final var relevanceArgument = relevance == null || relevance.toString().equals("") ? null : relevance;
@RequestParam(value = "relevance", required = false)
Optional<URI> relevance) {

return nodeService.getResourcesByNodeId(
subjectId, resourceTypeIdSet, relevanceArgument, language, true, Optional.of(false), false);
subjectId, resourceTypeIds, relevance, language, true, Optional.of(false), false);
}
}
13 changes: 3 additions & 10 deletions src/main/java/no/ndla/taxonomy/rest/v1/Topics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,20 +235,13 @@ public List<NodeChildDTO> getTopicResources(
"Select by resource type id(s). If not specified, resources of all types will be returned."
+ "Multiple ids may be separated with comma or the parameter may be repeated for each id.")
@RequestParam(value = "type", required = false)
URI[] resourceTypeIds,
Optional<List<URI>> resourceTypeIds,
@Parameter(description = "Select by relevance. If not specified, all resources will be returned.")
@RequestParam(value = "relevance", required = false)
URI relevance) {
final Set<URI> resourceTypeIdSet;

if (resourceTypeIds == null) {
resourceTypeIdSet = Set.of();
} else {
resourceTypeIdSet = new HashSet<>(Arrays.asList(resourceTypeIds));
}
Optional<URI> relevance) {

return nodeService.getResourcesByNodeId(
topicId, resourceTypeIdSet, relevance, language, recursive, Optional.of(false), false);
topicId, resourceTypeIds, relevance, language, recursive, Optional.of(false), false);
}

@Deprecated
Expand Down
51 changes: 23 additions & 28 deletions src/main/java/no/ndla/taxonomy/service/NodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

package no.ndla.taxonomy.service;

import static java.util.stream.Collectors.toList;

import java.net.URI;
import java.util.*;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -200,8 +198,8 @@ public Node getNode(URI publicId) {

public List<NodeChildDTO> getResourcesByNodeId(
URI nodePublicId,
Set<URI> resourceTypeIds,
URI relevancePublicId,
Optional<List<URI>> resourceTypeIds,
Optional<URI> relevanceId,
Optional<String> languageCode,
boolean recursive,
Optional<Boolean> includeContexts,
Expand Down Expand Up @@ -238,7 +236,7 @@ public List<NodeChildDTO> getResourcesByNodeId(
node,
topicIdsToSearchFor,
resourceTypeIds,
relevancePublicId,
relevanceId,
resourcesToSort,
languageCode,
includeContexts,
Expand All @@ -248,35 +246,32 @@ public List<NodeChildDTO> getResourcesByNodeId(
private List<NodeChildDTO> filterNodeResourcesByIdsAndReturn(
Node root,
Set<URI> nodeIds,
Set<URI> resourceTypeIds,
URI relevance,
Optional<List<URI>> resourceTypeIds,
Optional<URI> relevanceId,
Set<ResourceTreeSortable> sortableListToAddTo,
Optional<String> languageCode,
Optional<Boolean> includeContexts,
boolean filterProgrammes) {
final List<NodeConnection> nodeResources;

if (!resourceTypeIds.isEmpty()) {
nodeResources = nodeConnectionRepository.getResourceBy(nodeIds, resourceTypeIds, relevance);
} else {
var nodeResourcesStream = nodeConnectionRepository.getByResourceIds(nodeIds).stream();
if (relevance != null) {
final var isRequestingCore = "urn:relevance:core".equals(relevance.toString());
nodeResourcesStream = nodeResourcesStream.filter(nodeResource -> {
final var resource = nodeResource.getChild().orElse(null);
if (resource == null) {
return false;
}
final var rel = nodeResource.getRelevance().orElse(null);
if (rel != null) {
return rel.getPublicId().equals(relevance);
} else {
return isRequestingCore;
}
});
}
nodeResources = nodeResourcesStream.collect(toList());
var nodeResourcesStream =
nodeConnectionRepository.getResourceBy(nodeIds, resourceTypeIds, relevanceId).stream();
if (relevanceId.isPresent()) {
final var isRequestingCore = "urn:relevance:core".equals(relevanceId.toString());
nodeResourcesStream = nodeResourcesStream.filter(nodeResource -> {
final var resource = nodeResource.getChild().orElse(null);
if (resource == null) {
return false;
}
final var rel = nodeResource.getRelevance().orElse(null);
if (rel != null) {
return rel.getPublicId().equals(relevanceId.get());
} else {
return isRequestingCore;
}
});
}
nodeResources = nodeResourcesStream.toList();

nodeResources.forEach(nodeResource -> sortableListToAddTo.add(new ResourceTreeSortable(nodeResource)));

Expand All @@ -298,7 +293,7 @@ private List<NodeChildDTO> filterNodeResourcesByIdsAndReturn(
includeContexts,
filterProgrammes);
})
.collect(toList());
.toList();
}

@Override
Expand Down
Loading