From e9fce354160108915d2b4f34d77986e25347d0a0 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Fri, 29 Jan 2016 14:25:30 +0100
Subject: [PATCH] add filter->values and update DB script
---
src/main/java/org/hbp/mip/model/Filter.java | 12 ++++++++++++
src/test/db | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/hbp/mip/model/Filter.java b/src/main/java/org/hbp/mip/model/Filter.java
index d92fc5fc1..b973ed5af 100644
--- a/src/main/java/org/hbp/mip/model/Filter.java
+++ b/src/main/java/org/hbp/mip/model/Filter.java
@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.*;
+import java.util.LinkedList;
+import java.util.List;
@Entity
@Table(name = "`filter`")
@@ -24,6 +26,8 @@ public class Filter {
@ManyToOne
private Variable variable = null;
private String operator = null;
+ @ElementCollection(fetch = FetchType.EAGER)
+ private List<String> values = new LinkedList<>();
public Filter() {
}
@@ -67,6 +71,14 @@ public class Filter {
this.operator = operator;
}
+ public List<String> getValues() {
+ return values;
+ }
+
+ public void setValues(List<String> values) {
+ this.values = values;
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/src/test/db b/src/test/db
index c3d9d6d35..f7196ec2f 160000
--- a/src/test/db
+++ b/src/test/db
@@ -1 +1 @@
-Subproject commit c3d9d6d35b8044589ae6a251ccf14b0da7893ac6
+Subproject commit f7196ec2fe8a16006fd990f58a0bba5219c0b89f
--
GitLab