Skip to content

Commit

Permalink
WIP implementation of MeasureReport -> DataValueSets tranformation
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidCKen committed Jul 24, 2019
1 parent fa3eac3 commit 404554c
Show file tree
Hide file tree
Showing 10 changed files with 882 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.dhis2.fhir.adapter.dhis.model.DataValue;
import org.dhis2.fhir.adapter.dhis.model.DhisResource;
import org.dhis2.fhir.adapter.dhis.model.DhisResourceId;
import org.dhis2.fhir.adapter.dhis.model.DhisResourceType;
Expand All @@ -39,7 +40,9 @@
import javax.annotation.Nonnull;
import java.io.Serializable;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
* @author David Katuscak
Expand Down Expand Up @@ -104,6 +107,7 @@ public DataValueSet( boolean newResource )
this.newResource = newResource;
this.modified = newResource;
this.local = newResource;
this.dataValues = new ArrayList<>();
}

@Override
Expand Down Expand Up @@ -164,16 +168,6 @@ public DhisResourceType getResourceType()
return DhisResourceType.DATA_VALUE_SET;
}

public List<WritableDataValue> getDataValues()
{
return dataValues;
}

public void setDataValues( List<WritableDataValue> dataValues )
{
this.dataValues = dataValues;
}

@Override
public boolean isNewResource()
{
Expand Down Expand Up @@ -229,4 +223,61 @@ public void setLastUpdated( ZonedDateTime lastUpdated )
{
this.lastUpdated = lastUpdated;
}

public List<WritableDataValue> getDataValues()
{
return dataValues;
}

public void setDataValues( List<WritableDataValue> dataValues )
{
this.dataValues = dataValues;
}

public boolean containsDataValue( @Nonnull String dataElementId )
{
return getDataValues().stream().anyMatch( dv -> Objects.equals( dataElementId, dv.getDataElementId() ) );
}

public boolean containsDataValue( @Nonnull String dataElementId, @Nonnull String value )
{
return getDataValues().stream()
.anyMatch( dv -> Objects.equals( dataElementId, dv.getDataElementId() )
&& dv.getValue() != null
&& Objects.equals( value, String.valueOf( dv.getValue() ) ) );
}

public boolean containsDataValueWithValue( @Nonnull String dataElementId )
{
return getDataValues().stream()
.filter( dv -> ( dv.getValue() != null ) )
.anyMatch( dv -> Objects.equals( dataElementId, dv.getDataElementId() ) );
}

@Nonnull
public WritableDataValue getDataValue( @Nonnull String dataElementId )
{
if ( getDataValues() == null )
{
setDataValues( new ArrayList<>() );
}

WritableDataValue dataValue = getDataValues().stream()
.filter( dv -> Objects.equals( dataElementId, dv.getDataElementId() ) )
.findFirst()
.orElse( null );

if ( dataValue == null )
{
dataValue = new WritableDataValue( dataElementId, true );
getDataValues().add( dataValue );
}
return dataValue;
}

@JsonIgnore
public boolean isAnyDataValueModified()
{
return (getDataValues() != null) && getDataValues().stream().anyMatch( DataValue::isModified );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,4 @@ public interface DataValueSetService
{
@Nonnull
DataValueSet createOrUpdate( @Nonnull DataValueSet enrollment );

// @Nonnull
// DhisResourceResult<DataValueSet> find( @Nonnull String dataSetId, @Nonnull String orgUnitId, @Nonnull String period, @Nonnull UriFilterApplier uriFilterApplier, int from, int max );
}
127 changes: 127 additions & 0 deletions dhis/src/main/java/org/dhis2/fhir/adapter/dhis/model/DataElements.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
package org.dhis2.fhir.adapter.dhis.model;

/*
* Copyright (c) 2004-2019, 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 com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.StringUtils;

import javax.annotation.Nonnull;
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

/**
* @author David Katuscak
*/
public class DataElements implements Serializable
{
private static final long serialVersionUID = -4563360527610569923L;

@JsonProperty( "dataElements" )
private Collection<WritableDataElement> dataElements;

@JsonIgnore
private transient volatile Map<String, DataElement> dataElementsById;

@JsonIgnore
private transient volatile Map<String, DataElement> dataElementsByName;

@JsonIgnore
private transient volatile Map<String, DataElement> dataElementsByCode;

public DataElements()
{
this.dataElements = Collections.emptyList();
}

public DataElements( @Nonnull Collection<WritableDataElement> dataElements )
{
this.dataElements = dataElements;
}

@Nonnull
public Optional<DataElement> getOptional( @Nonnull Reference reference )
{
switch ( reference.getType() )
{
case CODE:
return getOptionalByCode( reference.getValue() );
case NAME:
return getOptionalByName( reference.getValue() );
case ID:
return getOptionalById( reference.getValue() );
default:
throw new AssertionError( "Unhandled reference type: " + reference.getType() );
}
}

@Nonnull
public Optional<DataElement> getOptionalById( @Nonnull String id )
{
Map<String, DataElement> tempDataElementsById = dataElementsById;
if ( tempDataElementsById == null )
{
dataElementsById = tempDataElementsById = dataElements.stream()
.map( ImmutableDataElement::new )
.collect( Collectors.toMap( DataElement::getId, de -> de ) );
}
return Optional.ofNullable( tempDataElementsById.get( id ) );
}

@Nonnull
public Optional<DataElement> getOptionalByCode( @Nonnull String code )
{
Map<String, DataElement> tempDataElementsByCode = dataElementsByCode;
if ( tempDataElementsByCode == null )
{
dataElementsByCode = tempDataElementsByCode = dataElements.stream()
.filter( de -> StringUtils.isNotBlank( de.getCode() ) )
.map( ImmutableDataElement::new )
.collect( Collectors.toMap( DataElement::getCode, de -> de ) );
}
return Optional.ofNullable( tempDataElementsByCode.get( code ) );
}

@Nonnull
public Optional<DataElement> getOptionalByName( @Nonnull String name )
{
Map<String, DataElement> tempDataElementsByName = dataElementsByName;
if ( tempDataElementsByName == null )
{
dataElementsByName = tempDataElementsByName = dataElements.stream()
.map( ImmutableDataElement::new )
.collect( Collectors.toMap( DataElement::getName, de -> de ) );
}
return Optional.ofNullable( tempDataElementsByName.get( name ) );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import org.dhis2.fhir.adapter.dhis.aggregate.DataValueSet;
import org.dhis2.fhir.adapter.dhis.aggregate.DataValueSetService;
import org.dhis2.fhir.adapter.dhis.model.DhisResource;
import org.dhis2.fhir.adapter.dhis.model.DhisResourceId;
import org.dhis2.fhir.adapter.dhis.model.Reference;
Expand All @@ -54,6 +56,7 @@
*
* @author volsch
* @author Charles Chigoriwa (ITINORDIC)
* @author David Katuscak
*/
@Component
public class DhisResourceRepositoryImpl implements DhisResourceRepository
Expand All @@ -68,13 +71,17 @@ public class DhisResourceRepositoryImpl implements DhisResourceRepository

private final EventService eventService;

private final DataValueSetService dataValueSetService;

public DhisResourceRepositoryImpl( @Nonnull OrganizationUnitService organizationUnitService,
@Nonnull TrackedEntityService trackedEntityService, @Nonnull EnrollmentService enrollmentService, @Nonnull EventService eventService )
@Nonnull TrackedEntityService trackedEntityService, @Nonnull EnrollmentService enrollmentService,
@Nonnull EventService eventService, @Nonnull DataValueSetService dataValueSetService )
{
this.organizationUnitService = organizationUnitService;
this.trackedEntityService = trackedEntityService;
this.enrollmentService = enrollmentService;
this.eventService = eventService;
this.dataValueSetService = dataValueSetService;
}

@Nonnull
Expand All @@ -91,8 +98,10 @@ public Optional<? extends DhisResource> findRefreshed( @Nonnull DhisResourceId d
return eventService.findOneById( dhisResourceId.getId() );
case ENROLLMENT:
return enrollmentService.findOneById( dhisResourceId.getId() );
case DATA_VALUE_SET:
throw new UnsupportedOperationException( "Finding DHIS2 DataValueSet resources is not supported." );
default:
throw new AssertionError( "Unhandled DHIS resource type: " + dhisResourceId.getType() );
throw new AssertionError( "Unhandled DHIS2 resource type: " + dhisResourceId.getType() );
}
}

Expand All @@ -107,9 +116,10 @@ public Optional<? extends DhisResource> findRefreshedDeleted( @Nonnull DhisResou
case ORGANIZATION_UNIT:
case TRACKED_ENTITY:
case ENROLLMENT:
throw new UnsupportedOperationException( "Retrieving deleted " + dhisResourceId.getType() + " DHIS resource items is not supported." );
case DATA_VALUE_SET:
throw new UnsupportedOperationException( "Retrieving deleted " + dhisResourceId.getType() + " DHIS2 resource items is not supported." );
default:
throw new AssertionError( "Unhandled DHIS resource type: " + dhisResourceId.getType() );
throw new AssertionError( "Unhandled DHIS2 resource type: " + dhisResourceId.getType() );
}
}

Expand All @@ -136,8 +146,11 @@ public DhisResource save( @Nonnull DhisResource resource )
case PROGRAM_STAGE_EVENT:
saveEvent( (Event) resource );
break;
case DATA_VALUE_SET:
saveDataValueSet( (DataValueSet) resource );
break;
default:
throw new AssertionError( "Unhandled DHIS resource type: " + resource.getResourceType() );
throw new AssertionError( "Unhandled DHIS2 resource type: " + resource.getResourceType() );
}
return resource;
}
Expand All @@ -153,8 +166,10 @@ public boolean delete( @Nonnull DhisResource resource )
return enrollmentService.delete( resource.getId() );
case PROGRAM_STAGE_EVENT:
return eventService.delete( resource.getId() );
case DATA_VALUE_SET:
throw new UnsupportedOperationException( "Deleting DHIS2 DataValueSet resources is nut supported." );
default:
throw new AssertionError( "Unhandled DHIS resource type: " + resource.getResourceType() );
throw new AssertionError( "Unhandled DHIS2 resource type: " + resource.getResourceType() );
}
}

