Skip to content

ENG-55741: filtering support on the get all notification rule api #272

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
merged 2 commits into from
Jan 21, 2025
Merged

ENG-55741: filtering support on the get all notification rule api #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d589b
ENG-55741: filtering support on the get all notification rule api
patelraj0602 Jan 20, 2025
b45d34c
addressed comment
patelraj0602 Jan 21, 2025
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
8 changes: 7 additions & 1 deletion ...roto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ message UpdateNotificationRuleResponse {
NotificationRule notification_rule = 1;
}

message GetAllNotificationRulesRequest {}
message GetAllNotificationRulesRequest {
NotificationRuleFilter filter = 3;
}

message NotificationRuleFilter {
repeated string event_condition_type = 1;
}

message GetAllNotificationRulesResponse {
repeated NotificationRule notification_rules = 1;
Expand Down
7 changes: 4 additions & 3 deletions ...in/java/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@
public class NotificationRuleConfigServiceImpl
extends NotificationRuleConfigServiceGrpc.NotificationRuleConfigServiceImplBase {

private final NotificationRuleStore notificationRuleStore;
private final NotificationRuleFilteredStore notificationRuleStore;
private final NotificationRuleConfigServiceRequestValidator validator;

public NotificationRuleConfigServiceImpl(
Channel channel, ConfigChangeEventGenerator configChangeEventGenerator) {
this.notificationRuleStore = new NotificationRuleStore(channel, configChangeEventGenerator);
this.notificationRuleStore =
new NotificationRuleFilteredStore(channel, configChangeEventGenerator);
this.validator = new NotificationRuleConfigServiceRequestValidator();
}

Expand Down Expand Up @@ -105,7 +106,7 @@ public void getAllNotificationRules(
responseObserver.onNext(
GetAllNotificationRulesResponse.newBuilder()
.addAllNotificationRules(
notificationRuleStore.getAllObjects(requestContext).stream()
notificationRuleStore.getAllObjects(requestContext, request.getFilter()).stream()
.map(ConfigObject::getData)
.collect(Collectors.toUnmodifiableList()))
.build());
Expand Down
23 changes: 20 additions & 3 deletions ...config/service/NotificationRuleStore.java → ...ervice/NotificationRuleFilteredStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@
import java.util.Optional;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.hypertrace.config.objectstore.IdentifiedObjectStore;
import org.hypertrace.config.objectstore.IdentifiedObjectStoreWithFilter;
import org.hypertrace.config.proto.converter.ConfigProtoConverter;
import org.hypertrace.config.service.change.event.api.ConfigChangeEventGenerator;
import org.hypertrace.config.service.v1.ConfigServiceGrpc;
import org.hypertrace.core.grpcutils.client.RequestContextClientCallCredsProviderFactory;
import org.hypertrace.notification.config.service.v1.NotificationRule;
import org.hypertrace.notification.config.service.v1.NotificationRuleFilter;

@Slf4j
public class NotificationRuleStore extends IdentifiedObjectStore<NotificationRule> {
public class NotificationRuleFilteredStore
extends IdentifiedObjectStoreWithFilter<NotificationRule, NotificationRuleFilter> {

private static final String NOTIFICATION_CONFIG_NAMESPACE = "notification-v1";
private static final String NOTIFICATION_RULE_CONFIG_RESOURCE_NAME = "notificationRuleConfig";

public NotificationRuleStore(
public NotificationRuleFilteredStore(
Channel channel, ConfigChangeEventGenerator configChangeEventGenerator) {
super(
ConfigServiceGrpc.newBlockingStub(channel)
Expand Down Expand Up @@ -52,4 +54,19 @@ protected Value buildValueFromData(NotificationRule object) {
protected String getContextFromData(NotificationRule object) {
return object.getId();
}

@Override
protected Optional<NotificationRule> filterConfigData(
NotificationRule data, NotificationRuleFilter filter) {
return Optional.of(data)
.filter(
notificationRule ->
filter.getEventConditionTypeList().isEmpty()
|| filter
.getEventConditionTypeList()
.contains(
notificationRule
.getNotificationRuleMutableData()
.getEventConditionType()));
}
}
29 changes: 24 additions & 5 deletions ...ava/org/hypertrace/notification/config/service/NotificationRuleConfigServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.hypertrace.notification.config.service.v1.GetNotificationRuleRequest;
import org.hypertrace.notification.config.service.v1.NotificationRule;
import org.hypertrace.notification.config.service.v1.NotificationRuleConfigServiceGrpc;
import org.hypertrace.notification.config.service.v1.NotificationRuleFilter;
import org.hypertrace.notification.config.service.v1.NotificationRuleMutableData;
import org.hypertrace.notification.config.service.v1.UpdateNotificationRuleRequest;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -23,13 +24,13 @@ class NotificationRuleConfigServiceImplTest {

MockGenericConfigService mockGenericConfigService;
NotificationRuleConfigServiceGrpc.NotificationRuleConfigServiceBlockingStub notificationStub;
NotificationRuleStore notificationRuleStore;
NotificationRuleFilteredStore notificationRuleStore;

@BeforeEach
void beforeEach() {
mockGenericConfigService =
new MockGenericConfigService().mockUpsert().mockGet().mockGetAll().mockDelete();
notificationRuleStore = mock(NotificationRuleStore.class);
notificationRuleStore = mock(NotificationRuleFilteredStore.class);

ConfigChangeEventGenerator configChangeEventGenerator = mock(ConfigChangeEventGenerator.class);
mockGenericConfigService
Expand Down Expand Up @@ -88,7 +89,13 @@ void createReadUpdateDeleteNotificationRules() {
assertEquals(
List.of(notificationRule2, notificationRule1),
notificationStub
.getAllNotificationRules(GetAllNotificationRulesRequest.getDefaultInstance())
.getAllNotificationRules(
GetAllNotificationRulesRequest.newBuilder()
.setFilter(
NotificationRuleFilter.newBuilder()
.addEventConditionType("metricAnomalyEventCondition")
.build())
.build())
.getNotificationRulesList());

NotificationRule ruleToUpdate =
Expand All @@ -111,7 +118,13 @@ void createReadUpdateDeleteNotificationRules() {
assertEquals(
List.of(notificationRule2, updatedRule),
notificationStub
.getAllNotificationRules(GetAllNotificationRulesRequest.getDefaultInstance())
.getAllNotificationRules(
GetAllNotificationRulesRequest.newBuilder()
.setFilter(
NotificationRuleFilter.newBuilder()
.addEventConditionType("metricAnomalyEventCondition")
.build())
.build())
.getNotificationRulesList());

notificationStub.deleteNotificationRule(
Expand All @@ -121,7 +134,13 @@ void createReadUpdateDeleteNotificationRules() {
assertEquals(
List.of(updatedRule),
notificationStub
.getAllNotificationRules(GetAllNotificationRulesRequest.getDefaultInstance())
.getAllNotificationRules(
GetAllNotificationRulesRequest.newBuilder()
.setFilter(
NotificationRuleFilter.newBuilder()
.addEventConditionType("metricAnomalyEventCondition")
.build())
.build())
.getNotificationRulesList());
}

Expand Down
Loading