어드민 기능 인덱스 에러 수정 및 선착순 기능 일부 구현

src/main/java/com/softeer/backend/bo_domain/admin/controller/AdminLoginController.java

@@ -6,6 +6,7 @@
 import com.softeer.backend.global.annotation.AuthInfo;
 import com.softeer.backend.global.common.dto.JwtTokenResponseDto;
 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.PostMapping;
@@ -28,7 +29,7 @@ ResponseDto<JwtTokenResponseDto> handleLogin(@Valid @RequestBody AdminLoginReque
     }
 
     @PostMapping("/logout")
-    ResponseDto<Void> handleLogout(@AuthInfo Integer adminId) {
+    ResponseDto<Void> handleLogout(@Parameter(hidden = true) @AuthInfo Integer adminId) {
         adminLoginService.handleLogout(adminId);
 
         return ResponseDto.onSuccess();

src/main/java/com/softeer/backend/bo_domain/admin/dto/indicator/EventIndicatorResponseDto.java

@@ -6,6 +6,7 @@
 import com.softeer.backend.bo_domain.admin.serializer.PercentageSerializer;
 import com.softeer.backend.bo_domain.admin.serializer.PhoneNumberSerializer;
 import com.softeer.backend.bo_domain.eventparticipation.domain.EventParticipation;
+import com.softeer.backend.fo_domain.draw.service.DrawSettingManager;
 import lombok.*;
 
 import java.time.LocalDate;
@@ -48,9 +49,9 @@ public static class VisitorNum {
         private int visitorNum;
     }
 
-    public static EventIndicatorResponseDto of(List<EventParticipation> eventParticipationList) {
-        LocalDate startDate = eventParticipationList.get(0).getEventDate();
-        LocalDate endDate = eventParticipationList.get(eventParticipationList.size() - 1).getEventDate();
+    public static EventIndicatorResponseDto of(List<EventParticipation> eventParticipationList, DrawSettingManager drawSettingManager) {
+        LocalDate startDate = drawSettingManager.getStartDate();
+        LocalDate endDate = drawSettingManager.getEndDate();
 
         int totalVisitorCount = eventParticipationList.stream()
                 .mapToInt(EventParticipation::getVisitorCount)
@@ -64,8 +65,8 @@ public static EventIndicatorResponseDto of(List<EventParticipation> eventPartici
                 .mapToInt(EventParticipation::getDrawParticipantCount)
                 .sum();
 
-        double fcfsParticipantRate = (double) totalFcfsParticipantCount / (double) totalVisitorCount;
-        double drawParticipantRate = (double) totalDrawParticipantCount / (double) totalVisitorCount;
+        double fcfsParticipantRate = totalVisitorCount == 0 ? 0 : (double) totalFcfsParticipantCount / (double) totalVisitorCount;
+        double drawParticipantRate = totalVisitorCount == 0 ? 0 : (double) totalDrawParticipantCount / (double) totalVisitorCount;
 
         List<VisitorNum> visitorNumList = eventParticipationList.stream()
                 .map((eventParticipation) ->

src/main/java/com/softeer/backend/bo_domain/admin/service/IndicatorPageService.java

@@ -26,7 +26,7 @@ public EventIndicatorResponseDto getEventIndicator() {
                 drawSettingManager.getStartDate(), drawSettingManager.getEndDate()
         );
 
-        return EventIndicatorResponseDto.of(eventParticipationList);
+        return EventIndicatorResponseDto.of(eventParticipationList, drawSettingManager);
     }
 
 }

src/main/java/com/softeer/backend/bo_domain/eventparticipation/domain/EventParticipation.java

@@ -33,15 +33,4 @@ public class EventParticipation {
     @Column(name = "event_date", nullable = false)
     private LocalDate eventDate;
 
-    public void addTotalVisitorsCount(int totalVisitorsCount) {
-        this.visitorCount += totalVisitorsCount;
-    }
-
-    public void addFcfsParticipantCount(int fcfsParticipantCount) {
-        this.fcfsParticipantCount += fcfsParticipantCount;
-    }
-
-    public void addDrawParticipantCount(int drawParticipantCount) {
-        this.drawParticipantCount += drawParticipantCount;
-    }
 }

src/main/java/com/softeer/backend/fo_domain/comment/controller/CommentController.java

@@ -6,6 +6,7 @@
 import com.softeer.backend.global.annotation.AuthInfo;
 import com.softeer.backend.global.common.code.status.ErrorStatus;
 import com.softeer.backend.global.common.response.ResponseDto;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -20,7 +21,7 @@ public class CommentController {
 
     @GetMapping("/comment")
     ResponseDto<CommentsResponseDto> getComment(@RequestParam(name = "cursor", required = false) Integer cursor,
-                                                @AuthInfo Integer userId) {
+                                                @Parameter(hidden = true) @AuthInfo Integer userId) {
         if (cursor == null) {
             cursor = Integer.MAX_VALUE;
         }
@@ -35,7 +36,7 @@ ResponseDto<CommentsResponseDto> getComment(@RequestParam(name = "cursor", requi
 
     @PostMapping("/comment")
     ResponseDto<Void> saveComment(@RequestParam(name = "commentType") Integer commentType,
-                                  @AuthInfo Integer userId) {
+                                  @Parameter(hidden = true) @AuthInfo Integer userId) {
 
         if(commentType == null || commentType<1 || commentType > 5){
 

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

@@ -5,6 +5,7 @@
 import com.softeer.backend.fo_domain.draw.service.DrawService;
 import com.softeer.backend.global.annotation.AuthInfo;
 import com.softeer.backend.global.common.response.ResponseDto;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +17,8 @@ public class DrawController {
     private final DrawService drawService;
 
     @GetMapping("/event/draw")
-    public ResponseDto<DrawMainResponseDto> getDrawMainPageInfo(@AuthInfo Integer userId) {
+    public ResponseDto<DrawResponseDto> getDrawMainPageInfo(@Parameter(hidden = true) @AuthInfo Integer userId) {
+
         return drawService.getDrawMainPageInfo(userId);
     }
 

src/main/java/com/softeer/backend/fo_domain/fcfs/controller/FcfsController.java

@@ -1,30 +1,68 @@
 package com.softeer.backend.fo_domain.fcfs.controller;
 
-import com.softeer.backend.fo_domain.fcfs.dto.FcfsResponseDto;
-import com.softeer.backend.fo_domain.fcfs.dto.FcfsSuccessResponseDto;
+import com.softeer.backend.fo_domain.fcfs.dto.FcfsPageResponseDto;
+import com.softeer.backend.fo_domain.fcfs.dto.result.FcfsResponseDto;
 import com.softeer.backend.fo_domain.fcfs.service.FcfsService;
 import com.softeer.backend.global.annotation.AuthInfo;
 import com.softeer.backend.global.common.response.ResponseDto;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-@RestController
+@Controller
 @RequiredArgsConstructor
+@RequestMapping("/fcfs")
 @Tag(name = "Fcfs Controller", description = "선착순 API")
 public class FcfsController {
     private final FcfsService fcfsService;
 
-//    @PostMapping("/fcfs")
-//    public ResponseDto<FcfsResponseDto> handleFCFS(@Parameter(hidden = true) @AuthInfo Integer userId) {
-//        FcfsResponseDto fcfsResponse = fcfsService.handleFcfsEvent(userId);
-//
-//        if (fcfsResponse instanceof FcfsSuccessResponseDto)
-//            return ResponseDto.onSuccess(fcfsResponse);
+    @GetMapping
+    @ResponseBody
+    public ResponseDto<FcfsPageResponseDto> getFcfsPage(@Parameter(hidden = true) HttpServletRequest request) {
+
+        int round = (Integer) request.getAttribute("round");
+
+        FcfsPageResponseDto fcfsPageResponseDto = fcfsService.getFcfsPage(round);
+
+        return ResponseDto.onSuccess(fcfsPageResponseDto);
+    }
+
+    @GetMapping("/tutorial")
+    @ResponseBody
+    public ResponseDto<FcfsPageResponseDto> getFcfsTutorialPage() {
+
+        FcfsPageResponseDto fcfsPageResponseDto = fcfsService.getFcfsTutorialPage();
+
+        return ResponseDto.onSuccess(fcfsPageResponseDto);
+    }
+
+    @PostMapping
+    public String handleFcfs(@Parameter(hidden = true) HttpServletRequest request,
+                             @Parameter(hidden = true) @AuthInfo Integer userId,
+                             @RequestParam(value = "answer") String answer,
+                             @Parameter(hidden = true) RedirectAttributes redirectAttributes) {
+
+        int round = (Integer) request.getAttribute("round");
+
+//        boolean isFcfsWinner = fcfsService.handleFcfsEvent(userId, round, answer);
 //
-//        return ResponseDto.onSuccess(fcfsResponse);
-//    }
+//        // 리다이렉트 시 쿼리 파라미터를 추가하여 정보 전달
+//        redirectAttributes.addAttribute("fcfsWin", isFcfsWinner);
+
+        // GET 요청으로 리다이렉트
+        return "redirect:/fcfs/result";
+    }
+
+    @GetMapping("/result")
+    @ResponseBody
+    public ResponseDto<FcfsResponseDto> getFcfsResult(@RequestParam("fcfsWin") Boolean fcfsWin){
+        FcfsResponseDto fcfsResponseDto = fcfsService.getFcfsResult(fcfsWin);
+
+        return ResponseDto.onSuccess(fcfsResponseDto);
+    }
 
 }

src/main/java/com/softeer/backend/fo_domain/fcfs/domain/Quiz.java

@@ -0,0 +1,42 @@
+package com.softeer.backend.fo_domain.fcfs.domain;
+
+import com.softeer.backend.fo_domain.user.domain.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Builder
+@Table(name = "quiz")
+public class Quiz {
+
+    @Id
+    @Column(name = "quiz_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "hint", nullable = false)
+    private String hint;
+
+    @Column(name = "answer_word", nullable = false)
+    private String answerWord;
+
+    @Column(name = "answer_sentence", nullable = false)
+    private String answerSentence;
+
+    @Column(name = "start_index", nullable = false)
+    private int startIndex;
+
+    @Column(name = "end_index", nullable = false)
+    private int endIndex;
+
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/dto/FcfsPageResponseDto.java

@@ -0,0 +1,22 @@
+package com.softeer.backend.fo_domain.fcfs.dto;
+
+import lombok.*;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+@Builder
+@Getter
+@Setter
+public class FcfsPageResponseDto {
+
+    private String answerWord;
+
+    private String answerSentence;
+
+    private int startIndex;
+
+    private int endIndex;
+
+    private String quizDescription;
+
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/dto/QuizDto.java

@@ -0,0 +1,23 @@
+package com.softeer.backend.fo_domain.fcfs.dto;
+
+import jakarta.persistence.Column;
+import lombok.*;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+@Builder
+@Getter
+@Setter
+public class QuizDto {
+
+    private String hint;
+
+    private String answerWord;
+
+    private String answerSentence;
+
+    private int startIndex;
+
+    private int endIndex;
+
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/dto/result/FcfsFailResponseDto.java

@@ -0,0 +1,16 @@
+package com.softeer.backend.fo_domain.fcfs.dto.result;
+
+import lombok.*;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+@Builder
+@Getter
+public class FcfsFailResponseDto implements FcfsResponseDto {
+
+    private String title;
+
+    private String subTitle;
+
+    private String caution;
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/dto/result/FcfsResponseDto.java

@@ -0,0 +1,4 @@
+package com.softeer.backend.fo_domain.fcfs.dto.result;
+
+public interface FcfsResponseDto {
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/dto/result/FcfsSuccessResponseDto.java

@@ -0,0 +1,25 @@
+package com.softeer.backend.fo_domain.fcfs.dto.result;
+
+import lombok.*;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PUBLIC)
+@Builder
+@Getter
+public class FcfsSuccessResponseDto implements FcfsResponseDto {
+
+    private String title;
+
+    private String subTitle;
+
+    private String qrCode;
+
+    private String codeWord;
+
+    private String fcfsCode;
+
+    private String expirationDate;
+
+    private String caution;
+
+}

src/main/java/com/softeer/backend/fo_domain/fcfs/exception/FcfsException.java

@@ -0,0 +1,11 @@
+package com.softeer.backend.fo_domain.fcfs.exception;
+
+import com.softeer.backend.global.common.code.BaseErrorCode;
+import com.softeer.backend.global.common.exception.GeneralException;
+
+public class FcfsException extends GeneralException {
+
+    public FcfsException(BaseErrorCode code) {
+        super(code);
+    }
+}