diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/domain/UserProject.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/domain/UserProject.java index f0969f0..d05070b 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/domain/UserProject.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/domain/UserProject.java @@ -1,13 +1,10 @@ package com.puzzling.puzzlingServer.api.project.domain; import com.puzzling.puzzlingServer.api.member.domain.Member; -import com.puzzling.puzzlingServer.api.template.domain.ReviewTemplate; import com.puzzling.puzzlingServer.common.entity.BaseTimeEntity; -import io.micrometer.core.annotation.Counted; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.ColumnDefault; import javax.persistence.*; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/dto/request/ProjectRegisterRequestDto.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/dto/request/ProjectRegisterRequestDto.java index f408346..3eaf4fc 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/dto/request/ProjectRegisterRequestDto.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/dto/request/ProjectRegisterRequestDto.java @@ -7,8 +7,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import java.lang.reflect.Array; -import java.util.List; import static lombok.AccessLevel.PROTECTED; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java index 1b66ca0..e50a606 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java @@ -17,7 +17,6 @@ import com.puzzling.puzzlingServer.common.response.ErrorStatus; import com.puzzling.puzzlingServer.common.util.MemberUtil; import lombok.RequiredArgsConstructor; -import org.apache.catalina.User; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -26,11 +25,6 @@ import java.nio.ByteBuffer; import java.security.Principal; -import java.security.SecureRandom; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.format.TextStyle; import java.util.*; import java.util.stream.Collectors; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java index 6dce28b..18a3f97 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/controller/ReviewController.java @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; @RestController diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/request/ReviewTILRequestDto.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/request/ReviewTILRequestDto.java index 458c7fe..786afa3 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/request/ReviewTILRequestDto.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/dto/request/ReviewTILRequestDto.java @@ -5,7 +5,6 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import static lombok.AccessLevel.PROTECTED; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java index b8d983f..200a23d 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java @@ -5,7 +5,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java index e4ba2e3..8c90e4c 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/review/service/Impl/ReviewServiceImpl.java @@ -36,10 +36,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.time.DayOfWeek; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.time.format.TextStyle; import java.util.*; import java.util.stream.Collectors; @@ -210,13 +208,10 @@ public List getTeamReviewStatus(Long projectId, Str List result = new ArrayList<>(); - //1. 프로젝트 id로 userProjects 리스트 뽑아오기 List userProjects = userProjectRepository.findAllByProjectId(projectId); - //2. 프로젝트 회고 주기 가져오기 String reviewCycle = findProjectById(projectId).getReviewCycle(); - //3.startDate와 endDate 사이에 회고 주기에 맞는 날짜 계산 List reviewDates = generateReviewDates(startDate, endDate, reviewCycle); for (String reviewDate : reviewDates) { diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/advice/ControllerExceptionAdvice.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/advice/ControllerExceptionAdvice.java index 0e41b28..a7b547b 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/advice/ControllerExceptionAdvice.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/advice/ControllerExceptionAdvice.java @@ -11,14 +11,11 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; import java.time.format.DateTimeParseException; import java.util.Objects; - import static com.puzzling.puzzlingServer.common.response.ErrorStatus.KAKAO_UNAUTHORIZED_USER; -import static com.puzzling.puzzlingServer.common.response.ErrorStatus.VALIDATION_PATH_MISSING_EXCEPTION; @RestControllerAdvice public class ControllerExceptionAdvice { diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/config/jwt/JwtTokenProvider.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/config/jwt/JwtTokenProvider.java index c8c141f..ffb5121 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/config/jwt/JwtTokenProvider.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/config/jwt/JwtTokenProvider.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; import java.security.Key; import java.util.Date; -import java.util.Objects; + @Slf4j @Component diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/response/ErrorStatus.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/response/ErrorStatus.java index 659e9a6..5d1cd65 100644 --- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/response/ErrorStatus.java +++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/common/response/ErrorStatus.java @@ -3,7 +3,6 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; @Getter @RequiredArgsConstructor(access = AccessLevel.PROTECTED)