From 18c3ce0c9267af5aa8942ccc5a1be3eab821a6b1 Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Sat, 23 Mar 2019 18:26:01 +0100 Subject: [PATCH 1/3] FIX: Database fix --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2b6ed72..98f5661 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,9 @@ apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'application' -application { - mainClassName = 'greenify.server.Application' -} +//application { +// mainClassName = 'greenify.server.Application' +//} repositories { mavenCentral() From 1cec0061784d4c0f308c37537484a9723601258c Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Mon, 25 Mar 2019 14:37:45 +0100 Subject: [PATCH 2/3] FIX: Create-drop databse. Add ManyToMany annotation --- .../java/greenify/server/data/model/User.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java index 4bced0a..b1b6698 100644 --- a/src/Server/src/main/java/greenify/server/data/model/User.java +++ b/src/Server/src/main/java/greenify/server/data/model/User.java @@ -4,14 +4,8 @@ import greenify.common.ApplicationException; import greenify.server.Application; import lombok.Data; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import java.util.*; +import javax.persistence.*; import javax.validation.constraints.NotNull; @Entity @@ -20,7 +14,9 @@ import javax.validation.constraints.NotNull; public class User { @Id + @NotNull @GeneratedValue(strategy = GenerationType.AUTO) +// @Column(name = "id") private Long id; @NotNull @@ -31,7 +27,12 @@ public class User { private int veganMeal; - private ArrayList friends; +// @ElementCollection +// @CollectionTable(name = "friends", joinColumns = @JoinColumn(name = "id")) +// @Column(name = "friendId") + @ManyToMany + @JoinColumn + private Collection friends; public User() {} @@ -98,8 +99,8 @@ public class User { this.veganMeal = veganMeal; } - public List getFriends(){ - return this.friends; + public ArrayList getFriends(){ + return (ArrayList)this.friends; } public void addFriend(User user){ From 437267dcb92dcbfac9576c98ca88016a368241ee Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Tue, 26 Mar 2019 10:24:21 +0100 Subject: [PATCH 3/3] Commit small changes before rebase --- src/Server/src/main/java/greenify/server/data/model/User.java | 3 --- src/Server/src/main/resources/application.properties | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java index b1b6698..0daf367 100644 --- a/src/Server/src/main/java/greenify/server/data/model/User.java +++ b/src/Server/src/main/java/greenify/server/data/model/User.java @@ -27,9 +27,6 @@ public class User { private int veganMeal; -// @ElementCollection -// @CollectionTable(name = "friends", joinColumns = @JoinColumn(name = "id")) -// @Column(name = "friendId") @ManyToMany @JoinColumn private Collection friends; diff --git a/src/Server/src/main/resources/application.properties b/src/Server/src/main/resources/application.properties index 3b7b07e..65fce80 100644 --- a/src/Server/src/main/resources/application.properties +++ b/src/Server/src/main/resources/application.properties @@ -2,5 +2,5 @@ spring.datasource.url=jdbc:h2:file:~/spring-boot-h2.db;DB_CLOSE_ON_EXIT=FALSE spring.datasource.username=sa spring.datasource.password= spring.datasource.driver-class-name=org.h2.Driver -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=create-drop spring.h2.console.enabled=true \ No newline at end of file