dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08461
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2031: Fix bug: Cannot run Organisation Unit Prunin function into Maintenance > Data Addministration.
------------------------------------------------------------
revno: 2031
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2010-11-11 14:30:38 +0700
message:
Fix bug: Cannot run Organisation Unit Prunin function into Maintenance > Data Addministration.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneService.java 2010-04-21 14:32:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneService.java 2010-11-11 07:30:38 +0000
@@ -36,5 +36,5 @@
public interface DataPruneService
{
- void pruneOrganisationUnit( OrganisationUnit organisationUnit );
+ int pruneOrganisationUnit( OrganisationUnit organisationUnit );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneStore.java 2010-06-28 15:31:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneStore.java 2010-11-11 07:30:38 +0000
@@ -38,5 +38,5 @@
public interface DataPruneStore
{
- void deleteMultiOrganisationUnit(List<OrganisationUnit> orgUnits);
+ int deleteMultiOrganisationUnit(List<OrganisationUnit> orgUnits);
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java 2010-09-17 12:11:18 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/DefaultDataPruneService.java 2010-11-11 07:30:38 +0000
@@ -67,7 +67,7 @@
// -------------------------------------------------------------------------
@Transactional
- public void pruneOrganisationUnit( OrganisationUnit organisationUnit )
+ public int pruneOrganisationUnit( OrganisationUnit organisationUnit )
{
deleteLevels( organisationUnit );
@@ -79,7 +79,7 @@
List<OrganisationUnit> deletedOrgUnits = pruneOrganisationUnitLocal( organisationUnit );
- dataPruneStore.deleteMultiOrganisationUnit( deletedOrgUnits );
+ return dataPruneStore.deleteMultiOrganisationUnit( deletedOrgUnits );
}
private void deleteLevels( OrganisationUnit organisationUnit )
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2010-10-29 12:19:15 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java 2010-11-11 07:30:38 +0000
@@ -27,14 +27,19 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.sql.ResultSet;
+import java.sql.Statement;
import java.util.List;
+import org.amplecode.quick.StatementHolder;
+import org.amplecode.quick.StatementManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.dataprune.DataPruneStore;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.system.util.ConversionUtils;
import org.hisp.dhis.system.util.TextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -56,89 +61,340 @@
{
this.jdbcTemplate = jdbcTemplate;
}
+
+ @Autowired
+ private StatementManager statementManager;
+
+ public void setStatementManager( StatementManager statementManager )
+ {
+ this.statementManager = statementManager;
+ }
// -------------------------------------------------------------------------
// DataPruneService implementation
// -------------------------------------------------------------------------
- public void deleteMultiOrganisationUnit(List<OrganisationUnit> orgUnits) {
-
- String orgUnitIds = TextUtils.getCommaDelimitedString( ConversionUtils.getIdentifiers( OrganisationUnit.class, orgUnits )) ;
-
- String sql = "delete from datasetlocksource where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from completedatasetregistration where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from datasetsource where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from frequencyoverrideassociation where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from minmaxdataelement where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from orgunitgroupmembers where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from usermembership where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from datamartexportorgunits where orgunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from excelgroup_associations where organisationid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from reportexcel_associations where organisationid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from maporganisationunitrelation where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from maporganisationunitrelation where mapid in (select mapid from map where organisationunitid in ("
- + orgUnitIds + "));";
- jdbcTemplate.execute( sql );
-
- sql = "delete from map where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from patientidentifier where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from program_organisationunits where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from chart_organisationunits where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from reporttable_organisationunits where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from datavalue_audit where (dataelementid, periodid, sourceid, categoryoptioncomboid) in (select dataelementid, periodid, sourceid, categoryoptioncomboid from datavalue where sourceid in ("
- + orgUnitIds + "));";
- jdbcTemplate.execute( sql );
-
- sql = "delete from datavalue where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from mapfile where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from feature where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "update organisationunit set parentid=null where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from organisationunit where organisationunitid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- sql = "delete from source where sourceid in (" + orgUnitIds + ");";
- jdbcTemplate.execute( sql );
-
- log.info( "Deleting " + orgUnits.size() + " organisations units sucessfully" );
+ public int deleteMultiOrganisationUnit(List<OrganisationUnit> orgUnits) {
+
+ try{
+
+ String orgUnitIds = TextUtils.getCommaDelimitedString( ConversionUtils.getIdentifiers( OrganisationUnit.class, orgUnits )) ;
+
+ // delete values into datasetlocksource table
+ String sql = "delete from datasetlocksource where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datasetlocksource sucessfully" );
+
+ // delete values into completedatasetregistration table
+ sql = "delete from completedatasetregistration where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into completedatasetregistration sucessfully" );
+
+ // delete values into datasetsource table
+ sql = "delete from datasetsource where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datasetsource sucessfully" );
+
+ // delete values into frequencyoverrideassociation table
+ sql = "delete from frequencyoverrideassociation where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into frequencyoverrideassociation sucessfully" );
+
+ // delete values into minmaxdataelement table
+ sql = "delete from minmaxdataelement where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into minmaxdataelement sucessfully" );
+
+ // delete values into orgunitgroupmembers table
+ sql = "delete from orgunitgroupmembers where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into orgunitgroupmembers sucessfully" );
+
+ // delete values into usermembership table
+ sql = "delete from usermembership where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into usermembership sucessfully" );
+
+ // delete values into datamartexportorgunits table
+ sql = "delete from datamartexportorgunits where orgunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datamartexportorgunits sucessfully" );
+
+ // delete values into excelgroup_associations table
+ sql = "delete from excelgroup_associations where organisationid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into excelgroup_associations sucessfully" );
+
+ // delete values into reportexcel_associations table
+ sql = "delete from reportexcel_associations where organisationid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into reportexcel_associations sucessfully" );
+
+ // delete values into maporganisationunitrelation table
+ sql = "delete from maporganisationunitrelation where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into maporganisationunitrelation sucessfully" );
+
+ // delete values into maporganisationunitrelation table
+ sql = "delete from maporganisationunitrelation where mapid in (select mapid from map where organisationunitid in ("
+ + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into maporganisationunitrelation sucessfully" );
+
+ // delete values into patientidentifier table
+ sql = "delete from patientidentifier where patientid in "+
+ "( select patientid from patient where organisationunitid in (" + orgUnitIds + ") );";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patientidentifier sucessfully" );
+
+ // delete values into patientattributevalue table
+ sql = "delete from patientdatavalue where programstageinstanceid in " +
+ "( select programstageinstanceid from programstageinstance "+
+ "join programinstance on programinstance.programinstanceid = programstageinstance.programinstanceid " +
+ "join patient on programinstance.patientid = patient.patientid "+
+ "where patient.organisationunitid in (" + orgUnitIds + ") );";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patientattributevalue sucessfully" );
+
+ // delete values into patientattributevalue table
+ sql = "delete from patientattributevalue where patientid in " +
+ "( select patientid from patient where organisationunitid in (" + orgUnitIds + ") );";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patientattributevalue sucessfully" );
+
+ // delete values into patient_attributes table
+ sql = "delete from patient_attributes where patientid in "+
+ "( select patientid from patient where organisationunitid in (" + orgUnitIds + ") );";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patient_attributes sucessfully" );
+
+ // delete values into patient_programs table
+ sql = "delete from patient_programs where patientid in "+
+ "( select patientid from patient where organisationunitid in (" + orgUnitIds + ") );";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patient_programs sucessfully" );
+
+ // delete values into relationship table
+ sql = "delete from relationship where patientaid in "+
+ "( select patientid from patient where organisationunitid in ( " + orgUnitIds + ")) OR "+
+ "patientbid in ( select patientid from patient where organisationunitid in ( " + orgUnitIds + ")); ";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patient sucessfully" );
+
+ // update values into representativeid column of patient table
+ deleteRepresentative(orgUnitIds);
+ log.info( "Updating values into representativeid column of patient table sucessfully" );
+
+ // delete values into patientdatavalue table
+ sql = "delete from patientdatavalue where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patientdatavalue sucessfully" );
+
+ // delete values into patientdatavaluearchive table
+ if(isExistTable( "patientdatavaluearchive" )){
+ sql = "delete from patientdatavaluearchive where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patientdatavaluearchive sucessfully" );
+ }
+
+ // delete values into programinstance_attributes table
+ sql = "delete from programinstance_attributes where programinstanceid in "+
+ "( select programinstanceid from programinstance "+
+ "join patient on programinstance.patientid = patient.patientid "+
+ "where patient.organisationunitid in ( " + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into programinstance_attributes sucessfully" );
+
+ // delete values into programattributevalue table
+ sql = "delete from programattributevalue where programinstanceid in "+
+ "( select programinstanceid from programinstance " +
+ "join patient on programinstance.patientid = patient.patientid "+
+ "where patient.organisationunitid in ( " + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into programattributevalue sucessfully" );
+
+ // delete values into programstageinstance table
+ sql = "delete from programstageinstance where programinstanceid in "+
+ "( select programinstanceid from programinstance "+
+ "join patient on programinstance.patientid = patient.patientid "+
+ "where patient.organisationunitid in ( " + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into programstageinstance sucessfully" );
+
+ // delete values into programinstance table
+ sql = "delete from programinstance where patientid in "+
+ "( select patientid from patient where organisationunitid in ( " + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into programinstance sucessfully" );
+
+
+ // delete values into patient table
+ deleteOrganisation(orgUnitIds );
+ sql = "delete from patient where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into patient sucessfully" );
+
+ // delete values into program_organisationunits table
+ sql = "delete from program_organisationunits where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into program_organisationunits sucessfully" );
+
+ // delete values into chart_organisationunits table
+ sql = "delete from chart_organisationunits where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into chart_organisationunits sucessfully" );
+
+ // delete values into reporttable_organisationunits table
+ sql = "delete from reporttable_organisationunits where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into reporttable_organisationunits sucessfully" );
+
+ // delete value into datavalue_audit table
+ if(isExistTable( "datavalue_audit" )){
+ sql = "delete from datavalue_audit where (dataelementid, periodid, sourceid, categoryoptioncomboid) in (select dataelementid, periodid, sourceid, categoryoptioncomboid from datavalue where sourceid in ("
+ + orgUnitIds + "));";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datavalue_audit sucessfully" );
+ }
+
+ // delete values into datavalue table
+ sql = "delete from datavalue where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datavalue sucessfully" );
+
+ // delete values into datavaluearchive table
+ if(isExistTable( "datavaluearchive" )){
+ sql = "delete from datavaluearchive where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into datavaluearchive sucessfully" );
+ }
+
+ // delete values into mapfile table
+ if(isExistTable( "mapfile" )){
+ sql = "delete from mapfile where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into mapfile sucessfully" );
+ }
+
+ // delete values into feature table
+ if(isExistTable( "feature" )){
+ sql = "delete from feature where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into feature sucessfully" );
+ }
+
+ // delete values into orgunitgroupmembers table
+ sql = "delete from orgunitgroupmembers where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into orgunitgroupmembers sucessfully" );
+
+ // delete values into orgunitstructure table
+ if(isExistTable( "orgunitstructure" )){
+ sql = "delete from orgunitstructure where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into orgunitstructure sucessfully" );
+ }
+
+ // delete values into organisationunit table
+ sql = "delete from organisationunit where organisationunitid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into organisationunit sucessfully" );
+
+ // delete values into source table
+ sql = "delete from source where sourceid in (" + orgUnitIds + ");";
+ jdbcTemplate.execute( sql );
+ log.info( "Deleting values into source sucessfully" );
+
+ log.info( "Deleting " + orgUnits.size() + " organisations units sucessfully" );
+
+ return 0;
+
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
+
+ return 1;
+ }
+
+ private boolean isExistTable(String tableName)
+ {
+ StatementHolder holder = statementManager.getHolder();
+
+ try
+ {
+ holder.getStatement().executeQuery( "SELECT * FROM " + tableName );
+
+ return true;
+ }
+ catch ( Exception ex )
+ {
+ return false;
+ }
+ finally
+ {
+ holder.close();
+ }
+
+ }
+
+ private void deleteRepresentative( String orgUnitIds ){
+
+ StatementHolder holder = statementManager.getHolder();
+
+ try
+ {
+ Statement statement = holder.getStatement();
+
+ ResultSet patient = statement
+ .executeQuery( "select patientid from patient where organisationunitid in ( " + orgUnitIds + ")" );
+
+ String patientIds = "0";
+ while ( patient.next() )
+ {
+ patientIds+= "," + patient.getInt( 1 );
+ }
+
+ jdbcTemplate.execute( "UPDATE patient SET representativeid=null WHERE representativeid in ( " + patientIds + " );" );
+ }
+ catch ( Exception ex )
+ {
+ log.error( ex );
+ }
+ finally
+ {
+ holder.close();
+ }
+
+ }
+
+ public void deleteOrganisation(String orgUnitIds )
+ {
+ StatementHolder holder = statementManager.getHolder();
+
+ try
+ {
+ Statement statement = holder.getStatement();
+
+ ResultSet parent = statement
+ .executeQuery( "select organisationunitid from organisationunit where organisationunitid in ( " + orgUnitIds + ")" );
+
+ String parentIds = "0";
+ while ( parent.next() )
+ {
+ parentIds+= "," + parent.getInt( 1 );
+ }
+
+ jdbcTemplate.execute( "UPDATE organisationunit SET parentid=null WHERE parentid in ( " + parentIds + " );" );
+ }
+ catch ( Exception ex )
+ {
+ log.error( ex );
+ }
+ finally
+ {
+ holder.close();
+ }
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java 2010-11-08 09:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataprune/PruneOrganisationUnitAction.java 2010-11-11 07:30:38 +0000
@@ -76,15 +76,21 @@
if ( kept.getParent() == null )
{
log.info( "Pruning is interrupted" );
-
- return ERROR;
- }
-
- dataPruneService.pruneOrganisationUnit( kept );
-
- log.info( "Pruning complete" );
-
- return SUCCESS;
+
+ return ERROR;
+ }
+
+ int codeError = dataPruneService.pruneOrganisationUnit( kept );
+
+ if ( codeError == 0 )
+ {
+
+ log.info( "Pruning complete" );
+
+ return SUCCESS;
+ }
+ else
+ return ERROR;
}
}
