KOP-682: Changed the way how Tasks refer to ActivityDefinitions as de…

…cided and used in kt2 simplifier v0.11.0

pom.xml

@@ -11,7 +11,7 @@
   </parent>
   <groupId>nl.koppeltaal</groupId>
   <artifactId>spring-boot-starter-smart-service</artifactId>
-  <version>1.1.57-SNAPSHOT</version>
+  <version>1.1.58-SNAPSHOT</version>
   <name>Koppeltaal-2.0-Spring-SMART-Service</name>
   <description>spring-boot-starter-smart-service project to connect to a FHIR Store that works according to
   the SMART Backend Service flow (https://hl7.org/fhir/uv/bulkdata/authorization/index.html)</description>

src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/constants/FhirConstant.java

@@ -32,6 +32,7 @@ public class FhirConstant {
   }};
 
   public static final String KT2_EXTENSION__CARE_TEAM__OBSERVER = "http://koppeltaal.nl/fhir/StructureDefinition/KT2ObservationTeam";
+  public static final String KT2_EXTENSION__TASK__INSTANTIATES = "http://vzvz.nl/fhir/StructureDefinition/instantiates";
   public final static String KT2_EXTENSION__ENDPOINT = "http://koppeltaal.nl/fhir/StructureDefinition/KT2EndpointExtension";
   public final static String KT2_EXTENSION__PUBLISHER_IDENTIFIER = "http://koppeltaal.nl/fhir/StructureDefinition/KT2PublisherId";
 

src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/dto/TaskDtoConverter.java

@@ -8,18 +8,17 @@
 
 package nl.koppeltaal.spring.boot.starter.smartservice.dto;
 
