=== 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-05-20 16:30:51 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java 2014-05-20 16:40:25 +0000 @@ -75,17 +75,6 @@ Collection getRepresentatives( TrackedEntityInstance instances ); /** - * Search entityInstances by phone number (performs partial search) - * - * @param phoneNumber The string for searching by phone number - * @param min - * @param max - * - * @return List of instances - */ - Collection getByPhoneNumber( String phoneNumber, Integer min, Integer max ); - - /** * Validate entity-instances attribute values and validation criteria by * program before registering / updating information * === 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-05-20 16:30:51 +0000 +++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-05-20 16:40:25 +0000 @@ -421,25 +421,6 @@ return getQuery( hql ).setEntity( "representative", instance ).list(); } - @Override - @SuppressWarnings( "unchecked" ) - public Collection getByPhoneNumber( String phoneNumber, Integer min, Integer max ) - { - Criteria criteria = getCriteria(); - criteria.createAlias( "attributeValues", "attributeValue" ); - criteria.createAlias( "attributeValue.attribute", "attribute" ); - criteria.add( Restrictions.eq( "attribute.valueType", TrackedEntityAttribute.TYPE_PHONE_NUMBER ) ); - criteria.add( Restrictions.like( "attributeValue.value", phoneNumber ) ); - - if ( min != null && max != null ) - { - criteria.setFirstResult( min ); - criteria.setMaxResults( max ); - } - - return criteria.list(); - } - public String validate( TrackedEntityInstance instance, Program program, I18nFormat format ) { if ( instance.getAttributeValues() != null && instance.getAttributeValues().size() > 0 ) === modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java' --- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java 2014-05-16 15:26:10 +0000 +++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java 2014-05-20 16:40:25 +0000 @@ -38,7 +38,6 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.program.ProgramInstanceService; import org.hisp.dhis.program.ProgramService; -import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue; import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueService; import org.hisp.dhis.validation.ValidationCriteriaService; import org.junit.Test; @@ -158,33 +157,4 @@ assertEquals( 2, entityInstanceStore.getRepresentatives( entityInstanceB1 ).size() ); } - - @Test - public void testGetByPhoneNumber() - { - entityInstanceStore.save( entityInstanceA1 ); - entityInstanceStore.save( entityInstanceB1 ); - - TrackedEntityAttribute attribute = createTrackedEntityAttribute( 'C' ); - attribute.setValueType( TrackedEntityAttribute.TYPE_PHONE_NUMBER ); - attributeService.addTrackedEntityAttribute( attribute ); - - TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA1, - attribute ); - attributeValue.setValue( "123456789" ); - attributeValueService.addTrackedEntityAttributeValue( attributeValue ); - - entityInstanceA1.addAttributeValue( attributeValue ); - entityInstanceStore.update( entityInstanceA1 ); - - attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceB1, attribute ); - attributeValue.setValue( "123456789" ); - attributeValueService.addTrackedEntityAttributeValue( attributeValue ); - - entityInstanceB1.addAttributeValue( attributeValue ); - entityInstanceStore.update( entityInstanceB1 ); - - assertEquals( 2, entityInstanceStore.getByPhoneNumber( "123456789", null, null ).size() ); - } - }