Merge pull request #67 from Donut-DONationUTile/feature/wallet

Feature/wallet
Donut-DONationUTile · Apr 28, 2024 · e8f7cbd · e8f7cbd
2 parents cec44b5 + 5b3164e
commit e8f7cbd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/main/java/zero/eight/donut/service/AuthService.java b/src/main/java/zero/eight/donut/service/AuthService.java
@@ -273,6 +273,7 @@ public boolean isDuplicatedID(String id) {
         return !receiverRepository.findByName(id).isEmpty();
     }
 
+    @Transactional
     public ApiResponse<?> receiverSignIn(AuthRequestDto requestDto) {
 
         Optional<Receiver> receiver = receiverRepository.findByName(requestDto.getId());

diff --git a/src/main/java/zero/eight/donut/service/HistoryReceiverService.java b/src/main/java/zero/eight/donut/service/HistoryReceiverService.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import zero.eight.donut.common.response.ApiResponse;
 import zero.eight.donut.config.jwt.AuthUtils;
 import zero.eight.donut.domain.Benefit;

diff --git a/src/main/java/zero/eight/donut/service/ReportService.java b/src/main/java/zero/eight/donut/service/ReportService.java
@@ -26,6 +26,7 @@ public class ReportService {
     private final ReportRepository reportRepository;
     private final GiftRepository giftRepository;
     private final GiftboxRepository giftboxRepository;
+
     @Transactional
     public ApiResponse<?> createUsed(Long giftId){
         //Gift 있는지 확인

diff --git a/src/main/java/zero/eight/donut/service/WalletService.java b/src/main/java/zero/eight/donut/service/WalletService.java
@@ -14,7 +14,7 @@
 import zero.eight.donut.domain.Giver;
 import zero.eight.donut.domain.enums.Store;
 import zero.eight.donut.dto.auth.Role;
-import zero.eight.donut.dto.donation.DonateGiftRequestDto;
+import zero.eight.donut.dto.home.receiver.GetGiftResponseDto;
 import zero.eight.donut.dto.wallet.WalletGiftInfoResponseDto;
 import zero.eight.donut.dto.wallet.WalletResponseDto;
 import zero.eight.donut.dto.wallet.WalletUploadRequestDto;
@@ -45,10 +45,7 @@ public class WalletService {
     private final ReceiverRepository receiverRepository;
     private final GiftRepository giftRepository;
     private final GiftboxRepository giftboxRepository;
-    private final HomeReceiverService homeReceiverService;
 
-    @Transactional
-    // 월렛 화면 조회
     public ApiResponse<?> walletMain() {
         // 변수 선언
         LocalDateTime now = LocalDateTime.now(); // 조회 시각
@@ -141,9 +138,23 @@ public ApiResponse<?> walletDetail(Long giftId) {
 
         Gift gift = giftOptional.get();
 
-        return ApiResponse.success(Success.HOME_RECEIVER_GIFT_SUCCESS, homeReceiverService.getGiftInfo(giftId, gift));
+        GetGiftResponseDto responseDto = GetGiftResponseDto.builder()
+                .product(gift.getProduct())
+                .price(gift.getPrice())
+                .dueDate(gift.getDueDate())
+                .imgUrl(gift.getImageUrl())
+                .store(gift.getStore())
+                .status(gift.getStatus())
+                .boxId(gift.getGiftbox().getId())
+                .build();
+
+        // 조회 시 일단 사용처리
+        gift.updateStatus("SELF_USED");
+
+        return ApiResponse.success(Success.HOME_RECEIVER_GIFT_SUCCESS, responseDto);
     }
 
+    @Transactional
     public ApiResponse<?> walletUpload(WalletUploadRequestDto requestDto) throws IOException {
         // 기부자 여부 검증
         if (!authUtils.getCurrentUserRole().equals(Role.ROLE_GIVER)) {