dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43540
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22073: basic working implementation of attribute values in new importer
------------------------------------------------------------
revno: 22073
committer: Morten Olav Hansen <morten@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-02-29 14:35:27 +0700
message:
basic working implementation of attribute values in new importer
added:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/IdentifiableObjectBundleHook.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.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-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2016-02-26 04:58:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2016-02-29 07:35:27 +0000
@@ -182,7 +182,6 @@
// AttributeValue implementation
// -------------------------------------------------------------------------
-
@Override
public <T extends IdentifiableObject> void addAttributeValue( T object, AttributeValue attributeValue ) throws NonUniqueAttributeValueException
{
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-02-29 03:47:01 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-02-29 07:35:27 +0000
@@ -281,7 +281,6 @@
if ( Preheat.isDefault( object ) ) continue;
objectBundleHooks.forEach( hook -> hook.preCreate( object, bundle ) );
- object.getAttributeValues().clear();
preheatService.connectReferences( object, bundle.getPreheat(), bundle.getPreheatIdentifier() );
manager.save( object, bundle.getUser() );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java 2016-02-26 09:07:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/AbstractObjectBundleHook.java 2016-02-29 07:35:27 +0000
@@ -33,6 +33,7 @@
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.dxf2.metadata2.objectbundle.ObjectBundle;
import org.hisp.dhis.preheat.PreheatService;
+import org.hisp.dhis.schema.SchemaService;
import org.hisp.dhis.schema.validation.SchemaValidator;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@
@Autowired
protected SessionFactory sessionFactory;
+ @Autowired
+ protected SchemaService schemaService;
+
@Override
public void preImport( ObjectBundle objectBundle )
{
=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/IdentifiableObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/IdentifiableObjectBundleHook.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/IdentifiableObjectBundleHook.java 2016-02-29 07:35:27 +0000
@@ -0,0 +1,80 @@
+package org.hisp.dhis.dxf2.metadata2.objectbundle.hooks;
+
+/*
+ * Copyright (c) 2004-2016, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.attribute.Attribute;
+import org.hisp.dhis.attribute.AttributeValue;
+import org.hisp.dhis.common.IdentifiableObject;
+import org.hisp.dhis.dxf2.metadata2.objectbundle.ObjectBundle;
+import org.hisp.dhis.schema.Schema;
+import org.hisp.dhis.user.UserGroup;
+import org.hisp.dhis.user.UserGroupAccess;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+@Order( 0 )
+@Component
+public class IdentifiableObjectBundleHook extends AbstractObjectBundleHook
+{
+ @Override
+ public void preCreate( IdentifiableObject identifiableObject, ObjectBundle objectBundle )
+ {
+ Schema schema = schemaService.getDynamicSchema( identifiableObject.getClass() );
+ handleAttributeValuesCreate( identifiableObject, objectBundle, schema );
+ handleUserGroupAccessesCreate( identifiableObject, objectBundle, schema );
+ }
+
+ public void handleAttributeValuesCreate( IdentifiableObject identifiableObject, ObjectBundle bundle, Schema schema )
+ {
+ if ( !schema.havePersistedProperty( "attributeValues" ) ) return;
+
+ for ( AttributeValue attributeValue : identifiableObject.getAttributeValues() )
+ {
+ Attribute attribute = bundle.getPreheat().get( bundle.getPreheatIdentifier(), attributeValue.getAttribute() );
+ if ( attribute != null ) attributeValue.setAttribute( attribute );
+ sessionFactory.getCurrentSession().save( attributeValue );
+ }
+ }
+
+ public void handleUserGroupAccessesCreate( IdentifiableObject identifiableObject, ObjectBundle bundle, Schema schema )
+ {
+ if ( !schema.havePersistedProperty( "userGroupAccesses" ) ) return;
+ identifiableObject.getUserGroupAccesses().clear();
+
+ for ( UserGroupAccess userGroupAccess : identifiableObject.getUserGroupAccesses() )
+ {
+ UserGroup userGroup = bundle.getPreheat().get( bundle.getPreheatIdentifier(), userGroupAccess.getUserGroup() );
+ if ( userGroup != null ) userGroupAccess.setUserGroup( userGroup );
+ sessionFactory.getCurrentSession().save( userGroupAccess );
+ }
+ }
+}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java 2016-02-26 10:05:22 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks/UserObjectBundleHook.java 2016-02-29 07:35:27 +0000
@@ -109,8 +109,7 @@
user.setDataViewOrganisationUnits( (Set<OrganisationUnit>) referenceMap.get( "dataViewOrganisationUnits" ) );
preheatService.connectReferences( identifiableObject, objectBundle.getPreheat(), objectBundle.getPreheatIdentifier() );
-
- manager.update( identifiableObject );
+ sessionFactory.getCurrentSession().update( identifiableObject );
}
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.java 2016-02-29 03:47:01 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.java 2016-02-29 07:35:27 +0000
@@ -538,6 +538,22 @@
assertEquals( "PdWlltZnVZe", user.getOrganisationUnit().getUid() );
assertEquals( 2, optionSet.getOptions().size() );
+
+ // attribute value check
+ DataElement dataElementA = manager.get( DataElement.class, "SG4HuKlNEFH" );
+ DataElement dataElementB = manager.get( DataElement.class, "CCwk5Yx440o" );
+ DataElement dataElementC = manager.get( DataElement.class, "j5PneRdU7WT" );
+ DataElement dataElementD = manager.get( DataElement.class, "k90AVpBahO4" );
+
+ assertNotNull( dataElementA );
+ assertNotNull( dataElementB );
+ assertNotNull( dataElementC );
+ assertNotNull( dataElementD );
+
+ assertTrue( dataElementA.getAttributeValues().isEmpty() );
+ assertTrue( dataElementB.getAttributeValues().isEmpty() );
+ assertFalse( dataElementC.getAttributeValues().isEmpty() );
+ assertFalse( dataElementD.getAttributeValues().isEmpty() );
}
private void defaultSetup()
