dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28538
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14257: Moved method to service layer
------------------------------------------------------------
revno: 14257
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-17 15:07:43 +0100
message:
Moved method to service layer
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.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/trackedentity/TrackedEntityInstanceStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java 2014-03-16 23:07:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java 2014-03-17 14:07:43 +0000
@@ -30,6 +30,7 @@
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
import org.hisp.dhis.common.Grid;
@@ -49,7 +50,7 @@
final int MAX_RESULTS = 50000;
- Grid getTrackedEntityInstances( TrackedEntityInstanceQueryParams params );
+ Collection<Map<String, String>> getTrackedEntityInstances( TrackedEntityInstanceQueryParams params );
/**
* Search entityInstances who registered in a certain organisation unit
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2014-03-17 14:00:38 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2014-03-17 14:07:43 +0000
@@ -28,12 +28,19 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.CREATED_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.LAST_UPDATED_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.ORG_UNIT_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_INSTANCE_ID;
+
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
@@ -132,7 +139,37 @@
@Override
public Grid getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
{
- return trackedEntityInstanceStore.getTrackedEntityInstances( params );
+ Grid grid = new ListGrid();
+
+ grid.addHeader( new GridHeader( TRACKED_ENTITY_INSTANCE_ID, "Instance" ) );
+ grid.addHeader( new GridHeader( CREATED_ID, "Created" ) );
+ grid.addHeader( new GridHeader( LAST_UPDATED_ID, "Last updated" ) );
+ grid.addHeader( new GridHeader( TRACKED_ENTITY_ID, "Tracked entity" ) );
+ grid.addHeader( new GridHeader( ORG_UNIT_ID, "Org unit" ) );
+
+ for ( QueryItem item : params.getItems() )
+ {
+ grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName() ) );
+ }
+
+ Collection<Map<String, String>> entities = trackedEntityInstanceStore.getTrackedEntityInstances( params );
+
+ for ( Map<String, String> entity : entities )
+ {
+ grid.addRow();
+ grid.addValue( entity.get( TRACKED_ENTITY_INSTANCE_ID ) );
+ grid.addValue( entity.get( CREATED_ID ) );
+ grid.addValue( entity.get( LAST_UPDATED_ID ) );
+ grid.addValue( entity.get( TRACKED_ENTITY_ID ) );
+ grid.addValue( entity.get( ORG_UNIT_ID ) );
+
+ for ( QueryItem item : params.getItems() )
+ {
+ grid.addValue( entity.get( item.getItemId() ) );
+ }
+ }
+
+ return grid;
}
@Override
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-17 14:00:38 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-17 14:07:43 +0000
@@ -38,10 +38,10 @@
import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.CREATED_ID;
import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.LAST_UPDATED_ID;
import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.ORG_UNIT_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ATTRIBUTE_ID;
+import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ATTRIBUTE_VALUE_ID;
import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ID;
import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_INSTANCE_ID;
-import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ATTRIBUTE_ID;
-import static org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams.TRACKED_ENTITY_ATTRIBUTE_VALUE_ID;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -63,7 +63,6 @@
import org.hibernate.criterion.Restrictions;
import org.hisp.dhis.common.DimensionalObject;
import org.hisp.dhis.common.Grid;
-import org.hisp.dhis.common.GridHeader;
import org.hisp.dhis.common.QueryItem;
import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
import org.hisp.dhis.i18n.I18nFormat;
@@ -75,7 +74,6 @@
import org.hisp.dhis.program.ProgramInstance;
import org.hisp.dhis.program.ProgramStageInstance;
import org.hisp.dhis.system.grid.GridUtils;
-import org.hisp.dhis.system.grid.ListGrid;
import org.hisp.dhis.system.util.DateUtils;
import org.hisp.dhis.system.util.MapMap;
import org.hisp.dhis.system.util.SqlHelper;
@@ -125,42 +123,7 @@
// -------------------------------------------------------------------------
@Override
- public Grid getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
- {
- Grid grid = new ListGrid();
-
- grid.addHeader( new GridHeader( TRACKED_ENTITY_INSTANCE_ID, "Instance" ) );
- grid.addHeader( new GridHeader( CREATED_ID, "Created" ) );
- grid.addHeader( new GridHeader( LAST_UPDATED_ID, "Last updated" ) );
- grid.addHeader( new GridHeader( TRACKED_ENTITY_ID, "Tracked entity" ) );
- grid.addHeader( new GridHeader( ORG_UNIT_ID, "Org unit" ) );
-
- for ( QueryItem item : params.getItems() )
- {
- grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName() ) );
- }
-
- Collection<Map<String, String>> entities = getEntities( params );
-
- for ( Map<String, String> entity : entities )
- {
- grid.addRow();
- grid.addValue( entity.get( TRACKED_ENTITY_INSTANCE_ID ) );
- grid.addValue( entity.get( CREATED_ID ) );
- grid.addValue( entity.get( LAST_UPDATED_ID ) );
- grid.addValue( entity.get( TRACKED_ENTITY_ID ) );
- grid.addValue( entity.get( ORG_UNIT_ID ) );
-
- for ( QueryItem item : params.getItems() )
- {
- grid.addValue( entity.get( item.getItemId() ) );
- }
- }
-
- return grid;
- }
-
- private Collection<Map<String, String>> getEntities( TrackedEntityInstanceQueryParams params )
+ public Collection<Map<String, String>> getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
{
SqlHelper hlp = new SqlHelper();
