Skip to content
This repository has been archived by the owner on Jun 26, 2024. It is now read-only.

Commit

Permalink
Pass through the updated entity ids (#161)
Browse files Browse the repository at this point in the history
  • Loading branch information
suresh-prakash authored Dec 30, 2022
1 parent 262fd0a commit 1c33b3c
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,13 @@ message UpdateOperation {
}

message BulkUpdateAllMatchingEntitiesResponse {
repeated EntityUpdateSummary summaries = 1;
}

message EntityUpdateSummary {
repeated UpdatedEntity updated_entities = 1;
}

message UpdatedEntity {
string id = 1;
}
4 changes: 2 additions & 2 deletions gateway-service-impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ dependencies {
implementation("org.hypertrace.core.query.service:query-service-client:0.8.0")
implementation("org.hypertrace.core.attribute.service:attribute-service-client:0.14.13")

implementation("org.hypertrace.entity.service:entity-service-client:0.8.52")
implementation("org.hypertrace.entity.service:entity-service-api:0.8.52")
implementation("org.hypertrace.entity.service:entity-service-client:0.8.56")
implementation("org.hypertrace.entity.service:entity-service-api:0.8.56")
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.7.5")
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.7.5")
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.37")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
package org.hypertrace.gateway.service.entity.converter;

import static java.util.stream.Collectors.toUnmodifiableList;

import org.hypertrace.entity.query.service.v1.BulkUpdateAllMatchingFilterResponse;
import org.hypertrace.entity.query.service.v1.UpdateSummary;
import org.hypertrace.gateway.service.common.converters.Converter;
import org.hypertrace.gateway.service.v1.entity.BulkUpdateAllMatchingEntitiesResponse;
import org.hypertrace.gateway.service.v1.entity.EntityUpdateSummary;
import org.hypertrace.gateway.service.v1.entity.UpdatedEntity;

public class BulkUpdateAllMatchingFilterResponseConverter
implements Converter<
BulkUpdateAllMatchingFilterResponse, BulkUpdateAllMatchingEntitiesResponse> {
@Override
public BulkUpdateAllMatchingEntitiesResponse convert(
final BulkUpdateAllMatchingFilterResponse source) {
return BulkUpdateAllMatchingEntitiesResponse.newBuilder().build();
return BulkUpdateAllMatchingEntitiesResponse.newBuilder()
.addAllSummaries(
source.getSummariesList().stream().map(this::convert).collect(toUnmodifiableList()))
.build();
}

private EntityUpdateSummary convert(final UpdateSummary summary) {
return EntityUpdateSummary.newBuilder()
.addAllUpdatedEntities(
summary.getUpdatedEntitiesList().stream()
.map(this::convert)
.collect(toUnmodifiableList()))
.build();
}

private UpdatedEntity convert(
final org.hypertrace.entity.query.service.v1.UpdatedEntity updatedEntity) {
return UpdatedEntity.newBuilder().setId(updatedEntity.getId()).build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import org.hypertrace.core.attribute.service.v1.AttributeKind;
import org.hypertrace.core.attribute.service.v1.AttributeMetadata;
Expand All @@ -50,6 +51,8 @@
import org.hypertrace.entity.query.service.v1.BulkUpdateAllMatchingFilterRequest;
import org.hypertrace.entity.query.service.v1.BulkUpdateAllMatchingFilterResponse;
import org.hypertrace.entity.query.service.v1.EntityQueryServiceGrpc.EntityQueryServiceBlockingStub;
import org.hypertrace.entity.query.service.v1.UpdateSummary;
import org.hypertrace.entity.query.service.v1.UpdatedEntity;
import org.hypertrace.gateway.service.AbstractGatewayServiceTest;
import org.hypertrace.gateway.service.common.AttributeMetadataProvider;
import org.hypertrace.gateway.service.common.QueryServiceRequestAndResponseUtils;
Expand All @@ -72,6 +75,7 @@
import org.hypertrace.gateway.service.v1.entity.EntitiesRequest;
import org.hypertrace.gateway.service.v1.entity.EntitiesResponse;
import org.hypertrace.gateway.service.v1.entity.Entity;
import org.hypertrace.gateway.service.v1.entity.EntityUpdateSummary;
import org.hypertrace.gateway.service.v1.entity.Update;
import org.hypertrace.gateway.service.v1.entity.UpdateOperation;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -508,8 +512,15 @@ void testBulkUpdateAllMatchingEntities() {
.setValueType(STRING)
.setString("GET")))))
.build();
final String updatedId = UUID.randomUUID().toString();
final BulkUpdateAllMatchingEntitiesResponse expectedResult =
BulkUpdateAllMatchingEntitiesResponse.newBuilder().build();
BulkUpdateAllMatchingEntitiesResponse.newBuilder()
.addSummaries(
EntityUpdateSummary.newBuilder()
.addUpdatedEntities(
org.hypertrace.gateway.service.v1.entity.UpdatedEntity.newBuilder()
.setId(updatedId)))
.build();

final BulkUpdateAllMatchingFilterRequest eqsRequest =
BulkUpdateAllMatchingFilterRequest.newBuilder()
Expand Down Expand Up @@ -553,7 +564,11 @@ void testBulkUpdateAllMatchingEntities() {
.setString("GET")))))
.build();
final BulkUpdateAllMatchingFilterResponse eqsResponse =
BulkUpdateAllMatchingFilterResponse.newBuilder().build();
BulkUpdateAllMatchingFilterResponse.newBuilder()
.addSummaries(
UpdateSummary.newBuilder()
.addUpdatedEntities(UpdatedEntity.newBuilder().setId(updatedId)))
.build();

when(entityQueryStub.bulkUpdateAllMatchingFilter(eqsRequest)).thenReturn(eqsResponse);

Expand Down

0 comments on commit 1c33b3c

Please sign in to comment.