[Feat] 당첨 내역 반환하는 api 구현

src/main/java/com/softeer/backend/fo_domain/draw/controller/DrawController.java

@@ -2,7 +2,7 @@
 
 import com.softeer.backend.fo_domain.draw.dto.main.DrawMainResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.participate.DrawModalResponseDto;
-import com.softeer.backend.fo_domain.draw.dto.result.DrawHistoryResponseDto;
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryResponseDto;
 import com.softeer.backend.fo_domain.draw.service.DrawService;
 import com.softeer.backend.global.annotation.AuthInfo;
 import com.softeer.backend.global.common.response.ResponseDto;

src/main/java/com/softeer/backend/fo_domain/draw/dto/history/DrawHistoryDto.java

@@ -0,0 +1,14 @@
+package com.softeer.backend.fo_domain.draw.dto.history;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+@Builder
+public class DrawHistoryDto {
+    private int drawRank;
+    private String image;
+    private LocalDate winningDate;
+}

src/main/java/com/softeer/backend/fo_domain/draw/dto/result/DrawHistoryLoserResponseDto.java → src/main/java/com/softeer/backend/fo_domain/draw/dto/history/DrawHistoryLoserResponseDto.java

@@ -1,4 +1,4 @@
-package com.softeer.backend.fo_domain.draw.dto.result;
+package com.softeer.backend.fo_domain.draw.dto.history;
 
 import lombok.Data;
 import lombok.experimental.SuperBuilder;

src/main/java/com/softeer/backend/fo_domain/draw/dto/result/DrawHistoryResponseDto.java → src/main/java/com/softeer/backend/fo_domain/draw/dto/history/DrawHistoryResponseDto.java

@@ -1,4 +1,4 @@
-package com.softeer.backend.fo_domain.draw.dto.result;
+package com.softeer.backend.fo_domain.draw.dto.history;
 
 import lombok.Data;
 import lombok.experimental.SuperBuilder;

src/main/java/com/softeer/backend/fo_domain/draw/dto/result/DrawHistoryWinnerResponseDto.java → src/main/java/com/softeer/backend/fo_domain/draw/dto/history/DrawHistoryWinnerResponseDto.java

@@ -1,14 +1,15 @@
-package com.softeer.backend.fo_domain.draw.dto.result;
+package com.softeer.backend.fo_domain.draw.dto.history;
 
-import com.softeer.backend.fo_domain.draw.dto.modal.WinModal;
 import lombok.Data;
 import lombok.experimental.SuperBuilder;
 
+import java.util.List;
+
 /**
  * 추첨 이벤트 당첨 내역이 있는 경우 응답 DTO 클래스
  */
 @Data
 @SuperBuilder
 public class DrawHistoryWinnerResponseDto extends DrawHistoryResponseDto {
-    private WinModal winModal;
+    private List<DrawHistoryDto> historyList;
 }

src/main/java/com/softeer/backend/fo_domain/draw/repository/DrawRepository.java

@@ -15,4 +15,6 @@
 public interface DrawRepository extends JpaRepository<Draw, Integer> {
     @Query("SELECT d FROM Draw d JOIN FETCH d.user WHERE d.rank = :rank")
     List<Draw> findDrawWithUser(@Param("rank") int rank);
+
+    List<Draw> findAllByUserIdOrderByWinningDateAsc(Integer userId);
 }

src/main/java/com/softeer/backend/fo_domain/draw/service/DrawService.java

@@ -1,11 +1,14 @@
 package com.softeer.backend.fo_domain.draw.service;
 
+import com.softeer.backend.fo_domain.draw.domain.Draw;
 import com.softeer.backend.fo_domain.draw.domain.DrawParticipationInfo;
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryDto;
 import com.softeer.backend.fo_domain.draw.dto.main.DrawMainResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.participate.DrawModalResponseDto;
-import com.softeer.backend.fo_domain.draw.dto.result.DrawHistoryResponseDto;
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryResponseDto;
 import com.softeer.backend.fo_domain.draw.exception.DrawException;
 import com.softeer.backend.fo_domain.draw.repository.DrawParticipationInfoRepository;
+import com.softeer.backend.fo_domain.draw.repository.DrawRepository;
 import com.softeer.backend.fo_domain.draw.util.DrawAttendanceCountUtil;
 import com.softeer.backend.fo_domain.draw.util.DrawResponseGenerateUtil;
 import com.softeer.backend.fo_domain.draw.util.DrawUtil;
