softeerbootcamp4th · hyeokson · Aug 22, 2024 · Aug 6, 2024 · Aug 6, 2024 · Jul 29, 2024
diff --git a/src/main/java/com/softeer/backend/fo_domain/comment/repository/CommentRepository.java b/src/main/java/com/softeer/backend/fo_domain/comment/repository/CommentRepository.java
@@ -12,5 +12,5 @@
 @Repository
 public interface CommentRepository extends JpaRepository<Comment, Integer> {
 
-    Page<Comment> findAllByIdLessThanEqualOrderByIdDesc(Integer id, Pageable pageable);
+    Page<Comment> findAllByIdLessThanOrderByIdDesc(Integer id, Pageable pageable);
 }
diff --git a/src/main/java/com/softeer/backend/fo_domain/comment/service/CommentService.java b/src/main/java/com/softeer/backend/fo_domain/comment/service/CommentService.java
@@ -32,7 +32,7 @@ public class CommentService {
     public CommentsResponseDto getComments(Integer userId, Integer cursor) {
 
         PageRequest pageRequest = PageRequest.of(0, SCROLL_SIZE + 1);
-        Page<Comment> page = commentRepository.findAllByIdLessThanEqualOrderByIdDesc(cursor, pageRequest);
+        Page<Comment> page = commentRepository.findAllByIdLessThanOrderByIdDesc(cursor, pageRequest);
 
         List<Comment> comments = page.getContent();
 

diff --git a/src/main/java/com/softeer/backend/fo_domain/comment/util/ScrollPaginationUtil.java b/src/main/java/com/softeer/backend/fo_domain/comment/util/ScrollPaginationUtil.java
@@ -44,7 +44,6 @@ public List<T> getCurrentScrollItems() {
         } else {
             itemsList = new ArrayList<>(itemsWithNextCursor.subList(0, countPerScroll));
         }
-        Collections.reverse(itemsList);
 
         return itemsList;
     }

diff --git a/src/main/java/com/softeer/backend/fo_domain/fcfs/controller/FcfsController.java b/src/main/java/com/softeer/backend/fo_domain/fcfs/controller/FcfsController.java
@@ -62,7 +62,7 @@ public ResponseDto<FcfsResultResponseDto> handleFcfs(@Parameter(hidden = true) H
         return ResponseDto.onSuccess(fcfsResultResponseDto);
     }
 
-    @GetMapping("/fcfs/history")
+    @GetMapping("/history")
     public ResponseDto<FcfsHistoryResponseDto> getFcfsHistory(@Parameter(hidden = true) @AuthInfo Integer userId){
 
         FcfsHistoryResponseDto fcfsHistoryResponseDto = fcfsService.getFcfsHistory(userId);

diff --git a/src/main/java/com/softeer/backend/fo_domain/fcfs/dto/result/FcfsResultResponseDto.java b/src/main/java/com/softeer/backend/fo_domain/fcfs/dto/result/FcfsResultResponseDto.java
@@ -13,7 +13,7 @@
 public class FcfsResultResponseDto {
 
     @JsonProperty("isFcfsWinner")
-    private boolean isFcfsWinner;
+    private boolean fcfsWinner;
 
     private FcfsResult fcfsResult;
 }
diff --git a/src/main/java/com/softeer/backend/fo_domain/fcfs/interceptor/FcfsTimeCheckInterceptor.java b/src/main/java/com/softeer/backend/fo_domain/fcfs/interceptor/FcfsTimeCheckInterceptor.java
@@ -3,6 +3,7 @@
 import com.softeer.backend.fo_domain.fcfs.exception.FcfsException;
 import com.softeer.backend.fo_domain.fcfs.service.FcfsSettingManager;
 import com.softeer.backend.global.common.code.status.ErrorStatus;
+import io.micrometer.core.ipc.http.HttpSender;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -39,8 +40,16 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
         if (!fcfsSettingManager.isFcfsEntryAvailable(now)) {
 
-            log.error("Cannot access the FCFS event");
-            throw new FcfsException(ErrorStatus._BAD_REQUEST);
+            if("GET".equalsIgnoreCase(request.getMethod())){
+                log.error("Cannot access the FCFS event");
+                throw new FcfsException(ErrorStatus._BAD_REQUEST);
+            }
+
+            else if("POST".equalsIgnoreCase(request.getMethod())){
+                log.error("Cannot participate FCFS event");
+                throw new FcfsException(ErrorStatus._FCFS_ALREADY_CLOSED);
+            }
+
         }
 
 

diff --git a/src/main/java/com/softeer/backend/fo_domain/fcfs/service/FcfsService.java b/src/main/java/com/softeer/backend/fo_domain/fcfs/service/FcfsService.java
@@ -23,14 +23,11 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * 선착순 관련 이벤트를 처리하는 클래스
  */
@@ -108,7 +105,7 @@ public FcfsResultResponseDto handleFcfsEvent(int userId, int round, FcfsRequestD
         if (fcfsSettingManager.isFcfsClosed()) {
             countFcfsParticipant(round);
 
-            return getFcfsResult(false, null);
+            return getFcfsResult(false, false, null);
         }
 
         // 선착순 등록을 처리하는 메서드 호출
@@ -156,10 +153,14 @@ public FcfsResultResponseDto saveFcfsWinners(int userId, int round) {
                 fcfsSettingManager.setFcfsClosed(true);
             }
 
-            return getFcfsResult(true, code);
+            return getFcfsResult(true, false, code);
         }
+        else if(numOfWinners < fcfsSettingManager.getFcfsWinnerNum()
+            && fcfsRedisUtil.isValueInIntegerSet(RedisKeyPrefix.FCFS_USERID_PREFIX.getPrefix() + round, userId))
+            return getFcfsResult(false, true, null);
+
 
-        return getFcfsResult(false, null);
+        return getFcfsResult(false, false, null);
 
     }
 
@@ -182,31 +183,26 @@ private void countFcfsParticipant(int round) {
     /**
      * 선착순 결과 모달 응답 Dto를 만들어서 반환하는 메서드
      */
-    public FcfsResultResponseDto getFcfsResult(boolean fcfsWin, String fcfsCode) {
-
-        Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
-        Map<String, String> s3ContentMap = staticResourceUtil.getS3ContentMap();
+    public FcfsResultResponseDto getFcfsResult(boolean fcfsWin, boolean isDuplicated, String fcfsCode) {
 
         FcfsSettingDto firstFcfsSetting = fcfsSettingManager.getFcfsSettingByRound(1);
 
         FcfsService fcfsService = fcfsServiceProvider.getObject();
 
         if (fcfsWin) {
-            FcfsSuccessResult fcfsSuccessResult = fcfsService.getFcfsSuccessResult(
-                    textContentMap, s3ContentMap, firstFcfsSetting
-            );
+            FcfsSuccessResult fcfsSuccessResult = fcfsService.getFcfsSuccessResult(firstFcfsSetting);
             fcfsSuccessResult.setFcfsCode(fcfsCode);
 
             return FcfsResultResponseDto.builder()
-                    .isFcfsWinner(fcfsWin)
+                    .fcfsWinner(fcfsWin)
                     .fcfsResult(fcfsSuccessResult)
                     .build();
         }
 
-        FcfsFailResult fcfsFailResult = fcfsService.getFcfsFailResult(textContentMap);
+        FcfsFailResult fcfsFailResult = fcfsService.getFcfsFailResult(isDuplicated);
 
         return FcfsResultResponseDto.builder()
-                .isFcfsWinner(fcfsWin)
+                .fcfsWinner(fcfsWin)
                 .fcfsResult(fcfsFailResult)
                 .build();
     }
@@ -215,8 +211,10 @@ public FcfsResultResponseDto getFcfsResult(boolean fcfsWin, String fcfsCode) {
      * 선착순 당첨 모달 정보 중, 정적 정보를 반환하는 메서드
      */
     @Cacheable(value = "staticResources", key = "'fcfsSuccess'")
-    public FcfsSuccessResult getFcfsSuccessResult(Map<String, String> textContentMap, Map<String, String> s3ContentMap,
-                                                  FcfsSettingDto firstFcfsSetting) {
+    public FcfsSuccessResult getFcfsSuccessResult(FcfsSettingDto firstFcfsSetting) {
+
+        Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
+        Map<String, String> s3ContentMap = staticResourceUtil.getS3ContentMap();
 
         return FcfsSuccessResult.builder()
                 .title(staticResourceUtil.format(textContentMap.get(StaticTextName.FCFS_WINNER_TITLE.name()),
@@ -235,9 +233,17 @@ public FcfsSuccessResult getFcfsSuccessResult(Map<String, String> textContentMap
     /**
      * 선착순 실패 모달 정보 중, 정적 정보를 반환하는 메서드
      */
-    @Cacheable(value = "staticResources", key = "'fcfsFail'")
-    public FcfsFailResult getFcfsFailResult(Map<String, String> textContentMap) {
+    @Cacheable(value = "staticResources", key = "'fcfsFail_' + #isDuplicated")
+    public FcfsFailResult getFcfsFailResult(boolean isDuplicated) {
+        Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
 
+        if(isDuplicated){
+            return FcfsFailResult.builder()
+                    .title(textContentMap.get(StaticTextName.FCFS_DUPLICATED_TITLE.name()))
+                    .subTitle(textContentMap.get(StaticTextName.FCFS_DUPLICATED_SUBTITLE.name()))
+                    .caution(textContentMap.get(StaticTextName.FCFS_LOSER_CAUTION.name()))
+                    .build();
+        }
         return FcfsFailResult.builder()
                 .title(textContentMap.get(StaticTextName.FCFS_LOSER_TITLE.name()))
                 .subTitle(textContentMap.get(StaticTextName.FCFS_LOSER_SUBTITLE.name()))
@@ -250,11 +256,21 @@ public FcfsFailResult getFcfsFailResult(Map<String, String> textContentMap) {
      */
     public FcfsHistoryResponseDto getFcfsHistory(int userId){
         fcfsRepository.findByUserIdOrderByWinningDateAsc(userId);
-        List<FcfsHistoryResponseDto.FcfsHistory> fcfsHistoryList = new ArrayList<>();
 
         Map<String, String> s3ContentMap = staticResourceUtil.getS3ContentMap();
 
         LocalDate now = LocalDate.now();
+
+        List<Fcfs> fcfsList = fcfsRepository.findByUserIdOrderByWinningDateAsc(userId);
+        List<FcfsHistoryResponseDto.FcfsHistory> fcfsHistoryList = new ArrayList<>(fcfsList.stream()
+                .map((fcfs) ->
+                        FcfsHistoryResponseDto.FcfsHistory.builder()
+                                .barcode(s3ContentMap.get(S3FileName.BARCODE_IMAGE.name()))
+                                .fcfsCode(fcfs.getCode())
+                                .winningDate(fcfs.getWinningDate())
+                                .build()
+                ).toList());
+
         Integer round = fcfsSettingManager.getFcfsRoundForHistory(now);
         if(round == null)
             round = fcfsSettingManager.getFcfsRoundForHistory(now.minusDays(1));
@@ -277,16 +293,6 @@ public FcfsHistoryResponseDto getFcfsHistory(int userId){
             }
         }
 
-        List<Fcfs> fcfsList = fcfsRepository.findByUserIdOrderByWinningDateAsc(userId);
-        fcfsHistoryList.addAll(fcfsList.stream()
-                .map((fcfs) ->
-                    FcfsHistoryResponseDto.FcfsHistory.builder()
-                            .barcode(s3ContentMap.get(S3FileName.BARCODE_IMAGE.name()))
-                            .fcfsCode(fcfs.getCode())
-                            .winningDate(fcfs.getWinningDate())
-                            .build()
-                ).toList());
-
         return FcfsHistoryResponseDto.builder()
                 .isFcfsWin(!fcfsHistoryList.isEmpty())
                 .fcfsHistoryList(fcfsHistoryList)

diff --git a/src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java b/src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java
@@ -107,10 +107,10 @@ public MainPageEventInfoResponseDto getEventPageInfo() {
 
         String fcfsTime = "";
         if(firstFcfsSetting.getStartTime().getMinute() != 0){
-            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeFormatter);
+            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeMinFormatter);
         }
         else
-            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeMinFormatter);
+            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeFormatter);
 
         return MainPageEventInfoResponseDto.builder()
                 .startDate(drawSettingManager.getStartDate().format(eventTimeFormatter))

diff --git a/src/main/java/com/softeer/backend/fo_domain/user/controller/LoginController.java b/src/main/java/com/softeer/backend/fo_domain/user/controller/LoginController.java
@@ -4,6 +4,7 @@
 import com.softeer.backend.global.common.dto.JwtTokenResponseDto;
 import com.softeer.backend.fo_domain.user.service.LoginService;
 import com.softeer.backend.global.common.response.ResponseDto;
+import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +23,7 @@ public class LoginController {
      */
     @PostMapping("/login")
     ResponseDto<JwtTokenResponseDto> handleLogin(@Valid @RequestBody LoginRequestDto loginRequestDto,
+                                                 @Parameter(hidden = true)
                                                  @RequestHeader(value = "X-Share-Code", required = false) String shareCode) {
         JwtTokenResponseDto jwtTokenResponseDto = loginService.handleLogin(loginRequestDto, shareCode);
 

diff --git a/src/main/java/com/softeer/backend/global/common/code/status/ErrorStatus.java b/src/main/java/com/softeer/backend/global/common/code/status/ErrorStatus.java
@@ -36,7 +36,10 @@ public enum ErrorStatus implements BaseErrorCode {
     _AUTH_CODE_ISSUE_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "A403",
             "인증 코드 발급 횟수를 초과하였습니다. 나중에 다시 시도하세요."),
     _AUTH_CODE_NOT_VERIFIED(HttpStatus.BAD_REQUEST, "A404", "인증되지 않은 상태에서 로그인 할 수 없습니다."),
-    _AUTH_USERNAME_NOT_MATCH(HttpStatus.BAD_REQUEST, "A405", "이미 등록된 번호입니다.");
+    _AUTH_USERNAME_NOT_MATCH(HttpStatus.BAD_REQUEST, "A405", "이미 등록된 번호입니다."),
+
+    // FCFS ERROR
+    _FCFS_ALREADY_CLOSED(HttpStatus.BAD_REQUEST, "F400", "이미 선착순 이벤트가 마감되었습니다.");
 
     // 예외의 Http 상태값
     private final HttpStatus httpStatus;

diff --git a/src/main/java/com/softeer/backend/global/common/exception/ExceptionAdvice.java b/src/main/java/com/softeer/backend/global/common/exception/ExceptionAdvice.java
@@ -1,8 +1,14 @@
 package com.softeer.backend.global.common.exception;
 
+import com.softeer.backend.fo_domain.fcfs.dto.result.FcfsFailResult;
+import com.softeer.backend.fo_domain.fcfs.dto.result.FcfsResultResponseDto;
+import com.softeer.backend.fo_domain.fcfs.exception.FcfsException;
 import com.softeer.backend.global.common.code.status.ErrorStatus;
 import com.softeer.backend.global.common.response.ResponseDto;
+import com.softeer.backend.global.staticresources.constant.StaticTextName;
+import com.softeer.backend.global.staticresources.util.StaticResourceUtil;
 import jakarta.validation.ConstraintViolationException;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataAccessException;
 import org.springframework.http.HttpHeaders;
@@ -13,7 +19,6 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import java.util.*;
@@ -24,8 +29,11 @@
  */
 @Slf4j
 @RestControllerAdvice
+@RequiredArgsConstructor
 public class ExceptionAdvice extends ResponseEntityExceptionHandler {
 
+    private final StaticResourceUtil staticResourceUtil;
+
     /**
      * GeneralException을 처리하는 메서드
      *
@@ -39,11 +47,22 @@ public ResponseEntity<Object> handleGeneralException(GeneralException generalExc
         return handleGeneralExceptionInternal(generalException, errorReasonHttpStatus, HttpHeaders.EMPTY, webRequest);
     }
 
+    /**
+     * 분산락 예외를 처리하는 메서드
+     */
     @ExceptionHandler
-    public ModelAndView handleEventLockException(EventLockException eventLockException, WebRequest webRequest) {
+    public ResponseEntity<Object> handleEventLockException(EventLockException eventLockException, WebRequest webRequest) {
         return handleEventLockExceptionInternal(eventLockException, HttpHeaders.EMPTY, webRequest);
     }
 
+    /**
+     * 선착순 예외를 처리하는 메서드
+     */
+    @ExceptionHandler
+    public ResponseEntity<Object> handleFcfsException(FcfsException FcfsException, WebRequest webRequest) {
+        return handleFcfsExceptionInternal(FcfsException, HttpHeaders.EMPTY, webRequest);
+    }
+
     /**
      * ConstraintViolationException을 처리하는 메서드
      *
@@ -130,24 +149,66 @@ private ResponseEntity<Object> handleGeneralExceptionInternal(Exception e, Respo
     }
 
     // EventLockException에 대한 client 응답 객체를 생성하는 메서드
-    private ModelAndView handleEventLockExceptionInternal(EventLockException e, HttpHeaders headers, WebRequest webRequest) {
+    private ResponseEntity<Object> handleEventLockExceptionInternal(EventLockException e, HttpHeaders headers, WebRequest webRequest) {
+        Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
 
         log.error("EventLockException captured in ExceptionAdvice", e);
 
         String redissonKeyName = e.getRedissonKeyName();
 
-        ModelAndView modelAndView = new ModelAndView();
+        ResponseDto<Object> body = null;
 
         if (redissonKeyName.contains("FCFS")) {
-
-            modelAndView.setViewName("redirect:/fcfs/result");
-            modelAndView.addObject("fcfsWin", false);
+            body = ResponseDto.onSuccess(FcfsResultResponseDto.builder()
+                    .fcfsWinner(false)
+                    .fcfsResult(FcfsFailResult.builder()
+                            .title(textContentMap.get(StaticTextName.FCFS_LOSER_TITLE.name()))
+                            .subTitle(textContentMap.get(StaticTextName.FCFS_LOSER_SUBTITLE.name()))
+                            .caution(textContentMap.get(StaticTextName.FCFS_LOSER_CAUTION.name()))
+                            .build())
+                    .build());
         }
 
+
         //TODO
         // DRAW 관련 예외일 경우, body 구성하는 코드 필요
 
-        return modelAndView;
+        return super.handleExceptionInternal(
+                e,
+                body,
+                headers,
+                HttpStatus.OK,
+                webRequest
+        );
+    }
+
+    // FcfsException 대한 client 응답 객체를 생성하는 메서드
+    private ResponseEntity<Object> handleFcfsExceptionInternal(FcfsException e, HttpHeaders headers, WebRequest webRequest) {
+        Map<String, String> textContentMap = staticResourceUtil.getTextContentMap();
+
+        ResponseDto<Object> body = null;
+
+        if (e.getCode() == ErrorStatus._FCFS_ALREADY_CLOSED) {
+            body = ResponseDto.onSuccess(FcfsResultResponseDto.builder()
+                            .fcfsWinner(false)
+                            .fcfsResult(FcfsFailResult.builder()
+                                    .title(textContentMap.get(StaticTextName.FCFS_CLOSED_TITLE.name()))
+                                    .subTitle(textContentMap.get(StaticTextName.FCFS_CLOSED_SUBTITLE.name()))
+                                    .caution(textContentMap.get(StaticTextName.FCFS_LOSER_CAUTION.name()))
+                                    .build())
+                            .build());
+        } else {
+            body = ResponseDto.onFailure(e.getCode());
+        }
+
+
+        return super.handleExceptionInternal(
+                e,
+                body,
+                headers,
+                HttpStatus.OK,
+                webRequest
+        );
     }
 
     // ConstraintViolationException에 대한 client 응답 객체를 생성하는 메서드