Adds tests for transformation of DHIS2 Program to FHIR Plan Definition.

Author: volsch

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

@@ -74,9 +74,8 @@ protected void expectProgramStageMetadataRequests() throws Exception
         systemDhis2Server.expect( ExpectedCount.between( 0, 1 ), method( HttpMethod.GET ) ).andExpect( header( "Authorization", testConfiguration.getDhis2SystemAuthorization() ) )
             .andExpect( requestTo( dhis2BaseUrl + "/api/" + dhis2ApiVersion + "/programs.json?paging=false&fields=id,name,code,description,selectIncidentDatesInFuture,selectEnrollmentDatesInFuture,displayIncidentDate,registration," +
                 "withoutRegistration,captureCoordinates,trackedEntityType%5Bid%5D,programTrackedEntityAttributes%5Bid,name,valueType,mandatory,allowFutureDate,trackedEntityAttribute%5Bid,name,code,valueType,generated%5D%5D,programStages%5Bid,name," +
-                "description," +
-                "repeatable,captureCoordinates,generatedByEnrollmentDate,minDaysFromStart,programStageDataElements%5Bid,compulsory,allowProvidedElsewhere,dataElement%5Bid,name,code,formName,valueType,optionSetValue,optionSet%5Bid,name,options%5Bcode," +
-                "name%5D%5D%5D%5D%5D&filter=name:eq:Child%20Programme" ) )
+                "description,repeatable,captureCoordinates,generatedByEnrollmentDate,minDaysFromStart,programStageDataElements%5Bid,compulsory,allowProvidedElsewhere,dataElement%5Bid,name,code,formName,valueType,optionSetValue,optionSet%5Bid,name," +
+                "options%5Bcode,name%5D%5D%5D%5D%5D&filter=name:eq:Child%20Programme" ) )
             .andRespond( withSuccess( IOUtils.resourceToString( "/org/dhis2/fhir/adapter/dhis/test/default-program.json", StandardCharsets.UTF_8 ), MediaType.APPLICATION_JSON ) );
     }
 }

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

@@ -44,37 +44,37 @@ public enum DhisResourceType
     /**
      * Resource is a tracked entity instance.
      */
-    TRACKED_ENTITY( "trackedEntityInstances", "te" ),
+    TRACKED_ENTITY( "trackedEntityInstances", "te", "TrackedEntityRule" ),
 
     /**
      * Resource is a tracked entity type.
      */
-    TRACKED_ENTITY_TYPE( "trackedEntityTypes", "tt" ),
+    TRACKED_ENTITY_TYPE( "trackedEntityTypes", "tt", "TrackedEntityTypeRule" ),
 
     /**
      * The program metadata.
      */
-    PROGRAM_METADATA( "programs", "pm" ),
+    PROGRAM_METADATA( "programs", "pm", "ProgramMetadataRule" ),
 
     /**
      * The program stage metadata.
      */
-    PROGRAM_STAGE_METADATA( "programStages", "sm" ),
+    PROGRAM_STAGE_METADATA( "programStages", "sm", "ProgramStageMetadataRule" ),
 
     /**
      * Resource is a program instance (aka enrollment).
      */
-    ENROLLMENT( "enrollments", "en" ),
+    ENROLLMENT( "enrollments", "en", "EnrollmentRule" ),
 
     /**
      * Resource is a program stage instance (aka event of a program instance).
      */
-    PROGRAM_STAGE_EVENT( "events", "ps" ),
+    PROGRAM_STAGE_EVENT( "events", "ps", "ProgramStageRule" ),
 
     /**
      * Resource is a organisation unit.
      */
-    ORGANIZATION_UNIT( "organisationUnits", "ou" );
+    ORGANIZATION_UNIT( "organisationUnits", "ou", "OrganizationUnitRule" );
 
     private static final Map<String, DhisResourceType> byTypeName = Arrays.stream( values() ).collect( Collectors.toMap( DhisResourceType::getTypeName, v -> v ) );
 
