Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ public class IngredientBookmark {
private User user;

@ManyToOne
@JoinColumn(name = "ingredient_management_pk")
private IngredientManagement ingredientManagement;
@JoinColumn(name = "ingredient_my_refrigerator_pk")
private IngredientMyRefrigerator ingredientMyRefrigerator;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
@Data
public class RequestRegistIngredientBookmark {
private long userPk;
private long ingredientPk;
private long ingredientMyRefrigeratorPk;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
import lombok.Data;
import moja.refrigerator.aggregate.ingredient.IngredientBookmark;
import moja.refrigerator.aggregate.ingredient.IngredientManagement;
import moja.refrigerator.aggregate.ingredient.IngredientMyRefrigerator;
import moja.refrigerator.aggregate.user.User;

@Data
public class ResponseRegistIngredientBookmark {
private long ingredientBookmarkPk;
private User user;
private IngredientManagement ingredientManagement;
private IngredientMyRefrigerator ingredientMyRefrigerator;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import lombok.Data;
import moja.refrigerator.aggregate.ingredient.IngredientManagement;
import moja.refrigerator.aggregate.ingredient.IngredientMyRefrigerator;

@Data
public class ResponseUsersIngredientBookmarkLists {
private IngredientManagement ingredientManagement;
private IngredientMyRefrigerator ingredientMyRefrigerator;
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ public ResponseRegistIngredientBookmark createIngredientBookmark(RequestRegistIn
User user = userRepository.findById(requestBookmark.getUserPk())
.orElseThrow(() -> new EntityNotFoundException("회원을 찾을 수 없습니다."));

IngredientManagement ingredientManagement = ingredientManagementRepository
.findById(requestBookmark.getIngredientPk())
IngredientMyRefrigerator ingredientManagement = ingredientMyRefrigeratorRepository
.findById(requestBookmark.getIngredientMyRefrigeratorPk())
.orElseThrow(() -> new EntityNotFoundException("재료를 찾을 수 없습니다."));

IngredientBookmark ingredientBookmark = new IngredientBookmark();

ingredientBookmark.setUser(user);
ingredientBookmark.setIngredientManagement(ingredientManagement);
ingredientBookmark.setIngredientMyRefrigerator(ingredientManagement);

ingredientBookmarkRepository.save(ingredientBookmark);

Expand Down Expand Up @@ -142,14 +142,14 @@ public ResponseDeleteIngredientBookmark deleteIngredientBookmark(

try {
ingredientBookmarkRepository.deleteById(requestDeleteBookmark.getIngredientBookmarkPk());
String message = ingredientBookmark.getIngredientManagement()
.getIngredientName() + " 재료의 즐겨찾기를 삭제했습니다";
String message = ingredientBookmark.getIngredientMyRefrigerator()
.getIngredientManagement().getIngredientName() + " 재료의 즐겨찾기를 삭제했습니다";
response.setMessage(message);
return response;
} catch (Exception e) {
String message =
ingredientBookmark.getIngredientManagement()
.getIngredientName() + " 재료의 즐겨찾기를 삭제 실패했습니다";
ingredientBookmark.getIngredientMyRefrigerator()
.getIngredientManagement().getIngredientName() + " 재료의 즐겨찾기를 삭제 실패했습니다";
response.setMessage(message);
return response;
}
Expand Down