From 8dd2a0b3c7f0b6aa54b35dcee165fc9ecd1fd408 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 15 Mar 2016 14:52:00 +0100
Subject: [PATCH] update dataset to send variable field too
---
src/main/java/org/hbp/mip/model/Dataset.java | 13 +++++++++++++
src/main/java/org/hbp/mip/utils/CSVUtil.java | 6 ++++++
src/test/db | 2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/hbp/mip/model/Dataset.java b/src/main/java/org/hbp/mip/model/Dataset.java
index de3fde258..61b5a5316 100644
--- a/src/main/java/org/hbp/mip/model/Dataset.java
+++ b/src/main/java/org/hbp/mip/model/Dataset.java
@@ -29,6 +29,10 @@ public class Dataset {
@CollectionTable(name = "dataset_grouping", joinColumns = @JoinColumn(name = "dataset_code"))
private List<String> grouping = new LinkedList<>();
+ @ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name = "dataset_variable", joinColumns = @JoinColumn(name = "dataset_code"))
+ private List<String> variable = new LinkedList<>();
+
@ElementCollection(fetch=FetchType.EAGER)
@CollectionTable(name = "dataset_data", joinColumns = @JoinColumn(name = "dataset_code"))
private Map<String, LinkedList<Object>> data = new HashMap<>();
@@ -74,6 +78,15 @@ public class Dataset {
}
+ public List<String> getVariable() {
+ return variable;
+ }
+
+ public void setVariable(List<String> variable) {
+ this.variable = variable;
+ }
+
+
public Map<String, LinkedList<Object>> getData() {
return data;
}
diff --git a/src/main/java/org/hbp/mip/utils/CSVUtil.java b/src/main/java/org/hbp/mip/utils/CSVUtil.java
index 804eb8d91..35fd05117 100644
--- a/src/main/java/org/hbp/mip/utils/CSVUtil.java
+++ b/src/main/java/org/hbp/mip/utils/CSVUtil.java
@@ -30,18 +30,23 @@ public class CSVUtil {
Date date = new Date();
List<String> header = new LinkedList<>();
List<String> grouping = new LinkedList<>();
+ List<String> variable = new LinkedList<>();
Map<String, LinkedList<Object>> data = new HashMap<>();
List<Variable> covs = new LinkedList<>();
List<Variable> grps = new LinkedList<>();
+ List<Variable> vars = new LinkedList<>();
List<Variable> all = new LinkedList<>();
covs.addAll(query.getCovariables());
grps.addAll(query.getGrouping());
+ vars.addAll(query.getVariables());
all.addAll(query.getCovariables());
all.addAll(query.getGrouping());
+ all.addAll(query.getVariables());
header.addAll(covs.stream().map(Variable::getCode).collect(Collectors.toList()));
grouping.addAll(grps.stream().map(Variable::getCode).collect(Collectors.toList()));
+ variable.addAll(vars.stream().map(Variable::getCode).collect(Collectors.toList()));
try {
InputStream is = Dataset.class.getClassLoader().getResourceAsStream(filename);
@@ -141,6 +146,7 @@ public class CSVUtil {
result.setDate(date);
result.setHeader(header);
result.setGrouping(grouping);
+ result.setVariable(variable);
result.setData(data);
return result;
diff --git a/src/test/db b/src/test/db
index d9f1a5cde..739945912 160000
--- a/src/test/db
+++ b/src/test/db
@@ -1 +1 @@
-Subproject commit d9f1a5cde43b31469c97c2b5923ce9585685d597
+Subproject commit 739945912e9eb01419a90ec92d2e76221f7f9da3
--
GitLab