new version 0.2.0-SNAPSHOT, work on dataTrigger implementation

Author: hhund

codex-process-data-transfer/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
 		<artifactId>codex-processes-ap1</artifactId>
-		<version>0.1.0</version>
+		<version>0.2.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/ConstantsDataTransfer.java

@@ -7,6 +7,7 @@ public interface ConstantsDataTransfer
 	String BPMN_EXECUTION_VARIABLE_PSEUDONYMS_LIST = "pseudonyms";
 	String BPMN_EXECUTION_VARIABLE_PSEUDONYM = "pseudonym";
 	String BPMN_EXECUTION_VARIABLE_STOP_TIMER = "stopTimer";
+	String BPMN_EXECUTION_VARIABLE_LAST_EXPORT_TO = "lastExportTo";
 	String BPMN_EXECUTION_VARIABLE_EXPORT_FROM = "exportFrom";
 	String BPMN_EXECUTION_VARIABLE_EXPORT_FROM_PRECISION = "exportFromPrecision";
 	String BPMN_EXECUTION_VARIABLE_EXPORT_TO = "exportTo";

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java

@@ -16,10 +16,11 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.spring.config.TransferDataConfig;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.spring.config.TransferDataSerializerConfig;
 
 public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.1.0";
+	public static final String VERSION = "0.2.0";
 
 	@Override
 	public String getName()
@@ -42,7 +43,7 @@ public Stream<String> getBpmnFiles()
 	@Override
 	public Stream<Class<?>> getSpringConfigClasses()
 	{
-		return Stream.of(TransferDataConfig.class);
+		return Stream.of(TransferDataConfig.class, TransferDataSerializerConfig.class);
 	}
 
 	@Override

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/service/FindNewData.java

@@ -3,33 +3,53 @@
 import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_EXPORT_FROM;
 import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_EXPORT_FROM_PRECISION;
 import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_EXPORT_TO;
+import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_LAST_EXPORT_TO;
 import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.BPMN_EXECUTION_VARIABLE_PSEUDONYMS_LIST;
+import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.CODESYSTEM_NUM_CODEX_DATA_TRANSFER;
+import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.CODESYSTEM_NUM_CODEX_DATA_TRANSFER_VALUE_EXPORT_FROM;
 import static org.highmed.dsf.bpe.ConstantsBase.BPMN_EXECUTION_VARIABLE_TARGET;
 
 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.camunda.bpm.engine.delegate.BpmnError;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.variable.Variables;
-import org.camunda.bpm.engine.variable.Variables.SerializationDataFormats;
 import org.highmed.dsf.bpe.delegate.AbstractServiceDelegate;
 import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
 import org.highmed.dsf.fhir.organization.OrganizationProvider;
 import org.highmed.dsf.fhir.task.TaskHelper;
 import org.highmed.dsf.fhir.variables.Target;
 import org.highmed.dsf.fhir.variables.TargetValues;