@@ -96,10 +96,13 @@ public static DhisResourceType getByAbbreviation( @Nullable String abbreviation
 
     private final String abbreviation;
 
-    DhisResourceType( @Nonnull String typeName, @Nonnull String abbreviation )
+    private final String ruleType;
+
+    DhisResourceType( @Nonnull String typeName, @Nonnull String abbreviation, @Nonnull String ruleType )
     {
         this.typeName = typeName;
         this.abbreviation = abbreviation;
+        this.ruleType = ruleType;
     }
 
     @Nonnull
@@ -113,4 +116,10 @@ public String getAbbreviation()
     {
         return abbreviation;
     }
+
+    @Nonnull
+    public String getRuleType()
+    {
+        return ruleType;
+    }
 }

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

@@ -42,7 +42,7 @@
 import org.dhis2.fhir.adapter.fhir.repository.FhirResourceRepository;
 import org.dhis2.fhir.adapter.fhir.script.ScriptExecutor;
 import org.dhis2.fhir.adapter.fhir.transform.dhis.DhisToFhirTransformerContext;
-import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.program.AbstractProgramMetadataToFhirCarePlanTransformer;
+import org.dhis2.fhir.adapter.fhir.transform.dhis.impl.metadata.program.AbstractProgramMetadataToFhirPlanDefinitionTransformer;
 import org.dhis2.fhir.adapter.fhir.transform.scripted.AccessibleScriptedDhisMetadata;
 import org.dhis2.fhir.adapter.lock.LockManager;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -62,9 +62,9 @@
  * @author volsch
  */
 @Component
