From d2aaa45a8b95475f47a8a26042ba7c925e9bc728 Mon Sep 17 00:00:00 2001 From: tommi27 Date: Sat, 18 Apr 2020 14:11:21 +0200 Subject: [PATCH] hopefully fixed invited relationship --- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java | 5 ----- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java index c389e18..63cf553 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java @@ -1,6 +1,5 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; -import java.util.Set; import javax.persistence.*; import javax.validation.constraints.NotNull; @@ -8,10 +7,6 @@ import javax.validation.constraints.NotNull; @Entity public class Invited { - /** A host user who can invite guests to their smart house */ - @OneToMany(mappedBy = "host") - private Set host; - /** Guests that have been invited to the host's house */ @ManyToOne @JoinColumn(name = "guests") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java index 60aad17..8ad844d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java @@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; +import java.util.Set; import javax.persistence.*; /** A user of the Smarthut application */ @@ -35,6 +36,10 @@ public class User { @Column(nullable = false, unique = true) private String email; + /** A host user who can invite guests to their smart house */ + @OneToMany(mappedBy = "host") + private Set guests; + @Column(nullable = false) @GsonExclude private Boolean isEnabled = false;