+import org.hl7.fhir.r4.model.DateTimeType;
+import org.hl7.fhir.r4.model.Task;
+import org.hl7.fhir.r4.model.Type;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.client.FhirClientFactory;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.variables.PseudonymList;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.variables.PseudonymListValues;
 
 public class FindNewData extends AbstractServiceDelegate implements InitializingBean
 {
+	@SuppressWarnings("serial")
+	private static class DateWithPrecision extends Date
+	{
+		private final TemporalPrecisionEnum precision;
+
+		DateWithPrecision(Date exportFrom, TemporalPrecisionEnum precision)
+		{
+			super(exportFrom.getTime());
+			this.precision = precision;
+		}
+	}
+
 	private static final Logger logger = LoggerFactory.getLogger(FindNewData.class);
 
 	private final OrganizationProvider organizationProvider;
@@ -56,40 +76,56 @@ public void afterPropertiesSet() throws Exception
 	@Override
 	protected void doExecute(DelegateExecution execution) throws BpmnError, Exception
 	{
-		Date exportFrom = (Date) execution.getVariable(BPMN_EXECUTION_VARIABLE_EXPORT_FROM);
-		String exportFromPrecisionStr = (String) execution.getVariable(BPMN_EXECUTION_VARIABLE_EXPORT_FROM_PRECISION);
-		TemporalPrecisionEnum exportFromPrecision = exportFromPrecisionStr == null ? null
-				: TemporalPrecisionEnum.valueOf(exportFromPrecisionStr);
-		Date exportTo = (Date) execution.getVariable(BPMN_EXECUTION_VARIABLE_EXPORT_TO);
+		Optional<DateWithPrecision> exportFrom = getExportFrom(execution);
+		Date exportTo = new Date();
 
-		List<String> pseudonyms = searchForPseudonymsWithNewData(exportFrom, exportFromPrecision, exportTo);
+		PseudonymList pseudonyms = searchForPseudonymsWithNewData(exportFrom.orElse(null), exportTo);
 
-		execution.setVariable(BPMN_EXECUTION_VARIABLE_PSEUDONYMS_LIST,
-				Variables.objectValue(pseudonyms).serializationDataFormat(SerializationDataFormats.JSON).create());
+		execution.setVariable(BPMN_EXECUTION_VARIABLE_EXPORT_FROM, Variables.dateValue(exportFrom.orElse(null)));
+		execution.setVariable(BPMN_EXECUTION_VARIABLE_EXPORT_FROM_PRECISION,
+				Variables.stringValue(exportFrom.map(p -> p.precision).map(Enum::name).orElse(null)));
+		execution.setVariable(BPMN_EXECUTION_VARIABLE_EXPORT_TO, Variables.dateValue(exportTo));
+		execution.setVariable(BPMN_EXECUTION_VARIABLE_LAST_EXPORT_TO, Variables.dateValue(exportTo));
+		execution.setVariable(BPMN_EXECUTION_VARIABLE_PSEUDONYMS_LIST, PseudonymListValues.create(pseudonyms));
 		execution.setVariable(BPMN_EXECUTION_VARIABLE_TARGET,
 				TargetValues.create(Target.createUniDirectionalTarget(organizationProvider.getLocalIdentifierValue())));
 	}
 
-	/**
-	 * @param exportFrom
-	 *            may be <code>null</code>
-	 * @param exportFromPrecision
-	 *            may be <code>null</code>
-	 * @param exportTo
-	 *            not <code>null</code>
-	 * @return
-	 */
-	private List<String> searchForPseudonymsWithNewData(Date exportFrom, TemporalPrecisionEnum exportFromPrecision,
-			Date exportTo)
+	protected Optional<DateWithPrecision> getExportFrom(DelegateExecution execution)
+	{
+		Date lastExportTo = (Date) execution.getVariable(BPMN_EXECUTION_VARIABLE_LAST_EXPORT_TO);
+
+		if (lastExportTo != null)
+			return Optional.of(new DateWithPrecision(lastExportTo, TemporalPrecisionEnum.MILLI));
+
+		Optional<DateTimeType> exportFromInput = getExportFromInput(getCurrentTaskFromExecutionVariables());
+		return exportFromInput.map(d -> new DateWithPrecision(d.getValue(), d.getPrecision()));
+	}
+
+	private Optional<DateTimeType> getExportFromInput(Task task)
+	{
+		return getInputParameterValues(task, CODESYSTEM_NUM_CODEX_DATA_TRANSFER,
+				CODESYSTEM_NUM_CODEX_DATA_TRANSFER_VALUE_EXPORT_FROM, DateTimeType.class).findFirst();
+	}
+
+	private <T extends Type> Stream<T> getInputParameterValues(Task task, String system, String code, Class<T> type)
+	{
+		return task.getInput().stream().filter(c -> type.isInstance(c.getValue()))
+				.filter(c -> c.getType().getCoding().stream()
+						.anyMatch(co -> system.equals(co.getSystem()) && code.equals(co.getCode())))
+				.map(c -> type.cast(c.getValue()));
+	}
+
+	protected PseudonymList searchForPseudonymsWithNewData(DateWithPrecision exportFrom, Date exportTo)
 	{
 		logger.debug("Searching for new data to transfer from {} with precision {} to {}", exportFrom,
-				exportFromPrecision, exportTo);
+				exportFrom.precision, exportTo);
 
 		// TODO implement FHIR search
 
 		// IGenericClient client = localFhirStoreClientFactory.createClient();
 		// client.search().forResource(Patient.class).withProfile("profile").lastUpdated(new DateRangeParam().set)
 
-		return Arrays.asList("1234567890");
+		return new PseudonymList(Arrays.asList("source/original"));
 	}
 }