diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java index c1d1160cee469b8525a64aec0cd375127f13051f..95e2328ad5475aff31bd05f4b1bc1cc7291a0249 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java @@ -11,7 +11,7 @@ import java.sql.Date; @AllArgsConstructor @NoArgsConstructor -@Getter @Setter +@Data @Entity(name = "fridge_product") @Builder public class FridgeProductAsso { diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java index 18bbfb732438f7ac86aaaca02fde6cdbec14ae63..537c640223ddc5cfe829c703a37ea2965f20e941 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java @@ -42,7 +42,7 @@ public class Fridge{ @OneToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, fetch = FetchType.LAZY, mappedBy = "fridgeId") @OnDelete(action = OnDeleteAction.CASCADE) - @JsonIgnoreProperties("fridge") + @JsonIgnoreProperties("fridgeId") List<FridgeProductAsso> products; diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java index 3f3840db584c0c651f19a3e2f5d41bdf6b95f3b2..5be0685a758f742133f83ddc542edb0f06b603b0 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java @@ -78,7 +78,6 @@ public class Product{ @OneToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, fetch = FetchType.LAZY, mappedBy = "ean") @OnDelete(action = OnDeleteAction.CASCADE) - @JsonIgnoreProperties({"products"}) @JsonIgnore List<FridgeProductAsso> fridges;