From 37f5e59ffc41e20a3ea7e7f6d3bb05ca6840f642 Mon Sep 17 00:00:00 2001
From: longma1 <32119004+longma1@users.noreply.github.com>
Date: Fri, 10 Mar 2023 15:01:28 -0700
Subject: [PATCH] add end time to reduction step (#4640)

* add end time to reduction step

* add changelog

---------

Co-authored-by: Long Ma <long@smilecdr.com>
---
 .../4324-add-end-time-to-builk-export-reduction-step.yaml     | 4 ++++
 .../ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_3/4324-add-end-time-to-builk-export-reduction-step.yaml

diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_3/4324-add-end-time-to-builk-export-reduction-step.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_3/4324-add-end-time-to-builk-export-reduction-step.yaml
new file mode 100644
index 00000000000..de495877563
--- /dev/null
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_4_3/4324-add-end-time-to-builk-export-reduction-step.yaml
@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 4324
+title: "Fix issue where end time is missing for bulk exports on completion"
diff --git a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java
index 99cd833e3bc..d812b278cae 100644
--- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java
+++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/ReductionStepDataSink.java
@@ -34,6 +34,7 @@ import ca.uhn.fhir.util.JsonUtil;
 import ca.uhn.fhir.util.Logs;
 import org.slf4j.Logger;
 
+import java.util.Date;
 import java.util.Optional;
 
 public class ReductionStepDataSink<PT extends IModelJson, IT extends IModelJson, OT extends IModelJson>
@@ -72,6 +73,7 @@ public class ReductionStepDataSink<PT extends IModelJson, IT extends IModelJson,
 			String dataString = JsonUtil.serialize(data, false);
 			instance.setReport(dataString);
 			instance.setStatus(StatusEnum.COMPLETED);
+			instance.setEndTime(new Date());
 
 			ourLog.info("Finalizing job instance {} with report length {} chars", instance.getInstanceId(), dataString.length());
 			ourLog.atTrace()