fix the request

Author: aman-bansal

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityEdgeFetcher.java

@@ -120,9 +120,14 @@ private Maybe<Edge> buildEdge(
 
     return zip(
             this.attributeMapConverter.convert(
-                edgeSetGroupRequest.getAllAttributeRequests(), response.getAttributeMap()),
+                edgeSetGroupRequest.edgeSetRequests().get(neighbor.type()).attributeRequests(),
+                response.getAttributeMap()),
             this.baselineMetricAggregationContainerMapConverter.convert(
-                edgeSetGroupRequest.getAllMetricAggregationRequests(), response.getMetricsMap()),
+                edgeSetGroupRequest
+                    .edgeSetRequests()
+                    .get(neighbor.type())
+                    .metricAggregationRequests(),
+                response.getMetricsMap()),
             (attributes, metrics) -> (Edge) new ConvertedEdge(neighbor, attributes, metrics))
         .toMaybe();
   }

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityInteractionRequestBuilder.java

@@ -24,6 +24,7 @@
 import org.hypertrace.gateway.service.v1.common.Operator;
 import org.hypertrace.gateway.service.v1.entity.InteractionsRequest;
 import org.hypertrace.graphql.entity.request.EdgeSetGroupRequest;
+import org.hypertrace.graphql.entity.request.EdgeSetRequest;
 import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 
 class GatewayServiceEntityInteractionRequestBuilder {
@@ -62,13 +63,28 @@ Single<InteractionsRequest> build(EdgeSetGroupRequest edgeSetRequestGroup) {
 
   private Single<Set<Expression>> collectSelectionsAndAggregations(EdgeSetGroupRequest request) {
     return this.selectionConverter
-        .convert(request.getAllAttributeRequests())
-        .mergeWith(this.aggregationConverter.convert(request.getAllMetricAggregationRequests()))
+        .convert(getAllAttributeRequests(request))
+        .mergeWith(this.aggregationConverter.convert(getAllMetricAggregationRequests(request)))
         .toObservable()
         .flatMap(Observable::fromIterable)
         .collect(Collectors.toUnmodifiableSet());
   }
 
+  private Set<AttributeRequest> getAllAttributeRequests(EdgeSetGroupRequest request) {
+    return request.edgeSetRequests().values().stream()
+        .map(EdgeSetRequest::attributeRequests)
+        .flatMap(Collection::stream)
+        .collect(Collectors.toUnmodifiableSet());
+  }
+
+  private Set<MetricAggregationRequest> getAllMetricAggregationRequests(
+      EdgeSetGroupRequest request) {
+    return request.edgeSetRequests().values().stream()
+        .map(EdgeSetRequest::metricAggregationRequests)
+        .flatMap(Collection::stream)
+        .collect(Collectors.toUnmodifiableSet());
+  }
+
   private Single<Filter> buildEntityInteractionFilter(EdgeSetGroupRequest request) {
     // Todo: we should be using converter taking argument as logical filters with filter arg schema
     return Observable.fromIterable(request.edgeSetRequests().entrySet())

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

@@ -60,7 +60,6 @@
 import org.hypertrace.graphql.entity.schema.EntityJoinable;
 import org.hypertrace.graphql.entity.schema.EntityResultSet;
 import org.hypertrace.graphql.entity.schema.argument.EntityTypeStringArgument;
-import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.request.MetricRequestBuilder;
 import org.hypertrace.graphql.metric.schema.argument.AggregatableOrderArgument;
@@ -329,16 +328,6 @@ public Single<EntityRequest> buildNeighborRequest(
           new UnsupportedOperationException(
               "Does not support fetching neighbors for joined entities"));
     }
-
-    @Override
-    public Collection<AttributeRequest> getAllAttributeRequests() {
-      return Collections.emptyList();
-    }
-
-    @Override
-    public Collection<MetricAggregationRequest> getAllMetricAggregationRequests() {
-      return Collections.emptyList();
-    }
   }
 
   @Value

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

@@ -266,22 +266,6 @@ public Single<EntityRequest> buildNeighborRequest(
         String entityType, Collection<String> neighborIds) {
       return this.neighborRequestBuilder.apply(entityType, neighborIds);
     }
-
-    @Override
-    public Collection<AttributeRequest> getAllAttributeRequests() {
-      return this.edgeSetRequests.values().stream()
-          .map(EdgeSetRequest::attributeRequests)
-          .flatMap(Collection::stream)
-          .collect(Collectors.toUnmodifiableSet());
-    }
-
-    @Override
-    public Collection<MetricAggregationRequest> getAllMetricAggregationRequests() {
-      return this.edgeSetRequests.values().stream()
-          .map(EdgeSetRequest::metricAggregationRequests)
-          .flatMap(Collection::stream)
-          .collect(Collectors.toUnmodifiableSet());
-    }
   }
 
   @Value

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

@@ -4,7 +4,6 @@
 import java.util.Collection;
 import java.util.Map;
 import org.hypertrace.core.graphql.common.request.AttributeRequest;
-import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 
 public interface EdgeSetGroupRequest {
   AttributeRequest neighborIdAttribute();
@@ -14,8 +13,4 @@ public interface EdgeSetGroupRequest {
   Single<EntityRequest> buildNeighborRequest(String entityType, Collection<String> neighborIds);
 
   Map<String, EdgeSetRequest> edgeSetRequests();
-
-  Collection<AttributeRequest> getAllAttributeRequests();
-
-  Collection<MetricAggregationRequest> getAllMetricAggregationRequests();
 }

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

@@ -56,7 +56,6 @@
 import org.hypertrace.graphql.label.schema.LabelResultSet;
 import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;
 import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleResultSet;
-import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.schema.argument.AggregatableOrderArgument;
 
@@ -328,16 +327,6 @@ public Single<EntityRequest> buildNeighborRequest(
           new UnsupportedOperationException(
               "Does not support fetching neighbors for joined entities"));
     }
-
-    @Override
-    public Collection<AttributeRequest> getAllAttributeRequests() {
-      return Collections.emptyList();
-    }
-
-    @Override
-    public Collection<MetricAggregationRequest> getAllMetricAggregationRequests() {
-      return Collections.emptyList();
-    }
   }
 
   @Value