-import static nl.koppeltaal.spring.boot.starter.smartservice.constants.FhirConstant.KT2_EXTENSION__CARE_TEAM__OBSERVER;
+import nl.koppeltaal.spring.boot.starter.smartservice.utils.ExtensionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.hl7.fhir.r4.model.*;
+import org.springframework.stereotype.Component;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.r4.model.Extension;
-import org.hl7.fhir.r4.model.Identifier;
-import org.hl7.fhir.r4.model.Reference;
-import org.hl7.fhir.r4.model.ResourceType;
-import org.hl7.fhir.r4.model.Task;
-import org.springframework.stereotype.Component;
+
+import static nl.koppeltaal.spring.boot.starter.smartservice.constants.FhirConstant.KT2_EXTENSION__CARE_TEAM__OBSERVER;
+import static nl.koppeltaal.spring.boot.starter.smartservice.constants.FhirConstant.KT2_EXTENSION__TASK__INSTANTIATES;
 
 /**
  *
@@ -33,7 +32,7 @@ public void applyDto(Task task, TaskDto taskDto) {
 				Collections.singletonList(createIdentifier(taskDto.getIdentifierSystem(), taskDto.getIdentifierValue())));
 		task.setRequester(new Reference(taskDto.getPractitioner()));
 		task.setOwner(new Reference(taskDto.getPatient()));
-		task.setInstantiatesCanonical(taskDto.getActivityDefinition());
+		addInstantiatesExtension(task, taskDto.getActivityDefinition());
 		task.setStatus(Task.TaskStatus.fromCode(taskDto.getStatus()));
 
 		// remove all "old" observer values
@@ -60,6 +59,18 @@ public static void addObserverExtension(Task task, String observerReference) {
 		task.addExtension(observerExtension);
 	}
 
+	public static void addInstantiatesExtension(Task task, String activityDefinitionReference) {
+		final Reference instantiatesReference = new Reference();
+		instantiatesReference.setReference(activityDefinitionReference);
+		instantiatesReference.setType(ResourceType.ActivityDefinition.name());
+
+		final Extension instantiatesExtension = new Extension();
+		instantiatesExtension.setValue(instantiatesReference);
+		instantiatesExtension.setUrl(KT2_EXTENSION__TASK__INSTANTIATES);
+
+		task.addExtension(instantiatesExtension);
+	}
+
 	public void applyResource(TaskDto taskDto, Task task) {
 		taskDto.setReference(getRelativeReference(task.getIdElement()));
 
@@ -71,13 +82,15 @@ public void applyResource(TaskDto taskDto, Task task) {
 
 		taskDto.setPatient(task.getOwner().getReference());
 		taskDto.setPractitioner(task.getRequester().getReference());
-		taskDto.setActivityDefinition(task.getInstantiatesCanonical());
 		if (task.getStatus() != null)
 			taskDto.setStatus(task.getStatus().toCode());
 
 		task.getExtensionsByUrl(KT2_EXTENSION__CARE_TEAM__OBSERVER).forEach(extension ->
 			taskDto.getObserverReferences().add(((Reference) extension.getValue()).getReference())
 		);
+
+		ExtensionUtils.getReferenceValue(task, KT2_EXTENSION__TASK__INSTANTIATES)
+				.ifPresent(taskDto::setActivityDefinition);
 	}
 
 	public TaskDto convert(Task task) {

src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/service/fhir/TaskFhirClientService.java

@@ -21,6 +21,7 @@
 import nl.koppeltaal.spring.boot.starter.smartservice.constants.FhirConstant;
 import nl.koppeltaal.spring.boot.starter.smartservice.dto.TaskDto;
 import nl.koppeltaal.spring.boot.starter.smartservice.dto.TaskDtoConverter;
+import nl.koppeltaal.spring.boot.starter.smartservice.utils.ExtensionUtils;
 import nl.koppeltaal.spring.boot.starter.smartservice.utils.ResourceUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.instance.model.api.IIdType;
@@ -134,9 +135,13 @@ private List<Task> getTasksForOwnerAndDefinition(Patient fhirPatient, ActivityDe
 		List<Task> rv = new ArrayList<>();
 		List<Task> resourcesByOwner = getResourcesByOwner(ResourceUtils.getReference(fhirPatient));
 		for (Task task : resourcesByOwner) {
-			if (StringUtils.equals(task.getInstantiatesCanonical(), ResourceUtils.getCanonicalReference(fhirDefinition))) {
-				rv.add(task);
-			}
+
+			ExtensionUtils.getReferenceValue(task, FhirConstant.KT2_EXTENSION__TASK__INSTANTIATES)
+					.ifPresent(instantiates -> {
+						if (StringUtils.equals(instantiates, ResourceUtils.getReference(fhirDefinition))) {
+							rv.add(task);
+						}
+					});
 		}
 		return rv;
 	}

src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/utils/ExtensionUtils.java

@@ -0,0 +1,25 @@
+package nl.koppeltaal.spring.boot.starter.smartservice.utils;
+
+import org.hl7.fhir.r4.model.DomainResource;
+import org.hl7.fhir.r4.model.Extension;
+import org.hl7.fhir.r4.model.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;
+
+public class ExtensionUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(ExtensionUtils.class);
+
+    public static Optional<String> getReferenceValue(DomainResource resource, String extensionSystem) {
+        Optional<Extension> instantiatesExtension = resource.getExtensionsByUrl(extensionSystem).stream().findFirst();
+
+        if(instantiatesExtension.isPresent()) {
+            return Optional.of(((Reference) instantiatesExtension.get().getValue()).getReference());
+        }
+
+        LOG.warn("No extension with system [{}] found on [{}]", extensionSystem, ResourceUtils.getReference(resource));
+        return Optional.empty();
+    }
+
+}

src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/utils/ResourceUtils.java

@@ -14,9 +14,4 @@ public static String getReference(IAnyResource resource) {
 		}
 		return null;
 	}
-
-	public static String getCanonicalReference(IAnyResource resource) {
-		IIdType idElement = resource.getIdElement();
-		return (idElement != null) ? idElement.getValue() : null;
-	}
 }