etc404/thymecrunch
1
0
Fork 0
mirror of https://gitlab.com/etc404/software-engineering-project.git synced 2026-05-10 20:52:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleaned up code format

Browse Source
This commit is contained in:
durn
2026-03-04 01:27:15 -07:00
parent 0a38aa3ded
commit 4bdb449f47
29 changed files with 865 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/src/main/java/com/example/demo/controller/RecipeController.java
+12 -14
View File
@@ -29,42 +29,40 @@ public class RecipeController {
this.recipeService = recipeService; this.recipeService = recipeService;
} }
//build create recipe REST API // build create recipe REST API
@PostMapping @PostMapping
public ResponseEntity<RecipeDto> saveUser(@RequestBody Recipe recipe){ public ResponseEntity<RecipeDto> saveUser(@RequestBody Recipe recipe) {
RecipeDto recipeDto = recipeService.convertToDto(recipe); RecipeDto recipeDto = recipeService.convertToDto(recipe);
return new ResponseEntity<RecipeDto>(recipeService.saveRecipe(recipeDto), HttpStatus.CREATED); return new ResponseEntity<RecipeDto>(recipeService.saveRecipe(recipeDto), HttpStatus.CREATED);
} }
//build get all recipes REST API // build get all recipes REST API
@GetMapping @GetMapping
public List<RecipeDto> getAllRecipes(){ public List<RecipeDto> getAllRecipes() {
return recipeService.getAllRecipes(); return recipeService.getAllRecipes();
} }
//build get recipe by id REST API // build get recipe by id REST API
// http://localhost:8080/api/recipes/(id number goes here) // http://localhost:8080/api/recipes/(id number goes here)
@GetMapping("{id}") @GetMapping("{id}")
public ResponseEntity<RecipeDto> getRecipeById(@PathVariable("id") Integer recipeId){ public ResponseEntity<RecipeDto> getRecipeById(@PathVariable("id") Integer recipeId) {
return new ResponseEntity<RecipeDto>(recipeService.getRecipeById(recipeId), HttpStatus.OK); return new ResponseEntity<RecipeDto>(recipeService.getRecipeById(recipeId), HttpStatus.OK);
} }
//build update recipe REST API // build update recipe REST API
//http://localhost:8080/api/recipes/(id number goes here) // http://localhost:8080/api/recipes/(id number goes here)
@PutMapping("{id}") @PutMapping("{id}")
public ResponseEntity<RecipeDto> updateUser(@PathVariable("id") Integer recipeId, @RequestBody Recipe recipe){ public ResponseEntity<RecipeDto> updateUser(@PathVariable("id") Integer recipeId, @RequestBody Recipe recipe) {
RecipeDto recipeDto = recipeService.convertToDto(recipe); RecipeDto recipeDto = recipeService.convertToDto(recipe);
return new ResponseEntity<RecipeDto>(recipeService.updateRecipe(recipeDto, recipeId), HttpStatus.OK); return new ResponseEntity<RecipeDto>(recipeService.updateRecipe(recipeDto, recipeId), HttpStatus.OK);
} }
//build delete recipe REST API // build delete recipe REST API
//http://localhost:8080/api/recipes/(id number goes here) // http://localhost:8080/api/recipes/(id number goes here)
@DeleteMapping("{id}") @DeleteMapping("{id}")
public ResponseEntity<String> deleteUser(@PathVariable("id") Integer recipeId){ public ResponseEntity<String> deleteUser(@PathVariable("id") Integer recipeId) {
recipeService.deleteRecipe(recipeId); recipeService.deleteRecipe(recipeId);
return new ResponseEntity<String>("Recipe deleted succesfully!", HttpStatus.OK); return new ResponseEntity<String>("Recipe deleted succesfully!", HttpStatus.OK);
} }
} }
demo/src/main/java/com/example/demo/controller/UserController.java
+20 -20
View File
@@ -28,55 +28,55 @@ public class UserController {
this.userService = userService; this.userService = userService;
} }
//build create user REST API // build create user REST API
@PostMapping @PostMapping
public ResponseEntity<User> saveUser(@RequestBody User user){ public ResponseEntity<User> saveUser(@RequestBody User user) {
return new ResponseEntity<User>(userService.saveUser(user), HttpStatus.CREATED); return new ResponseEntity<User>(userService.saveUser(user), HttpStatus.CREATED);
} }
//build get all users REST API // build get all users REST API
@GetMapping @GetMapping
public List<UserDto> getAllUsers(){ public List<UserDto> getAllUsers() {
return userService.getAllUsers(); return userService.getAllUsers();
} }
//build get user by id REST API // build get user by id REST API
// http://localhost:8080/api/users/(id number goes here) // http://localhost:8080/api/users/(id number goes here)
@GetMapping("{id}") @GetMapping("{id}")
public ResponseEntity<UserDto> getUserById(@PathVariable("id") Integer userId){ public ResponseEntity<UserDto> getUserById(@PathVariable("id") Integer userId) {
return new ResponseEntity<UserDto>(userService.getUserById(userId), HttpStatus.OK); return new ResponseEntity<UserDto>(userService.getUserById(userId), HttpStatus.OK);
} }
//build create favorite REST API // build create favorite REST API
@PostMapping("/{userId}/favorites/{recipeId}") @PostMapping("/{userId}/favorites/{recipeId}")
public ResponseEntity<UserDto> saveFavorite( @PathVariable Integer userId, @PathVariable Integer recipeId) { public ResponseEntity<UserDto> saveFavorite(@PathVariable Integer userId, @PathVariable Integer recipeId) {
UserDto updatedUser = userService.saveFavorite(userId, recipeId); UserDto updatedUser = userService.saveFavorite(userId, recipeId);
return new ResponseEntity<>(updatedUser, HttpStatus.OK); return new ResponseEntity<>(updatedUser, HttpStatus.OK);
} }
//build update user REST API // build update user REST API
// http://localhost:8080/api/users/(id number goes here) // http://localhost:8080/api/users/(id number goes here)
@PutMapping("{id}") @PutMapping("{id}")
public ResponseEntity<UserDto> updateUser(@PathVariable("id") Integer userId, @RequestBody User user){ public ResponseEntity<UserDto> updateUser(@PathVariable("id") Integer userId, @RequestBody User user) {
return new ResponseEntity<UserDto>(userService.updateUser(user, userId), HttpStatus.OK); return new ResponseEntity<UserDto>(userService.updateUser(user, userId), HttpStatus.OK);
} }
//build delete user REST API // build delete user REST API
@DeleteMapping("{id}") @DeleteMapping("{id}")
public ResponseEntity<String> deleteUser(@PathVariable("id") Integer userId){ public ResponseEntity<String> deleteUser(@PathVariable("id") Integer userId) {
userService.deleteUser(userId); userService.deleteUser(userId);
return new ResponseEntity<String>("User deleted succesfully!", HttpStatus.OK); return new ResponseEntity<String>("User deleted succesfully!", HttpStatus.OK);
} }
//build delete favorite REST API // build delete favorite REST API
@DeleteMapping("/{userId}/favorites/{recipeId}") @DeleteMapping("/{userId}/favorites/{recipeId}")
public ResponseEntity<String> deleteFavorite( @PathVariable Integer userId, @PathVariable Integer recipeId) { public ResponseEntity<String> deleteFavorite(@PathVariable Integer userId, @PathVariable Integer recipeId) {
userService.deleteFavorite(userId, recipeId); userService.deleteFavorite(userId, recipeId);
return new ResponseEntity<String>("Favorite deleted succesfully!", HttpStatus.OK); return new ResponseEntity<String>("Favorite deleted succesfully!", HttpStatus.OK);
} }
} }
demo/src/main/java/com/example/demo/dto/ImageDto.java
-3
View File
@@ -3,8 +3,6 @@ package com.example.demo.dto;
public class ImageDto { public class ImageDto {
String imageUrl; String imageUrl;
public ImageDto() { public ImageDto() {
super(); super();
} }
@@ -22,5 +20,4 @@ public class ImageDto {
this.imageUrl = imageUrl; this.imageUrl = imageUrl;
} }
} }
demo/src/main/java/com/example/demo/dto/RecipeDto.java
+27 -19
View File
@@ -5,27 +5,25 @@ import java.util.List;
import com.example.demo.entity.Recipe; import com.example.demo.entity.Recipe;
public class RecipeDto { public class RecipeDto {
private String title; private String title;
private String description; private String description;
private Integer prepTimeMinutes; private Integer prepTimeMinutes;
private Integer cookTimeMinutes; private Integer cookTimeMinutes;
private Integer servings; private Integer servings;
private UserDto userDto; private UserDto userDto;
private String status; private String status;
private List<RecipeIngredientDto> ingredients; private List<RecipeIngredientDto> ingredients;
private List<StepDto> steps; private List<StepDto> steps;
private List<ImageDto> images; private List<ImageDto> images;
private List<TagDto> tags; private List<TagDto> tags;
public RecipeDto() {
public RecipeDto() {
super(); super();
} }
public RecipeDto(String title, String description, Integer prepTimeMinutes, Integer cookTimeMinutes, public RecipeDto(String title, String description, Integer prepTimeMinutes, Integer cookTimeMinutes,
Integer servings, UserDto userDto, String status, List<RecipeIngredientDto> ingredients, List<StepDto> steps, List<ImageDto> images, List<TagDto> tags) { Integer servings, UserDto userDto, String status, List<RecipeIngredientDto> ingredients,
List<StepDto> steps, List<ImageDto> images, List<TagDto> tags) {
super(); super();
this.title = title; this.title = title;
this.description = description; this.description = description;
@@ -45,42 +43,55 @@ public class RecipeDto {
public String getTitle() { public String getTitle() {
return title; return title;
} }
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
public String getDescription() { public String getDescription() {
return description; return description;
} }
public void setDescription(String description) { public void setDescription(String description) {
this.description = description; this.description = description;
} }
public Integer getPrepTimeMinutes() { public Integer getPrepTimeMinutes() {
return prepTimeMinutes; return prepTimeMinutes;
} }
public void setPrepTimeMinutes(Integer prepTimeMinutes) { public void setPrepTimeMinutes(Integer prepTimeMinutes) {
this.prepTimeMinutes = prepTimeMinutes; this.prepTimeMinutes = prepTimeMinutes;
} }
public Integer getCookTimeMinutes() { public Integer getCookTimeMinutes() {
return cookTimeMinutes; return cookTimeMinutes;
} }
public void setCookTimeMinutes(Integer cookTimeMinutes) { public void setCookTimeMinutes(Integer cookTimeMinutes) {
this.cookTimeMinutes = cookTimeMinutes; this.cookTimeMinutes = cookTimeMinutes;
} }
public Integer getServings() { public Integer getServings() {
return servings; return servings;
} }
public void setServings(Integer servings) { public void setServings(Integer servings) {
this.servings = servings; this.servings = servings;
} }
public String getStatus() { public String getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public List<RecipeIngredientDto> getIngredients() { public List<RecipeIngredientDto> getIngredients() {
return ingredients; return ingredients;
} }
public void setIngredients(List<RecipeIngredientDto> ingredients) { public void setIngredients(List<RecipeIngredientDto> ingredients) {
this.ingredients = ingredients; this.ingredients = ingredients;
} }
@@ -93,7 +104,6 @@ public class RecipeDto {
this.steps = steps; this.steps = steps;
} }
public List<ImageDto> getImages() { public List<ImageDto> getImages() {
return images; return images;
} }
@@ -102,7 +112,6 @@ public class RecipeDto {
this.images = images; this.images = images;
} }
public List<TagDto> getTags() { public List<TagDto> getTags() {
return tags; return tags;
} }
@@ -119,5 +128,4 @@ public class RecipeDto {
this.userDto = userDto; this.userDto = userDto;
} }
} }
demo/src/main/java/com/example/demo/dto/RecipeIngredientDto.java
+15 -12
View File
@@ -3,18 +3,14 @@ package com.example.demo.dto;
import java.math.BigDecimal; import java.math.BigDecimal;
public class RecipeIngredientDto { public class RecipeIngredientDto {
private String ingredientName; private String ingredientName;
private BigDecimal quantity; private BigDecimal quantity;
private String unit; private String unit;
private String notes; private String notes;
public RecipeIngredientDto() {
super();
}
public RecipeIngredientDto() {
super();
}
public RecipeIngredientDto(String ingredientName, BigDecimal quantity, String unit, String notes) { public RecipeIngredientDto(String ingredientName, BigDecimal quantity, String unit, String notes) {
super(); super();
@@ -24,28 +20,35 @@ public class RecipeIngredientDto {
this.notes = notes; this.notes = notes;
} }
// getters and setters // getters and setters
public String getIngredientName() { public String getIngredientName() {
return ingredientName; return ingredientName;
} }
public void setIngredientName(String ingredientName) { public void setIngredientName(String ingredientName) {
this.ingredientName = ingredientName; this.ingredientName = ingredientName;
} }
public BigDecimal getQuantity() { public BigDecimal getQuantity() {
return quantity; return quantity;
} }
public void setQuantity(BigDecimal quantity) { public void setQuantity(BigDecimal quantity) {
this.quantity = quantity; this.quantity = quantity;
} }
public String getUnit() { public String getUnit() {
return unit; return unit;
} }
public void setUnit(String unit) { public void setUnit(String unit) {
this.unit = unit; this.unit = unit;
} }
public String getNotes() { public String getNotes() {
return notes; return notes;
} }
public void setNotes(String notes) { public void setNotes(String notes) {
this.notes = notes; this.notes = notes;
} }
demo/src/main/java/com/example/demo/dto/StepDto.java
+20 -19
View File
@@ -1,29 +1,30 @@
package com.example.demo.dto; package com.example.demo.dto;
public class StepDto { public class StepDto {
private Integer stepNumber; private Integer stepNumber;
private String instruction; private String instruction;
public StepDto() {} public StepDto() {
}
public StepDto(Integer stepNumber, String instruction) { public StepDto(Integer stepNumber, String instruction) {
this.stepNumber = stepNumber; this.stepNumber = stepNumber;
this.instruction = instruction; this.instruction = instruction;
} }
public Integer getStepNumber() { public Integer getStepNumber() {
return stepNumber; return stepNumber;
} }
public void setStepNumber(Integer stepNumber) { public void setStepNumber(Integer stepNumber) {
this.stepNumber = stepNumber; this.stepNumber = stepNumber;
} }
public String getInstruction() { public String getInstruction() {
return instruction; return instruction;
} }
public void setInstruction(String instruction) { public void setInstruction(String instruction) {
this.instruction = instruction; this.instruction = instruction;
} }
} }
demo/src/main/java/com/example/demo/dto/TagDto.java
+1 -7
View File
@@ -1,27 +1,21 @@
package com.example.demo.dto; package com.example.demo.dto;
public class TagDto { public class TagDto {
private String name; private String name;
public TagDto() { public TagDto() {
super(); super();
} }
public TagDto(String name) { public TagDto(String name) {
super(); super();
this.name = name; this.name = name;
} }
public String getName() { public String getName() {
return name; return name;
} }
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
demo/src/main/java/com/example/demo/dto/UserDto.java
+16 -16
View File
@@ -1,25 +1,26 @@
package com.example.demo.dto; package com.example.demo.dto;
public class UserDto { public class UserDto {
private Integer id; private Integer id;
private String username; private String username;
private String email; private String email;
public UserDto() {} public UserDto() {
}
public UserDto(Integer id, String username, String email) { public UserDto(Integer id, String username, String email) {
this.id = id; this.id = id;
this.username = username; this.username = username;
this.email = email; this.email = email;
} }
public Integer getId() { public Integer getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
public String getUsername() { public String getUsername() {
return username; return username;
@@ -37,5 +38,4 @@ public class UserDto {
this.email = email; this.email = email;
} }
} }
demo/src/main/java/com/example/demo/entity/Image.java
+42 -26
View File
@@ -6,37 +6,43 @@ import lombok.EqualsAndHashCode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Entity @Entity
@Table(name = "recipe_images") // keep table name the same @Table(name = "recipe_images")
public class Image { public class Image {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "recipe_id", nullable = false) @JoinColumn(name = "recipe_id", nullable = false)
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private Recipe recipe; private Recipe recipe;
@Column(name = "image_url", nullable = false) @Column(name = "image_url", nullable = false)
private String imageUrl; private String imageUrl;
@Column(name = "created_at") @Column(name = "created_at")
private LocalDateTime createdAt; private LocalDateTime createdAt;
public Image() {} public Image() {
}
public Image(Recipe recipe, String imageUrl) { public Image(Recipe recipe, String imageUrl) {
this.recipe = recipe; this.recipe = recipe;
this.imageUrl = imageUrl; this.imageUrl = imageUrl;
this.createdAt = LocalDateTime.now(); this.createdAt = LocalDateTime.now();
} }
// Getters and setters // Getters and setters
public Integer getId() { return id; } public Integer getId() {
public void setId(Integer id) { this.id = id; } return id;
}
public Recipe getRecipe() { public void setId(Integer id) {
this.id = id;
}
public Recipe getRecipe() {
return recipe; return recipe;
} }
@@ -44,9 +50,19 @@ public class Image {
this.recipe = recipe; this.recipe = recipe;
} }
public String getImageUrl() { return imageUrl; } public String getImageUrl() {
public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } return imageUrl;
}
public LocalDateTime getCreatedAt() { return createdAt; } public void setImageUrl(String imageUrl) {
public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; } this.imageUrl = imageUrl;
}
public LocalDateTime getCreatedAt() {
return createdAt;
}
public void setCreatedAt(LocalDateTime createdAt) {
this.createdAt = createdAt;
}
} }
demo/src/main/java/com/example/demo/entity/Ingredient.java
+28 -22
View File
@@ -16,38 +16,44 @@ import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@Entity @Entity
@Table(name = "ingredients", uniqueConstraints = { @Table(name = "ingredients", uniqueConstraints = { @UniqueConstraint(columnNames = "name") })
@UniqueConstraint(columnNames = "name")
})
public class Ingredient { public class Ingredient {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@Column(nullable = false, unique = true)
private String name;
@Column(nullable = false, unique = true) @OneToMany(mappedBy = "ingredient")
private String name; private Set<RecipeIngredient> recipeIngredients = new HashSet<>();
@OneToMany(mappedBy = "ingredient") public Ingredient() {
private Set<RecipeIngredient> recipeIngredients = new HashSet<>(); }
// Default constructor required by JPA public Ingredient(String name) {
public Ingredient() {} this.name = name;
}
// Convenience constructor // Getters and setters
public Ingredient(String name) { public Integer getId() {
this.name = name; return id;
} }
// Getters and setters public void setId(Integer id) {
public Integer getId() { return id; } this.id = id;
public void setId(Integer id) { this.id = id; } }
public String getName() { return name; } public String getName() {
public void setName(String name) { this.name = name; } return name;
}
public Set<RecipeIngredient> getRecipeIngredients() { public void setName(String name) {
this.name = name;
}
public Set<RecipeIngredient> getRecipeIngredients() {
return recipeIngredients; return recipeIngredients;
} }
demo/src/main/java/com/example/demo/entity/Recipe.java
+119 -100
View File
@@ -1,6 +1,7 @@
package com.example.demo.entity; package com.example.demo.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.validation.constraints.NotBlank;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -12,101 +13,78 @@ import java.util.Set;
@Table(name = "recipes") @Table(name = "recipes")
public class Recipe { public class Recipe {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
private String title; @NotBlank(message = "Please provide a recipe title")
private String title;
@Column(columnDefinition = "TEXT") @Column(columnDefinition = "TEXT")
private String description; private String description;
private Integer prepTimeMinutes; private Integer prepTimeMinutes;
private Integer cookTimeMinutes; private Integer cookTimeMinutes;
private Integer servings; private Integer servings;
private String status; private String status;
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id", nullable = false) @JoinColumn(name = "user_id", nullable = false)
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private User user; private User user;
// Recipe ingredients relationship
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
private Set<RecipeIngredient> recipeIngredients = new HashSet<>();
// Recipe ingredients relationship // Recipe Steps relationship
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
private Set<RecipeIngredient> recipeIngredients = new HashSet<>(); private Set<Step> steps = new HashSet<>();
// Recipe Steps relationship // Recipe Images relationship
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
private Set<Step> steps = new HashSet<>(); private Set<Image> images = new HashSet<>();
// Recipe Images relationship // Recipe Tag relationship and also junction table
@OneToMany(mappedBy = "recipe", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @ManyToMany(fetch = FetchType.LAZY)
private Set<Image> images = new HashSet<>(); @JoinTable(name = "recipe_tags", joinColumns = { @JoinColumn(name = "recipe_id") }, inverseJoinColumns = {
@JoinColumn(name = "tag_id") })
private Set<Tag> tags = new HashSet<>();
// Recipe Tag relationship and also junction table // User is the manager for this relationship
@ManyToMany(fetch = FetchType.LAZY) @ManyToMany(fetch = FetchType.LAZY, mappedBy = "FavRecipes")
@JoinTable(name = "recipe_tags", private Set<User> users = new HashSet<>();
joinColumns = {@JoinColumn(name = "recipe_id")},
inverseJoinColumns = {@JoinColumn(name = "tag_id")})
private Set<Tag> tags = new HashSet<>();
// User is the manager for this relationship public Recipe() {
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "FavRecipes") }
private Set<User> users = new HashSet<>();
public Recipe(String title, String description, Integer prepTimeMinutes, Integer cookTimeMinutes, Integer servings,
User user, String status) {
this.title = title;
this.description = description;
this.prepTimeMinutes = prepTimeMinutes;
this.cookTimeMinutes = cookTimeMinutes;
this.servings = servings;
this.user = user;
this.status = status;
this.createdAt = LocalDateTime.now();
this.updatedAt = LocalDateTime.now();
}
// Default constructor // Getters and setters
public Recipe() {} public Integer getId() {
return id;
}
// Convenience constructor public void setId(Integer id) {
public Recipe(String title, String description, Integer prepTimeMinutes, Integer cookTimeMinutes, this.id = id;
Integer servings, User user, String status) { }
this.title = title;
this.description = description;
this.prepTimeMinutes = prepTimeMinutes;
this.cookTimeMinutes = cookTimeMinutes;
this.servings = servings;
this.user = user;
this.status = status;
this.createdAt = LocalDateTime.now();
this.updatedAt = LocalDateTime.now();
}
// Helper method to add an ingredient public User getUser() {
public void addIngredient(Ingredient ingredient, BigDecimal quantity, String unit, String notes) {
RecipeIngredient recipeIngredient = new RecipeIngredient(this, ingredient, quantity, unit, notes);
recipeIngredients.add(recipeIngredient);
ingredient.getRecipeIngredients().add(recipeIngredient);
}
public void removeIngredient(Ingredient ingredient) {
RecipeIngredient remove = null;
for (RecipeIngredient recipeIngredient : recipeIngredients) {
if (recipeIngredient.getIngredient().equals(ingredient)) {
remove = recipeIngredient;
break;
}
}
if (remove != null) {
recipeIngredients.remove(remove);
ingredient.getRecipeIngredients().remove(remove);
remove.setRecipe(null);
remove.setIngredient(null);
}
}
// Getters and setters
public Integer getId() { return id; }
public void setId(Integer id) { this.id = id; }
public User getUser() {
return user; return user;
} }
@@ -114,33 +92,77 @@ public class Recipe {
this.user = user; this.user = user;
} }
public String getTitle() { return title; } public String getTitle() {
public void setTitle(String title) { this.title = title; } return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getDescription() { return description; } public String getDescription() {
public void setDescription(String description) { this.description = description; } return description;
}
public Integer getPrepTimeMinutes() { return prepTimeMinutes; } public void setDescription(String description) {
public void setPrepTimeMinutes(Integer prepTimeMinutes) { this.prepTimeMinutes = prepTimeMinutes; } this.description = description;
}
public Integer getCookTimeMinutes() { return cookTimeMinutes; } public Integer getPrepTimeMinutes() {
public void setCookTimeMinutes(Integer cookTimeMinutes) { this.cookTimeMinutes = cookTimeMinutes; } return prepTimeMinutes;
}
public Integer getServings() { return servings; } public void setPrepTimeMinutes(Integer prepTimeMinutes) {
public void setServings(Integer servings) { this.servings = servings; } this.prepTimeMinutes = prepTimeMinutes;
}
public String getStatus() { return status; } public Integer getCookTimeMinutes() {
public void setStatus(String status) { this.status = status; } return cookTimeMinutes;
}
public LocalDateTime getCreatedAt() { return createdAt; } public void setCookTimeMinutes(Integer cookTimeMinutes) {
public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; } this.cookTimeMinutes = cookTimeMinutes;
}
public LocalDateTime getUpdatedAt() { return updatedAt; } public Integer getServings() {
public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; } return servings;
}
public Set<RecipeIngredient> getRecipeIngredients() { return recipeIngredients; } public void setServings(Integer servings) {
public void setRecipeIngredients(Set<RecipeIngredient> recipeIngredients) { this.recipeIngredients = recipeIngredients; } this.servings = servings;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public LocalDateTime getCreatedAt() {
return createdAt;
}
public void setCreatedAt(LocalDateTime createdAt) {
this.createdAt = createdAt;
}
public LocalDateTime getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(LocalDateTime updatedAt) {
this.updatedAt = updatedAt;
}
public Set<RecipeIngredient> getRecipeIngredients() {
return recipeIngredients;
}
public void setRecipeIngredients(Set<RecipeIngredient> recipeIngredients) {
this.recipeIngredients = recipeIngredients;
}
public Set<Step> getSteps() { public Set<Step> getSteps() {
return steps; return steps;
@@ -173,7 +195,4 @@ public class Recipe {
public void setUsers(Set<User> users) { public void setUsers(Set<User> users) {
this.users = users; this.users = users;
} }
} }
demo/src/main/java/com/example/demo/entity/RecipeIngredient.java
+69 -40
View File
@@ -5,59 +5,88 @@ import java.math.BigDecimal;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@Entity @Entity
@Table(name = "recipe_ingredient_junction", @Table(name = "recipe_ingredient_junction", uniqueConstraints = {
uniqueConstraints = {@UniqueConstraint(columnNames = {"recipe_id", "ingredient_id"})}) @UniqueConstraint(columnNames = { "recipe_id", "ingredient_id" }) })
@EqualsAndHashCode( @EqualsAndHashCode(onlyExplicitlyIncluded = true)
onlyExplicitlyIncluded = true
)
public class RecipeIngredient { public class RecipeIngredient {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "recipe_id", nullable = false) @JoinColumn(name = "recipe_id", nullable = false)
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private Recipe recipe; private Recipe recipe;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ingredient_id", nullable = false) @JoinColumn(name = "ingredient_id", nullable = false)
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private Ingredient ingredient; private Ingredient ingredient;
private BigDecimal quantity; private BigDecimal quantity;
private String unit; private String unit;
private String notes; private String notes;
public RecipeIngredient() {} public RecipeIngredient() {
}
public RecipeIngredient(Recipe recipe, Ingredient ingredient, BigDecimal quantity, String unit, String notes) { public RecipeIngredient(Recipe recipe, Ingredient ingredient, BigDecimal quantity, String unit, String notes) {
this.recipe = recipe; this.recipe = recipe;
this.ingredient = ingredient; this.ingredient = ingredient;
this.quantity = quantity; this.quantity = quantity;
this.unit = unit; this.unit = unit;
this.notes = notes; this.notes = notes;
} }
// Getters and setters // Getters and setters
public Integer getId() { return id; } public Integer getId() {
public void setId(Integer id) { this.id = id; } return id;
}
public Recipe getRecipe() { return recipe; } public void setId(Integer id) {
public void setRecipe(Recipe recipe) { this.recipe = recipe; } this.id = id;
}
public Ingredient getIngredient() { return ingredient; } public Recipe getRecipe() {
public void setIngredient(Ingredient ingredient) { this.ingredient = ingredient; } return recipe;
}
public BigDecimal getQuantity() { return quantity; } public void setRecipe(Recipe recipe) {
public void setQuantity(BigDecimal quantity) { this.quantity = quantity; } this.recipe = recipe;
}
public String getUnit() { return unit; } public Ingredient getIngredient() {
public void setUnit(String unit) { this.unit = unit; } return ingredient;
}
public String getNotes() { return notes; } public void setIngredient(Ingredient ingredient) {
public void setNotes(String notes) { this.notes = notes; } this.ingredient = ingredient;
}
public BigDecimal getQuantity() {
return quantity;
}
public void setQuantity(BigDecimal quantity) {
this.quantity = quantity;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getNotes() {
return notes;
}
public void setNotes(String notes) {
this.notes = notes;
}
} }
demo/src/main/java/com/example/demo/entity/RecipeTagId.java
+35 -34
View File
@@ -8,49 +8,50 @@ import java.util.Objects;
@Embeddable @Embeddable
public class RecipeTagId implements Serializable { public class RecipeTagId implements Serializable {
private static final long serialVersionUID = 5272431101708393749L; private static final long serialVersionUID = 5272431101708393749L;
@Column(name = "recipe_id") @Column(name = "recipe_id")
private Integer recipeId; private Integer recipeId;
@Column(name = "tag_id") @Column(name = "tag_id")
private Integer tagId; private Integer tagId;
public RecipeTagId() {} public RecipeTagId() {
}
public RecipeTagId(Integer recipeId, Integer tagId) { public RecipeTagId(Integer recipeId, Integer tagId) {
this.recipeId = recipeId; this.recipeId = recipeId;
this.tagId = tagId; this.tagId = tagId;
} }
public Integer getRecipeId() { public Integer getRecipeId() {
return recipeId; return recipeId;
} }
public void setRecipeId(Integer recipeId) { public void setRecipeId(Integer recipeId) {
this.recipeId = recipeId; this.recipeId = recipeId;
} }
public Integer getTagId() { public Integer getTagId() {
return tagId; return tagId;
} }
public void setTagId(Integer tagId) { public void setTagId(Integer tagId) {
this.tagId = tagId; this.tagId = tagId;
} }
// REQUIRED for composite keys @Override
@Override public boolean equals(Object o) {
public boolean equals(Object o) { if (this == o)
if (this == o) return true; return true;
if (!(o instanceof RecipeTagId)) return false; if (!(o instanceof RecipeTagId))
RecipeTagId that = (RecipeTagId) o; return false;
return Objects.equals(recipeId, that.recipeId) && RecipeTagId that = (RecipeTagId) o;
Objects.equals(tagId, that.tagId); return Objects.equals(recipeId, that.recipeId) && Objects.equals(tagId, that.tagId);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(recipeId, tagId); return Objects.hash(recipeId, tagId);
} }
} }
demo/src/main/java/com/example/demo/entity/Step.java
+41 -25
View File
@@ -7,34 +7,40 @@ import lombok.EqualsAndHashCode;
@Table(name = "steps") @Table(name = "steps")
public class Step { public class Step {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@Column(name = "step_number", nullable = false) @Column(name = "step_number", nullable = false)
private Integer stepNumber; private Integer stepNumber;
@Column(name = "instruction", nullable = false, columnDefinition = "TEXT") @Column(name = "instruction", nullable = false, columnDefinition = "TEXT")
private String instruction; private String instruction;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "recipe_id", nullable = false) @JoinColumn(name = "recipe_id", nullable = false)
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private Recipe recipe; private Recipe recipe;
public Step() {} public Step() {
}
public Step(Recipe recipe, Integer stepNumber, String instruction) { public Step(Recipe recipe, Integer stepNumber, String instruction) {
this.recipe = recipe; this.recipe = recipe;
this.stepNumber = stepNumber; this.stepNumber = stepNumber;
this.instruction = instruction; this.instruction = instruction;
} }
// Getters and setters // Getters and setters
public Integer getId() { return id; } public Integer getId() {
public void setId(Integer id) { this.id = id; } return id;
}
public Recipe getRecipe() { public void setId(Integer id) {
this.id = id;
}
public Recipe getRecipe() {
return recipe; return recipe;
} }
@@ -42,9 +48,19 @@ public class Step {
this.recipe = recipe; this.recipe = recipe;
} }
public Integer getStepNumber() { return stepNumber; } public Integer getStepNumber() {
public void setStepNumber(Integer stepNumber) { this.stepNumber = stepNumber; } return stepNumber;
}
public String getInstruction() { return instruction; } public void setStepNumber(Integer stepNumber) {
public void setInstruction(String instruction) { this.instruction = instruction; } this.stepNumber = stepNumber;
}
public String getInstruction() {
return instruction;
}
public void setInstruction(String instruction) {
this.instruction = instruction;
}
} }
demo/src/main/java/com/example/demo/entity/Tag.java
+26 -27
View File
@@ -9,40 +9,40 @@ import jakarta.persistence.*;
@Table(name = "tags") @Table(name = "tags")
public class Tag { public class Tag {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@Column(nullable = false, unique = true) @Column(nullable = false, unique = true)
private String name; private String name;
// Recipe is the manager for this relationship // Recipe is the manager for this relationship
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "tags") @ManyToMany(fetch = FetchType.LAZY, mappedBy = "tags")
private Set<Recipe> recipes = new HashSet<>(); private Set<Recipe> recipes = new HashSet<>();
// Required by JPA public Tag() {
public Tag() {} }
public Tag(String name) { public Tag(String name) {
this.name = name; this.name = name;
} }
// Getters and setters // Getters and setters
public Integer getId() { public Integer getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
public String getName() { public String getName() {
return name; return name;
} }
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public Set<Recipe> getRecipes() { public Set<Recipe> getRecipes() {
return recipes; return recipes;
@@ -52,5 +52,4 @@ public class Tag {
this.recipes = recipes; this.recipes = recipes;
} }
} }
demo/src/main/java/com/example/demo/entity/User.java
+69 -42
View File
@@ -20,63 +20,91 @@ import java.util.Set;
@Table(name = "users") @Table(name = "users")
public class User { public class User {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
@Column(nullable = false, unique = true) @Column(nullable = false, unique = true)
private String username; private String username;
private String role; private String role;
@Column(unique = true) @Column(unique = true)
private String email; private String email;
private String hashedpassword; private String hashedpassword;
@Column(name = "created_at") @Column(name = "created_at")
private LocalDateTime createdAt; private LocalDateTime createdAt;
// User Recipe relationship // User Recipe relationship
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
private Set<Recipe> recipes = new HashSet<>(); private Set<Recipe> recipes = new HashSet<>();
// Favorite relationship and also junction table // Favorite relationship and also junction table
@ManyToMany(fetch = FetchType.LAZY) @ManyToMany(fetch = FetchType.LAZY)
@JoinTable(name = "favorites", @JoinTable(name = "favorites", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns = {
joinColumns = {@JoinColumn(name = "userId")}, @JoinColumn(name = "recipeId") })
inverseJoinColumns = {@JoinColumn(name = "recipeId")}) private Set<Recipe> FavRecipes = new HashSet<>();
private Set<Recipe> FavRecipes = new HashSet<>();
// Constructors public User() {
public User() {} }
public User(String username, String role, String email, String hashedpassword, LocalDateTime createdAt) { public User(String username, String role, String email, String hashedpassword, LocalDateTime createdAt) {
this.username = username; this.username = username;
this.role = role; this.role = role;
this.email = email; this.email = email;
this.hashedpassword = hashedpassword; this.hashedpassword = hashedpassword;
this.createdAt = createdAt; this.createdAt = createdAt;
} }
public Integer getId() {
return id;
}
public Integer getId() { return id; } public void setId(Integer id) {
public void setId(Integer id) { this.id = id; } this.id = id;
}
public String getUsername() { return username; } public String getUsername() {
public void setUsername(String username) { this.username = username; } return username;
}
public String getRole() { return role; } public void setUsername(String username) {
public void setRole(String role) { this.role = role; } this.username = username;
}
public String getEmail() { return email; } public String getRole() {
public void setEmail(String email) { this.email = email; } return role;
}
public String getHashedpassword() { return hashedpassword; } public void setRole(String role) {
public void setHashedpassword(String hashedpassword) { this.hashedpassword = hashedpassword; } this.role = role;
}
public LocalDateTime getCreatedAt() { return createdAt; } public String getEmail() {
public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; } return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getHashedpassword() {
return hashedpassword;
}
public void setHashedpassword(String hashedpassword) {
this.hashedpassword = hashedpassword;
}
public LocalDateTime getCreatedAt() {
return createdAt;
}
public void setCreatedAt(LocalDateTime createdAt) {
this.createdAt = createdAt;
}
public Set<Recipe> getFavRecipes() { public Set<Recipe> getFavRecipes() {
return FavRecipes; return FavRecipes;
@@ -86,5 +114,4 @@ public class User {
FavRecipes = favRecipes; FavRecipes = favRecipes;
} }
} }
demo/src/main/java/com/example/demo/exception/NotFoundException.java
+2 -3
View File
@@ -3,8 +3,8 @@ package com.example.demo.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus (value = HttpStatus.NOT_FOUND) @ResponseStatus(value = HttpStatus.NOT_FOUND)
public class NotFoundException extends RuntimeException{ public class NotFoundException extends RuntimeException {
private static final long serialVersionUID = 1l; private static final long serialVersionUID = 1l;
private String resourceName; private String resourceName;
@@ -26,7 +26,6 @@ public class NotFoundException extends RuntimeException{
return fieldName; return fieldName;
} }
public Object getFieldValue() { public Object getFieldValue() {
return fieldValue; return fieldValue;
} }
demo/src/main/java/com/example/demo/repository/ImageRepo.java
-1
View File
@@ -5,7 +5,6 @@ import com.example.demo.entity.Image;
import java.util.List; import java.util.List;
public interface ImageRepo extends JpaRepository<Image, Integer> { public interface ImageRepo extends JpaRepository<Image, Integer> {
} }
demo/src/main/java/com/example/demo/repository/IngredientRepo.java
-1
View File
@@ -5,7 +5,6 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import com.example.demo.entity.Ingredient; import com.example.demo.entity.Ingredient;
public interface IngredientRepo extends JpaRepository<Ingredient, Integer> { public interface IngredientRepo extends JpaRepository<Ingredient, Integer> {
Optional<Ingredient> findByName(String name); Optional<Ingredient> findByName(String name);
} }
demo/src/main/java/com/example/demo/repository/RecipeIngredientRepo.java
+1 -1
View File
@@ -6,6 +6,6 @@ import com.example.demo.entity.Recipe;
import com.example.demo.entity.RecipeIngredient; import com.example.demo.entity.RecipeIngredient;
public interface RecipeIngredientRepo extends JpaRepository<RecipeIngredient, Integer> { public interface RecipeIngredientRepo extends JpaRepository<RecipeIngredient, Integer> {
// Custom query: find all ingredients for a recipe // Custom query: find all ingredients for a recipe
void deleteByRecipe(Recipe recipe); void deleteByRecipe(Recipe recipe);
} }
demo/src/main/java/com/example/demo/repository/RecipeRepo.java
-1
View File
@@ -3,7 +3,6 @@ package com.example.demo.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import com.example.demo.entity.Recipe; import com.example.demo.entity.Recipe;
public interface RecipeRepo extends JpaRepository<Recipe, Integer> { public interface RecipeRepo extends JpaRepository<Recipe, Integer> {
} }
demo/src/main/java/com/example/demo/repository/RecipeTagRepo.java
-1
View File
@@ -1,6 +1,5 @@
package com.example.demo.repository; package com.example.demo.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import com.example.demo.entity.RecipeTag; import com.example.demo.entity.RecipeTag;
import com.example.demo.entity.RecipeTagId; import com.example.demo.entity.RecipeTagId;
demo/src/main/java/com/example/demo/repository/StepRepo.java
-1
View File
@@ -8,5 +8,4 @@ import java.util.List;
public interface StepRepo extends JpaRepository<Step, Integer> { public interface StepRepo extends JpaRepository<Step, Integer> {
} }
demo/src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
+191 -258
View File
@@ -31,18 +31,19 @@ import com.example.demo.service.RecipeService;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
@Service @Service
public class RecipeServiceImpl implements RecipeService{ public class RecipeServiceImpl implements RecipeService {
private RecipeRepo recipeRepository;
private IngredientRepo ingredientRepository;
private RecipeIngredientRepo recipeIngredientRepository;
private UserRepo userRepository;
private StepRepo stepRepository;
private ImageRepo imageRepository;
private TagRepo tagRepository;
private RecipeRepo recipeRepository; public RecipeServiceImpl(RecipeRepo recipeRepository, IngredientRepo ingredientRepository,
private IngredientRepo ingredientRepository; RecipeIngredientRepo recipeIngredientRepository, UserRepo userRepository, StepRepo stepRepository,
private RecipeIngredientRepo recipeIngredientRepository; ImageRepo imageRepository, TagRepo tagRepository) {
private UserRepo userRepository;
private StepRepo stepRepository;
private ImageRepo imageRepository;
private TagRepo tagRepository;
public RecipeServiceImpl(RecipeRepo recipeRepository, IngredientRepo ingredientRepository, RecipeIngredientRepo recipeIngredientRepository, UserRepo userRepository, StepRepo stepRepository, ImageRepo imageRepository, TagRepo tagRepository) {
super(); super();
this.recipeRepository = recipeRepository; this.recipeRepository = recipeRepository;
this.ingredientRepository = ingredientRepository; this.ingredientRepository = ingredientRepository;
@@ -54,332 +55,264 @@ private TagRepo tagRepository;
} }
public RecipeDto convertToDto(Recipe recipe) { public RecipeDto convertToDto(Recipe recipe) {
List<RecipeIngredientDto> ingredientDtos = recipe.getRecipeIngredients().stream() List<RecipeIngredientDto> ingredientDtos = recipe.getRecipeIngredients().stream()
.map(ri -> new RecipeIngredientDto( .map(ri -> new RecipeIngredientDto(ri.getIngredient().getName(), ri.getQuantity(), ri.getUnit(),
ri.getIngredient().getName(), ri.getNotes()))
ri.getQuantity(), .toList();
ri.getUnit(),
ri.getNotes()
))
.toList();
List<StepDto> stepDtos = recipe.getSteps().stream() List<StepDto> stepDtos = recipe.getSteps().stream()
.map(ri -> new StepDto( .map(ri -> new StepDto(ri.getStepNumber(), ri.getInstruction())).toList();
ri.getStepNumber(),
ri.getInstruction()
))
.toList();
List<ImageDto> imageDtos = recipe.getImages().stream() List<ImageDto> imageDtos = recipe.getImages().stream().map(ri -> new ImageDto(ri.getImageUrl())).toList();
.map(ri -> new ImageDto(
ri.getImageUrl()
))
.toList();
List<TagDto> tagDtos = recipe.getTags().stream() List<TagDto> tagDtos = recipe.getTags().stream().map(ri -> new TagDto(ri.getName())).toList();
.map(ri -> new TagDto(
ri.getName()
))
.toList();
UserDto userDto = new UserDto(recipe.getUser().getId(), recipe.getUser().getUsername(), recipe.getUser().getEmail()); UserDto userDto = new UserDto(recipe.getUser().getId(), recipe.getUser().getUsername(),
recipe.getUser().getEmail());
return new RecipeDto( return new RecipeDto(recipe.getTitle(), recipe.getDescription(), recipe.getPrepTimeMinutes(),
recipe.getTitle(), recipe.getCookTimeMinutes(), recipe.getServings(), userDto, recipe.getStatus(), ingredientDtos,
recipe.getDescription(), stepDtos, imageDtos, tagDtos);
recipe.getPrepTimeMinutes(),
recipe.getCookTimeMinutes(),
recipe.getServings(),
userDto,
recipe.getStatus(),
ingredientDtos,
stepDtos,
imageDtos,
tagDtos
);
} }
@Override @Override
public RecipeDto saveRecipe(RecipeDto dto) { public RecipeDto saveRecipe(RecipeDto dto) {
User user = userRepository.findById(dto.getUserDto().getId()) User user = userRepository.findById(dto.getUserDto().getId())
.orElseThrow(() -> new NotFoundException("User", "id", dto.getUserDto().getId())); .orElseThrow(() -> new NotFoundException("User", "id", dto.getUserDto().getId()));
Recipe recipe = new Recipe( Recipe recipe = new Recipe(dto.getTitle(), dto.getDescription(), dto.getPrepTimeMinutes(),
dto.getTitle(), dto.getCookTimeMinutes(), dto.getServings(), user, dto.getStatus());
dto.getDescription(),
dto.getPrepTimeMinutes(),
dto.getCookTimeMinutes(),
dto.getServings(),
user,
dto.getStatus()
);
for (RecipeIngredientDto riDto : dto.getIngredients()) {
for (RecipeIngredientDto riDto : dto.getIngredients()) { Ingredient ingredient = ingredientRepository.findByName(riDto.getIngredientName())
.orElseGet(() -> new Ingredient(riDto.getIngredientName()));
if (ingredient.getId() == null) {
ingredientRepository.save(ingredient);
}
Ingredient ingredient = ingredientRepository.findByName(riDto.getIngredientName()) RecipeIngredient ri = new RecipeIngredient(recipe, ingredient, riDto.getQuantity(), riDto.getUnit(),
.orElseGet(() -> new Ingredient(riDto.getIngredientName())); riDto.getNotes());
recipe.getRecipeIngredients().add(ri);
}
if (ingredient.getId() == null) { if (dto.getSteps() != null) {
ingredientRepository.save(ingredient); for (StepDto stepDto : dto.getSteps()) {
} Step step = new Step(recipe, stepDto.getStepNumber(), stepDto.getInstruction());
recipe.getSteps().add(step);
}
}
RecipeIngredient ri = new RecipeIngredient( if (dto.getImages() != null) {
recipe, for (ImageDto imageDto : dto.getImages()) {
ingredient, Image image = new Image(recipe, imageDto.getImageUrl());
riDto.getQuantity(), recipe.getImages().add(image);
riDto.getUnit(), }
riDto.getNotes() }
);
recipe.getRecipeIngredients().add(ri); for (TagDto tDto : dto.getTags()) {
}
if (dto.getSteps() != null) { Tag tag = tagRepository.findByName(tDto.getName()).orElseGet(() -> new Tag(tDto.getName()));
for (StepDto stepDto : dto.getSteps()) {
Step step = new Step(recipe, stepDto.getStepNumber(), stepDto.getInstruction());
recipe.getSteps().add(step);
}
}
if (dto.getImages() != null) { if (tag.getId() == null) {
for (ImageDto imageDto : dto.getImages()) { tagRepository.save(tag);
Image image = new Image(recipe, imageDto.getImageUrl()); }
recipe.getImages().add(image); recipe.getTags().add(tag);
} }
}
// if (dto.getTags() != null) { Recipe saved = recipeRepository.save(recipe);
// for (TagDto tagDto : dto.getTags()) {
// Tag tag = new Tag(tagDto.getName());
// tagRepository.save(tag);
// recipe.getTags().add(tag);
// }
// }
for (TagDto tDto : dto.getTags()) { return convertToDto(saved);
}
Tag tag = tagRepository.findByName(tDto.getName())
.orElseGet(() -> new Tag(tDto.getName()));
if (tag.getId() == null) {
tagRepository.save(tag);
}
recipe.getTags().add(tag);
}
Recipe saved = recipeRepository.save(recipe);
return convertToDto(saved);
}
@Override @Override
@Transactional @Transactional
public List<RecipeDto> getAllRecipes() { public List<RecipeDto> getAllRecipes() {
List<RecipeDto> list = new ArrayList<>(); List<RecipeDto> list = new ArrayList<>();
for (Recipe recipe : recipeRepository.findAll()) { for (Recipe recipe : recipeRepository.findAll()) {
RecipeDto recipeDto = convertToDto(recipe); RecipeDto recipeDto = convertToDto(recipe);
list.add(recipeDto); list.add(recipeDto);
} }
return list; return list;
} }
@Override @Override
@Transactional @Transactional
public RecipeDto getRecipeById(Integer Id) { public RecipeDto getRecipeById(Integer Id) {
return convertToDto(recipeRepository.findById(Id).orElseThrow(() -> return convertToDto(recipeRepository.findById(Id).orElseThrow(() -> new NotFoundException("Recipe", "id", Id)));
new NotFoundException("Recipe", "id", Id)));
} }
@Override @Override
@Transactional @Transactional
public RecipeDto updateRecipe(RecipeDto recipeDto, Integer id) { public RecipeDto updateRecipe(RecipeDto recipeDto, Integer id) {
Recipe existingRecipe = recipeRepository.findById(id) Recipe existingRecipe = recipeRepository.findById(id)
.orElseThrow(() -> new NotFoundException("Recipe", "id", id)); .orElseThrow(() -> new NotFoundException("Recipe", "id", id));
existingRecipe.setTitle(recipeDto.getTitle()); existingRecipe.setTitle(recipeDto.getTitle());
existingRecipe.setDescription(recipeDto.getDescription()); existingRecipe.setDescription(recipeDto.getDescription());
existingRecipe.setPrepTimeMinutes(recipeDto.getPrepTimeMinutes()); existingRecipe.setPrepTimeMinutes(recipeDto.getPrepTimeMinutes());
existingRecipe.setCookTimeMinutes(recipeDto.getCookTimeMinutes()); existingRecipe.setCookTimeMinutes(recipeDto.getCookTimeMinutes());
existingRecipe.setServings(recipeDto.getServings()); existingRecipe.setServings(recipeDto.getServings());
existingRecipe.setStatus(recipeDto.getStatus()); existingRecipe.setStatus(recipeDto.getStatus());
List<RecipeIngredientDto> updatedIngredients = recipeDto.getIngredients();
List<RecipeIngredient> ingredientsToRemove = new ArrayList<>();
List<RecipeIngredientDto> updatedIngredients = recipeDto.getIngredients(); List<StepDto> updatedSteps = recipeDto.getSteps();
List<RecipeIngredient> ingredientsToRemove = new ArrayList<>(); List<Step> stepsToRemove = new ArrayList<>();
List<StepDto> updatedSteps = recipeDto.getSteps(); List<ImageDto> updatedImages = recipeDto.getImages();
List<Step> stepsToRemove = new ArrayList<>(); List<Image> imagesToRemove = new ArrayList<>();
List<ImageDto> updatedImages = recipeDto.getImages(); List<TagDto> updatedTags = recipeDto.getTags();
List<Image> imagesToRemove = new ArrayList<>(); List<Tag> tagsToRemove = new ArrayList<>();
List<TagDto> updatedTags = recipeDto.getTags(); for (RecipeIngredient ri : existingRecipe.getRecipeIngredients()) {
List<Tag> tagsToRemove = new ArrayList<>();
for (RecipeIngredient ri : existingRecipe.getRecipeIngredients()) { boolean existsInUpdatedList = false;
for (RecipeIngredientDto dto : updatedIngredients) {
String updatedName = dto.getIngredientName();
String existingName = ri.getIngredient().getName();
boolean existsInUpdatedList = false; if (updatedName.equals(existingName)) {
for (RecipeIngredientDto dto : updatedIngredients) { existsInUpdatedList = true;
String updatedName = dto.getIngredientName(); break;
String existingName = ri.getIngredient().getName(); }
}
if (updatedName.equals(existingName)) { if (!existsInUpdatedList) {
existsInUpdatedList = true; ingredientsToRemove.add(ri);
break; }
} }
}
if (!existsInUpdatedList) { existingRecipe.getRecipeIngredients().removeAll(ingredientsToRemove);
ingredientsToRemove.add(ri);
}
}
existingRecipe.getRecipeIngredients().removeAll(ingredientsToRemove); for (RecipeIngredientDto riDto : updatedIngredients) {
for (RecipeIngredientDto riDto : updatedIngredients) { // go through the old list of ingredients until we find a match with updated
// list
RecipeIngredient existingRI = existingRecipe.getRecipeIngredients().stream()
.filter(ri -> ri.getIngredient().getName().equals(riDto.getIngredientName())).findFirst()
.orElse(null);
// go through the old list of ingredients until we find a match with updated list // if old ingredient just update parameters
RecipeIngredient existingRI = existingRecipe.getRecipeIngredients().stream() if (existingRI != null) {
.filter(ri -> ri.getIngredient().getName().equals(riDto.getIngredientName()))
.findFirst()
.orElse(null);
existingRI.setQuantity(riDto.getQuantity());
existingRI.setUnit(riDto.getUnit());
existingRI.setNotes(riDto.getNotes());
}
// if old ingredient just update parameters // if new ingredient, have to make a whole new thing
if (existingRI != null) { else {
existingRI.setQuantity(riDto.getQuantity()); Ingredient ingredient = ingredientRepository.findByName(riDto.getIngredientName())
existingRI.setUnit(riDto.getUnit()); .orElseGet(() -> new Ingredient(riDto.getIngredientName()));
existingRI.setNotes(riDto.getNotes());
}
// if new ingredient, have to make a whole new thing if (ingredient.getId() == null) {
else { ingredientRepository.save(ingredient);
}
Ingredient ingredient = ingredientRepository.findByName(riDto.getIngredientName()) RecipeIngredient newRI = new RecipeIngredient(existingRecipe, ingredient, riDto.getQuantity(),
.orElseGet(() -> new Ingredient(riDto.getIngredientName())); riDto.getUnit(), riDto.getNotes());
if (ingredient.getId() == null) { existingRecipe.getRecipeIngredients().add(newRI);
ingredientRepository.save(ingredient); }
} }
RecipeIngredient newRI = new RecipeIngredient( if (updatedSteps != null) {
existingRecipe, // find steps that weren't included
ingredient, for (Step step : existingRecipe.getSteps()) {
riDto.getQuantity(), boolean existsInUpdatedList = updatedSteps.stream()
riDto.getUnit(), .anyMatch(dto -> dto.getStepNumber().equals(step.getStepNumber()));
riDto.getNotes()
);
existingRecipe.getRecipeIngredients().add(newRI); if (!existsInUpdatedList)
} stepsToRemove.add(step);
} }
// delete those steps
existingRecipe.getSteps().removeAll(stepsToRemove);
if(updatedSteps != null) { // go through updated steps
// find steps that weren't included for (StepDto stepDto : updatedSteps) {
for (Step step : existingRecipe.getSteps()) {
boolean existsInUpdatedList = updatedSteps.stream()
.anyMatch(dto -> dto.getStepNumber().equals(step.getStepNumber()));
if (!existsInUpdatedList) stepsToRemove.add(step); // find matching step by step number
} Step existingStep = existingRecipe.getSteps().stream()
// delete those steps .filter(s -> s.getStepNumber().equals(stepDto.getStepNumber())).findFirst().orElse(null);
existingRecipe.getSteps().removeAll(stepsToRemove);
// go through updated steps // if there's a match update the instruction string
for (StepDto stepDto : updatedSteps) { if (existingStep != null) {
existingStep.setInstruction(stepDto.getInstruction());
}
// find matching step by step number // if no match then make a whole new step
Step existingStep = existingRecipe.getSteps().stream() else {
.filter(s -> s.getStepNumber().equals(stepDto.getStepNumber())) Step newStep = new Step(existingRecipe, stepDto.getStepNumber(), stepDto.getInstruction());
.findFirst() existingRecipe.getSteps().add(newStep);
.orElse(null); }
}
}
// if there's a match update the instruction string // same process as above just with images instead
if (existingStep != null) { if (updatedImages != null) {
existingStep.setInstruction(stepDto.getInstruction()); for (Image image : existingRecipe.getImages()) {
} boolean existsInUpdatedList = updatedImages.stream()
.anyMatch(dto -> dto.getImageUrl().equals(image.getImageUrl()));
if (!existsInUpdatedList)
imagesToRemove.add(image);
}
// if no match then make a whole new step existingRecipe.getImages().removeAll(imagesToRemove);
else {
Step newStep = new Step(existingRecipe, stepDto.getStepNumber(), stepDto.getInstruction());
existingRecipe.getSteps().add(newStep);
}
}
}
//same process as above just with images instead for (ImageDto imageDto : updatedImages) {
if (updatedImages != null) { Image existingImage = existingRecipe.getImages().stream()
for (Image image : existingRecipe.getImages()) { .filter(img -> img.getImageUrl().equals(imageDto.getImageUrl())).findFirst().orElse(null);
boolean existsInUpdatedList = updatedImages.stream()
.anyMatch(dto -> dto.getImageUrl().equals(image.getImageUrl()));
if (!existsInUpdatedList) imagesToRemove.add(image);
}
existingRecipe.getImages().removeAll(imagesToRemove); if (existingImage != null) {
existingImage.setImageUrl(imageDto.getImageUrl());
} else {
Image newImage = new Image(existingRecipe, imageDto.getImageUrl());
existingRecipe.getImages().add(newImage);
}
}
}
for (ImageDto imageDto : updatedImages) { // same process as above just with tags instead, except for saving the tag
Image existingImage = existingRecipe.getImages().stream() // since the relationship for this one was slightly different
.filter(img -> img.getImageUrl().equals(imageDto.getImageUrl())) if (updatedTags != null) {
.findFirst() for (Tag tag : existingRecipe.getTags()) {
.orElse(null); boolean existsInUpdatedList = updatedTags.stream().anyMatch(dto -> dto.getName().equals(tag.getName()));
if (!existsInUpdatedList)
tagsToRemove.add(tag);
}
if (existingImage != null) { existingRecipe.getTags().removeAll(tagsToRemove);
existingImage.setImageUrl(imageDto.getImageUrl());
}
else {
Image newImage = new Image(existingRecipe, imageDto.getImageUrl());
existingRecipe.getImages().add(newImage);
}
}
}
for (TagDto tagDto : updatedTags) {
Tag existingTag = existingRecipe.getTags().stream()
.filter(tag -> tag.getName().equals(tagDto.getName())).findFirst().orElse(null);
if (existingTag != null) {
existingTag.setName(tagDto.getName());
} else {
Tag newTag = tagRepository.findByName(tagDto.getName())
.orElseGet(() -> tagRepository.save(new Tag(tagDto.getName())));
//same process as above just with tags instead, except for saving the tag existingRecipe.getTags().add(newTag);
// since the relationship for this one was slightly different }
if (updatedTags != null) { }
for (Tag tag : existingRecipe.getTags()) { }
boolean existsInUpdatedList = updatedTags.stream() recipeRepository.save(existingRecipe);
.anyMatch(dto -> dto.getName().equals(tag.getName())); return convertToDto(existingRecipe);
if (!existsInUpdatedList) tagsToRemove.add(tag);
}
existingRecipe.getTags().removeAll(tagsToRemove);
for (TagDto tagDto : updatedTags) {
Tag existingTag = existingRecipe.getTags().stream()
.filter(tag -> tag.getName().equals(tagDto.getName()))
.findFirst()
.orElse(null);
if (existingTag != null) {
existingTag.setName(tagDto.getName());
}
else {
Tag newTag = tagRepository.findByName(tagDto.getName())
.orElseGet(() -> tagRepository.save(new Tag(tagDto.getName())));
existingRecipe.getTags().add(newTag);
}
}
}
recipeRepository.save(existingRecipe);
return convertToDto(existingRecipe);
} }
@Override @Override
public void deleteRecipe(Integer Id) { public void deleteRecipe(Integer Id) {
recipeRepository.findById(Id) recipeRepository.findById(Id).orElseThrow(() -> new NotFoundException("Recipe", "id", Id));
.orElseThrow(() -> new NotFoundException("Recipe", "id", Id));
recipeRepository.deleteById(Id); recipeRepository.deleteById(Id);
} }
demo/src/main/java/com/example/demo/service/Impl/UserServiceImpl.java
+19 -29
View File
@@ -22,7 +22,7 @@ import com.example.demo.service.UserService;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
@Service @Service
public class UserServiceImpl implements UserService{ public class UserServiceImpl implements UserService {
private UserRepo userRepository; private UserRepo userRepository;
private RecipeRepo recipeRepository; private RecipeRepo recipeRepository;
@@ -34,11 +34,7 @@ public class UserServiceImpl implements UserService{
} }
public UserDto convertToDto(User user) { public UserDto convertToDto(User user) {
return new UserDto( return new UserDto(user.getId(), user.getUsername(), user.getEmail());
user.getId(),
user.getUsername(),
user.getEmail()
);
} }
@Override @Override
@@ -50,33 +46,31 @@ public class UserServiceImpl implements UserService{
public List<UserDto> getAllUsers() { public List<UserDto> getAllUsers() {
List<UserDto> list = new ArrayList<>(); List<UserDto> list = new ArrayList<>();
for (User user : userRepository.findAll()) { for (User user : userRepository.findAll()) {
UserDto userDto = convertToDto(user); UserDto userDto = convertToDto(user);
list.add(userDto); list.add(userDto);
} }
return list; return list;
} }
@Override @Override
public UserDto getUserById(Integer Id) { public UserDto getUserById(Integer Id) {
return convertToDto(userRepository.findById(Id).orElseThrow(() -> return convertToDto(userRepository.findById(Id).orElseThrow(() -> new NotFoundException("User", "id", Id)));
new NotFoundException("User", "id", Id)));
} }
@Override @Override
@Transactional @Transactional
public UserDto saveFavorite(Integer userId, Integer recipeId) { public UserDto saveFavorite(Integer userId, Integer recipeId) {
User existingUser = userRepository.findById(userId).orElseThrow( User existingUser = userRepository.findById(userId)
() -> new NotFoundException("User", "id", userId)); .orElseThrow(() -> new NotFoundException("User", "id", userId));
Recipe existingRecipe = recipeRepository.findById(recipeId).orElseThrow( Recipe existingRecipe = recipeRepository.findById(recipeId)
() -> new NotFoundException("Recipe", "id", recipeId)); .orElseThrow(() -> new NotFoundException("Recipe", "id", recipeId));
existingUser.getFavRecipes().add(existingRecipe); existingUser.getFavRecipes().add(existingRecipe);
userRepository.save(existingUser); userRepository.save(existingUser);
return convertToDto(existingUser); return convertToDto(existingUser);
} }
@@ -84,8 +78,7 @@ public class UserServiceImpl implements UserService{
@Override @Override
public UserDto updateUser(User user, Integer Id) { public UserDto updateUser(User user, Integer Id) {
User existingUser = userRepository.findById(Id).orElseThrow( User existingUser = userRepository.findById(Id).orElseThrow(() -> new NotFoundException("User", "id", Id));
() -> new NotFoundException("User", "id", Id));
existingUser.setUsername(user.getUsername()); existingUser.setUsername(user.getUsername());
existingUser.setEmail(user.getEmail()); existingUser.setEmail(user.getEmail());
@@ -97,25 +90,22 @@ public class UserServiceImpl implements UserService{
@Override @Override
public void deleteUser(Integer Id) { public void deleteUser(Integer Id) {
userRepository.findById(Id).orElseThrow( userRepository.findById(Id).orElseThrow(() -> new NotFoundException("User", "id", Id));
() -> new NotFoundException("User", "id", Id));
userRepository.deleteById(Id); userRepository.deleteById(Id);
} }
@Override @Override
@Transactional @Transactional
public void deleteFavorite(Integer userId, Integer recipeId) { public void deleteFavorite(Integer userId, Integer recipeId) {
User existingUser = userRepository.findById(userId).orElseThrow( User existingUser = userRepository.findById(userId)
() -> new NotFoundException("User", "id", userId)); .orElseThrow(() -> new NotFoundException("User", "id", userId));
Recipe existingRecipe = recipeRepository.findById(recipeId).orElseThrow( Recipe existingRecipe = recipeRepository.findById(recipeId)
() -> new NotFoundException("Recipe", "id", recipeId)); .orElseThrow(() -> new NotFoundException("Recipe", "id", recipeId));
userRepository.save(existingUser); userRepository.save(existingUser);
existingUser.getFavRecipes().remove(existingRecipe); existingUser.getFavRecipes().remove(existingRecipe);
} }
} }
demo/src/main/java/com/example/demo/service/RecipeService.java
+6 -1
View File
@@ -9,11 +9,16 @@ import com.example.demo.entity.Recipe;
import com.example.demo.entity.User; import com.example.demo.entity.User;
public interface RecipeService { public interface RecipeService {
RecipeDto convertToDto(Recipe recipe) ; RecipeDto convertToDto(Recipe recipe);
RecipeDto saveRecipe(RecipeDto recipe); RecipeDto saveRecipe(RecipeDto recipe);
List<RecipeDto> getAllRecipes(); List<RecipeDto> getAllRecipes();
RecipeDto getRecipeById(Integer recipeId); RecipeDto getRecipeById(Integer recipeId);
RecipeDto updateRecipe(RecipeDto recipedto, Integer Id); RecipeDto updateRecipe(RecipeDto recipedto, Integer Id);
void deleteRecipe(Integer Id); void deleteRecipe(Integer Id);
} }
demo/src/main/java/com/example/demo/service/UserService.java
+7
View File
@@ -7,11 +7,18 @@ import com.example.demo.entity.User;
public interface UserService { public interface UserService {
UserDto convertToDto(User user); UserDto convertToDto(User user);
User saveUser(User user); User saveUser(User user);
List<UserDto> getAllUsers(); List<UserDto> getAllUsers();
UserDto getUserById(Integer Id); UserDto getUserById(Integer Id);
UserDto saveFavorite(Integer userId, Integer recipeId); UserDto saveFavorite(Integer userId, Integer recipeId);
UserDto updateUser(User user, Integer Id); UserDto updateUser(User user, Integer Id);
void deleteUser(Integer Id); void deleteUser(Integer Id);
void deleteFavorite(Integer userId, Integer recipeId); void deleteFavorite(Integer userId, Integer recipeId);
} }