HHH-7827 - Correlating aggregated and outer queries

lukasz-antoniak · lukasz-antoniak · commit 516577ea80b5 · 2012-12-05T10:27:35.000+01:00
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
@@ -32,10 +32,13 @@
 
 /**
  * @author Adam Warski (adam at warski dot org)
+ * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
 public class AggregatedAuditExpression implements AuditCriterion, ExtendableCriterion {
     private PropertyNameGetter propertyNameGetter;
     private AggregatedMode mode;
+	// Correlate subquery with outer query by entity id.
+	private boolean correlate = false;
     private List<AuditCriterion> criterions;
 
     public AggregatedAuditExpression(PropertyNameGetter propertyNameGetter, AggregatedMode mode) {
@@ -80,7 +83,26 @@ public void addToQuery(AuditConfiguration auditCfg, String entityName, QueryBuil
                 subQb.addProjection("max", propertyName, false);
         }
 
+		// Correlating subquery with the outer query by entity id. See JIRA HHH-7827.
+		if ( correlate ) {
+			final String originalIdPropertyName = auditCfg.getAuditEntCfg().getOriginalIdPropName();
+			auditCfg.getEntCfg().get( entityName ).getIdMapper().addIdsEqualToQuery(
+					subQb.getRootParameters(),
+					subQb.getRootAlias() + "." + originalIdPropertyName,
+					qb.getRootAlias() + "." + originalIdPropertyName
+			);
+		}
+
         // Adding the constrain on the result of the aggregated criteria
         subParams.addWhere(propertyName, "=", subQb);
     }
+
+	/**
+	 * Correlates aggregated subquery with the main query by entity id.
+	 * @return this (for method chaining).
+	 */
+	public AggregatedAuditExpression correlateSubquery() {
+		correlate = true;
+		return this;
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java
@@ -182,6 +182,10 @@ private List<String> getAliasList() {
         return aliasList;
     }
 
+	public String getRootAlias() {
+		return alias;
+	}
+
     private List<String> getFromList() {
         List<String> fromList = new ArrayList<String>();
         for (Pair<String, String> from : froms) {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
@@ -30,6 +30,8 @@
 
 import javax.persistence.EntityManager;
 
+import org.hibernate.envers.RevisionType;
+import org.hibernate.envers.enhanced.SequenceIdRevisionEntity;
 import org.hibernate.envers.query.AuditEntity;
 import org.hibernate.envers.query.criteria.AuditDisjunction;
 import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
@@ -42,12 +44,14 @@
 
 /**
  * @author Adam Warski (adam at warski dot org)
+ * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
 @SuppressWarnings({"unchecked"})
 public class MaximalizePropertyQuery extends BaseEnversJPAFunctionalTestCase {
     Integer id1;
     Integer id2;
     Integer id3;
+    Integer id4;
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
@@ -64,14 +68,17 @@ public void initData() {
         StrIntTestEntity site1 = new StrIntTestEntity("a", 10);
         StrIntTestEntity site2 = new StrIntTestEntity("b", 15);
         StrIntTestEntity site3 = new StrIntTestEntity("c", 42);
+        StrIntTestEntity site4 = new StrIntTestEntity("d", 52);
 
         em.persist(site1);
         em.persist(site2);
         em.persist(site3);
+        em.persist(site4);
 
         id1 = site1.getId();
         id2 = site2.getId();
         id3 = site3.getId();
+        id4 = site4.getId();
 
         em.getTransaction().commit();
 
@@ -107,6 +114,12 @@ public void initData() {
         site2.setStr1("a");
 
         em.getTransaction().commit();
+
+		// Revision 5
+		em.getTransaction().begin();
+		site4 = em.find( StrIntTestEntity.class, id4 );
+		em.remove( site4 );
+		em.getTransaction().commit();
     }
 
     @Test
@@ -170,4 +183,32 @@ public void testMaximizeInDisjunction() {
 			}
 		}
 	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-7827")
+	public void testAllLatestRevisionsOfEntityType() {
+		List result = getAuditReader().createQuery()
+				.forRevisionsOfEntity( StrIntTestEntity.class, false, true )
+				.add( AuditEntity.revisionNumber().maximize().correlateSubquery() )
+				.addOrder( AuditEntity.property( "id" ).asc() )
+				.getResultList();
+
+		Assert.assertEquals( 4, result.size() );
+
+		Object[] result1 = (Object[]) result.get( 0 );
+		Object[] result2 = (Object[]) result.get( 1 );
+		Object[] result3 = (Object[]) result.get( 2 );
+		Object[] result4 = (Object[]) result.get( 3 );
+
+		checkRevisionData( result1, 4, RevisionType.MOD, new StrIntTestEntity( "d", 5, id1 ) );
+		checkRevisionData( result2, 4, RevisionType.MOD, new StrIntTestEntity( "a", 20, id2 ) );
+		checkRevisionData( result3, 1, RevisionType.ADD, new StrIntTestEntity( "c", 42, id3 ) );
+		checkRevisionData( result4, 5, RevisionType.DEL, new StrIntTestEntity( null, null, id4 ) );
+	}
+
+	private void checkRevisionData(Object[] result, int revision, RevisionType type, StrIntTestEntity entity) {
+		Assert.assertEquals( entity, result[0] );
+		Assert.assertEquals( revision, ( (SequenceIdRevisionEntity) result[1] ).getId() );
+		Assert.assertEquals( type, result[2] );
+	}
 }
