#339 엔티티 ID strategy AUTO -> IDENTITY 및 데이터 변경으로 인한 실행오류 수정

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)

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;
 

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;
 

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;
 

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;

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<FridgeFoodsRes> foodList = new ArrayList<>();
 
-  public static FridgeMainRes toFridgeDto(FridgeDiscardRes fridgeDiscard, List<FridgeFood> fridgeFoods) {
-    return new FridgeMainRes(isNullFoodDiscardRes(fridgeDiscard), fridgeFoods.stream()
+  public static FridgeMainRes toFridgeDto(List<FridgeFood> 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()));
   }

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;
 

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;
 

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;
 

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);

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<T>{
 
@@ -20,6 +19,15 @@ public class ResponseCustom<T>{
     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 <T> ResponseCustom<T> success() {
-        return new ResponseCustom<>(null);
+        return new ResponseCustom<>();
     }
 
     public static <T> ResponseCustom<T> success(@Nullable T data) {

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;