-public class R4ProgramMetadataToFhirCarePlanTransformer extends AbstractProgramMetadataToFhirCarePlanTransformer<PlanDefinition>
+public class R4ProgramMetadataToFhirPlanDefinitionTransformer extends AbstractProgramMetadataToFhirPlanDefinitionTransformer<PlanDefinition>
 {
-    public R4ProgramMetadataToFhirCarePlanTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
+    public R4ProgramMetadataToFhirPlanDefinitionTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
         @Nonnull FhirDhisAssignmentRepository fhirDhisAssignmentRepository, @Nonnull OrganizationUnitService organizationUnitService,
         @Nonnull TrackedEntityMetadataService trackedEntityMetadataService, @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository )
     {

fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/r4/R4ProgramMetadataToFhirCarePlanTransformer.java renamed to fhir-r4/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/r4/R4ProgramMetadataToFhirPlanDefinitionTransformer.java

@@ -98,8 +98,7 @@
         "SELECT r FROM AbstractRule r JOIN r.applicableCodeSet acs WHERE r.fhirResourceType=:fhirResourceType AND r.enabled=true " +
             "AND r.expEnabled=true AND acs.code IN (:codeSetCodes)" ),
     @NamedQuery( name = AbstractRule.FIND_IMP_RULE_BY_ID_NAMED_QUERY, query =
-        "SELECT r FROM AbstractRule r WHERE r.fhirResourceType=:fhirResourceType AND TYPE(r)=:dhisResourceType AND r.id=:ruleId AND r.enabled=true AND r.impEnabled=true" ),
-    @NamedQuery( name = AbstractRule.FIND_ALL_EXP_NAMED_QUERY, query = "SELECT our FROM OrganizationUnitRule our WHERE our.enabled=true AND our.expEnabled=true AND (our.fhirCreateEnabled=true OR our.fhirUpdateEnabled=true)" )
+        "SELECT r FROM AbstractRule r WHERE r.fhirResourceType=:fhirResourceType AND TYPE(r)=:dhisResourceType AND r.id=:ruleId AND r.enabled=true AND r.impEnabled=true" )
 } )
 @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "dhisResourceType", include = JsonTypeInfo.As.EXISTING_PROPERTY )
 @JsonSubTypes( {
@@ -129,8 +128,6 @@ public abstract class AbstractRule extends VersionedBaseMetadata implements Seri
 
     public static final String FIND_IMP_RULE_BY_ID_NAMED_QUERY = "AbstractRule.findImpById";
 
-    public static final String FIND_ALL_EXP_NAMED_QUERY = "AbstractRule.findAllExp";
-
     public static final int MAX_NAME_LENGTH = 230;
 
     @NotBlank

fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/AbstractRule.java

@@ -67,6 +67,6 @@ public interface CustomRuleRepository
 
     @RestResource( exported = false )
     @Nonnull
-    Collection<RuleInfo<? extends AbstractRule>> findAllExp();
+    Collection<RuleInfo<? extends AbstractRule>> findAllExp( @Nonnull DhisResourceType dhisResourceType );
 
 }

fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/CustomRuleRepository.java

@@ -111,11 +111,12 @@ public List<RuleInfo<? extends AbstractRule>> findAllExpByInputData( @Nonnull Fh
 
     @RestResource( exported = false )
     @Nonnull
-    @Cacheable( key = "{#root.methodName}", cacheManager = "metadataCacheManager", cacheNames = "rule" )
+    @Cacheable( key = "{#root.methodName, #a0}", cacheManager = "metadataCacheManager", cacheNames = "rule" )
     @Transactional( readOnly = true )
-    public Collection<RuleInfo<? extends AbstractRule>> findAllExp()
+    public Collection<RuleInfo<? extends AbstractRule>> findAllExp( @Nonnull DhisResourceType dhisResourceType )
     {
-        final List<AbstractRule> rules = entityManager.createNamedQuery( AbstractRule.FIND_ALL_EXP_NAMED_QUERY, AbstractRule.class ).getResultList();
+        final List<AbstractRule> rules = entityManager.createQuery( "SELECT r FROM " + dhisResourceType.getRuleType() +
+            " r WHERE r.enabled=true AND r.expEnabled=true AND (r.fhirCreateEnabled=true OR r.fhirUpdateEnabled=true)", AbstractRule.class ).getResultList();
 
         return rules.stream().map( r -> {
             Hibernate.initialize( r.getDhisDataReferences() );

fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/repository/impl/CustomRuleRepositoryImpl.java

@@ -61,7 +61,7 @@ protected AbstractDhisMetadataToFhirRequestResolver( @Nonnull FhirClientReposito
     @Override
     public List<RuleInfo<? extends AbstractRule>> resolveRules( @Nonnull ScriptedDhisResource dhisResource )
     {
-        return ruleRepository.findAllExp().stream().sorted().collect( Collectors.toList() );
+        return ruleRepository.findAllExp( dhisResource.getResourceType() ).stream().sorted().collect( Collectors.toList() );
     }
 
     @Nonnull

fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/metadata/AbstractDhisMetadataToFhirRequestResolver.java

@@ -59,15 +59,15 @@
  * @param <F> the concrete type of the FHIR resource into which the DHIS2 resource should be transformed.
  * @author volsch
  */
-public abstract class AbstractProgramMetadataToFhirCarePlanTransformer<F extends IBaseResource> extends AbstractReadOnlyDhisMetadataToTypedFhirTransformer<AccessibleScriptedDhisMetadata, F, ProgramMetadataRule>
+public abstract class AbstractProgramMetadataToFhirPlanDefinitionTransformer<F extends IBaseResource> extends AbstractReadOnlyDhisMetadataToTypedFhirTransformer<AccessibleScriptedDhisMetadata, F, ProgramMetadataRule>
 {
     private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     private final TrackedEntityMetadataService trackedEntityMetadataService;
 
     private final TrackedEntityRuleRepository trackedEntityRuleRepository;
 
-    public AbstractProgramMetadataToFhirCarePlanTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
+    public AbstractProgramMetadataToFhirPlanDefinitionTransformer( @Nonnull ScriptExecutor scriptExecutor, @Nonnull LockManager lockManager, @Nonnull SystemRepository systemRepository, @Nonnull FhirResourceRepository fhirResourceRepository,
         @Nonnull FhirDhisAssignmentRepository fhirDhisAssignmentRepository, @Nonnull OrganizationUnitService organizationUnitService,
         @Nonnull TrackedEntityMetadataService trackedEntityMetadataService, @Nonnull TrackedEntityRuleRepository trackedEntityRuleRepository )
     {