Remove alert history when a resource alert rule is removed

Author: Daman Arora

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImpl.java

@@ -189,6 +189,7 @@ public void evaluateRules() {
         for (ResourceAlertRuleVO rule : rules) {
             if (isOrphaned(rule)) {
                 logger.info("Removing resource alert rule {} as its owner or resource no longer exists", rule.getUuid());
+                alertDao.removeByAlertRuleId(rule.getId());
                 ruleDao.remove(rule.getId());
                 continue;
             }

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertServiceImpl.java

@@ -214,6 +214,7 @@ public ResourceAlertRuleResponse updateResourceAlertRule(UpdateResourceAlertRule
     @ActionEvent(eventType = EventTypes.EVENT_RESOURCE_ALERT_RULE_DELETE, eventDescription = "deleting resource alert rule")
     public boolean deleteResourceAlertRule(DeleteResourceAlertRuleCmd cmd) {
         findRuleForCaller(cmd.getId());
+        alertDao.removeByAlertRuleId(cmd.getId());
         return ruleDao.remove(cmd.getId());
     }
 

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/dao/ResourceAlertDao.java

@@ -36,4 +36,6 @@ Pair<List<ResourceAlertVO>, Integer> searchAndCountByFilters(List<Long> alertRul
             Date startDate, Date endDate, Long startIndex, Long pageSize);
 
     int removeOlderThan(Date date);
+
+    int removeByAlertRuleId(long alertRuleId);
 }

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/dao/ResourceAlertDaoImpl.java

@@ -51,6 +51,13 @@ public int removeOlderThan(Date date) {
         return expunge(sc);
     }
 
+    @Override
+    public int removeByAlertRuleId(long alertRuleId) {
+        SearchCriteria<ResourceAlertVO> sc = alertRuleIdSearch.create();
+        sc.setParameters("alertRuleId", alertRuleId);
+        return expunge(sc);
+    }
+
     @Override
     public List<ResourceAlertVO> listByAlertRuleId(long alertRuleId) {
         SearchCriteria<ResourceAlertVO> sc = alertRuleIdSearch.create();

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImplTest.java

@@ -829,6 +829,7 @@ public void testRuleRemovedWhenOwnerMissing() {
 
         manager.evaluateRules();
 
+        verify(alertDao).removeByAlertRuleId(rule.getId());
         verify(ruleDao).remove(rule.getId());
         verify(userVmDao, never()).listIdsByAccountOrDomainsAndState(any(), any(), any());
     }

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertServiceImplTest.java

@@ -303,6 +303,21 @@ public void testDeleteDoesNotRemoveWhenCallerCannotAccessRule() {
         } catch (PermissionDeniedException expected) {
         }
         verify(ruleDao, never()).remove(1L);
+        verify(alertDao, never()).removeByAlertRuleId(1L);
+    }
+
+    @Test
+    public void testDeleteRemovesAlertHistory() {
+        DeleteResourceAlertRuleCmd cmd = mock(DeleteResourceAlertRuleCmd.class);
+        when(cmd.getId()).thenReturn(1L);
+        ResourceAlertRuleVO rule = mock(ResourceAlertRuleVO.class);
+        when(ruleDao.findById(1L)).thenReturn(rule);
+        when(ruleDao.remove(1L)).thenReturn(true);
+
+        service.deleteResourceAlertRule(cmd);
+
+        verify(alertDao).removeByAlertRuleId(1L);
+        verify(ruleDao).remove(1L);
     }
 
     @Test(expected = InvalidParameterValueException.class)