Skip to content

Story ####: improve facets computing #3210

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+33 −7
Open

Story ####: improve facets computing #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ...ain/java/fr/gouv/vitamui/cas/webflow/actions/I18NSendPasswordResetInstructionsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
import org.springframework.webflow.execution.RequestContext;

import java.net.URL;
import java.util.Objects;

/**
* Send reset password emails with i18n messages.
Expand Down
39 changes: 33 additions & 6 deletions ...mons-api/src/main/java/fr/gouv/vitamui/commons/api/utils/MetadataSearchCriteriaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import fr.gouv.vitamui.commons.api.domain.DirectionDto;
import fr.gouv.vitamui.commons.api.dsl.VitamQueryHelper;
import fr.gouv.vitamui.commons.api.dtos.CriteriaValue;
import fr.gouv.vitamui.commons.api.dtos.Facet;
import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaDto;
import fr.gouv.vitamui.commons.api.dtos.SearchCriteriaEltDto;
import fr.gouv.vitamui.commons.api.dtos.TermsFacet;
Expand Down Expand Up @@ -129,13 +130,32 @@ public static SelectMultiQuery createDslQueryWithFacets(SearchCriteriaDto search
fillWaitingToComputeCriteria(searchQuery);

SelectMultiQuery selectMultiQuery = mapRequestToSelectMultiQuery(searchQuery);
selectMultiQuery.addFacets(
FacetHelper.terms(FACETS_COUNT_BY_NODE, ALL_UNIT_UPS, DEFAULT_FACET_SIZE, FacetOrder.ASC)
);
if (CollectionUtils.isNotEmpty(searchQuery.getFacets())) {
addFacetIfPresent(searchQuery.getFacets(), "COUNT_BY_NODE", () -> {
try {
selectMultiQuery.addFacets(
FacetHelper.terms(FACETS_COUNT_BY_NODE, ALL_UNIT_UPS, DEFAULT_FACET_SIZE, FacetOrder.ASC)
);
} catch (InvalidCreateOperationException e) {
throw new RuntimeException(e);
}
});

selectMultiQuery.addFacets(
FacetHelper.terms(FACETS_VIRTUAL_TREE, ARCHIVE_UNIT_VIRTUAL_PATHS, DEFAULT_FACET_SIZE, FacetOrder.ASC)
);
addFacetIfPresent(searchQuery.getFacets(), "FACETS_VIRTUAL_TREE", () -> {
try {
selectMultiQuery.addFacets(
FacetHelper.terms(
FACETS_VIRTUAL_TREE,
ARCHIVE_UNIT_VIRTUAL_PATHS,
DEFAULT_FACET_SIZE,
FacetOrder.ASC
)
);
} catch (InvalidCreateOperationException e) {
throw new RuntimeException(e);
}
});
}

if (searchQuery.isComputeMgtRulesFacets()) {
selectMultiQuery.addFacets(
Expand All @@ -155,6 +175,13 @@ public static SelectMultiQuery createDslQueryWithFacets(SearchCriteriaDto search
return selectMultiQuery;
}

private static void addFacetIfPresent(List<Facet> facets, String facetName, Runnable action) {
boolean hasFacet = facets.stream().anyMatch(facet -> facetName.equals(facet.getName()));
if (hasFacet) {
action.run();
}
}

public static SelectMultiQuery getBasicQuery(SearchCriteriaDto searchQuery) throws VitamClientException {
if (searchQuery == null) {
throw new BadRequestException("Can't parse null criteria");
Expand Down
Loading