Skip to content

Commit b9439e6

Browse files
author
bu2000
committed
update database structure
1 parent 246382b commit b9439e6

5 files changed

Lines changed: 16 additions & 129 deletions

File tree

src/main/java/com/webservice/algorithmchef/model/Ingredient.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,4 @@ public class Ingredient {
4646
@OneToMany(mappedBy = "ingredient",orphanRemoval = true,cascade = CascadeType.ALL)
4747
private List<FridgeIngredient> ingredients;
4848

49-
@OneToMany(mappedBy = "ingredient",orphanRemoval = true,cascade = CascadeType.ALL)
50-
private List<RecipeIngredient> recipeIngredients;
51-
5249
}

src/main/java/com/webservice/algorithmchef/model/Recipe.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Recipe {
3030
@Column(name="recipe_id")
3131
private Long id;
3232

33-
@Column(nullable = false, unique = true)
33+
@Column(nullable = false)
3434
private String name;
3535

3636
@Lob
@@ -45,14 +45,25 @@ public class Recipe {
4545
@Column(nullable = false)
4646
private String type;
4747

48+
@Column(nullable = false)
49+
@Lob
50+
private String neededIngredients;
51+
4852
@Column(nullable = false)
4953
private double kcal;
5054

51-
@OneToMany(mappedBy = "recipe", orphanRemoval = true)
52-
private List<RecipeTag> recipeTags;
55+
@Column
56+
private String tag;
57+
58+
@Column
59+
private String portions;
60+
61+
@Column
62+
private String time;
63+
64+
@Column
65+
private String tip;
5366

54-
@OneToMany(mappedBy = "recipe", orphanRemoval = true)
55-
private List<RecipeIngredient> recipeIngredients;
5667

5768
@OneToMany(mappedBy = "recipe", orphanRemoval = true)
5869
private List<RecipeReview> recipeReviews;

src/main/java/com/webservice/algorithmchef/model/RecipeIngredient.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/main/java/com/webservice/algorithmchef/model/RecipeTag.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/com/webservice/algorithmchef/model/Tag.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)