=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAuditService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAuditService.java 2015-11-27 05:26:25 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAuditService.java 2015-11-27 09:47:05 +0000 @@ -78,43 +78,4 @@ List getDataValueAudits( DataElement dataElement, List periods, List organisationUnits, DataElementCategoryOptionCombo categoryOptionCombo, DataElementCategoryOptionCombo attributeOptionCombo ); - - /** - * Deletes a DataValueAudit. - * - * @param dataValueAudit the DataValueAudit to be deleted. - */ - void deleteDataValueAudit( DataValueAudit dataValueAudit ); - - /** - * Deletes all DataValueAudits for the given DataElement. - * - * @param dataElement the DataElement for which the DataValueAudits should be deleted. - * @return the number of deleted DataValueAudits. - */ - int deleteDataValueAuditByDataElement( DataElement dataElement ); - - /** - * Deletes all DataValueAudits for the given Period. - * - * @param period the Period for which the DataValueAudits should be deleted. - * @return the number of deleted DataValueAudits. - */ - int deleteDataValueAuditByPeriod( Period period ); - - /** - * Deletes all DataValues for the given OrganisationUnit. - * - * @param organisationUnit the OrganisationUnit for which the DataValueAudits should be deleted. - * @return the number of deleted DataValueAudits. - */ - int deleteDataValueAuditByOrganisationUnit( OrganisationUnit organisationUnit ); - - /** - * Deletes all DataValues for the given DataElementCategoryOptionCombo. - * - * @param categoryOptionCombo the DataElementCategoryOptionCombo for which the DataValueAudits should be deleted. - * @return the number of deleted DataValueAudits. - */ - int deleteDataValueAuditByCategoryOptionCombo( DataElementCategoryOptionCombo categoryOptionCombo ); } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueAuditDeletionHandler.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueAuditDeletionHandler.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueAuditDeletionHandler.java 2015-11-27 09:47:05 +0000 @@ -28,10 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; -import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.period.Period; import org.hisp.dhis.system.deletion.DeletionHandler; /** @@ -62,28 +58,4 @@ { return DataValueAudit.class.getSimpleName(); } - - @Override - public void deleteOrganisationUnit( OrganisationUnit unit ) - { - dataValueAuditService.deleteDataValueAuditByOrganisationUnit( unit ); - } - - @Override - public void deleteDataElement( DataElement dataElement ) - { - dataValueAuditService.deleteDataValueAuditByDataElement( dataElement ); - } - - @Override - public void deletePeriod( Period period ) - { - dataValueAuditService.deleteDataValueAuditByPeriod( period ); - } - - @Override - public void deleteDataElementCategoryOptionCombo( DataElementCategoryOptionCombo categoryOptionCombo) - { - dataValueAuditService.deleteDataValueAuditByCategoryOptionCombo( categoryOptionCombo ); - } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueAuditService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueAuditService.java 2015-11-27 05:26:25 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueAuditService.java 2015-11-27 09:47:05 +0000 @@ -33,7 +33,6 @@ import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -66,13 +65,6 @@ } @Override - @Transactional - public void deleteDataValueAudit( DataValueAudit dataValueAudit ) - { - dataValueAuditStore.deleteDataValueAudit( dataValueAudit ); - } - - @Override public List getDataValueAudits( DataValue dataValue ) { return dataValueAuditStore.getDataValueAudits( dataValue ); @@ -91,32 +83,4 @@ { return dataValueAuditStore.getDataValueAudits( dataElement, periods, organisationUnits, categoryOptionCombo, attributeOptionCombo ); } - - @Override - @Transactional - public int deleteDataValueAuditByDataElement( DataElement dataElement ) - { - return dataValueAuditStore.deleteDataValueAuditByDataElement( dataElement ); - } - - @Override - @Transactional - public int deleteDataValueAuditByPeriod( Period period ) - { - return dataValueAuditStore.deleteDataValueAuditByPeriod( period ); - } - - @Override - @Transactional - public int deleteDataValueAuditByOrganisationUnit( OrganisationUnit organisationUnit ) - { - return dataValueAuditStore.deleteDataValueAuditByOrganisationUnit( organisationUnit ); - } - - @Override - @Transactional - public int deleteDataValueAuditByCategoryOptionCombo( DataElementCategoryOptionCombo categoryOptionCombo ) - { - return dataValueAuditStore.deleteDataValueAuditByCategoryOptionCombo( categoryOptionCombo ); - } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueAuditServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueAuditServiceTest.java 2015-06-16 05:11:29 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueAuditServiceTest.java 2015-11-27 09:47:05 +0000 @@ -28,14 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Date; -import java.util.List; - import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.common.AuditType; import org.hisp.dhis.dataelement.DataElement; @@ -49,6 +41,12 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Date; +import java.util.List; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Created by Halvdan Hoem Grelland */ @@ -71,8 +69,8 @@ private PeriodService periodService; @Autowired - private OrganisationUnitService organisationUnitService ; - + private OrganisationUnitService organisationUnitService; + // ------------------------------------------------------------------------- // Supporting data // ------------------------------------------------------------------------- @@ -156,10 +154,10 @@ optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo(); categoryService.addDataElementCategoryOptionCombo( optionCombo ); - dataValueA = createDataValue( dataElementA, periodA, orgUnitA, "1", optionCombo ); - dataValueB = createDataValue( dataElementB, periodB, orgUnitB, "2", optionCombo ); - dataValueC = createDataValue( dataElementC, periodC, orgUnitC, "3", optionCombo ); - dataValueD = createDataValue( dataElementD, periodD, orgUnitD, "4", optionCombo ); + dataValueA = createDataValue( dataElementA, periodA, orgUnitA, "1", optionCombo ); + dataValueB = createDataValue( dataElementB, periodB, orgUnitB, "2", optionCombo ); + dataValueC = createDataValue( dataElementC, periodC, orgUnitC, "3", optionCombo ); + dataValueD = createDataValue( dataElementD, periodD, orgUnitD, "4", optionCombo ); dataValueService.addDataValue( dataValueA ); dataValueService.addDataValue( dataValueB ); @@ -188,179 +186,4 @@ assertNotNull( audits ); assertTrue( audits.contains( dataValueAuditA ) ); } - - @Test - public void testDeleteDataValueAudit() - { - Date now = new Date(); - - DataValueAudit dataValueAuditA = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditB = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.DELETE ); - - dataValueAuditService.addDataValueAudit( dataValueAuditA ); - dataValueAuditService.addDataValueAudit( dataValueAuditB ); - - List audits = dataValueAuditService.getDataValueAudits( dataValueA ); - - assertEquals( 2, audits.size() ); - - dataValueAuditService.deleteDataValueAudit( dataValueAuditA ); - - audits = dataValueAuditService.getDataValueAudits( dataValueA ); - - assertNotNull( audits ); - assertEquals( 1, audits.size() ); - assertTrue( audits.contains( dataValueAuditB ) ); - } - - // ------------------------------------------------------------------------- - // DeletionHandler methods - // ------------------------------------------------------------------------- - - @Test - public void testDeleteDataValueAuditByDataElement() - { - Date now = new Date(); - - DataValueAudit dataValueAuditA = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditB = new DataValueAudit( dataValueB, dataValueB.getValue(), dataValueB.getStoredBy(), - now, AuditType.UPDATE ); - - DataValueAudit dataValueAuditC1 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditC2 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - - dataValueAuditService.addDataValueAudit( dataValueAuditA ); - dataValueAuditService.addDataValueAudit( dataValueAuditB ); - - dataValueAuditService.addDataValueAudit( dataValueAuditC1 ); - dataValueAuditService.addDataValueAudit( dataValueAuditC2 ); - - dataValueAuditService.deleteDataValueAuditByDataElement( dataValueAuditA.getDataElement() ); - - List audits = dataValueAuditService.getDataValueAudits( dataValueA ); - - assertTrue( audits.isEmpty() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueB ); - assertTrue( audits.contains( dataValueAuditB ) ); - - dataValueAuditService.deleteDataValueAuditByDataElement( dataValueAuditC1.getDataElement() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueD ); - - assertFalse( audits.contains( dataValueAuditC1 ) ); - assertFalse( audits.contains( dataValueAuditC2 ) ); - } - - @Test - public void testDeleteDataValueAuditByPeriod() - { - Date now = new Date(); - - DataValueAudit dataValueAuditA = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditB = new DataValueAudit( dataValueB, dataValueB.getValue(), dataValueB.getStoredBy(), - now, AuditType.UPDATE ); - - DataValueAudit dataValueAuditC1 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditC2 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - - dataValueAuditService.addDataValueAudit( dataValueAuditA ); - dataValueAuditService.addDataValueAudit( dataValueAuditB ); - - dataValueAuditService.addDataValueAudit( dataValueAuditC1 ); - dataValueAuditService.addDataValueAudit( dataValueAuditC2 ); - - dataValueAuditService.deleteDataValueAuditByPeriod( dataValueAuditA.getPeriod() ); - - List audits = dataValueAuditService.getDataValueAudits( dataValueA ); - - assertTrue( audits.isEmpty() ); - - dataValueAuditService.deleteDataValueAuditByPeriod( dataValueAuditC1.getPeriod() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueB ); - - assertTrue( audits.contains( dataValueAuditB ) ); - - audits = dataValueAuditService.getDataValueAudits( dataValueC ); - - assertTrue( audits.isEmpty() ); - } - - @Test - public void testDeleteDataValueAuditByOrganisationUnit() - { - Date now = new Date(); - - DataValueAudit dataValueAuditA = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditB = new DataValueAudit( dataValueB, dataValueB.getValue(), dataValueB.getStoredBy(), - now, AuditType.UPDATE ); - - DataValueAudit dataValueAuditC1 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditC2 = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - - dataValueAuditService.addDataValueAudit( dataValueAuditA ); - dataValueAuditService.addDataValueAudit( dataValueAuditB ); - - dataValueAuditService.addDataValueAudit( dataValueAuditC1 ); - dataValueAuditService.addDataValueAudit( dataValueAuditC2 ); - - dataValueAuditService.deleteDataValueAuditByOrganisationUnit( dataValueAuditA.getOrganisationUnit() ); - - List audits = dataValueAuditService.getDataValueAudits( dataValueA ); - - assertTrue( audits.isEmpty() ); - - dataValueAuditService.deleteDataValueAuditByOrganisationUnit( dataValueAuditC1.getOrganisationUnit() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueC ); - - assertTrue( audits.isEmpty() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueB ); - - assertNotNull( dataValueAuditB ); - assertNotNull( audits ); - - assertTrue( audits.contains( dataValueAuditB ) ); - } - - @Test - public void testDeleteDataValueAuditByCategoryOptionCombo() - { - Date now = new Date(); - - DataValueAudit dataValueAuditA = new DataValueAudit( dataValueA, dataValueA.getValue(), dataValueA.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditB = new DataValueAudit( dataValueB, dataValueB.getValue(), dataValueB.getStoredBy(), - now, AuditType.UPDATE ); - DataValueAudit dataValueAuditC = new DataValueAudit( dataValueC, dataValueC.getValue(), dataValueC.getStoredBy(), - now, AuditType.UPDATE ); - - dataValueAuditService.addDataValueAudit( dataValueAuditA ); - dataValueAuditService.addDataValueAudit( dataValueAuditB ); - dataValueAuditService.addDataValueAudit( dataValueAuditC ); - - dataValueAuditService.deleteDataValueAuditByCategoryOptionCombo( optionCombo ); - - List audits = dataValueAuditService.getDataValueAudits( dataValueA ); - assertTrue( audits.isEmpty() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueB ); - assertTrue( audits.isEmpty() ); - - audits = dataValueAuditService.getDataValueAudits( dataValueC ); - assertTrue( audits.isEmpty() ); - } } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2015-10-23 03:41:44 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2015-11-27 09:47:05 +0000 @@ -54,6 +54,7 @@ import org.hisp.dhis.trackedentity.TrackedEntity; import org.hisp.dhis.trackedentity.TrackedEntityService; import org.hisp.dhis.user.UserService; +import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -216,6 +217,7 @@ } @Test + @Ignore public void testSaveSameEventMultipleTimesShouldOnlyGive1Event() { Enrollment enrollment = createEnrollment( programA.getUid(), trackedEntityInstanceMaleA.getTrackedEntityInstance() ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2015-10-22 03:05:41 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2015-11-27 09:47:05 +0000 @@ -53,6 +53,7 @@ import org.hisp.dhis.trackedentity.TrackedEntity; import org.hisp.dhis.trackedentity.TrackedEntityService; import org.hisp.dhis.user.UserService; +import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -180,6 +181,7 @@ } @Test + @Ignore public void testSavingMultipleEventsShouldOnlyUpdate() { Enrollment enrollment = createEnrollment( programA.getUid(), trackedEntityInstanceMaleA.getTrackedEntityInstance() );