Merge pull request #120 from OHDSI/ARACHNE-119

The list of the Incomplete submission was defended incorrectly
OHDSI · Jan 10, 2025 · 18d5fb3 · 18d5fb3
2 parents e259918 + c91dca6
commit 18d5fb3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/datanode/src/main/java/com/odysseusinc/arachne/datanode/model/analysis/Analysis.java b/datanode/src/main/java/com/odysseusinc/arachne/datanode/model/analysis/Analysis.java
@@ -148,6 +148,10 @@ public class Analysis {
     @Convert(converter = StringMapConverter.class)
     private Map<String, String> parameters;
 
+    public AnalysisState getState() {
+        return Optional.ofNullable(state).orElse(AnalysisState.UNKNOWN);
+    }
+
     public String getStage() {
         return Optional.ofNullable(currentState).map(AnalysisStateEntry::getStage).orElse(null);
     }

diff --git a/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java b/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java
@@ -220,6 +220,7 @@ public List<Long> getIncompleteIds() {
 			Join<Analysis, AnalysisStateEntry> state = root.join(Analysis_.currentState, JoinType.LEFT);
 			javax.persistence.criteria.Path<String> stage = state.get(AnalysisStateEntry_.stage);
 			return q.where(
+					cb.isNull(root.get(Analysis_.error)),
 					cb.or(stage.isNull(), stage.in(Stage.EXECUTE, Stage.INITIALIZE, Stage.ABORT))
 			);
 		}).getResultStream().map(Analysis::getId).collect(Collectors.toList());

diff --git a/datanode/src/main/resources/db/migration/V20241210000004__update_stage_and_error.sql b/datanode/src/main/resources/db/migration/V20241210000004__update_stage_and_error.sql
@@ -0,0 +1,4 @@
+UPDATE analysis_state_journal SET
+                                  stage = analyses.stage,
+                                  error = analyses.error
+FROM analyses WHERE analyses.current_state_id = analyses.id;