Merge pull request #84 from Donut-DONationUTile/feature/history/receiver

Feature/history/receiver
Donut-DONationUTile · Apr 30, 2024 · 6a864bd · 6a864bd
2 parents 6586bd4 + a5b1bde
commit 6a864bd
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 323 deletions.
diff --git a/src/main/java/zero/eight/donut/config/firebase/FcmUtils.java b/src/main/java/zero/eight/donut/config/firebase/FcmUtils.java
diff --git a/src/main/java/zero/eight/donut/config/firebase/FirebaseConfig.java b/src/main/java/zero/eight/donut/config/firebase/FirebaseConfig.java
diff --git a/src/main/java/zero/eight/donut/controller/FcmController.java b/src/main/java/zero/eight/donut/controller/FcmController.java
diff --git a/src/main/java/zero/eight/donut/domain/FcmToken.java b/src/main/java/zero/eight/donut/domain/FcmToken.java
diff --git a/src/main/java/zero/eight/donut/dto/fcm/FcmMemberDto.java b/src/main/java/zero/eight/donut/dto/fcm/FcmMemberDto.java
diff --git a/src/main/java/zero/eight/donut/dto/fcm/FcmTokenRequestDto.java b/src/main/java/zero/eight/donut/dto/fcm/FcmTokenRequestDto.java
diff --git a/src/main/java/zero/eight/donut/dto/history/giver/GiverDonationDetailResponseDto.java b/src/main/java/zero/eight/donut/dto/history/giver/GiverDonationDetailResponseDto.java
@@ -15,8 +15,10 @@ public class GiverDonationDetailResponseDto {
     private LocalDateTime dueDate;
     private Store store;
     private String receiver;
+    private String giver;
     private Boolean isAssigned;
     private Status status;
     private String message;
     private LocalDateTime donateDate;
+    private LocalDateTime receivedDate;
 }
diff --git a/src/main/java/zero/eight/donut/repository/FcmTokenRepository.java b/src/main/java/zero/eight/donut/repository/FcmTokenRepository.java
diff --git a/src/main/java/zero/eight/donut/service/DonationService.java b/src/main/java/zero/eight/donut/service/DonationService.java
@@ -8,15 +8,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import zero.eight.donut.common.response.ApiResponse;
-import zero.eight.donut.config.firebase.FcmUtils;
-import zero.eight.donut.config.jwt.AuthUtils;
 import zero.eight.donut.domain.Gift;
-import zero.eight.donut.domain.Giver;
-import zero.eight.donut.domain.enums.Status;
 import zero.eight.donut.dto.donation.DonateGiftRequestDto;
 import zero.eight.donut.dto.donation.GiftboxRequestDto;
-import zero.eight.donut.exception.Error;
-import zero.eight.donut.exception.Success;
 import zero.eight.donut.repository.GiftRepository;
 
 import java.io.IOException;
@@ -28,7 +22,6 @@
 @Service
 public class DonationService {
 
-    private final FcmUtils fcmUtils;
     private final SerialDonationService donationService;
     private  final GiftRepository giftRepository;
 
@@ -40,7 +33,6 @@ public void autoDonate() throws FirebaseMessagingException {
         for (Gift gift : giftList) {
             gift.updateStatus("UNUSED");
             giftRepository.save(gift);
-            fcmUtils.sendMessage(gift.getGiver().getId(), "wallet: D-30", "Your item" + gift.getProduct() + "is donated now!");
         }
     }
 

diff --git a/src/main/java/zero/eight/donut/service/FcmService.java b/src/main/java/zero/eight/donut/service/FcmService.java
diff --git a/src/main/java/zero/eight/donut/service/HistoryGiverService.java b/src/main/java/zero/eight/donut/service/HistoryGiverService.java
@@ -101,8 +101,12 @@ public ApiResponse<?> getDonationDetail(Long giftId){
 
         //name of receiver
         String receiver = "not delivered";
-        if (gift.getGiftbox() != null && gift.getGiftbox().getReceiver() != null)
+        LocalDateTime receivedDate = null;
+        if (gift.getGiftbox() != null && gift.getGiftbox().getReceiver() != null) {
             receiver = gift.getGiftbox().getReceiver().getName();
+            receivedDate = gift.getGiftbox().getAssignedAt();
+        }
+
 
 
         //message
@@ -116,11 +120,13 @@ public ApiResponse<?> getDonationDetail(Long giftId){
                 .amount(gift.getPrice())
                 .dueDate(gift.getDueDate())
                 .store(gift.getStore())
+                .giver(gift.getGiver().getName())
                 .receiver(receiver)
                 .isAssigned(gift.getIsAssigned())
                 .status(gift.getStatus())
                 .message(message)
-                .donateDate(gift.getCreatedAt())
+                .donateDate(gift.getUpdatedAt())
+                .receivedDate(receivedDate)
                 .build();
 
         return ApiResponse.success(Success.GET_HISTORY_GIVER_DONATION_SUCCESS, responseDto);