Merge branch 'feature/226-add-leave-group-endpoint' into 'main'

Fixed get fridg items

See merge request idatt2106-v23-03/backend!187

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 {

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;
 
 

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;