Skip to content
Snippets Groups Projects
Commit b12efe70 authored by Karsch Lukas's avatar Karsch Lukas
Browse files

equals method for recipes and more

parent d5ba8f5c
Branches
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ public class Recipe implements RecipeComponent {
private String description;
private List<String> preparation;
private List<Category> categories;
private Integer preparationTimeMins;
private int preparationTimeMins;
private NutritionTable nutritionTable;
private final LocalDateTime creationTime;
......@@ -33,7 +33,7 @@ public class Recipe implements RecipeComponent {
String description,
List<String> preparation,
List<Category> categories,
Integer preparationTimeMins) {
int preparationTimeMins) {
//Das ruft den anderen Konstruktor dieser Klasse auf (siehe unten)
this(name, ingredients, description, preparation, categories, preparationTimeMins, NutritionCalculator.calculateNutritionTable(ingredients));
......@@ -56,7 +56,7 @@ public class Recipe implements RecipeComponent {
String description,
List<String> preparation,
List<Category> categories,
Integer preparationTimeMins,
int preparationTimeMins,
NutritionTable nutritionTable) {
if (ingredients == null || ingredients.size() == 0) {
......@@ -68,17 +68,14 @@ public class Recipe implements RecipeComponent {
if (preparation == null || preparation.isEmpty()) {
throw new InvalidRecipeException("Preparation can not be null or empty");
}
if (categories == null) {
categories = new ArrayList<>();
}
this.ingredients = ingredients;
this.name = name;
this.description = description;
this.preparation = preparation;
this.categories = categories;
this.preparationTimeMins = preparationTimeMins;
this.nutritionTable = nutritionTable;
setPreparationTimeMins(preparationTimeMins);
setCategories(categories);
this.creationTime = LocalDateTime.now();
}
......@@ -115,6 +112,10 @@ public class Recipe implements RecipeComponent {
}
public void setCategories(List<Category> categories) {
if (categories == null) {
categories = new ArrayList<>();
}
this.categories = categories;
}
......@@ -122,7 +123,7 @@ public class Recipe implements RecipeComponent {
categories.add(category);
}
public Integer getPreparationTimeMins() {
public int getPreparationTimeMins() {
return preparationTimeMins;
}
......@@ -147,4 +148,16 @@ public class Recipe implements RecipeComponent {
public NutritionTable getNutritionTable() {
return nutritionTable;
}
public Map<RecipeComponent, Integer> getIngredients() {
return ingredients;
}
@Override
public boolean equals(Object o) {
if (o instanceof Recipe r) {
return r.getName().equals(this.name);
}
return false;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment