smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hopefully fixed invited relationship

Browse source
This commit is contained in:
Tommaso Rodolfo Masera 2020-04-18 14:11:21 +02:00
parent 6e36d7d306
commit d2aaa45a8b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Invited.java
View file

@ -1,6 +1,5 @@
package ch.usi.inf.sa4.sanmarinoes.smarthut.models; package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
import java.util.Set;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -8,10 +7,6 @@ import javax.validation.constraints.NotNull;
@Entity @Entity
public class Invited { public class Invited {
/** A host user who can invite guests to their smart house */
@OneToMany(mappedBy = "host")
private Set<User> host;
/** Guests that have been invited to the host's house */ /** Guests that have been invited to the host's house */
@ManyToOne @ManyToOne
@JoinColumn(name = "guests") @JoinColumn(name = "guests")

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
View file

@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import javax.persistence.*; import javax.persistence.*;
/** A user of the Smarthut application */ /** A user of the Smarthut application */
@ -35,6 +36,10 @@ public class User {
@Column(nullable = false, unique = true) @Column(nullable = false, unique = true)
private String email; private String email;
/** A host user who can invite guests to their smart house */
@OneToMany(mappedBy = "host")
private Set<Invited> guests;
@Column(nullable = false) @Column(nullable = false)
@GsonExclude @GsonExclude
private Boolean isEnabled = false; private Boolean isEnabled = false;