From 7136a76f16effb5ffb089471e7433f88b7252a3d Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 8 Mar 2016 08:52:35 +0100
Subject: [PATCH] clean code
---
src/main/java/org/hbp/mip/model/Article.java | 2 ++
src/main/java/org/hbp/mip/model/Model.java | 7 +++----
src/test/db | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/hbp/mip/model/Article.java b/src/main/java/org/hbp/mip/model/Article.java
index a22a2bbf1..65c016393 100644
--- a/src/main/java/org/hbp/mip/model/Article.java
+++ b/src/main/java/org/hbp/mip/model/Article.java
@@ -38,9 +38,11 @@ public class Article {
private Date updatedAt = null;
@ManyToOne
+ @JoinColumn(name = "createdby_username")
private User createdBy = null;
@ManyToOne
+ @JoinColumn(name = "updatedby_username")
private User updatedBy = null;
@ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
diff --git a/src/main/java/org/hbp/mip/model/Model.java b/src/main/java/org/hbp/mip/model/Model.java
index 2a3b64dfb..08f2a509d 100644
--- a/src/main/java/org/hbp/mip/model/Model.java
+++ b/src/main/java/org/hbp/mip/model/Model.java
@@ -9,10 +9,7 @@ import io.swagger.annotations.ApiModel;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
import java.util.Date;
@Entity
@@ -47,9 +44,11 @@ public class Model {
private Config config = null;
@ManyToOne
+ @JoinColumn(name = "createdby_username")
private User createdBy = null;
@ManyToOne
+ @JoinColumn(name = "updatedby_username")
private User updatedBy = null;
private String textQuery = null;
diff --git a/src/test/db b/src/test/db
index e1fcb1c49..368949009 160000
--- a/src/test/db
+++ b/src/test/db
@@ -1 +1 @@
-Subproject commit e1fcb1c4915415abdd1e545b9f4c04276c5c4b0f
+Subproject commit 368949009f0dd1895eac947aa86822e5fb0f39f2
--
GitLab