From 672a111b71f5886be69578a9d0b7290ff3bcfe40 Mon Sep 17 00:00:00 2001 From: psyeon1120 Date: Mon, 29 Jul 2024 21:27:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#339=20entity:=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20ID=20strategy=20AUTO=20->=20IDENTITY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/icebutler_server/admin/entity/Admin.java | 2 +- .../example/icebutler_server/alarm/entity/PushNotification.java | 2 +- .../java/com/example/icebutler_server/cart/entity/Cart.java | 2 +- .../java/com/example/icebutler_server/cart/entity/CartFood.java | 2 +- .../java/com/example/icebutler_server/food/entity/Food.java | 2 +- .../java/com/example/icebutler_server/fridge/entity/Fridge.java | 2 +- .../com/example/icebutler_server/fridge/entity/FridgeFood.java | 2 +- .../com/example/icebutler_server/fridge/entity/FridgeUser.java | 2 +- .../java/com/example/icebutler_server/user/entity/User.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/icebutler_server/admin/entity/Admin.java b/src/main/java/com/example/icebutler_server/admin/entity/Admin.java index 81070db5..a09ba81f 100644 --- a/src/main/java/com/example/icebutler_server/admin/entity/Admin.java +++ b/src/main/java/com/example/icebutler_server/admin/entity/Admin.java @@ -13,7 +13,7 @@ @Entity @EntityListeners(UserEntityListener.class) public class Admin extends BaseEntity { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; @Column(nullable = false) diff --git a/src/main/java/com/example/icebutler_server/alarm/entity/PushNotification.java b/src/main/java/com/example/icebutler_server/alarm/entity/PushNotification.java index 420929e0..b77b1008 100644 --- a/src/main/java/com/example/icebutler_server/alarm/entity/PushNotification.java +++ b/src/main/java/com/example/icebutler_server/alarm/entity/PushNotification.java @@ -14,7 +14,7 @@ @Entity public class PushNotification extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/cart/entity/Cart.java b/src/main/java/com/example/icebutler_server/cart/entity/Cart.java index 822eca5e..e6f8f2ed 100644 --- a/src/main/java/com/example/icebutler_server/cart/entity/Cart.java +++ b/src/main/java/com/example/icebutler_server/cart/entity/Cart.java @@ -18,7 +18,7 @@ @EntityListeners(CartEntityListener.class) public class Cart extends BaseEntity { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/cart/entity/CartFood.java b/src/main/java/com/example/icebutler_server/cart/entity/CartFood.java index e6ca99dd..c8c6bc63 100644 --- a/src/main/java/com/example/icebutler_server/cart/entity/CartFood.java +++ b/src/main/java/com/example/icebutler_server/cart/entity/CartFood.java @@ -16,7 +16,7 @@ @SQLDelete(sql = "UPDATE cart_food SET is_enable = false, updated_at = current_timestamp WHERE id = ?") public class CartFood extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/food/entity/Food.java b/src/main/java/com/example/icebutler_server/food/entity/Food.java index eee17065..f6dbd545 100644 --- a/src/main/java/com/example/icebutler_server/food/entity/Food.java +++ b/src/main/java/com/example/icebutler_server/food/entity/Food.java @@ -27,7 +27,7 @@ @SQLDelete(sql = "UPDATE food SET is_enable = false, updated_at = current_timestamp WHERE id = ?") @EntityListeners(FoodEntityListener.class) public class Food extends BaseEntity { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; private String foodName; diff --git a/src/main/java/com/example/icebutler_server/fridge/entity/Fridge.java b/src/main/java/com/example/icebutler_server/fridge/entity/Fridge.java index bc344c73..53688194 100644 --- a/src/main/java/com/example/icebutler_server/fridge/entity/Fridge.java +++ b/src/main/java/com/example/icebutler_server/fridge/entity/Fridge.java @@ -19,7 +19,7 @@ public class Fridge extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/fridge/entity/FridgeFood.java b/src/main/java/com/example/icebutler_server/fridge/entity/FridgeFood.java index 9c4f3da2..d40acf21 100644 --- a/src/main/java/com/example/icebutler_server/fridge/entity/FridgeFood.java +++ b/src/main/java/com/example/icebutler_server/fridge/entity/FridgeFood.java @@ -20,7 +20,7 @@ @SQLDelete(sql = "UPDATE fridge_food SET is_enable = false, updated_at = current_timestamp WHERE id = ?") public class FridgeFood extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/fridge/entity/FridgeUser.java b/src/main/java/com/example/icebutler_server/fridge/entity/FridgeUser.java index 35a03959..1cc606f7 100644 --- a/src/main/java/com/example/icebutler_server/fridge/entity/FridgeUser.java +++ b/src/main/java/com/example/icebutler_server/fridge/entity/FridgeUser.java @@ -18,7 +18,7 @@ @SQLDelete(sql = "UPDATE fridge_user SET is_enable = false, updated_at = current_timestamp WHERE id = ?") @EntityListeners(FridgeUserEntityListener.class) public class FridgeUser extends BaseEntity { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; diff --git a/src/main/java/com/example/icebutler_server/user/entity/User.java b/src/main/java/com/example/icebutler_server/user/entity/User.java index 7398e5ce..42263264 100644 --- a/src/main/java/com/example/icebutler_server/user/entity/User.java +++ b/src/main/java/com/example/icebutler_server/user/entity/User.java @@ -14,7 +14,7 @@ @EntityListeners(UserEntityListener.class) public class User extends BaseEntity { - @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(nullable = false) private Long id; From 739287e1cf6e479fbc9f2c1c5d45dbaf7e9c8461 Mon Sep 17 00:00:00 2001 From: psyeon1120 Date: Mon, 29 Jul 2024 21:28:07 +0900 Subject: [PATCH 2/3] =?UTF-8?q?#339=20fix:=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fridge/dto/response/FridgeMainRes.java | 6 ++---- .../fridge/service/FridgeServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/icebutler_server/fridge/dto/response/FridgeMainRes.java b/src/main/java/com/example/icebutler_server/fridge/dto/response/FridgeMainRes.java index f96ba185..dbcd8a22 100644 --- a/src/main/java/com/example/icebutler_server/fridge/dto/response/FridgeMainRes.java +++ b/src/main/java/com/example/icebutler_server/fridge/dto/response/FridgeMainRes.java @@ -16,13 +16,11 @@ @NoArgsConstructor @Schema(name = "FridgeMainRes", description = "냉장고 식품 정보") public class FridgeMainRes { - @Schema(name = "fridgeDiscard", description = "냉장고 낭비된 식품 정보") - private FridgeDiscardRes fridgeDiscard; @Schema(name = "foodList", description = "냉장고 식품 정보") private List foodList = new ArrayList<>(); - public static FridgeMainRes toFridgeDto(FridgeDiscardRes fridgeDiscard, List fridgeFoods) { - return new FridgeMainRes(isNullFoodDiscardRes(fridgeDiscard), fridgeFoods.stream() + public static FridgeMainRes toFridgeDto(List fridgeFoods) { + return new FridgeMainRes(fridgeFoods.stream() .map(ff -> new FridgeFoodsRes(ff.getId(), ff.getFood().getFoodName(), AwsS3ImageUrlUtil.toUrl(ff.getFood().getFoodImgKey()), FridgeUtils.calShelfLife(ff.getShelfLife()))) .collect(Collectors.toList())); } diff --git a/src/main/java/com/example/icebutler_server/fridge/service/FridgeServiceImpl.java b/src/main/java/com/example/icebutler_server/fridge/service/FridgeServiceImpl.java index d8ef14db..b2bebe6f 100644 --- a/src/main/java/com/example/icebutler_server/fridge/service/FridgeServiceImpl.java +++ b/src/main/java/com/example/icebutler_server/fridge/service/FridgeServiceImpl.java @@ -60,10 +60,10 @@ public FridgeMainRes getFoods(Long fridgeId, Long userId, String category) { if (category == null) { // 값이 없으면 전체 조회 - return FridgeMainRes.toFridgeDto(this.fridgeFoodRepository.findByFridgeForDisCardFood(fridge), this.fridgeFoodRepository.findByFridgeAndIsEnableOrderByShelfLife(fridge, true)); + return FridgeMainRes.toFridgeDto(this.fridgeFoodRepository.findByFridgeAndIsEnableOrderByShelfLife(fridge, true)); } else { // 값이 있으면 특정 값을 불러온 조회 - return FridgeMainRes.toFridgeDto(this.fridgeFoodRepository.findByFridgeForDisCardFood(fridge), this.fridgeFoodRepository.findByFridgeAndFood_FoodCategoryAndIsEnableOrderByShelfLife(fridge, FoodCategory.getFoodCategoryByName(category), true)); + return FridgeMainRes.toFridgeDto(this.fridgeFoodRepository.findByFridgeAndFood_FoodCategoryAndIsEnableOrderByShelfLife(fridge, FoodCategory.getFoodCategoryByName(category), true)); } } @@ -251,7 +251,7 @@ public void addFridgeFood(FridgeFoodsReq fridgeFoodsReq, Long fridgeId, Long use Food food = foodRepository.findByFoodName(fridgeFoodReq.getFoodName()) .orElseGet(() -> { Food save = foodRepository.save(Food.toEntity(fridgeFoodReq)); - amazonSQSSender.sendMessage(FoodData.toDto(save)); +// amazonSQSSender.sendMessage(FoodData.toDto(save)); return save; }); @@ -276,7 +276,7 @@ public void modifyFridgeFood(Long fridgeId, Long fridgeFoodId, FridgeFoodReq fri Food food = this.foodRepository.findByFoodName(fridgeFoodReq.getFoodName()) .orElseGet(() -> { Food save = foodRepository.save(Food.toEntity(fridgeFoodReq)); - amazonSQSSender.sendMessage(FoodData.toDto(save)); +// amazonSQSSender.sendMessage(FoodData.toDto(save)); return save; }); modifyFridgeFood.updateFridgeFoodInfo(food); From 57f5898a74c6ac5ebfa974071c2499623d89f0c4 Mon Sep 17 00:00:00 2001 From: psyeon1120 Date: Mon, 29 Jul 2024 21:36:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?#339=20fix:=20data=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=84=B1=EA=B3=B5=20ResponseCustom=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/dto/response/ResponseCustom.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/icebutler_server/global/dto/response/ResponseCustom.java b/src/main/java/com/example/icebutler_server/global/dto/response/ResponseCustom.java index e79d7202..82824b4f 100644 --- a/src/main/java/com/example/icebutler_server/global/dto/response/ResponseCustom.java +++ b/src/main/java/com/example/icebutler_server/global/dto/response/ResponseCustom.java @@ -9,7 +9,6 @@ import java.time.LocalDateTime; @Getter -@RequiredArgsConstructor @AllArgsConstructor public class ResponseCustom{ @@ -20,6 +19,15 @@ public class ResponseCustom{ private T data; private LocalDateTime timeStamp; + // 성공 + public ResponseCustom() { + this.data = null; + this.timeStamp = LocalDateTime.now(); + this.httpStatus = HttpStatus.OK.value(); + this.message = ReturnCode.SUCCESS.getMessage(); + this.code = ReturnCode.SUCCESS.getCode(); + } + // 성공 public ResponseCustom(T data) { this.data = data; @@ -39,7 +47,7 @@ public ResponseCustom(ReturnCode returnCode) { } public static ResponseCustom success() { - return new ResponseCustom<>(null); + return new ResponseCustom<>(); } public static ResponseCustom success(@Nullable T data) {