Expand Down Expand Up @@ -248,4 +263,42 @@ else if ( enrollment.isModified() )

return updated;
}

private boolean saveDataValueSet( @Nonnull DataValueSet dataValueSet )
{
if ( validateDataValueSet( dataValueSet ) )
{
if ( dataValueSet.isNewResource() )
{
logger.info( "Creating new DataValueSet." );
dataValueSetService.createOrUpdate( dataValueSet );
logger.info( "Created new DataValueSet for dataSetId: {}, orgUnit: {}, period: {}.",
dataValueSet.getDataSetId(), dataValueSet.getOrgUnitId(), dataValueSet.getPeriod() );
return true;
}
else if ( dataValueSet.isModified() )
{
logger.info( "Updating existing DataValueSet." );
dataValueSetService.createOrUpdate( dataValueSet );
logger.info( "Created new DataValueSet for dataSetId: {}, orgUnit: {}, period: {}.",
dataValueSet.getDataSetId(), dataValueSet.getOrgUnitId(), dataValueSet.getPeriod() );
return true;
}
}

return false;
}

private boolean validateDataValueSet( @Nonnull DataValueSet dataValueSet )
{
if ( dataValueSet.getDataSetId() != null && !dataValueSet.getDataSetId().isEmpty() &&
dataValueSet.getOrgUnitId() != null && !dataValueSet.getOrgUnitId().isEmpty() &&
dataValueSet.getPeriod() != null && !dataValueSet.getPeriod().isEmpty() &&
dataValueSet.getDataValues() != null && !dataValueSet.getDataValues().isEmpty() )
{
return true;
}

return false;
}
}
Loading

0 comments on commit 404554c

Please sign in to comment.