Adds support for lazy loaded tracked entity instances.

Author: volsch

app/src/test/java/org/dhis2/fhir/adapter/fhir/server/AbstractBatchBundleFhirRestAppTest.java

@@ -101,12 +101,10 @@ protected void prepareUpdate() throws Exception
             "deleted,trackedEntityInstance,trackedEntityType,orgUnit,coordinates,lastUpdated,attributes%5Battribute,value,lastUpdated,storedBy%5D" ) )
             .andExpect( method( HttpMethod.GET ) ).andExpect( header( "Authorization", "Basic Zmhpcl9jbGllbnQ6Zmhpcl9jbGllbnRfMQ==" ) )
             .andRespond( withSuccess( IOUtils.resourceToString( "/org/dhis2/fhir/adapter/dhis/test/default-tei-15-get.json", StandardCharsets.UTF_8 ), MediaType.APPLICATION_JSON ) );
-
         userDhis2Server.expect( ExpectedCount.once(), requestTo( matchesPattern( dhis2BaseUrl + "/api/" + dhis2ApiVersion + "/enrollments.json?program=EPDyQuoRnXk&programStatus=ACTIVE&trackedEntityInstance=*&ouMode=ACCESSIBLE&fields=:all&" +
             "order=lastUpdated:desc&pageSize=1" ) ) )
             .andExpect( method( HttpMethod.GET ) ).andExpect( header( "Authorization", "Basic Zmhpcl9jbGllbnQ6Zmhpcl9jbGllbnRfMQ==" ) )
             .andRespond( withSuccess( IOUtils.resourceToString( "/org/dhis2/fhir/adapter/dhis/test/default-bundle-enrollment-get.json", StandardCharsets.UTF_8 ), MediaType.APPLICATION_JSON ) );
-
         userDhis2Server.expect( ExpectedCount.between( 1, 2 ), requestTo( dhis2BaseUrl + "/api/" + dhis2ApiVersion + "/events.json?program=EPDyQuoRnXk&trackedEntityInstance=JeR2Ul4mZfx&ouMode=ACCESSIBLE&fields=deleted,event,orgUnit,program," +
             "enrollment,trackedEntityInstance,programStage,status,eventDate,dueDate,coordinate,lastUpdated,dataValues%5BdataElement,value,providedElsewhere,lastUpdated,storedBy%5D&skipPaging=true" ) )
             .andExpect( method( HttpMethod.GET ) ).andExpect( header( "Authorization", "Basic Zmhpcl9jbGllbnQ6Zmhpcl9jbGllbnRfMQ==" ) )

app/src/test/java/org/dhis2/fhir/adapter/fhir/server/dstu3/Dstu3ProgramStageFhirRestAppTest.java

@@ -124,6 +124,15 @@ public Optional<T> findOneById( @Nonnull String id, @Nonnull Function<String, T>
         return Optional.ofNullable( result );
     }
 
