diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java index 3f4de8ed417..810ce026082 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertUtil.java @@ -190,9 +190,9 @@ public final class AlertUtil { List resource, CreateEventSubscription.AlertType alertType, AlertFilteringInput input) { - if (resource.size() > 1) { + if (resource.size() != 1) { throw new BadRequestException( - "Only one resource can be specified. Multiple resources are not supported."); + "One resource can be specified. Zero or Multiple resources are not supported."); } if (alertType.equals(CreateEventSubscription.AlertType.NOTIFICATION)) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java index 580cb0b76e4..a687d3d6d67 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/subscription/AlertsRuleEvaluator.java @@ -15,6 +15,8 @@ import static org.openmetadata.service.Entity.USER; import java.util.List; import java.util.Set; import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.Function; @@ -134,7 +136,9 @@ public class AlertsRuleEvaluator { EntityInterface entity = getEntity(changeEvent); for (String name : entityNames) { - if (entity.getFullyQualifiedName().equals(name)) { + Pattern pattern = Pattern.compile(name); + Matcher matcher = pattern.matcher(entity.getFullyQualifiedName()); + if (matcher.find()) { return true; } } @@ -249,7 +253,9 @@ public class AlertsRuleEvaluator { EntityInterface entity = getEntity(changeEvent); for (String name : tableNameList) { - if (entity.getFullyQualifiedName().contains(name)) { + Pattern pattern = Pattern.compile(name); + Matcher matcher = pattern.matcher(entity.getFullyQualifiedName()); + if (matcher.find()) { return true; } } diff --git a/openmetadata-service/src/main/resources/json/data/app/DataInsightsReportApplication.json b/openmetadata-service/src/main/resources/json/data/app/DataInsightsReportApplication.json deleted file mode 100644 index 54206e2bc69..00000000000 --- a/openmetadata-service/src/main/resources/json/data/app/DataInsightsReportApplication.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "DataInsightsReportApplication", - "displayName": "Data Insights Report", - "appConfiguration": { - "sendToAdmins": true, - "sendToTeams": true - }, - "appSchedule": { - "scheduleType": "Weekly" - } -} \ No newline at end of file