DailyDefense 컨트롤러 작성 및 시험 타이머 기능 개발

build.gradle

@@ -72,31 +72,41 @@ repositories {
 }
 
 dependencies {
+
+    // Spring Data Jpa
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
+    // Spring Data Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-
+    // Spring Security
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    testImplementation 'org.springframework.security:spring-security-test'
+
+    // validation
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-    implementation 'org.springframework.boot:spring-boot-starter-web'
 
+    // WebFlux (WebClient)
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
-    implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
+    // Spring Web
+    implementation 'org.springframework.boot:spring-boot-starter-web'
 
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
-
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.2'
 
+    // MariaDB
     runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 
+    // lombok
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
+    // Test Dependencies
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'com.h2database:h2'
 }
 

src/main/java/kr/co/morandi/backend/common/config/WebClientConfig.java

@@ -6,6 +6,7 @@
 
 @Configuration
 public class WebClientConfig {
+
     @Bean
     public WebClient webClient() {
         return WebClient.builder().build();

src/main/java/kr/co/morandi/backend/common/config/WebMvcConfig.java

@@ -0,0 +1,24 @@
+package kr.co.morandi.backend.common.config;
+
+import kr.co.morandi.backend.common.web.resolver.MemberHandlerMethodArgumentResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Bean
+    MemberHandlerMethodArgumentResolver memberHandlerMethodArgumentResolver() {
+        return new MemberHandlerMethodArgumentResolver();
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(memberHandlerMethodArgumentResolver());
+    }
+
+}

src/main/java/kr/co/morandi/backend/common/exception/MorandiException.java

@@ -8,9 +8,12 @@ public class MorandiException extends RuntimeException {
     private final ErrorCode errorCode;
 
     public MorandiException(ErrorCode errorCode) {
+        super(errorCode.getMessage());
         this.errorCode = errorCode;
     }
+
     public MorandiException(ErrorCode errorCode, String message) {
+        super(message);
         this.errorCode = errorCode;
     }
 }

src/main/java/kr/co/morandi/backend/common/exception/handler/GlobalExceptionHandler.java

@@ -7,17 +7,13 @@
 import kr.co.morandi.backend.member_management.infrastructure.config.cookie.utils.CookieUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.NoHandlerFoundException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import java.net.URI;
-
 import static kr.co.morandi.backend.common.exception.handler.exception.CommonErrorCode.INTERNAL_SERVER_ERROR;
 import static kr.co.morandi.backend.member_management.infrastructure.config.jwt.constants.TokenType.REFRESH_TOKEN;
 
@@ -28,9 +24,6 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
     private final CookieUtils cookieUtils;
 
-    @Value("${oauth2.signup-url}")
-    private String signupPath;
-
     @ExceptionHandler(MorandiException.class)
     public ResponseEntity<ErrorResponse> morandiExceptionHandler(MorandiException e) {
         log.error(e.getErrorCode().name()+" : ", e.getErrorCode().getMessage() + " : ", e);
@@ -39,8 +32,7 @@ public ResponseEntity<ErrorResponse> morandiExceptionHandler(MorandiException e)
         if (e.getErrorCode().getHttpStatus() == HttpStatus.UNAUTHORIZED) {
             HttpHeaders headers = createUnauthorizedHeaders();
 
-            // 로그인 페이지로 리다이렉트
-            return new ResponseEntity<>(headers, HttpStatus.FOUND);
+            return new ResponseEntity<>(headers, HttpStatus.UNAUTHORIZED);
         }
 
         // 그 외의 에러가 발생한 경우
@@ -61,11 +53,9 @@ public ResponseEntity<String> handleAllException(Exception e) {
     /**
      * Unauthorized 에러가 발생한 경우
      * Refresh Token 쿠키를 제거하고
-     * 로그인 페이지로 리다이렉트
      */
     private HttpHeaders createUnauthorizedHeaders() {
         HttpHeaders headers = new HttpHeaders();
-        headers.setLocation(URI.create(signupPath));
         Cookie cookie = cookieUtils.removeCookie(REFRESH_TOKEN, null);
         headers.add("Set-Cookie", cookie.toString());
         return headers;

src/main/java/kr/co/morandi/backend/common/web/MemberId.java

@@ -0,0 +1,11 @@
+package kr.co.morandi.backend.common.web;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MemberId {
+}

src/main/java/kr/co/morandi/backend/common/web/resolver/MemberHandlerMethodArgumentResolver.java

@@ -0,0 +1,22 @@
+package kr.co.morandi.backend.common.web.resolver;
+
+import kr.co.morandi.backend.common.web.MemberId;
+import kr.co.morandi.backend.member_management.infrastructure.config.security.utils.SecurityUtils;
+import org.springframework.core.MethodParameter;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+public class MemberHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.getParameterAnnotation(MemberId.class) != null
+                && parameter.getParameterType().equals(Long.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+        return SecurityUtils.getCurrentMemberId();
+    }
+}

src/main/java/kr/co/morandi/backend/defense_information/application/dto/response/DailyDefenseInfoResponse.java

@@ -0,0 +1,27 @@
+package kr.co.morandi.backend.defense_information.application.dto.response;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class DailyDefenseInfoResponse {
+
+    private String defenseName;
+    private Integer problemCount;
+    private Long attemptCount;
+    private List<DailyDefenseProblemInfoResponse> problems;
+
+
+    @Builder
+    private DailyDefenseInfoResponse(String defenseName, Integer problemCount, Long attemptCount, List<DailyDefenseProblemInfoResponse> problems) {
+        this.defenseName = defenseName;
+        this.problemCount = problemCount;
+        this.attemptCount = attemptCount;
+        this.problems = problems;
+    }
+}

src/main/java/kr/co/morandi/backend/defense_information/application/dto/response/DailyDefenseProblemInfoResponse.java

@@ -0,0 +1,35 @@
+package kr.co.morandi.backend.defense_information.application.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import kr.co.morandi.backend.defense_information.domain.model.defense.ProblemTier;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class DailyDefenseProblemInfoResponse {
+
+    private Long problemNumber;
+    private Long problemId;
+    private Long baekjoonProblemId;
+    private ProblemTier difficulty;
+    private Long solvedCount;
+    private Long submitCount;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean isSolved;
+
+    @Builder
+    private DailyDefenseProblemInfoResponse(Long problemNumber, Long problemId, Long baekjoonProblemId, ProblemTier difficulty, Long solvedCount, Long submitCount, Boolean isSolved) {
+        this.problemNumber = problemNumber;
+        this.problemId = problemId;
+        this.baekjoonProblemId = baekjoonProblemId;
+        this.difficulty = difficulty;
+        this.solvedCount = solvedCount;
+        this.submitCount = submitCount;
+        this.isSolved = isSolved;
+    }
+}
+
+

src/main/java/kr/co/morandi/backend/defense_information/application/mapper/dailydefense/DailyDefenseInfoMapper.java

@@ -0,0 +1,32 @@
+package kr.co.morandi.backend.defense_information.application.mapper.dailydefense;
+
+import kr.co.morandi.backend.defense_information.application.dto.response.DailyDefenseInfoResponse;
+import kr.co.morandi.backend.defense_information.domain.model.dailydefense.DailyDefense;
+import kr.co.morandi.backend.defense_record.domain.model.dailydefense_record.DailyRecord;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class DailyDefenseInfoMapper {
+
+    public static DailyDefenseInfoResponse fromNonAttempted(DailyDefense dailyDefense) {
+        return DailyDefenseInfoResponse.builder()
+                .defenseName(dailyDefense.getContentName())
+                .problemCount(dailyDefense.getProblemCount())
+                .attemptCount(dailyDefense.getAttemptCount())
+                .problems(DailyDefenseProblemInfoMapper.ofNonAttempted(dailyDefense.getDailyDefenseProblems()))
+                .build();
+    }
+
+    public static DailyDefenseInfoResponse ofAttempted(DailyDefense dailyDefense, DailyRecord dailyRecord) {
+        return DailyDefenseInfoResponse.builder()
+                .defenseName(dailyDefense.getContentName())
+                .problemCount(dailyDefense.getProblemCount())
+                .attemptCount(dailyDefense.getAttemptCount())
+                .problems(DailyDefenseProblemInfoMapper.ofAttempted(
+                        dailyDefense.getDailyDefenseProblems(),
+                        dailyRecord.getSolvedProblemNumbers())
+                )
+                .build();
+    }
+}

src/main/java/kr/co/morandi/backend/defense_information/application/mapper/dailydefense/DailyDefenseProblemInfoMapper.java

@@ -0,0 +1,37 @@
+package kr.co.morandi.backend.defense_information.application.mapper.dailydefense;
+
+import kr.co.morandi.backend.defense_information.application.dto.response.DailyDefenseProblemInfoResponse;
+import kr.co.morandi.backend.defense_information.domain.model.dailydefense.DailyDefenseProblem;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Set;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class DailyDefenseProblemInfoMapper {
+
+    public static List<DailyDefenseProblemInfoResponse> ofNonAttempted(List<DailyDefenseProblem> dailyDefenseProblems) {
+        return dailyDefenseProblems.stream().map(problem -> DailyDefenseProblemInfoResponse.builder()
+                .problemNumber(problem.getProblemNumber())
+                .problemId(problem.getProblem().getProblemId())
+                .baekjoonProblemId(problem.getProblem().getBaekjoonProblemId())
+                .difficulty(problem.getProblem().getProblemTier())
+                .solvedCount(problem.getSolvedCount())
+                .submitCount(problem.getSubmitCount())
+                .build()
+        ).toList();
+    }
+    public static List<DailyDefenseProblemInfoResponse> ofAttempted(List<DailyDefenseProblem> dailyDefenseProblems, Set<Long> solvedProblemNumbers) {
+        return dailyDefenseProblems.stream().map(problem -> DailyDefenseProblemInfoResponse.builder()
+                .problemNumber(problem.getProblemNumber())
+                .problemId(problem.getProblem().getProblemId())
+                .baekjoonProblemId(problem.getProblem().getBaekjoonProblemId())
+                .difficulty(problem.getProblem().getProblemTier())
+                .solvedCount(problem.getSolvedCount())
+                .submitCount(problem.getSubmitCount())
+                .isSolved(solvedProblemNumbers.contains(problem.getProblemNumber()))
+                .build()
+        ).toList();
+    }
+}

src/main/java/kr/co/morandi/backend/defense_information/application/port/in/DailyDefenseUseCase.java

@@ -0,0 +1,9 @@
+package kr.co.morandi.backend.defense_information.application.port.in;
+
+import kr.co.morandi.backend.defense_information.application.dto.response.DailyDefenseInfoResponse;
+
+import java.time.LocalDateTime;
+
+public interface DailyDefenseUseCase {
+    DailyDefenseInfoResponse getDailyDefenseInfo(Long memberId, LocalDateTime requestDateTime);
+}

src/main/java/kr/co/morandi/backend/defense_information/application/service/DailyDefenseUseCaseImpl.java

@@ -0,0 +1,57 @@
+package kr.co.morandi.backend.defense_information.application.service;
+
+import kr.co.morandi.backend.defense_information.application.dto.response.DailyDefenseInfoResponse;
+import kr.co.morandi.backend.defense_information.application.mapper.dailydefense.DailyDefenseInfoMapper;
+import kr.co.morandi.backend.defense_information.application.port.in.DailyDefenseUseCase;
+import kr.co.morandi.backend.defense_information.application.port.out.dailydefense.DailyDefensePort;
+import kr.co.morandi.backend.defense_information.domain.model.dailydefense.DailyDefense;
+import kr.co.morandi.backend.defense_record.application.port.out.dailyrecord.DailyRecordPort;
+import kr.co.morandi.backend.defense_record.domain.model.dailydefense_record.DailyRecord;
+import kr.co.morandi.backend.member_management.application.port.out.member.MemberPort;
+import kr.co.morandi.backend.member_management.domain.model.member.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+
+import static kr.co.morandi.backend.defense_information.domain.model.defense.DefenseType.DAILY;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class DailyDefenseUseCaseImpl implements DailyDefenseUseCase {
+
+    private final MemberPort memberPort;
+    private final DailyDefensePort dailyDefensePort;
+    private final DailyRecordPort dailyRecordPort;
+
+    @Override
+    public DailyDefenseInfoResponse getDailyDefenseInfo(Long memberId, LocalDateTime requestDateTime) {
+        final DailyDefense dailyDefense = dailyDefensePort.findDailyDefense(DAILY, requestDateTime.toLocalDate());
+        /*
+        * 비로그인 상태인 경우
+        * */
+        if(memberId == null) {
+            return DailyDefenseInfoMapper.fromNonAttempted(dailyDefense);
+        }
+        /*
+        * 로그인 상태인 경우
+        * */
+        final Member member = memberPort.findMemberById(memberId);
+        Optional<DailyRecord> maybeDailyRecord = dailyRecordPort.findDailyRecord(member, requestDateTime.toLocalDate());
+
+        /*
+        * 시험 기록이 존재하는 경우
+        * */
+        if(maybeDailyRecord.isPresent()) {
+            DailyRecord dailyRecord = maybeDailyRecord.get();
+            return DailyDefenseInfoMapper.ofAttempted(dailyDefense, dailyRecord);
+        }
+        /*
+        * 시험 응시 기록이 없는 경우
+        * */
+        return DailyDefenseInfoMapper.fromNonAttempted(dailyDefense);
+    }
+}

src/main/java/kr/co/morandi/backend/defense_information/domain/model/defense/Defense.java

@@ -30,6 +30,9 @@ public abstract class Defense extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private DefenseType defenseType;
 
+    public void increaseAttemptCount() {
+        ++this.attemptCount;
+    }
     public abstract LocalDateTime getEndTime(LocalDateTime startTime);
     //팩토리 메소드 패턴
     public Map<Long, Problem> getDefenseProblems(ProblemGenerationService problemGenerationService) {