Added support for passing additional filters to EntityRequest (#199)

* Added support for passing additional filters to EntityRequest

* minor cleanup

* refactor: default context

---------

Co-authored-by: Aaron Steinfeld <[email protected]>

Author: avinashkolluru

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,24 @@ public Single<EntityRequest> build(
     return this.build(context, arguments, entityScope, selectionSet);
   }
 
+  @Override
+  public Single<EntityRequest> rebuildWithAdditionalFilters(
+      EntityRequest originalRequest, List<FilterArgument> filterArguments) {
+    return this.resultSetRequestBuilder
+        .rebuildWithAdditionalFilters(originalRequest.resultSetRequest(), filterArguments)
+        .map(
+            newResultSetRequest ->
+                new DefaultEntityRequest(
+                    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,

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

@@ -2,11 +2,19 @@
 
 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.core.graphql.context.GraphQlRequestContext;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.schema.argument.AggregatableOrderArgument;
 
-public interface EntityRequest {
+public interface EntityRequest extends ContextualRequest {
+
+  @Override
+  default GraphQlRequestContext context() {
+    return resultSetRequest().context();
+  }
+
   String entityType();
 
   ResultSetRequest<AggregatableOrderArgument> resultSetRequest();

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

@@ -2,12 +2,17 @@
 
 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(
+      EntityRequest originalRequest, List<FilterArgument> filterArguments);
 }