Added support for passing additional filters to EntityRequest

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/joiner/DefaultEntityJoinerBuilder.java

@@ -291,7 +291,7 @@ private Single<EntityRequest> buildEntityRequest(
               context, entityType, this.entityFieldsByType.get(entityType)),
           (resultSetRequest, metricRequestList, optionalLabelRequest) ->
               new DefaultEntityRequest(
-                  entityType, resultSetRequest, metricRequestList, optionalLabelRequest));
+                  context, entityType, resultSetRequest, metricRequestList, optionalLabelRequest));
     }
 
     private Single<List<AttributeAssociation<FilterArgument>>> buildIdFilter(
@@ -304,6 +304,7 @@ private Single<List<AttributeAssociation<FilterArgument>>> buildIdFilter(
   @Value
   @Accessors(fluent = true)
   private static class DefaultEntityRequest implements EntityRequest {
+    GraphQlRequestContext context;
     String entityType;
     ResultSetRequest<AggregatableOrderArgument> resultSetRequest;
     List<MetricRequest> metricRequests;

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/DefaultEntityRequestBuilder.java

@@ -18,6 +18,7 @@
 import org.hypertrace.core.graphql.common.request.ResultSetRequestBuilder;
 import org.hypertrace.core.graphql.common.schema.arguments.TimeRangeArgument;
 import org.hypertrace.core.graphql.common.schema.results.ResultSet;
+import org.hypertrace.core.graphql.common.schema.results.arguments.filter.FilterArgument;
 import org.hypertrace.core.graphql.common.schema.results.arguments.space.SpaceArgument;
 import org.hypertrace.core.graphql.context.GraphQlRequestContext;
 import org.hypertrace.core.graphql.deserialization.ArgumentDeserializer;
@@ -74,6 +75,27 @@ public Single<EntityRequest> build(
     return this.build(context, arguments, entityScope, selectionSet);
   }
 
+  @Override
+  public Single<EntityRequest> rebuildWithAdditionalFilters(
+      GraphQlRequestContext context,
+      EntityRequest originalRequest,
+      List<FilterArgument> filterArguments) {
+    return this.resultSetRequestBuilder
+        .rebuildWithAdditionalFilters(originalRequest.resultSetRequest(), filterArguments)
+        .map(
+            newResultSetRequest ->
+                new DefaultEntityRequest(
+                    originalRequest.context(),
+                    originalRequest.entityType(),
+                    newResultSetRequest,
+                    originalRequest.metricRequests(),
+                    originalRequest.incomingEdgeRequests(),
+                    originalRequest.outgoingEdgeRequests(),
+                    originalRequest.includeInactive(),
+                    originalRequest.fetchTotal(),
+                    originalRequest.labelRequest()));
+  }
+
   private Single<EntityRequest> build(
       GraphQlRequestContext context,
       Map<String, Object> arguments,
@@ -113,6 +135,7 @@ private Single<EntityRequest> build(
             outgoingEdges,
             optionalLabelsAttributeRequest) ->
             new DefaultEntityRequest(
+                context,
                 scope,
                 resultSetRequest,
                 metricRequestList,
@@ -157,6 +180,7 @@ private Optional<String> space(Map<String, Object> arguments) {
   @Value
   @Accessors(fluent = true)
   private static class DefaultEntityRequest implements EntityRequest {
+    GraphQlRequestContext context;
     String entityType;
     ResultSetRequest<AggregatableOrderArgument> resultSetRequest;
     List<MetricRequest> metricRequests;

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/EntityRequest.java

@@ -2,11 +2,12 @@
 
 import java.util.List;
 import java.util.Optional;
+import org.hypertrace.core.graphql.common.request.ContextualRequest;
 import org.hypertrace.core.graphql.common.request.ResultSetRequest;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.schema.argument.AggregatableOrderArgument;
 
-public interface EntityRequest {
+public interface EntityRequest extends ContextualRequest {
   String entityType();
 
   ResultSetRequest<AggregatableOrderArgument> resultSetRequest();

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/EntityRequestBuilder.java

@@ -2,12 +2,19 @@
 
 import graphql.schema.DataFetchingFieldSelectionSet;
 import io.reactivex.rxjava3.core.Single;
+import java.util.List;
 import java.util.Map;
+import org.hypertrace.core.graphql.common.schema.results.arguments.filter.FilterArgument;
 import org.hypertrace.core.graphql.context.GraphQlRequestContext;
 
 public interface EntityRequestBuilder {
   Single<EntityRequest> build(
       GraphQlRequestContext context,
       Map<String, Object> arguments,
       DataFetchingFieldSelectionSet selectionSet);
+
+  Single<EntityRequest> rebuildWithAdditionalFilters(
+      GraphQlRequestContext context,
+      EntityRequest originalRequest,
+      List<FilterArgument> filterArguments);
 }

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/NeighborEntitiesRequestBuilder.java

@@ -90,6 +90,7 @@ private Single<EntityRequest> build(
             context, timeRange, space, this.getOutgoingEdges(neighborFields)),
         (resultSetRequest, metricRequestList, incomingEdges, outgoingEdges) ->
             new NeighborEntityRequest(
+                context,
                 entityScope,
                 resultSetRequest,
                 metricRequestList,
@@ -174,6 +175,7 @@ private static class EntityNeighborIdFilter implements FilterArgument {
   @Value
   @Accessors(fluent = true)
   private static class NeighborEntityRequest implements EntityRequest {
+    GraphQlRequestContext context;
     String entityType;
     ResultSetRequest<AggregatableOrderArgument> resultSetRequest;
     List<MetricRequest> metricRequests;

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/DefaultEntityAndRuleJoinerBuilder.java

@@ -291,7 +291,7 @@ private Single<EntityRequest> buildEntityRequest(
               filterArguments,
               selectionSet.getFields().stream(),
               Optional.empty())
-          .map(request -> new DefaultEntityRequest(entityType, request, fetchTotal));
+          .map(request -> new DefaultEntityRequest(context, entityType, request, fetchTotal));
     }
 
     private Single<List<AttributeAssociation<FilterArgument>>> buildLabelIdFilter(
@@ -303,6 +303,7 @@ private Single<List<AttributeAssociation<FilterArgument>>> buildLabelIdFilter(
   @Value
   @Accessors(fluent = true)
   private static class DefaultEntityRequest implements EntityRequest {
+    GraphQlRequestContext context;
     String entityType;
     ResultSetRequest<AggregatableOrderArgument> resultSetRequest;
     List<MetricRequest> metricRequests = Collections.emptyList(); // Only support attributes for now