AMBARI-9823 - Alert Notifications Are Not Received Without Restarting Ambari Server (part2) (jonathanhurley)

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java

@@ -82,7 +82,7 @@ public class AlertGroupEntity {
   /**
    * Unidirectional many-to-many association to {@link AlertTargetEntity}
    */
-  @ManyToMany(cascade = CascadeType.MERGE)
+  @ManyToMany(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
   @JoinTable(name = "alert_group_target", joinColumns = { @JoinColumn(name = "group_id", nullable = false) }, inverseJoinColumns = { @JoinColumn(name = "target_id", nullable = false) })
   private Set<AlertTargetEntity> alertTargets;
 

ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java

@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -583,6 +584,43 @@ public class AlertDispatchDAOTest {
     }
   }
 
+  /**
+   * Tests finding groups by a definition ID that they are associatd with in
+   * order to get any targets associated with that group. This exercises the
+   * bi-directional
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testFindTargetsViaGroupsByDefinition() throws Exception {
+    List<AlertDefinitionEntity> definitions = createDefinitions();
+    AlertGroupEntity group = m_helper.createAlertGroup(
+        m_cluster.getClusterId(), null);
+
+    group = m_dao.findGroupById(group.getGroupId());
+    assertNotNull(group);
+
+    AlertDefinitionEntity definition = definitions.get(0);
+    group.addAlertDefinition(definition);
+
+    m_dao.merge(group);
+
+    List<AlertTargetEntity> targets = m_dao.findAllTargets();
+    AlertTargetEntity target = targets.get(0);
+    Set<AlertTargetEntity> setTargets = Collections.singleton(target);
+
+    group.setAlertTargets(setTargets);
+    m_dao.merge(group);
+
+    List<AlertGroupEntity> groups = m_dao.findGroupsByDefinition(definition);
+    assertEquals(2, groups.size());
+
+    group = groups.get(groups.indexOf(group));
+    assertEquals(1, group.getAlertTargets().size());
+    assertEquals(target.getTargetId(),
+        group.getAlertTargets().iterator().next().getTargetId());
+  }
+
   /**
    * @throws Exception
    */