From 438b9101c834a3124751eb6be5362940fad9e1c0 Mon Sep 17 00:00:00 2001 From: jcorvi Date: Wed, 31 Aug 2022 15:28:59 +0200 Subject: [PATCH 1/2] link section to report --- .../workflow/rest/api/model/Report.java | 10 ++++++- .../rest/api/services/WorkflowTask.java | 29 +------------------ 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/model/Report.java b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/model/Report.java index d674500..27d7a46 100644 --- a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/model/Report.java +++ b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/model/Report.java @@ -15,6 +15,8 @@ public class Report { private String fileName; + private String name; + private String fileType; private String fileSize; @@ -103,7 +105,13 @@ public class Report { this.workflow = workflow; } - + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java index 6f9f76b..36e6dd9 100644 --- a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java +++ b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java @@ -91,34 +91,7 @@ public class WorkflowTask implements Runnable{ } - } - -// /** -// * Add reports to workflow and set up legacy pdf in input directory. -// * @param workflow -// * @param workflowExecutionInputDataPath -// */ -// private void setUpReportsForWorkflowProcess(Workflow workflow, List reports_ids, String workflowExecutionInputDataPath) { -// for (String id : reports_ids) { -// try { -// Report report = reportService.findReportWithFile(id); -// FileUtils.writeByteArrayToFile(new File(workflowExecutionInputDataPath + File.separator + report.getFileName()), report.getFile()); -// report.setFile(null); -// workflow.getReports().add(report); -// report.setWorkflow(workflow); -// report.setStatus(WorkflowStatus.READY); -// reportService.save(report); -// } catch (IllegalStateException e1) { -// // TODO Auto-generated catch block -// e1.printStackTrace(); -// } catch (IOException e1) { -// // TODO Auto-generated catch block -// e1.printStackTrace(); -// } -// } -// workflowRepository.save(workflow); -// } -// + } /** * Set up reports for execution, copy legacy file in input directory. * @param workflow -- GitLab From 3dc7f7099f5600351c716dbc50a15a68840cd26a Mon Sep 17 00:00:00 2001 From: Javi Corvi Date: Thu, 1 Sep 2022 13:38:47 +0200 Subject: [PATCH 2/2] link section to report --- bash_workflow/import-json-to-mongo/docker-build.sh | 2 +- .../pretox/workflow/rest/api/services/WorkflowTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bash_workflow/import-json-to-mongo/docker-build.sh b/bash_workflow/import-json-to-mongo/docker-build.sh index 597ec17..1589e6e 100755 --- a/bash_workflow/import-json-to-mongo/docker-build.sh +++ b/bash_workflow/import-json-to-mongo/docker-build.sh @@ -3,7 +3,7 @@ HOME=/usr/local/share/components/import-json-to-mongo/ cd "${HOME}" -git clone -b 2.1.B https://gitlab.bsc.es/inb/etransafe/pretox-import-pipeline-results-to-mongo.git +git clone -b 2.1 https://gitlab.bsc.es/inb/etransafe/pretox-import-pipeline-results-to-mongo.git cd pretox-import-pipeline-results-to-mongo mvn clean install -DskipTests diff --git a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java index 36e6dd9..0b04036 100644 --- a/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java +++ b/src/main/java/es/bsc/inb/etransafe/pretox/workflow/rest/api/services/WorkflowTask.java @@ -101,7 +101,7 @@ public class WorkflowTask implements Runnable{ for (Report report : workflow.getReports()) { try { report = reportService.findReportWithFile(report.getId()); - FileUtils.writeByteArrayToFile(new File(workflowExecutionInputDataPath + File.separator + report.getFileName()), report.getFile()); + FileUtils.writeByteArrayToFile(new File(workflowExecutionInputDataPath + File.separator + report.getId() + "_" + report.getFileName()), report.getFile()); report.setFile(null); } catch (IllegalStateException e1) { // TODO Auto-generated catch block -- GitLab