diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java index de4cc3be20892acc3111c2aff2dc026c9077cb3b..7eb771dc2d56b0a221f636532f37825f519ccecc 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java @@ -1,15 +1,20 @@ package ntnu.idatt2016.v233.SmartMat.entity; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import ntnu.idatt2016.v233.SmartMat.entity.product.Product; /** * Recipe is an entity class representing a recipe in the system. * - * @author Anders + * @author Anders & Stian * @version 1.0.001 * @since 19.04.2023 * @@ -31,4 +36,12 @@ public class Recipe { @Column(name = "recipe_description") String description; + + @ManyToMany + @JoinTable(name = "recipe_product", + joinColumns = @JoinColumn(name = "recipe_id"), + inverseJoinColumns = @JoinColumn(name = "ean")) + @JsonIgnoreProperties({"recipes"}) + List<Product> 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 e065f3cfb3f45b7e1e047bdfcf4e41825f89ab7e..8517bf53a8b8e7436a18d189b480f71baff96c2b 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 @@ -8,6 +8,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import ntnu.idatt2016.v233.SmartMat.entity.Fridge; +import ntnu.idatt2016.v233.SmartMat.entity.Recipe; import java.util.List; @@ -64,4 +65,9 @@ public class Product{ @ManyToMany(mappedBy = "products") @JsonIgnoreProperties({"products"}) List<Fridge> fridges; + + @ManyToMany(mappedBy = "products") + @JsonIgnoreProperties({"products"}) + List<Recipe> recipes; + } \ No newline at end of file