fix conflicting check

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookFilter.java

@@ -100,8 +100,7 @@ default WebhookFilter getConflicting(List<? extends WebhookFilter> existing) {
             }
 
             // 2. Opposite mode (INCLUDE vs EXCLUDE) — check for overlap
-            if (Mode.Exclude.equals(f.getMode())
-                    && Mode.Include.equals(this.getMode())) {
+            if (f.getMode() != this.getMode()) {
                 String oldVal = f.getValue().toUpperCase();
                 String newVal = this.getValue().toUpperCase();
 

plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookApiServiceImplTest.java

@@ -64,6 +64,7 @@
 import com.cloud.cluster.dao.ManagementServerHostDao;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
+import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.user.Account;
@@ -1262,6 +1263,28 @@ public void addWebhookFilterConflictsWithExisting() {
         webhookApiServiceImpl.addWebhookFilter(cmd);
     }
 
+    @Test(expected = InvalidParameterValueException.class)
+    public void addWebhookFilterSameEventConflictsWithExisting() {
+        AddWebhookFilterCmd cmd = Mockito.mock(AddWebhookFilterCmd.class);
+        WebhookVO webhook = Mockito.mock(WebhookVO.class);
+        WebhookFilterVO filter = Mockito.mock(WebhookFilterVO.class);
+
+        Mockito.when(webhook.getId()).thenReturn(1L);
+        Mockito.when(filter.getType()).thenReturn(WebhookFilter.Type.EventType);
+        Mockito.when(filter.getMode()).thenReturn(WebhookFilter.Mode.Include);
+        Mockito.when(filter.getMatchType()).thenReturn(WebhookFilter.MatchType.Exact);
+        Mockito.when(filter.getValue()).thenReturn(EventTypes.EVENT_VM_CREATE);
+        Mockito.when(cmd.getId()).thenReturn(1L);
+        Mockito.when(cmd.getType()).thenReturn(WebhookFilter.Type.EventType.name());
+        Mockito.when(cmd.getMode()).thenReturn(WebhookFilter.Mode.Exclude.name());
+        Mockito.when(cmd.getMatchType()).thenReturn(WebhookFilter.MatchType.Exact.name());
+        Mockito.when(cmd.getValue()).thenReturn(EventTypes.EVENT_VM_CREATE);
+        Mockito.when(webhookDao.findById(1L)).thenReturn(webhook);
+        Mockito.when(webhookFilterDao.listByWebhook(1L)).thenReturn(List.of(filter));
+
+        webhookApiServiceImpl.addWebhookFilter(cmd);
+    }
+
     @Test
     public void deleteWebhookFilterDeletesFilterSuccessfully() {
         DeleteWebhookFilterCmd cmd = Mockito.mock(DeleteWebhookFilterCmd.class);