+    public boolean isLocal( @Nonnull String id )
+    {
+        final RequestCacheContext context = requestCacheService.getCurrentRequestCacheContext();
+        final Optional<LocalDhisResourceRepository<T>> repository = getRepository( context );
+
+        return repository.map( r -> r.findOneById( id ).map( DhisResource::isLocal ).orElse( false ) ).orElse( false );
+
+    }
+
     @Nonnull
     public Collection<T> find( @Nonnull Predicate<T> filter, @Nonnull Supplier<Collection<T>> collectionSupplier, boolean localOnly, @Nonnull String methodName, @Nonnull Object... args )
     {

app/src/test/java/org/dhis2/fhir/adapter/fhir/server/r4/R4ProgramStageFhirRestAppTest.java

@@ -0,0 +1,77 @@
+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 javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.Serializable;
+
+/**
+ * Contains either the ID of the resource or the resource itself.
+ *
+ * @param <T> the concrete type of the DHIS2 resource.
+ * @author volsch
+ */
+public class IdentifiedDhisResource<T extends DhisResource> implements Serializable
+{
+    private static final long serialVersionUID = -5373285083896395201L;
+
+    private final String id;
+
+    private final T resource;
+
+    public IdentifiedDhisResource( @Nonnull String id )
+    {
+        this.id = id;
+        this.resource = null;
+    }
+
+    public IdentifiedDhisResource( @Nonnull T resource )
+    {
+        this.resource = resource;
+        this.id = null;
+    }
+
+    @Nullable
+    public String getId()
+    {
+        return id;
+    }
+
+    @Nullable
+    public T getResource()
+    {
+        return resource;
+    }
+
+    public boolean hasResource()
+    {
+        return resource != null;
+    }
+}

dhis/src/main/java/org/dhis2/fhir/adapter/dhis/local/LocalDhisResourceRepositoryTemplate.java

@@ -0,0 +1,53 @@
+package org.dhis2.fhir.adapter.dhis.tracker.trackedentity;
+
+/*
+ * 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 org.dhis2.fhir.adapter.dhis.model.IdentifiedDhisResource;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Identified tracked entity instance.
+ *
+ * @author volsch
+ */
+public class IdentifiedTrackedEntityInstance extends IdentifiedDhisResource<TrackedEntityInstance>
+{
+    private static final long serialVersionUID = 7975425868929861631L;
+
+    public IdentifiedTrackedEntityInstance( @Nonnull String id )
+    {
+        super( id );
+    }
+
+    public IdentifiedTrackedEntityInstance( @Nonnull TrackedEntityInstance resource )
+    {
+        super( resource );
+    }
+}

dhis/src/main/java/org/dhis2/fhir/adapter/dhis/model/IdentifiedDhisResource.java

@@ -57,6 +57,8 @@ void updateGeneratedValues( @Nonnull TrackedEntityInstance trackedEntityInstance
     @Nonnull
     Optional<TrackedEntityInstance> findOneById( @Nonnull String id );
 
+    boolean isLocal( @Nonnull String id );
+
     @Nonnull
     Collection<TrackedEntityInstance> findByAttrValueRefreshed( @Nonnull String typeId,
         @Nonnull String attributeId, @Nonnull String value, int maxResult );

dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/IdentifiedTrackedEntityInstance.java

@@ -225,6 +225,12 @@ public Optional<TrackedEntityInstance> findOneById( @Nonnull String id )
         return findOneByIdRefreshed( id );
     }
 
+    @Override
+    public boolean isLocal( @Nonnull String id )
+    {
+        return resourceRepositoryTemplate.isLocal( id );
+    }
+
     @HystrixCommand( ignoreExceptions = UnauthorizedException.class )
     @Nonnull
     @Override

dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/TrackedEntityService.java

@@ -174,6 +174,68 @@ public void deleteByIdLocal()
         Mockito.verifyZeroInteractions( persistCallback );
     }
 
