vincentRamiere/simpleat-back
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into Vincent

Browse source 
OK
This commit is contained in:
Vincent Ramiere 2022-02-17 09:32:10 +01:00
commit d88b34c774
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/fr/cardon/simpleat/model/Restaurant.java
View file

@ -144,7 +144,6 @@ public class Restaurant {
@JoinTable(name="type_restau",
joinColumns = @JoinColumn(name = "id_restau"/*classe en cours*/,referencedColumnName = "id_restau" /*classe reliée*/) ,
inverseJoinColumns = @JoinColumn(name = "id_type",referencedColumnName = "id_type"))
@JsonBackReference("typerestaus")
public Collection<TypeRestau> getTyperestaus() {
return typerestaus;
}

3
src/main/java/fr/cardon/simpleat/model/TypeRestau.java
View file

@ -10,6 +10,7 @@ import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@ -49,7 +50,7 @@ public class TypeRestau {
}
@ManyToMany(mappedBy="typerestaus")
@JsonIgnoreProperties("typerestaus")
@JsonBackReference("restaurants")
public List<Restaurant> getRestaurants() {
return restaurants;
}