Skip to content

fix(entity): query labels attribute, if requested #106

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

Merged
skjindal93 merged 1 commit into from
Sep 27, 2021
Merged

fix(entity): query labels attribute, if requested #106

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
38 changes: 23 additions & 15 deletions ...hema/src/main/java/org/hypertrace/graphql/entity/request/DefaultEntityRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,6 @@ private Single<EntityRequest> build(
.count()
> 0;

boolean canFetchLabels =
this.selectionFinder
.findSelections(
selectionSet,
SelectionQuery.builder()
.selectionPath(
List.of(ResultSet.RESULT_SET_RESULTS_NAME, Entity.LABELS_KEY))
.build())
.count()
> 0;

return zip(
this.resultSetRequestBuilder.build(
context, scope, arguments, selectionSet, AggregatableOrderArgument.class),
Expand All @@ -121,7 +110,7 @@ private Single<EntityRequest> build(
this.timeRange(arguments),
this.space(arguments),
this.getOutgoingEdges(selectionSet)),
attributeRequestBuilder.buildForKey(context, scope, LABELS_KEY_NAME),
buildLabelRequest(context, scope, selectionSet),
(resultSetRequest,
metricRequestList,
incomingEdges,
Expand All @@ -135,9 +124,28 @@ private Single<EntityRequest> build(
outgoingEdges,
includeInactive,
fetchTotal,
canFetchLabels
? Optional.of(new DefaultLabelRequest(labelsAttributeRequest))
: Optional.empty()));
labelsAttributeRequest));
}

private Single<Optional<LabelRequest>> buildLabelRequest(
GraphQlRequestContext context, String scope, DataFetchingFieldSelectionSet selectionSet) {
boolean canFetchLabels =
this.selectionFinder
.findSelections(
selectionSet,
SelectionQuery.builder()
.selectionPath(
List.of(ResultSet.RESULT_SET_RESULTS_NAME, Entity.LABELS_KEY))
.build())
.count()
> 0;

return canFetchLabels
? attributeRequestBuilder
.buildForKey(context, scope, LABELS_KEY_NAME)
.map(DefaultLabelRequest::new)
.map(Optional::of)
: Single.just(Optional.empty());
}

private Stream<SelectedField> getResultSets(DataFetchingFieldSelectionSet selectionSet) {
Expand Down