Refactor: 소비기한 계산시 구매 날짜가 등록되지 않으면 발생하는 오류 해결

DuruDuru-UMC-7th · Feb 2, 2025 · 919cb28 · 919cb28
1 parent c152632
commit 919cb28
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/backend/DuruDuru/global/service/OCRService/ClovaOCRReceiptService.java b/src/main/java/com/backend/DuruDuru/global/service/OCRService/ClovaOCRReceiptService.java
@@ -290,6 +290,8 @@ private Ingredient createAndSaveIngredient(String productName, Member member, Fr
         int shelfLifeDays = minorCategory.getShelfLifeDays();
         StorageType storageType = minorCategory.getStorageType();
 
+        LocalDate purchaseDate = (receipt.getPurchaseDate() != null) ? receipt.getPurchaseDate() : LocalDate.now();
+        LocalDate expiryDate = purchaseDate.plusDays(shelfLifeDays);
 
         Ingredient ingredient = Ingredient.builder()
                 .member(member)
@@ -299,10 +301,11 @@ private Ingredient createAndSaveIngredient(String productName, Member member, Fr
                 .minorCategory(minorCategory != null ? minorCategory : MinorCategory.기타)
                 .storageType(storageType)
                 .count(1L)
-                .purchaseDate(receipt.getPurchaseDate())
-                .expiryDate(receipt.getPurchaseDate().plusDays(shelfLifeDays))
+                .purchaseDate(purchaseDate)
+                .expiryDate(expiryDate)
                 .receipt(receipt)
                 .build();
+
         return ingredientRepository.save(ingredient);
     }