@@ -17,6 +20,10 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 추첨 참여 로직을 처리하기 위한 클래스
  */
@@ -30,11 +37,12 @@ public class DrawService {
     private final DrawResponseGenerateUtil drawResponseGenerateUtil;
     private final DrawAttendanceCountUtil drawAttendanceCountUtil;
     private final DrawSettingManager drawSettingManager;
+    private final DrawRepository drawRepository;
 
     /**
      * 1. 연속 참여일수 조회
-     *  1-1. 만약 7일 연속 참여했다면 상품 정보 응답
-     *  1-2. 만약 7일 미만 참여라면 일반 정보 응답
+     * 1-1. 만약 7일 연속 참여했다면 상품 정보 응답
+     * 1-2. 만약 7일 미만 참여라면 일반 정보 응답
      */
     public DrawMainResponseDto getDrawMainPageInfo(Integer userId) {
         // 참여 정보 (연속참여일수) 조회
@@ -135,16 +143,41 @@ public DrawModalResponseDto participateDrawEvent(Integer userId) {
 
     /**
      * 당첨 내역 조회하는 메서드
+     * 1. DB 조회
+     * 2. redis 조회
+     * 3. 내역을 리스트로 만들어서 반환
+     * 3-1. 내역이 없다면 내역이 없다는 응답 반환
      *
-     * 1. 당첨자라면 WinModal과 같은 당첨 내역 응답
-     * 2. 낙첨자라면 LoseModal과 같은 공유 url 응답
+     * @param userId 사용자 아이디
+     * @return 당첨 내역에 따른 응답
      */
     public DrawHistoryResponseDto getDrawHistory(Integer userId) {
         int ranking = drawRedisUtil.getRankingIfWinner(userId);
+        List<Draw> drawList = drawRepository.findAllByUserIdOrderByWinningDateAsc(userId);
+        List<DrawHistoryDto> drawHistoryList = new ArrayList<>();
+
+        // DB내역을 리스트로 만들기
+        for (Draw draw : drawList) {
+            int drawRank = draw.getRank();
+            drawHistoryList.add(DrawHistoryDto.builder()
+                    .drawRank(drawRank)
+                    .winningDate(draw.getWinningDate())
+                    .image(drawResponseGenerateUtil.getImageUrl(drawRank))
+                    .build());
+        }
 
+        // redis 내역을 리스트로 만들기
         if (ranking != 0) {
+            drawHistoryList.add(DrawHistoryDto.builder()
+                    .drawRank(ranking)
+                    .winningDate(LocalDate.now())
+                    .image(drawResponseGenerateUtil.getImageUrl(ranking))
+                    .build());
+        }
+
+        if (!drawHistoryList.isEmpty()) {
             // 당첨자라면
-            return drawResponseGenerateUtil.generateDrawHistoryWinnerResponse(ranking);
+            return drawResponseGenerateUtil.generateDrawHistoryWinnerResponse(drawHistoryList);
         }
 
         // 당첨자가 아니라면

src/main/java/com/softeer/backend/fo_domain/draw/util/DrawResponseGenerateUtil.java

@@ -1,17 +1,22 @@
 package com.softeer.backend.fo_domain.draw.util;
 
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryDto;
 import com.softeer.backend.fo_domain.draw.dto.main.DrawMainFullAttendResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.main.DrawMainResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.participate.DrawLoseModalResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.participate.DrawWinModalResponseDto;
-import com.softeer.backend.fo_domain.draw.dto.result.DrawHistoryLoserResponseDto;
-import com.softeer.backend.fo_domain.draw.dto.result.DrawHistoryWinnerResponseDto;
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryLoserResponseDto;
+import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryWinnerResponseDto;
 import com.softeer.backend.fo_domain.share.exception.ShareUrlInfoException;
 import com.softeer.backend.fo_domain.share.repository.ShareUrlInfoRepository;
 import com.softeer.backend.global.common.code.status.ErrorStatus;
+import com.softeer.backend.global.staticresources.constant.S3FileName;
+import com.softeer.backend.global.staticresources.util.StaticResourceUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 추첨 이벤트 결과 응답을 생성하는 클래스
  */
@@ -24,13 +29,14 @@ public class DrawResponseGenerateUtil {
     private final ShareUrlInfoRepository shareUrlInfoRepository;
     private final DrawUtil drawUtil;
     private final DrawModalGenerateUtil drawModalGenerateUtil;
+    private final StaticResourceUtil staticResourceUtil;
 
 
     /**
      * 7일 연속 출석 시 상품 정보 모달 만들어서 반환하는 메서드
      *
-     * @param invitedNum             초대한 사람 수
-     * @param remainDrawCount        남은 추첨 기회
+     * @param invitedNum          초대한 사람 수
+     * @param remainDrawCount     남은 추첨 기회
      * @param drawAttendanceCount 연속 출석 일수
      * @return 7일 연속 출석 상품 모달
      */
@@ -46,8 +52,8 @@ public DrawMainFullAttendResponseDto generateMainFullAttendResponse(int invitedN
     /**
      * 7일 미만 출석 시 모달 만들어서 반환하는 메서드
      *
-     * @param invitedNum             초대한 사람 수
-     * @param remainDrawCount        남은 추첨 기회
+     * @param invitedNum          초대한 사람 수
+     * @param remainDrawCount     남은 추첨 기회
      * @param drawAttendanceCount 연속 출석 일수
      * @return 7일 미만 출석 상품 모달
      */
@@ -90,13 +96,13 @@ public DrawWinModalResponseDto generateDrawWinnerResponse(int ranking) {
     /**
      * 당첨내역이 있는 경우 당첨 내역 응답 만들어서 반환
      *
-     * @param ranking 등수
+     * @param drawHistoryList 당첨 내역 리스트
      * @return 당첨 내역 응답
      */
-    public DrawHistoryWinnerResponseDto generateDrawHistoryWinnerResponse(int ranking) {
+    public DrawHistoryWinnerResponseDto generateDrawHistoryWinnerResponse(List<DrawHistoryDto> drawHistoryList) {
         return DrawHistoryWinnerResponseDto.builder()
                 .isDrawWin(true)
-                .winModal(drawModalGenerateUtil.generateWinModal(ranking))
+                .historyList(drawHistoryList)
                 .build();
     }
 
@@ -123,4 +129,17 @@ private String getShareUrl(Integer userId) {
         return BASE_URL + shareUrlInfoRepository.findShareUrlByUserId(userId)
                 .orElseThrow(() -> new ShareUrlInfoException(ErrorStatus._NOT_FOUND));
     }
+
+    /**
+     * ranking에 따른 s3 이미지 url 반환
+     */
+    public String getImageUrl(int ranking) {
+        if (ranking == 1) {
+            return staticResourceUtil.getS3ContentMap().get(S3FileName.DRAW_REWARD_IMAGE_1.name());
+        } else if (ranking == 2) {
+            return staticResourceUtil.getS3ContentMap().get(S3FileName.DRAW_REWARD_IMAGE_2.name());
+        } else {
+            return staticResourceUtil.getS3ContentMap().get(S3FileName.DRAW_REWARD_IMAGE_3.name());
+        }
+    }
 }

src/main/java/com/softeer/backend/fo_domain/mainpage/controller/MainPageController.java

@@ -29,8 +29,8 @@ public class MainPageController {
      * 메인 페이지에서 정적 정보를 반환하는 메서드
      */
     @GetMapping("/event/static")
-    public ResponseEntity<ResponseDto<MainPageEventStaticResponseDto>> getEventPageStatic(){
-        MainPageEventStaticResponseDto mainPageEventStaticResponseDto= mainPageService.getEventPageStatic();
+    public ResponseEntity<ResponseDto<MainPageEventStaticResponseDto>> getEventPageStatic() {
+        MainPageEventStaticResponseDto mainPageEventStaticResponseDto = mainPageService.getEventPageStatic();
 
         return ResponseEntity.ok()
                 .cacheControl(CacheControl.maxAge(1, TimeUnit.DAYS).cachePublic()) // 1일 동안 public 캐싱
@@ -41,7 +41,7 @@ public ResponseEntity<ResponseDto<MainPageEventStaticResponseDto>> getEventPageS
      * 메인 페이지에서 이벤트 정보를 반환하는 메서드
      */
     @GetMapping("/event/info")
-    public ResponseDto<MainPageEventInfoResponseDto> getEventPageInfo(){
+    public ResponseDto<MainPageEventInfoResponseDto> getEventPageInfo() {
 
         MainPageEventInfoResponseDto mainPageEventInfoResponseDto = mainPageService.getEventPageInfo();
 
@@ -52,7 +52,7 @@ public ResponseDto<MainPageEventInfoResponseDto> getEventPageInfo(){
      * 메인 페이지에서 자동차 설명 정보를 반환하는 메서드
      */
     @GetMapping("/car")
-    public ResponseEntity<ResponseDto<MainPageCarResponseDto>> getCarPage(){
+    public ResponseEntity<ResponseDto<MainPageCarResponseDto>> getCarPage() {
 
         MainPageCarResponseDto mainPageCarResponseDto = mainPageService.getCarPage();
 

src/main/java/com/softeer/backend/fo_domain/mainpage/dto/MainPageEventStaticResponseDto.java

@@ -22,7 +22,7 @@ public class MainPageEventStaticResponseDto {
     @Getter
     @AllArgsConstructor
     @Builder
-    public static class EventInfo{
+    public static class EventInfo {
 
         private String title;
 
@@ -32,6 +32,8 @@ public static class EventInfo{
 
         private String rewardImage2;
 
+        private String rewardImage3;
+
     }
 
 }

src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java

@@ -51,7 +51,7 @@ public class MainPageService {
      */
     @Transactional(readOnly = true)
     @Cacheable(value = "staticResources", key = "'event'")
-    public MainPageEventStaticResponseDto getEventPageStatic(){
+    public MainPageEventStaticResponseDto getEventPageStatic() {
 
         Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
         Map<String, String> s3ContentMap = staticResourceUtil.getS3ContentMap();
@@ -61,13 +61,15 @@ public MainPageEventStaticResponseDto getEventPageStatic(){
                 .content(textContentMap.get(StaticTextName.FCFS_CONTENT.name()))
                 .rewardImage1(s3ContentMap.get(S3FileName.FCFS_REWARD_IMAGE_1.name()))
                 .rewardImage2(s3ContentMap.get(S3FileName.FCFS_REWARD_IMAGE_2.name()))
+                .rewardImage3(null)
                 .build();
 
         MainPageEventStaticResponseDto.EventInfo drawInfo = MainPageEventStaticResponseDto.EventInfo.builder()
                 .title(textContentMap.get(StaticTextName.DRAW_TITLE.name()))
                 .content(textContentMap.get(StaticTextName.DRAW_CONTENT.name()))
                 .rewardImage1(s3ContentMap.get(S3FileName.DRAW_REWARD_IMAGE_1.name()))
-                .rewardImage2(s3ContentMap.get(S3FileName.DRAW_REWARD_IMAGE_2_3.name()))
+                .rewardImage2(s3ContentMap.get(S3FileName.DRAW_REWARD_IMAGE_2.name()))
+                .rewardImage3(s3ContentMap.get(S3FileName.DRAW_REWARD_IMAGE_3.name()))
                 .build();
 
         return MainPageEventStaticResponseDto.builder()
@@ -82,7 +84,7 @@ public MainPageEventStaticResponseDto getEventPageStatic(){
      * 메인 페이지에서 이벤트 정보를 반환하는 메서드
      */
     @Transactional(readOnly = true)
-    public MainPageEventInfoResponseDto getEventPageInfo(){
+    public MainPageEventInfoResponseDto getEventPageInfo() {
 
         setTotalVisitorsCount();
 
@@ -94,7 +96,7 @@ public MainPageEventInfoResponseDto getEventPageInfo(){
         int totalDrawWinner = drawSettingManager.getWinnerNum1()
                 + drawSettingManager.getWinnerNum2() + drawSettingManager.getWinnerNum3();
 
-        int remainDrawCount = totalDrawWinner - (int)drawRepository.count();
+        int remainDrawCount = totalDrawWinner - (int) drawRepository.count();
 
         return MainPageEventInfoResponseDto.builder()
                 .startDate(drawSettingManager.getStartDate().format(eventTimeFormatter))
@@ -114,7 +116,7 @@ public MainPageEventInfoResponseDto getEventPageInfo(){
     }
 
     // 이벤트 기간이면 redis에 사이트 방문자 수 +1 하기
-    public void setTotalVisitorsCount(){
+    public void setTotalVisitorsCount() {
 
         LocalDate now = LocalDate.now();