+    @Test
+    public void isLocal()
+    {
+        final TrackedEntityInstance tei = new TrackedEntityInstance();
+        final Object resourceKey = new Object();
+
+        tei.setLocal( true );
+
+        Mockito.doReturn( requestCacheContext ).when( requestCacheService ).getCurrentRequestCacheContext();
+        Mockito.doReturn( resourceRepositoryContainer ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.CONTAINER_REQUEST_CACHE_ATTRIBUTE_NAME ),
+            Mockito.eq( LocalDhisResourceRepositoryContainer.class ) );
+        Mockito.doReturn( resourceKey ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.RESOURCE_KEY_REQUEST_CACHE_ATTRIBUTE_NAME ), Mockito.eq( Object.class ) );
+        Mockito.doReturn( resourceRepository ).when( resourceRepositoryContainer ).getRepository( Mockito.eq( TrackedEntityInstance.class ), Mockito.same( persistCallback ) );
+        Mockito.doReturn( Optional.of( tei ) ).when( resourceRepository ).findOneById( Mockito.eq( "h1234567890" ) );
+
+        Assert.assertTrue( template.isLocal( "h1234567890" ) );
+
+        Mockito.verifyZeroInteractions( persistCallback );
+    }
+
+    @Test
+    public void isLocalIncludedNot()
+    {
+        final TrackedEntityInstance tei = new TrackedEntityInstance();
+        final Object resourceKey = new Object();
+
+        Mockito.doReturn( requestCacheContext ).when( requestCacheService ).getCurrentRequestCacheContext();
+        Mockito.doReturn( resourceRepositoryContainer ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.CONTAINER_REQUEST_CACHE_ATTRIBUTE_NAME ),
+            Mockito.eq( LocalDhisResourceRepositoryContainer.class ) );
+        Mockito.doReturn( resourceKey ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.RESOURCE_KEY_REQUEST_CACHE_ATTRIBUTE_NAME ), Mockito.eq( Object.class ) );
+        Mockito.doReturn( resourceRepository ).when( resourceRepositoryContainer ).getRepository( Mockito.eq( TrackedEntityInstance.class ), Mockito.same( persistCallback ) );
+        Mockito.doReturn( Optional.of( tei ) ).when( resourceRepository ).findOneById( Mockito.eq( "h1234567890" ) );
+
+        Assert.assertFalse( template.isLocal( "h1234567890" ) );
+
+        Mockito.verifyZeroInteractions( persistCallback );
+    }
+
+    @Test
+    public void isLocalNotIncluded()
+    {
+        final TrackedEntityInstance tei = new TrackedEntityInstance();
+        final Object resourceKey = new Object();
+
+        Mockito.doReturn( requestCacheContext ).when( requestCacheService ).getCurrentRequestCacheContext();
+        Mockito.doReturn( resourceRepositoryContainer ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.CONTAINER_REQUEST_CACHE_ATTRIBUTE_NAME ),
+            Mockito.eq( LocalDhisResourceRepositoryContainer.class ) );
+        Mockito.doReturn( resourceKey ).when( requestCacheContext ).getAttribute(
+            Mockito.eq( LocalDhisResourceRepositoryTemplate.RESOURCE_KEY_REQUEST_CACHE_ATTRIBUTE_NAME ), Mockito.eq( Object.class ) );
+        Mockito.doReturn( resourceRepository ).when( resourceRepositoryContainer ).getRepository( Mockito.eq( TrackedEntityInstance.class ), Mockito.same( persistCallback ) );
+        Mockito.doReturn( Optional.empty() ).when( resourceRepository ).findOneById( Mockito.eq( "h1234567890" ) );
+
+        Assert.assertFalse( template.isLocal( "h1234567890" ) );
+
+        Mockito.verifyZeroInteractions( persistCallback );
+    }
+
     @Test
     public void findOneByIdNoLocal()
     {

dhis/src/main/java/org/dhis2/fhir/adapter/dhis/tracker/trackedentity/impl/TrackedEntityServiceImpl.java

@@ -154,6 +154,45 @@ public void findLocal() throws IOException
         mockServer.verify();
     }
 
+    @Test
+    public void isLocal() throws IOException
+    {
+        mockServer.expect( ExpectedCount.once(), requestTo( "http://localhost:8080/api/trackedEntityInstances.json?strategy=CREATE" ) )
+            .andExpect( content().contentTypeCompatibleWith( MediaType.APPLICATION_JSON ) )
+            .andExpect( content().json( IOUtils.resourceToString( "/org/dhis2/fhir/adapter/dhis/tracker/program/impl/createTrackedEntityInstance.json", StandardCharsets.UTF_8 ) ) )
+            .andExpect( method( HttpMethod.POST ) ).andRespond( withSuccess( IOUtils.resourceToByteArray( "/org/dhis2/fhir/adapter/dhis/tracker/program/impl/createTrackedEntityInstance-response.json" ), MediaType.APPLICATION_JSON ) );
+
+        final TrackedEntityInstance trackedEntityInstance = new TrackedEntityInstance( trackedEntityType, "Jskdsjeua1s", true );
+        trackedEntityInstance.setOrgUnitId( "pMEnu7BjqMz" );
+
+        try ( final RequestCacheContext cacheContext = requestCacheService.createRequestCacheContext() )
+        {
+            cacheContext.setAttribute( LocalDhisResourceRepositoryTemplate.CONTAINER_REQUEST_CACHE_ATTRIBUTE_NAME,
+                new LocalDhisResourceRepositoryContainerImpl( Collections.singleton( TrackedEntityInstance.class ) ) );
+
+            final TrackedEntityInstance createdTrackedEntityInstance = service.createOrUpdate( trackedEntityInstance );
+            Assert.assertTrue( service.isLocal( "Jskdsjeua1s" ) );
+        }
+    }
+
+    @Test
+    public void isLocalNot()
+    {
+        try ( final RequestCacheContext cacheContext = requestCacheService.createRequestCacheContext() )
+        {
+            Assert.assertFalse( service.isLocal( "Jskdsjeua1s" ) );
+        }
+    }
+
+    @Test
+    public void isLocalNoContextNot()
+    {
+        try ( final RequestCacheContext cacheContext = requestCacheService.createRequestCacheContext() )
+        {
+            Assert.assertFalse( service.isLocal( "Jskdsjeua1s" ) );
+        }
+    }
+
     @Test
     public void findOneById() throws IOException
     {