Merge pull request #249 from marinesnow34/test

Fix: 삭제된 옵션 보여주지 않기 수정
readyvery · May 22, 2024 · e2dfdaf · e2dfdaf
2 parents ee73d8c + af66740
commit e2dfdaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/FoodieOption.java b/src/main/java/com/readyvery/readyverydemo/domain/FoodieOption.java
@@ -41,6 +41,10 @@ public class FoodieOption extends BaseTimeEntity {
 	@Column(nullable = false)
 	private Long price;
 
+	//식품 옵션 삭제 여부
+	@Column(nullable = false)
+	private Boolean isDelete;
+
 	//식품 옵션 연관관계 매핑
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "foodie_option_category_idx")

diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
@@ -65,6 +65,7 @@ private OptionCategoryDto foodieOptionCategoryToOptionCategoryDto(FoodieOptionCa
 			.options(
 				category.getFoodieOptions()
 					.stream()
+					.filter(options -> !options.getIsDelete())
 					.map(this::foodyOptionToOptionDto)
 					.toList())
 			.build();