diff --git a/src/main/java/until/the/eternity/dcs/common/config/RedisConfig.java b/src/main/java/until/the/eternity/dcs/common/config/RedisConfig.java index 924e3354..d3f81006 100644 --- a/src/main/java/until/the/eternity/dcs/common/config/RedisConfig.java +++ b/src/main/java/until/the/eternity/dcs/common/config/RedisConfig.java @@ -1,6 +1,7 @@ package until.the.eternity.dcs.common.config; import com.fasterxml.jackson.databind.ObjectMapper; +import java.time.Duration; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; @@ -14,8 +15,6 @@ import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.StringRedisSerializer; -import java.time.Duration; - @Configuration @EnableCaching public class RedisConfig { diff --git a/src/main/java/until/the/eternity/dcs/common/config/RedisStreamConfig.java b/src/main/java/until/the/eternity/dcs/common/config/RedisStreamConfig.java index 2b02fc3e..dffeca01 100644 --- a/src/main/java/until/the/eternity/dcs/common/config/RedisStreamConfig.java +++ b/src/main/java/until/the/eternity/dcs/common/config/RedisStreamConfig.java @@ -2,6 +2,7 @@ import io.lettuce.core.RedisBusyException; import jakarta.annotation.PostConstruct; +import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -11,8 +12,6 @@ import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.core.StringRedisTemplate; -import java.util.Map; - @Configuration @RequiredArgsConstructor public class RedisStreamConfig { diff --git a/src/main/java/until/the/eternity/dcs/common/config/RedisStreamListenerConfig.java b/src/main/java/until/the/eternity/dcs/common/config/RedisStreamListenerConfig.java index 48076c74..00360671 100644 --- a/src/main/java/until/the/eternity/dcs/common/config/RedisStreamListenerConfig.java +++ b/src/main/java/until/the/eternity/dcs/common/config/RedisStreamListenerConfig.java @@ -1,5 +1,10 @@ package until.the.eternity.dcs.common.config; +import static org.springframework.data.redis.connection.stream.Consumer.from; + +import java.time.Duration; +import java.util.UUID; +import java.util.concurrent.Executor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -14,12 +19,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import until.the.eternity.dcs.domain.notice.application.NoticeListener; -import java.time.Duration; -import java.util.UUID; -import java.util.concurrent.Executor; - -import static org.springframework.data.redis.connection.stream.Consumer.from; - @Configuration @RequiredArgsConstructor @Slf4j diff --git a/src/main/java/until/the/eternity/dcs/common/config/SecurityConfig.java b/src/main/java/until/the/eternity/dcs/common/config/SecurityConfig.java index 066c9dcd..23c1af14 100644 --- a/src/main/java/until/the/eternity/dcs/common/config/SecurityConfig.java +++ b/src/main/java/until/the/eternity/dcs/common/config/SecurityConfig.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.common.config; +import java.util.Arrays; +import java.util.Collections; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,9 +15,6 @@ import org.springframework.web.cors.CorsConfigurationSource; import until.the.eternity.dcs.common.filter.JwtHeaderFilter; -import java.util.Arrays; -import java.util.Collections; - @Configuration @EnableWebSecurity @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/common/entity/BaseEntity.java b/src/main/java/until/the/eternity/dcs/common/entity/BaseEntity.java index 65b2d681..5eb35c58 100644 --- a/src/main/java/until/the/eternity/dcs/common/entity/BaseEntity.java +++ b/src/main/java/until/the/eternity/dcs/common/entity/BaseEntity.java @@ -3,14 +3,13 @@ import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; - @MappedSuperclass @EntityListeners(AuditingEntityListener.class) @Getter diff --git a/src/main/java/until/the/eternity/dcs/common/entity/SoftDeleteEntity.java b/src/main/java/until/the/eternity/dcs/common/entity/SoftDeleteEntity.java index cd9d46ed..4063a653 100644 --- a/src/main/java/until/the/eternity/dcs/common/entity/SoftDeleteEntity.java +++ b/src/main/java/until/the/eternity/dcs/common/entity/SoftDeleteEntity.java @@ -3,11 +3,10 @@ import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PreRemove; +import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; - @MappedSuperclass @Getter @Setter diff --git a/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionCode.java b/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionCode.java index 17443f31..c32d6d62 100644 --- a/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionCode.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.common.exception; +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import static org.springframework.http.HttpStatus.BAD_REQUEST; -import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; - @Getter @RequiredArgsConstructor public enum GlobalExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionHandler.java b/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionHandler.java index 38200a56..eb194404 100644 --- a/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/until/the/eternity/dcs/common/exception/GlobalExceptionHandler.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.common.exception; +import static until.the.eternity.dcs.common.exception.GlobalExceptionCode.SERVER_ERROR; + import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -9,8 +11,6 @@ import until.the.eternity.dcs.common.response.ApiResponse; import until.the.eternity.dcs.domain.announcement.exception.AnnouncementInvalidBoardIdParameterException; -import static until.the.eternity.dcs.common.exception.GlobalExceptionCode.SERVER_ERROR; - @Slf4j @RestControllerAdvice public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { diff --git a/src/main/java/until/the/eternity/dcs/common/exception/PostImageExceptionCode.java b/src/main/java/until/the/eternity/dcs/common/exception/PostImageExceptionCode.java index 3aab66b8..5cbf8bca 100644 --- a/src/main/java/until/the/eternity/dcs/common/exception/PostImageExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/common/exception/PostImageExceptionCode.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.common.exception; +import static org.springframework.http.HttpStatus.*; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import static org.springframework.http.HttpStatus.*; - @Getter @RequiredArgsConstructor public enum PostImageExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/common/filter/JwtHeaderFilter.java b/src/main/java/until/the/eternity/dcs/common/filter/JwtHeaderFilter.java index 47426cdf..a39b1df7 100644 --- a/src/main/java/until/the/eternity/dcs/common/filter/JwtHeaderFilter.java +++ b/src/main/java/until/the/eternity/dcs/common/filter/JwtHeaderFilter.java @@ -4,6 +4,9 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,10 +20,6 @@ import until.the.eternity.dcs.common.util.IpAddressUtil; import until.the.eternity.dcs.domain.user.enums.UserGrade; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - @Slf4j @Component @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/common/infrastructure/ArchivingScheduler.java b/src/main/java/until/the/eternity/dcs/common/infrastructure/ArchivingScheduler.java index 5c8b387d..7a1d4cfe 100644 --- a/src/main/java/until/the/eternity/dcs/common/infrastructure/ArchivingScheduler.java +++ b/src/main/java/until/the/eternity/dcs/common/infrastructure/ArchivingScheduler.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.common.infrastructure; +import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -7,8 +8,6 @@ import until.the.eternity.dcs.domain.comment.application.CommentArchiveService; import until.the.eternity.dcs.domain.post.application.PostArchiveService; -import java.time.LocalDateTime; - @Component @RequiredArgsConstructor public class ArchivingScheduler { diff --git a/src/main/java/until/the/eternity/dcs/common/infrastructure/MinioService.java b/src/main/java/until/the/eternity/dcs/common/infrastructure/MinioService.java index 889c6ded..df1c06e5 100644 --- a/src/main/java/until/the/eternity/dcs/common/infrastructure/MinioService.java +++ b/src/main/java/until/the/eternity/dcs/common/infrastructure/MinioService.java @@ -1,7 +1,14 @@ package until.the.eternity.dcs.common.infrastructure; +import static until.the.eternity.dcs.common.exception.PostImageExceptionCode.*; + import io.minio.*; import io.minio.http.Method; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -11,14 +18,6 @@ import until.the.eternity.dcs.common.exception.InvalidFileNameException; import until.the.eternity.dcs.common.exception.MissingFileUploadException; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -import static until.the.eternity.dcs.common.exception.PostImageExceptionCode.*; - @Service @RequiredArgsConstructor public class MinioService { diff --git a/src/main/java/until/the/eternity/dcs/common/notification/RedisSender.java b/src/main/java/until/the/eternity/dcs/common/notification/RedisSender.java index c7de7c82..8cbebaea 100644 --- a/src/main/java/until/the/eternity/dcs/common/notification/RedisSender.java +++ b/src/main/java/until/the/eternity/dcs/common/notification/RedisSender.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.common.notification; +import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.connection.RedisStreamCommands.XAddOptions; @@ -9,8 +10,6 @@ import org.springframework.stereotype.Service; import until.the.eternity.dcs.common.notification.dto.NotificationJob; -import java.util.Map; - @Service @RequiredArgsConstructor public class RedisSender { diff --git a/src/main/java/until/the/eternity/dcs/common/notification/dto/NotificationJob.java b/src/main/java/until/the/eternity/dcs/common/notification/dto/NotificationJob.java index d6de1273..415736ab 100644 --- a/src/main/java/until/the/eternity/dcs/common/notification/dto/NotificationJob.java +++ b/src/main/java/until/the/eternity/dcs/common/notification/dto/NotificationJob.java @@ -1,11 +1,10 @@ package until.the.eternity.dcs.common.notification.dto; -import lombok.Builder; -import until.the.eternity.dcs.domain.notice.enums.NoticeType; - import java.util.HashMap; import java.util.Map; import java.util.UUID; +import lombok.Builder; +import until.the.eternity.dcs.domain.notice.enums.NoticeType; @Builder public record NotificationJob( diff --git a/src/main/java/until/the/eternity/dcs/common/request/CustomPageRequest.java b/src/main/java/until/the/eternity/dcs/common/request/CustomPageRequest.java index ba12bd40..f64fbe3f 100644 --- a/src/main/java/until/the/eternity/dcs/common/request/CustomPageRequest.java +++ b/src/main/java/until/the/eternity/dcs/common/request/CustomPageRequest.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.common.request; +import static org.springframework.data.domain.Sort.Direction.ASC; +import static org.springframework.data.domain.Sort.Direction.DESC; + import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -7,9 +10,6 @@ import org.springframework.data.domain.Sort.Direction; import until.the.eternity.dcs.common.exception.InvalidPageRequestException; -import static org.springframework.data.domain.Sort.Direction.ASC; -import static org.springframework.data.domain.Sort.Direction.DESC; - public record CustomPageRequest( @Schema(description = "요청할 페이지 번호", example = "1") Integer page, @Schema(description = "페이지당 항목 수", example = "20") Integer size, diff --git a/src/main/java/until/the/eternity/dcs/common/response/ApiResponse.java b/src/main/java/until/the/eternity/dcs/common/response/ApiResponse.java index 3d8a9154..1ef57e4b 100644 --- a/src/main/java/until/the/eternity/dcs/common/response/ApiResponse.java +++ b/src/main/java/until/the/eternity/dcs/common/response/ApiResponse.java @@ -1,10 +1,9 @@ package until.the.eternity.dcs.common.response; +import java.time.Instant; import lombok.Builder; import lombok.Getter; -import java.time.Instant; - @Getter public class ApiResponse { diff --git a/src/main/java/until/the/eternity/dcs/common/response/CustomPageResponse.java b/src/main/java/until/the/eternity/dcs/common/response/CustomPageResponse.java index ef56ce48..ad1603ff 100644 --- a/src/main/java/until/the/eternity/dcs/common/response/CustomPageResponse.java +++ b/src/main/java/until/the/eternity/dcs/common/response/CustomPageResponse.java @@ -1,9 +1,8 @@ package until.the.eternity.dcs.common.response; import io.swagger.v3.oas.annotations.media.Schema; -import org.springframework.data.domain.Page; - import java.util.List; +import org.springframework.data.domain.Page; @Schema(description = "페이지 응답 객체") public record CustomPageResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementService.java b/src/main/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementService.java index 100259ba..037560c8 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementService.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementService.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.domain.announcement.application; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.ANNOUNCEMENT; + +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; @@ -24,10 +27,6 @@ import until.the.eternity.dcs.domain.post.infrastructure.PostMetaRepository; import until.the.eternity.dcs.domain.post.infrastructure.PostRepository; -import java.util.List; - -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.ANNOUNCEMENT; - @Service @RequiredArgsConstructor public class AnnouncementService { diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/request/AnnouncementCreateRequest.java b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/request/AnnouncementCreateRequest.java index 044cb494..12ae6b79 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/request/AnnouncementCreateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/request/AnnouncementCreateRequest.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.announcement.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record AnnouncementCreateRequest( @Schema(description = "공지글 전체공개 여부", example = "true", requiredMode = REQUIRED) @NotNull Boolean isGlobal) {} diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPageResponseItem.java b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPageResponseItem.java index 0774ed43..005b6812 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPageResponseItem.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPageResponseItem.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.announcement.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.announcement.entity.Announcement; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record AnnouncementPageResponseItem( @Schema(description = "게시글 ID", example = "1") Long postId, diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPersistResponse.java index e28aedb9..ea5bf164 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementPersistResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.announcement.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.announcement.entity.Announcement; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record AnnouncementPersistResponse( @Schema(description = "공지글 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementToggleResponse.java b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementToggleResponse.java index 01455dde..458a6612 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementToggleResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/dto/response/AnnouncementToggleResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.announcement.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.announcement.entity.Announcement; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record AnnouncementToggleResponse( @Schema(description = "공지글 아이디", example = "1", requiredMode = REQUIRED) Long id, diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementExceptionCode.java index f9a33d6a..9937892d 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementExceptionCode.java @@ -1,23 +1,21 @@ package until.the.eternity.dcs.domain.announcement.exception; +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.CONFLICT; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.CONFLICT; -import static org.springframework.http.HttpStatus.NOT_FOUND; -import static org.springframework.http.HttpStatus.BAD_REQUEST; - @Getter @RequiredArgsConstructor public enum AnnouncementExceptionCode implements ExceptionCode { ANNOUNCEMENT_DUPLICATE_EXCEPTION(CONFLICT, "해당 게시물이 이미 공지로 등록되어 있습니다."), ANNOUNCEMENT_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 ID의 공지글이 존재하지 않습니다."), - ANNOUNCEMENT_BOARD_NOT_FOUND_EXCEPTION( - NOT_FOUND, "해당 게시판이 존재하지 않습니다."), - ANNOUNCEMENT_INVALID_BOARD_ID_EXCEPTION( - BAD_REQUEST, "boardId 요청 값은 숫자여야 합니다."), + ANNOUNCEMENT_BOARD_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 게시판이 존재하지 않습니다."), + ANNOUNCEMENT_INVALID_BOARD_ID_EXCEPTION(BAD_REQUEST, "boardId 요청 값은 숫자여야 합니다."), ; private final HttpStatus status; diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementNotFoundException.java index 0e4a93ec..a4fd3fc5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/exception/AnnouncementNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.announcement.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.announcement.exception.AnnouncementExceptionCode.ANNOUNCEMENT_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class AnnouncementNotFoundException extends CustomException { public AnnouncementNotFoundException(Long id) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/infrastructure/AnnouncementRepository.java b/src/main/java/until/the/eternity/dcs/domain/announcement/infrastructure/AnnouncementRepository.java index fee88bb1..04e2b450 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/infrastructure/AnnouncementRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/infrastructure/AnnouncementRepository.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.announcement.infrastructure; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.announcement.entity.Announcement; -import java.util.List; - @Repository public interface AnnouncementRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/announcement/presentation/AnnouncementController.java b/src/main/java/until/the/eternity/dcs/domain/announcement/presentation/AnnouncementController.java index cc28a7d5..b6cdfb43 100644 --- a/src/main/java/until/the/eternity/dcs/domain/announcement/presentation/AnnouncementController.java +++ b/src/main/java/until/the/eternity/dcs/domain/announcement/presentation/AnnouncementController.java @@ -1,10 +1,14 @@ package until.the.eternity.dcs.domain.announcement.presentation; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.NO_CONTENT; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.validation.Valid; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -14,11 +18,6 @@ import until.the.eternity.dcs.domain.announcement.dto.response.AnnouncementPersistResponse; import until.the.eternity.dcs.domain.announcement.dto.response.AnnouncementToggleResponse; -import java.util.List; - -import static org.springframework.http.HttpStatus.CREATED; -import static org.springframework.http.HttpStatus.NO_CONTENT; - @RestController @RequiredArgsConstructor @RequestMapping("/api/announcements") @@ -44,8 +43,7 @@ public ResponseEntity create( @DeleteMapping("/{id}") @Operation( summary = "공지글 삭제 API", - description = - """ + description = """ - Description : 이 API를 통해 공지글을 삭제합니다. - Assignee : 담당자 미정""") @ApiResponse(responseCode = "204") @@ -57,8 +55,7 @@ public ResponseEntity delete(@PathVariable Long id) { @PatchMapping("/toggle-global/{id}") @Operation( summary = "공지글 전체 공지 토글 API", - description = - """ + description = """ - Description : 공지글의 전체 공지 여부를 토글합니다. - Assignee : 담당자 미정""") @ApiResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardArchiveService.java b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardArchiveService.java index ac4bcbe0..2898d4cd 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardArchiveService.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardArchiveService.java @@ -1,6 +1,9 @@ package until.the.eternity.dcs.domain.board.application; import jakarta.transaction.Transactional; +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import until.the.eternity.dcs.domain.board.entity.Board; @@ -8,10 +11,6 @@ import until.the.eternity.dcs.domain.board.infrastructure.BoardArchiveRepository; import until.the.eternity.dcs.domain.board.infrastructure.BoardRepository; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - @Service @RequiredArgsConstructor public class BoardArchiveService { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardConverter.java b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardConverter.java index a01890e0..6189313a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardConverter.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardConverter.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.board.application; +import java.util.List; import org.springframework.stereotype.Component; import until.the.eternity.dcs.domain.board.dto.request.BoardCreateRequest; import until.the.eternity.dcs.domain.board.dto.response.BoardListResponse; import until.the.eternity.dcs.domain.board.dto.response.BoardPersistResponse; import until.the.eternity.dcs.domain.board.entity.Board; -import java.util.List; - @Component public class BoardConverter { public Board fromCreateRequestToBoard(BoardCreateRequest request, Long userId) { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardService.java b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardService.java index 5c3178b8..1d7da7f6 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/application/BoardService.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/application/BoardService.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.board.application; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; @@ -14,8 +15,6 @@ import until.the.eternity.dcs.domain.board.exception.BoardNotFoundException; import until.the.eternity.dcs.domain.board.infrastructure.BoardRepository; -import java.util.List; - @Service @RequiredArgsConstructor public class BoardService { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardCreateRequest.java b/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardCreateRequest.java index e59cf248..2130ea11 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardCreateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardCreateRequest.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.board.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record BoardCreateRequest( @Schema(description = "게시판 이름", example = "길드원 모집", requiredMode = REQUIRED) @NotBlank(message = "게시판의 이름은 공란일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardUpdateRequest.java b/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardUpdateRequest.java index 6a481d8a..7cc2134f 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardUpdateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/dto/request/BoardUpdateRequest.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.board.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record BoardUpdateRequest( @Schema(description = "게시판 이름", example = "길드원 모집", requiredMode = REQUIRED) @NotBlank(message = "게시판의 이름은 공란일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardDetailResponse.java index 27280371..9810be08 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardDetailResponse.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.board.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.board.entity.Board; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record BoardDetailResponse( @Schema(description = "게시판 아이디", example = "1", requiredMode = REQUIRED) Long id, diff --git a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardListResponse.java b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardListResponse.java index 8c224f4a..dce14927 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardListResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardListResponse.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.board.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.Builder; import until.the.eternity.dcs.domain.board.entity.Board; -import java.util.List; - -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record BoardListResponse( @Schema(description = "게시판의 개수", example = "1", requiredMode = REQUIRED) int count, diff --git a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardPersistResponse.java index 1302b189..794e2e89 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/dto/response/BoardPersistResponse.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.board.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record BoardPersistResponse( @Schema(description = "게시판 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/entity/Board.java b/src/main/java/until/the/eternity/dcs/domain/board/entity/Board.java index 736fdab5..ddc81cb0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/entity/Board.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/entity/Board.java @@ -1,6 +1,7 @@ package until.the.eternity.dcs.domain.board.entity; import jakarta.persistence.*; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -9,8 +10,6 @@ import until.the.eternity.dcs.domain.announcement.entity.Announcement; import until.the.eternity.dcs.domain.post.entity.Post; -import java.util.List; - @Entity @Table(name = "board") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/board/entity/BoardArchive.java b/src/main/java/until/the/eternity/dcs/domain/board/entity/BoardArchive.java index cd30cdf3..a648b4f3 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/entity/BoardArchive.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/entity/BoardArchive.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.board.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; -import java.time.LocalDateTime; - @Entity @Table(name = "board_archive") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardExceptionCode.java index d6696b73..67103bf2 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardExceptionCode.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.board.exception; +import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.FORBIDDEN; -import static org.springframework.http.HttpStatus.NOT_FOUND; - @Getter @RequiredArgsConstructor public enum BoardExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardModifyForbiddenException.java b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardModifyForbiddenException.java index 558d7eb9..2af3f811 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardModifyForbiddenException.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardModifyForbiddenException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.board.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.board.exception.BoardExceptionCode.BOARD_MODIFY_FORBIDDEN_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class BoardModifyForbiddenException extends CustomException { public BoardModifyForbiddenException() { super(BOARD_MODIFY_FORBIDDEN_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardNotFoundException.java index db9f0afc..6c1e2e6a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/exception/BoardNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.board.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.board.exception.BoardExceptionCode.BOARD_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class BoardNotFoundException extends CustomException { public BoardNotFoundException(Long id) { super(BOARD_NOT_FOUND_EXCEPTION, BOARD_NOT_FOUND_EXCEPTION.getMessage() + " ID : " + id); diff --git a/src/main/java/until/the/eternity/dcs/domain/board/infrastructure/BoardRepository.java b/src/main/java/until/the/eternity/dcs/domain/board/infrastructure/BoardRepository.java index 8795d6aa..9d61b395 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/infrastructure/BoardRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/infrastructure/BoardRepository.java @@ -1,12 +1,11 @@ package until.the.eternity.dcs.domain.board.infrastructure; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import until.the.eternity.dcs.domain.board.entity.Board; - import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import until.the.eternity.dcs.domain.board.entity.Board; @Repository public interface BoardRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/board/presentation/BoardController.java b/src/main/java/until/the/eternity/dcs/domain/board/presentation/BoardController.java index b04810b6..7766d927 100644 --- a/src/main/java/until/the/eternity/dcs/domain/board/presentation/BoardController.java +++ b/src/main/java/until/the/eternity/dcs/domain/board/presentation/BoardController.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.domain.board.presentation; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.NO_CONTENT; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -13,9 +16,6 @@ import until.the.eternity.dcs.domain.board.dto.response.BoardListResponse; import until.the.eternity.dcs.domain.board.dto.response.BoardPersistResponse; -import static org.springframework.http.HttpStatus.CREATED; -import static org.springframework.http.HttpStatus.NO_CONTENT; - @RestController @RequiredArgsConstructor @RequestMapping("/api/boards") diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentArchiveService.java b/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentArchiveService.java index 21ff5dd3..a2495398 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentArchiveService.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentArchiveService.java @@ -1,6 +1,9 @@ package until.the.eternity.dcs.domain.comment.application; import jakarta.transaction.Transactional; +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import until.the.eternity.dcs.domain.comment.entity.Comment; @@ -10,10 +13,6 @@ import until.the.eternity.dcs.domain.comment.infrastructure.CommentMetaRepository; import until.the.eternity.dcs.domain.comment.infrastructure.CommentRepository; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - @Service @RequiredArgsConstructor public class CommentArchiveService { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentService.java b/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentService.java index 289b1214..0750dbb9 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentService.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/application/CommentService.java @@ -1,5 +1,11 @@ package until.the.eternity.dcs.domain.comment.application; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.*; + +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -34,13 +40,6 @@ import until.the.eternity.dcs.domain.user.application.UserSummaryService; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.*; - @Slf4j @Service @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentCreateRequest.java b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentCreateRequest.java index bdb33071..8517ca7a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentCreateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentCreateRequest.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.comment.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record CommentCreateRequest( @Schema(description = "대댓글일 경우 상위 댓글의 아이디", example = "1", requiredMode = NOT_REQUIRED) Long parentComment, diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentLikeToggleRequest.java b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentLikeToggleRequest.java index 6d00b789..2f6fe4aa 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentLikeToggleRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentLikeToggleRequest.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.comment.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record CommentLikeToggleRequest( @Schema(description = "댓글 아이디", example = "1", requiredMode = REQUIRED) @NotNull(message = "댓글 아이디는 Null일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentUpdateRequest.java b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentUpdateRequest.java index a0f76bf2..5c9a5989 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentUpdateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/dto/request/CommentUpdateRequest.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.comment.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record CommentUpdateRequest( @Schema(description = "댓글 내용", example = "정말 좋은 게시글이네요!!", requiredMode = REQUIRED) @NotBlank(message = "댓글 내용은 공란일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPageResponseItem.java b/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPageResponseItem.java index c67494a2..b9bc0859 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPageResponseItem.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPageResponseItem.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.comment.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.comment.entity.Comment; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record CommentPageResponseItem( @Schema(description = "댓글 아이디", example = "1", requiredMode = REQUIRED) Long id, diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPersistResponse.java index c7c84974..bc24095c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/dto/response/CommentPersistResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.comment.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.comment.entity.Comment; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record CommentPersistResponse( @Schema(description = "댓글 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/entity/Comment.java b/src/main/java/until/the/eternity/dcs/domain/comment/entity/Comment.java index 15dd90be..07764238 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/entity/Comment.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/entity/Comment.java @@ -1,6 +1,7 @@ package until.the.eternity.dcs.domain.comment.entity; import jakarta.persistence.*; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -8,8 +9,6 @@ import until.the.eternity.dcs.common.entity.SoftDeleteEntity; import until.the.eternity.dcs.domain.post.entity.Post; -import java.util.List; - @Entity @Table(name = "comment") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentArchive.java b/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentArchive.java index 48f5e453..396e1bfa 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentArchive.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentArchive.java @@ -1,6 +1,7 @@ package until.the.eternity.dcs.domain.comment.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -8,8 +9,6 @@ import org.springframework.data.annotation.CreatedDate; import until.the.eternity.dcs.common.entity.AuditableEntity; -import java.time.LocalDateTime; - @Entity @Table(name = "comment_archive") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentLike.java b/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentLike.java index c89923b4..91454afb 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentLike.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/entity/CommentLike.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.comment.entity; +import static jakarta.persistence.GenerationType.IDENTITY; + import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; - -import static jakarta.persistence.GenerationType.IDENTITY; - @Entity @Table(name = "comment_like") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentExceptionCode.java index 47688b9d..6afa6195 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentExceptionCode.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.comment.exception; +import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.FORBIDDEN; -import static org.springframework.http.HttpStatus.NOT_FOUND; - @Getter @RequiredArgsConstructor public enum CommentExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentModifyForbiddenException.java b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentModifyForbiddenException.java index 1670afe5..a651a9dc 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentModifyForbiddenException.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentModifyForbiddenException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.comment.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.comment.exception.CommentExceptionCode.COMMENT_MODIFY_FORBIDDEN_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class CommentModifyForbiddenException extends CustomException { public CommentModifyForbiddenException() { super(COMMENT_MODIFY_FORBIDDEN_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotFoundException.java index 1597fc4a..ef75a21b 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.comment.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.comment.exception.CommentExceptionCode.COMMENT_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class CommentNotFoundException extends CustomException { public CommentNotFoundException(Long id) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotLikedYetException.java b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotLikedYetException.java index e8fb0e73..7007c42c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotLikedYetException.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/exception/CommentNotLikedYetException.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.comment.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.comment.exception.CommentExceptionCode.COMMENT_NOT_FOUND_EXCEPTION; import static until.the.eternity.dcs.domain.comment.exception.CommentExceptionCode.COMMENT_NOT_LIKED_YET_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class CommentNotLikedYetException extends CustomException { public CommentNotLikedYetException(Long commentId) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentLikeRepository.java b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentLikeRepository.java index 32ddea26..7a11cf98 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentLikeRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentLikeRepository.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.domain.comment.infrastructure; +import java.util.List; +import java.util.Optional; +import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -7,10 +10,6 @@ import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.comment.entity.CommentLike; -import java.util.List; -import java.util.Optional; -import java.util.Set; - @Repository public interface CommentLikeRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentMetaRepository.java b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentMetaRepository.java index 7d00208d..3c6bfe12 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentMetaRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentMetaRepository.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.comment.infrastructure; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -7,8 +8,6 @@ import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.comment.entity.CommentMeta; -import java.util.List; - @Repository public interface CommentMetaRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentRepository.java b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentRepository.java index 6261299a..daad12eb 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/infrastructure/CommentRepository.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.comment.infrastructure; +import java.time.LocalDateTime; +import java.util.List; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,9 +11,6 @@ import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.comment.entity.Comment; -import java.time.LocalDateTime; -import java.util.List; - @Repository public interface CommentRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/comment/presentation/CommentController.java b/src/main/java/until/the/eternity/dcs/domain/comment/presentation/CommentController.java index f814fc51..8fefdf18 100644 --- a/src/main/java/until/the/eternity/dcs/domain/comment/presentation/CommentController.java +++ b/src/main/java/until/the/eternity/dcs/domain/comment/presentation/CommentController.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.domain.comment.presentation; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.NO_CONTENT; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,9 +19,6 @@ import until.the.eternity.dcs.domain.comment.dto.response.CommentPageResponseItem; import until.the.eternity.dcs.domain.comment.dto.response.CommentPersistResponse; -import static org.springframework.http.HttpStatus.CREATED; -import static org.springframework.http.HttpStatus.NO_CONTENT; - @RestController @RequiredArgsConstructor @RequestMapping("/api/comments") diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeConverter.java b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeConverter.java index f240f90f..92aa97f6 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeConverter.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeConverter.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.notice.application; +import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import until.the.eternity.dcs.domain.notice.dto.request.NoticeSendRequest; @@ -9,8 +10,6 @@ import until.the.eternity.dcs.domain.notice.entity.NoticeUser; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.time.LocalDateTime; - @Component @RequiredArgsConstructor public class NoticeConverter { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeListener.java b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeListener.java index 4f7881fe..e0d3c8df 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeListener.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeListener.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.notice.application; +import java.time.Duration; +import java.util.Objects; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -9,9 +11,6 @@ import until.the.eternity.dcs.common.notification.dto.NotificationJob; import until.the.eternity.dcs.domain.notice.dto.request.NoticeSendRequest; -import java.time.Duration; -import java.util.Objects; - @Component @RequiredArgsConstructor @Slf4j diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeService.java b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeService.java index a160e179..d1315de7 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeService.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/application/NoticeService.java @@ -1,5 +1,11 @@ package until.the.eternity.dcs.domain.notice.application; +import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.context.SecurityContextHolder; @@ -19,13 +25,6 @@ import until.the.eternity.dcs.domain.user.exception.UserNotFoundException; import until.the.eternity.dcs.domain.user.infrastructure.UserSummaryRepository; -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; - @Service @RequiredArgsConstructor public class NoticeService { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/dto/request/NoticeSendRequest.java b/src/main/java/until/the/eternity/dcs/domain/notice/dto/request/NoticeSendRequest.java index 81f74924..acd90e23 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/dto/request/NoticeSendRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/dto/request/NoticeSendRequest.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.notice.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.common.notification.dto.NotificationJob; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record NoticeSendRequest( @Schema(description = "수신자 아이디", example = "1", requiredMode = REQUIRED) Long receiverId, diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponse.java b/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponse.java index 19c41c7a..2243c23b 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponse.java @@ -1,17 +1,16 @@ package until.the.eternity.dcs.domain.notice.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; import lombok.Builder; import until.the.eternity.dcs.domain.notice.entity.Notice; import until.the.eternity.dcs.domain.notice.entity.NoticeUser; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.time.LocalDateTime; - -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record NoticeCommonResponse( @Schema(description = "알림 아이디", example = "1", requiredMode = REQUIRED) Long id, diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticePersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticePersistResponse.java index acbb7ade..77f024da 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticePersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/dto/response/NoticePersistResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.notice.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.notice.entity.Notice; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record NoticePersistResponse( @Schema(description = "알림 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/entity/Notice.java b/src/main/java/until/the/eternity/dcs/domain/notice/entity/Notice.java index 813201f3..e525f964 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/entity/Notice.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/entity/Notice.java @@ -1,6 +1,7 @@ package until.the.eternity.dcs.domain.notice.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -9,8 +10,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.time.LocalDateTime; - @Entity @Table(name = "notice") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/entity/NoticeUser.java b/src/main/java/until/the/eternity/dcs/domain/notice/entity/NoticeUser.java index ed685db2..2dadcadd 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/entity/NoticeUser.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/entity/NoticeUser.java @@ -1,6 +1,9 @@ package until.the.eternity.dcs.domain.notice.entity; +import static jakarta.persistence.GenerationType.IDENTITY; + import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -8,10 +11,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; - -import static jakarta.persistence.GenerationType.IDENTITY; - @Entity @Table(name = "notice_user") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/enums/NoticeType.java b/src/main/java/until/the/eternity/dcs/domain/notice/enums/NoticeType.java index c27ee177..6190b32c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/enums/NoticeType.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/enums/NoticeType.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.notice.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeExceptionCode.java index 5d474504..90a08154 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeExceptionCode.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.notice.exception; +import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.FORBIDDEN; -import static org.springframework.http.HttpStatus.NOT_FOUND; - @Getter @RequiredArgsConstructor public enum NoticeExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeNotFoundException.java index af09bcc1..d1e2ad78 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.notice.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.notice.exception.NoticeExceptionCode.NOTICE_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class NoticeNotFoundException extends CustomException { public NoticeNotFoundException(Long id) { super(NOTICE_NOT_FOUND_EXCEPTION, NOTICE_NOT_FOUND_EXCEPTION.getMessage() + " ID : " + id); diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeSendForbiddenException.java b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeSendForbiddenException.java index 0baa60d9..44b77f3a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeSendForbiddenException.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/exception/NoticeSendForbiddenException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.notice.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.notice.exception.NoticeExceptionCode.NOTICE_SEND_FORBIDDEN_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class NoticeSendForbiddenException extends CustomException { public NoticeSendForbiddenException() { super(NOTICE_SEND_FORBIDDEN_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeRepository.java b/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeRepository.java index d90b5ab9..b3f02923 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeRepository.java @@ -1,11 +1,10 @@ package until.the.eternity.dcs.domain.notice.infrastructure; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.notice.entity.Notice; -import java.util.List; - @Repository public interface NoticeRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeUserRepository.java b/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeUserRepository.java index 6aec42f8..5a2cb05a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeUserRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/infrastructure/NoticeUserRepository.java @@ -1,12 +1,11 @@ package until.the.eternity.dcs.domain.notice.infrastructure; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import until.the.eternity.dcs.domain.notice.entity.NoticeUser; - import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import until.the.eternity.dcs.domain.notice.entity.NoticeUser; @Repository public interface NoticeUserRepository extends JpaRepository { diff --git a/src/main/java/until/the/eternity/dcs/domain/notice/presentation/NoticeController.java b/src/main/java/until/the/eternity/dcs/domain/notice/presentation/NoticeController.java index c6b0f2fc..7fd8d7b7 100644 --- a/src/main/java/until/the/eternity/dcs/domain/notice/presentation/NoticeController.java +++ b/src/main/java/until/the/eternity/dcs/domain/notice/presentation/NoticeController.java @@ -1,9 +1,12 @@ package until.the.eternity.dcs.domain.notice.presentation; +import static org.springframework.http.HttpStatus.CREATED; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.connection.stream.RecordId; import org.springframework.http.ResponseEntity; @@ -16,10 +19,6 @@ import until.the.eternity.dcs.domain.notice.dto.response.NoticePersistResponse; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.util.List; - -import static org.springframework.http.HttpStatus.CREATED; - @RestController @RequiredArgsConstructor @RequestMapping("/api/notices") diff --git a/src/main/java/until/the/eternity/dcs/domain/post/application/PostArchiveService.java b/src/main/java/until/the/eternity/dcs/domain/post/application/PostArchiveService.java index ea6c8233..a36014eb 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/application/PostArchiveService.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/application/PostArchiveService.java @@ -1,6 +1,10 @@ package until.the.eternity.dcs.domain.post.application; import jakarta.transaction.Transactional; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -14,11 +18,6 @@ import until.the.eternity.dcs.domain.post.infrastructure.PostRepository; import until.the.eternity.dcs.domain.tag.infrastructure.PostTagRepository; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - @Slf4j @Service @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/post/application/PostConverter.java b/src/main/java/until/the/eternity/dcs/domain/post/application/PostConverter.java index 6d1dad0f..a4e0fa82 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/application/PostConverter.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/application/PostConverter.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.post.application; +import java.util.List; import org.springframework.stereotype.Component; import until.the.eternity.dcs.domain.board.entity.Board; import until.the.eternity.dcs.domain.post.dto.request.PostCreateRequest; @@ -10,8 +11,6 @@ import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.util.List; - @Component public class PostConverter { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaService.java b/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaService.java index 155e1fa8..edc1a7d0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaService.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaService.java @@ -1,5 +1,11 @@ package until.the.eternity.dcs.domain.post.application; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; @@ -12,13 +18,6 @@ import until.the.eternity.dcs.domain.post.enums.PostMetaType; import until.the.eternity.dcs.domain.post.infrastructure.PostMetaRepository; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - @Service @Transactional(readOnly = true) @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaSyncScheduler.java b/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaSyncScheduler.java index e0b199bb..1b1366b0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaSyncScheduler.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/application/PostMetaSyncScheduler.java @@ -1,6 +1,11 @@ package until.the.eternity.dcs.domain.post.application; import jakarta.transaction.Transactional; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; @@ -11,12 +16,6 @@ import until.the.eternity.dcs.domain.post.entity.PostMeta; import until.the.eternity.dcs.domain.post.infrastructure.PostMetaRepository; -import java.util.HashSet; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - @Component @RequiredArgsConstructor public class PostMetaSyncScheduler { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/application/PostService.java b/src/main/java/until/the/eternity/dcs/domain/post/application/PostService.java index e3df6fac..1392a3bd 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/application/PostService.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/application/PostService.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.post.application; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -43,14 +50,6 @@ import until.the.eternity.dcs.domain.user.entity.UserSummary; import until.the.eternity.dcs.domain.user.exception.UserNotFoundException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; - @Slf4j @Service @Transactional(readOnly = true) diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostCreateRequest.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostCreateRequest.java index bae4870a..1c79dcfa 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostCreateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostCreateRequest.java @@ -4,7 +4,6 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; - import java.util.List; public record PostCreateRequest( diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostPageRequest.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostPageRequest.java index a46f7de9..378d4d36 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostPageRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostPageRequest.java @@ -1,17 +1,16 @@ package until.the.eternity.dcs.domain.post.dto.request; +import static org.springframework.data.domain.Sort.Direction.ASC; +import static org.springframework.data.domain.Sort.Direction.DESC; + import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Set; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; import until.the.eternity.dcs.common.exception.InvalidPageRequestException; -import java.util.Set; - -import static org.springframework.data.domain.Sort.Direction.ASC; -import static org.springframework.data.domain.Sort.Direction.DESC; - public record PostPageRequest( @Schema(description = "요청할 페이지 번호", example = "1") Integer page, @Schema(description = "페이지당 항목 수", example = "20") Integer size, diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostUpdateRequest.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostUpdateRequest.java index c97a145b..3dbf25c0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostUpdateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/request/PostUpdateRequest.java @@ -3,7 +3,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; - import java.util.List; public record PostUpdateRequest( diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostDetailResponse.java index 00be6ac0..5a67ae7d 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostDetailResponse.java @@ -2,11 +2,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import until.the.eternity.dcs.domain.post.entity.Post; - import java.time.LocalDateTime; import java.util.List; +import lombok.Builder; +import until.the.eternity.dcs.domain.post.entity.Post; @Builder public record PostDetailResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostPersistResponse.java index cd9abe32..9d4aaf9a 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostPersistResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.post.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.post.entity.Post; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record PostPersistResponse( @Schema(description = "게시글 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostSummaryResponse.java b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostSummaryResponse.java index 65dd6db0..2db73eb5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostSummaryResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/dto/response/PostSummaryResponse.java @@ -2,12 +2,11 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; import lombok.Builder; import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.time.LocalDateTime; - @Builder public record PostSummaryResponse( @Schema(description = "게시글 ID", example = "1") Long id, diff --git a/src/main/java/until/the/eternity/dcs/domain/post/entity/Post.java b/src/main/java/until/the/eternity/dcs/domain/post/entity/Post.java index 6942a712..ef4f6602 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/entity/Post.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/entity/Post.java @@ -1,15 +1,14 @@ package until.the.eternity.dcs.domain.post.entity; import jakarta.persistence.*; +import java.util.ArrayList; +import java.util.List; import lombok.*; import until.the.eternity.dcs.common.entity.SoftDeleteEntity; import until.the.eternity.dcs.domain.board.entity.Board; import until.the.eternity.dcs.domain.comment.entity.Comment; import until.the.eternity.dcs.domain.tag.entity.PostTag; -import java.util.ArrayList; -import java.util.List; - @Entity @Table(name = "post") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostArchive.java b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostArchive.java index fde660ed..9e2716da 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostArchive.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostArchive.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.post.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; -import java.time.LocalDateTime; - @Entity @Table(name = "post_archive") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostLike.java b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostLike.java index bf6ea790..73a0f5c9 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostLike.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostLike.java @@ -1,12 +1,11 @@ package until.the.eternity.dcs.domain.post.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; - @Entity @Table(name = "post_like") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostMeta.java b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostMeta.java index 3cdac1fd..1d081ac7 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/entity/PostMeta.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/entity/PostMeta.java @@ -4,10 +4,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import lombok.*; - import java.util.HashMap; import java.util.Map; +import lombok.*; @ToString @Entity diff --git a/src/main/java/until/the/eternity/dcs/domain/post/enums/PostMetaType.java b/src/main/java/until/the/eternity/dcs/domain/post/enums/PostMetaType.java index b3e16734..56b089b6 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/enums/PostMetaType.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/enums/PostMetaType.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.post.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/post/enums/PostSortType.java b/src/main/java/until/the/eternity/dcs/domain/post/enums/PostSortType.java index 847a914d..25b18cfb 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/enums/PostSortType.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/enums/PostSortType.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.post.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/post/enums/SearchType.java b/src/main/java/until/the/eternity/dcs/domain/post/enums/SearchType.java index 5413743d..6aefaa6d 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/enums/SearchType.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/enums/SearchType.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.post.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDeletionNotAllowedException.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDeletionNotAllowedException.java index 7c783231..4097fdd5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDeletionNotAllowedException.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDeletionNotAllowedException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.post.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.post.exception.PostExceptionCode.POST_DELETION_NOT_ALLOWED_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class PostDeletionNotAllowedException extends CustomException { public PostDeletionNotAllowedException() { super(POST_DELETION_NOT_ALLOWED_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDraftRequiredException.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDraftRequiredException.java index 9c4767a9..70b61e6e 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDraftRequiredException.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostDraftRequiredException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.post.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.post.exception.PostExceptionCode.POST_DRAFT_REQUIRED_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class PostDraftRequiredException extends CustomException { public PostDraftRequiredException() { super(POST_DRAFT_REQUIRED_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostExceptionCode.java index c15ef5a1..93981351 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostExceptionCode.java @@ -1,12 +1,12 @@ package until.the.eternity.dcs.domain.post.exception; +import static org.springframework.http.HttpStatus.*; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.*; - @Getter @RequiredArgsConstructor public enum PostExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostImageCountExceededException.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostImageCountExceededException.java index 1be73654..5c015406 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostImageCountExceededException.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostImageCountExceededException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.post.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.post.exception.PostExceptionCode.POST_IMAGE_COUNT_EXCEEDED_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class PostImageCountExceededException extends CustomException { public PostImageCountExceededException() { super(POST_IMAGE_COUNT_EXCEEDED_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostModifyForbiddenException.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostModifyForbiddenException.java index 9e61ad17..fb8e0bd8 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostModifyForbiddenException.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostModifyForbiddenException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.post.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.post.exception.PostExceptionCode.POST_MODIFY_FORBIDDEN_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class PostModifyForbiddenException extends CustomException { public PostModifyForbiddenException() { super(POST_MODIFY_FORBIDDEN_EXCEPTION); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostNotFoundException.java index e532b991..6661f1c0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/exception/PostNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/exception/PostNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.post.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.post.exception.PostExceptionCode.POST_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class PostNotFoundException extends CustomException { public PostNotFoundException(Long id) { super(POST_NOT_FOUND_EXCEPTION, POST_NOT_FOUND_EXCEPTION.getMessage() + " ID : " + id); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostLikeRepository.java b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostLikeRepository.java index 8133e0e8..b0b621b0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostLikeRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostLikeRepository.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import until.the.eternity.dcs.domain.post.entity.PostLike; -import java.util.List; -import java.util.Optional; - public interface PostLikeRepository extends JpaRepository { Optional findByUserIdAndPostId(Long userId, Long postId); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostMetaRepository.java b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostMetaRepository.java index 27d7b555..04a70dc6 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostMetaRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostMetaRepository.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import until.the.eternity.dcs.domain.post.entity.PostMeta; -import java.util.List; -import java.util.Optional; - public interface PostMetaRepository extends JpaRepository { Optional findByPostId(Long postId); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepository.java b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepository.java index 9f0e95d3..d94ce28c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepository.java @@ -1,5 +1,8 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,10 +12,6 @@ import org.springframework.stereotype.Repository; import until.the.eternity.dcs.domain.post.entity.Post; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - @Repository public interface PostRepository extends JpaRepository, PostRepositoryCustom { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryCustom.java b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryCustom.java index 75f8d1b2..39359a00 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryCustom.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryCustom.java @@ -1,12 +1,11 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import until.the.eternity.dcs.domain.board.entity.Board; import until.the.eternity.dcs.domain.post.entity.Post; -import java.util.Optional; - public interface PostRepositoryCustom { Page findWithPostMetaByBoardId(Pageable pageable, Board board); diff --git a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryImpl.java b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryImpl.java index 8820340b..5d776efa 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryImpl.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryImpl.java @@ -1,5 +1,10 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import static until.the.eternity.dcs.domain.post.entity.QPost.post; +import static until.the.eternity.dcs.domain.post.entity.QPostMeta.postMeta; +import static until.the.eternity.dcs.domain.tag.entity.QPostTag.postTag; +import static until.the.eternity.dcs.domain.tag.entity.QTag.tag; + import com.querydsl.core.types.Order; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.Expressions; @@ -8,6 +13,9 @@ import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -18,15 +26,6 @@ import until.the.eternity.dcs.domain.board.entity.Board; import until.the.eternity.dcs.domain.post.entity.Post; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import static until.the.eternity.dcs.domain.post.entity.QPost.post; -import static until.the.eternity.dcs.domain.post.entity.QPostMeta.postMeta; -import static until.the.eternity.dcs.domain.tag.entity.QPostTag.postTag; -import static until.the.eternity.dcs.domain.tag.entity.QTag.tag; - @Repository @RequiredArgsConstructor public class PostRepositoryImpl implements PostRepositoryCustom { diff --git a/src/main/java/until/the/eternity/dcs/domain/post/presentation/PostController.java b/src/main/java/until/the/eternity/dcs/domain/post/presentation/PostController.java index c0571a0a..b40620a1 100644 --- a/src/main/java/until/the/eternity/dcs/domain/post/presentation/PostController.java +++ b/src/main/java/until/the/eternity/dcs/domain/post/presentation/PostController.java @@ -1,10 +1,13 @@ package until.the.eternity.dcs.domain.post.presentation; +import static org.springframework.http.HttpStatus.*; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.validation.Valid; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -19,10 +22,6 @@ import until.the.eternity.dcs.domain.post.dto.response.PostPersistResponse; import until.the.eternity.dcs.domain.post.dto.response.PostSummaryResponse; -import java.util.List; - -import static org.springframework.http.HttpStatus.*; - @RestController @RequiredArgsConstructor @RequestMapping("/api/posts") diff --git a/src/main/java/until/the/eternity/dcs/domain/report/application/ReportConverter.java b/src/main/java/until/the/eternity/dcs/domain/report/application/ReportConverter.java index ff82218f..f75d52e0 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/application/ReportConverter.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/application/ReportConverter.java @@ -9,14 +9,10 @@ import until.the.eternity.dcs.domain.report.enums.ReportTargetType; import until.the.eternity.dcs.domain.report.exception.CategoryNotFoundException; import until.the.eternity.dcs.domain.report.exception.TargetNotFoundException; -import until.the.eternity.dcs.domain.user.application.UserSummaryService; -import until.the.eternity.dcs.domain.user.dto.response.UserSummaryDetailResponse; @Component @RequiredArgsConstructor public class ReportConverter { - private final UserSummaryService userSummaryService; - public Report fromReportCreateRequestToReport( ReportCreateRequest reportCreateRequest, Long userId) { ReportTargetType targetType = @@ -57,29 +53,27 @@ public ReportRevivedDetailResponse fromReportToReportRevivedDetailResponse( .build(); } - public ReportRevivedSummaryResponse fromReportToReportRevivedSummaryResponse(Report report) { - Long targetUserId = report.getTargetUserId(); - UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(targetUserId); + public ReportRevivedSummaryResponse fromReportToReportRevivedSummaryResponse( + Report report, String targetUserName) { return ReportRevivedSummaryResponse.builder() .Id(report.getId()) .targetType(report.getTargetType().getCode()) .targetUserId(report.getTargetUserId()) - .targetUsername(userSummary.nickname()) + .targetUsername(targetUserName) .categoryCd(report.getCategoryCd().getCode()) .revivedAt(report.getRevivedAt()) .revivedBy(report.getRevivedBy()) .build(); } - public ReportRepliedDetailResponse fromReportToReportRepliedDetailResponse(Report report) { - Long targetUserId = report.getTargetUserId(); - UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(targetUserId); + public ReportRepliedDetailResponse fromReportToReportRepliedDetailResponse( + Report report, String targetUserName) { return ReportRepliedDetailResponse.builder() .Id(report.getId()) .targetType(report.getTargetType().getCode()) .targetId(report.getTargetId()) .targetUserId(report.getTargetUserId()) - .targetUsername(userSummary.nickname()) + .targetUsername(targetUserName) .userId(report.getUserId()) .categoryCd(report.getCategoryCd().getCode()) .reason(report.getReason()) @@ -88,46 +82,41 @@ public ReportRepliedDetailResponse fromReportToReportRepliedDetailResponse(Repor .build(); } - public ReportRepliedSummaryResponse fromReportToReportRepliedSummaryResponse(Report report) { - // todo usersummaryservice 사용 부분 N+1 문제 발생 가능 -> 해결 예정 - Long targetUserId = report.getTargetUserId(); - UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(targetUserId); + public ReportRepliedSummaryResponse fromReportToReportRepliedSummaryResponse( + Report report, String targetUserName) { return ReportRepliedSummaryResponse.builder() .Id(report.getId()) .targetType(report.getTargetType().getCode()) .targetUserId(report.getTargetUserId()) - .targetUsername(userSummary.nickname()) + .targetUsername(targetUserName) .categoryCd(report.getCategoryCd().getCode()) .repliedAt(report.getRepliedAt()) .repliedBy(report.getRepliedBy()) .build(); } - public ReportReportedDetailResponse fromReportToReportReportedDetailResponse(Report report) { - Long targetUserId = report.getTargetUserId(); - UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(targetUserId); - + public ReportReportedDetailResponse fromReportToReportReportedDetailResponse( + Report report, String targetUserName) { return ReportReportedDetailResponse.builder() .Id(report.getId()) .targetType(report.getTargetType().getCode()) .targetId(report.getTargetId()) - .targetUserId(targetUserId) - .targetUsername(userSummary.nickname()) + .targetUserId(report.getTargetUserId()) + .targetUsername(targetUserName) .userId(report.getUserId()) .categoryCd(report.getCategoryCd().getCode()) .reason(report.getReason()) .build(); } - public ReportReportedSummaryResponse fromReportToReportReportedSummaryResponse(Report report) { - Long targetUserId = report.getTargetUserId(); - UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(targetUserId); + public ReportReportedSummaryResponse fromReportToReportReportedSummaryResponse( + Report report, String targetUserName) { return ReportReportedSummaryResponse.builder() .Id(report.getId()) .targetType(report.getTargetType().getCode()) .targetUserId(report.getTargetUserId()) - .targetUsername(userSummary.nickname()) + .targetUsername(targetUserName) .categoryCd(report.getCategoryCd().getCode()) .build(); } diff --git a/src/main/java/until/the/eternity/dcs/domain/report/application/ReportService.java b/src/main/java/until/the/eternity/dcs/domain/report/application/ReportService.java index 61c735db..d3fff2a4 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/application/ReportService.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/application/ReportService.java @@ -1,5 +1,14 @@ package until.the.eternity.dcs.domain.report.application; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.*; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.COMMENT_BLOCKED; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_BLOCKED; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.REPORT_RESULT; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -18,14 +27,12 @@ import until.the.eternity.dcs.domain.report.enums.ReportStatus; import until.the.eternity.dcs.domain.report.enums.ReportTargetType; import until.the.eternity.dcs.domain.report.exception.ReportNotFoundException; +import until.the.eternity.dcs.domain.report.exception.ReportStatusNotMatchException; import until.the.eternity.dcs.domain.report.exception.StatusNotFoundException; import until.the.eternity.dcs.domain.report.infrastructure.ReportRepository; import until.the.eternity.dcs.domain.user.application.UserSummaryService; import until.the.eternity.dcs.domain.user.dto.response.UserSummaryDetailResponse; - -import java.time.LocalDateTime; - -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.*; +import until.the.eternity.dcs.domain.user.entity.UserSummary; @Service @RequiredArgsConstructor @@ -48,12 +55,18 @@ public ReportPersistResponse createReport(ReportCreateRequest request) { @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") public ReportRepliedDetailResponse getRepliedReport(Long id) { Report report = findById(id); - return reportConverter.fromReportToReportRepliedDetailResponse(report); + reportStatusValid(report, ReportStatus.ACCEPT); + UserSummaryDetailResponse userSummary = + userSummaryService.findUserSummary(report.getTargetUserId()); + + return reportConverter.fromReportToReportRepliedDetailResponse( + report, userSummary.nickname()); } @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") public ReportRevivedDetailResponse getRevivedReport(Long id) { Report report = findById(id); + reportStatusValid(report, ReportStatus.REJECT); UserSummaryDetailResponse userSummary = userSummaryService.findUserSummary(report.getTargetUserId()); @@ -64,7 +77,12 @@ public ReportRevivedDetailResponse getRevivedReport(Long id) { @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") public ReportReportedDetailResponse getReportedReport(Long id) { Report report = findById(id); - return reportConverter.fromReportToReportReportedDetailResponse(report); + reportStatusValid(report, ReportStatus.REPORTED); + UserSummaryDetailResponse userSummary = + userSummaryService.findUserSummary(report.getTargetUserId()); + + return reportConverter.fromReportToReportReportedDetailResponse( + report, userSummary.nickname()); } @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") @@ -74,7 +92,19 @@ public Page findRepliedReports(CustomPageRequest r Page repliedReports = reportRepository.findAllByStatusCd(ReportStatus.ACCEPT, pageable); - return repliedReports.map(reportConverter::fromReportToReportRepliedSummaryResponse); + List userIdList = + repliedReports.stream().map(Report::getTargetUserId).distinct().toList(); + Map userSummaryMap = + userSummaryService.findByIdIn(userIdList).stream() + .collect(Collectors.toMap(UserSummary::getId, u -> u)); + + return repliedReports.map( + report -> { + UserSummary userSummary = userSummaryMap.get(report.getTargetUserId()); + String nickname = (userSummary != null) ? userSummary.getNickname() : "알수없음"; + return reportConverter.fromReportToReportRepliedSummaryResponse( + report, nickname); + }); } @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") @@ -84,7 +114,19 @@ public Page findRevivedReports(CustomPageRequest r Page revivedReports = reportRepository.findAllByStatusCd(ReportStatus.REJECT, pageable); - return revivedReports.map(reportConverter::fromReportToReportRevivedSummaryResponse); + List userIdList = + revivedReports.stream().map(Report::getTargetUserId).distinct().toList(); + Map userSummaryMap = + userSummaryService.findByIdIn(userIdList).stream() + .collect(Collectors.toMap(UserSummary::getId, u -> u)); + + return revivedReports.map( + report -> { + UserSummary userSummary = userSummaryMap.get(report.getTargetUserId()); + String nickname = (userSummary != null) ? userSummary.getNickname() : "알수없음"; + return reportConverter.fromReportToReportRevivedSummaryResponse( + report, nickname); + }); } @PreAuthorize("@reportPermissionEvaluator.isAuthorized(authentication)") @@ -94,7 +136,19 @@ public Page findReportedReports(CustomPageRequest Page reportedReports = reportRepository.findAllByStatusCd(ReportStatus.REPORTED, pageable); - return reportedReports.map(reportConverter::fromReportToReportReportedSummaryResponse); + List userIdList = + reportedReports.stream().map(Report::getTargetUserId).distinct().toList(); + Map userSummaryMap = + userSummaryService.findByIdIn(userIdList).stream() + .collect(Collectors.toMap(UserSummary::getId, u -> u)); + + return reportedReports.map( + report -> { + UserSummary userSummary = userSummaryMap.get(report.getTargetUserId()); + String nickname = (userSummary != null) ? userSummary.getNickname() : "알수없음"; + return reportConverter.fromReportToReportReportedSummaryResponse( + report, nickname); + }); } @Transactional @@ -148,4 +202,10 @@ private Long getCurrentUserId() { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); return reportPermissionEvaluator.getCurrentUserId(auth); } + + private void reportStatusValid(Report report, ReportStatus status) { + if (!report.getStatusCd().equals(status)) { + throw new ReportStatusNotMatchException(report.getStatusCd()); + } + } } diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportPersistResponse.java index de71b582..fdd0f8c6 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportPersistResponse.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.report.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record ReportPersistResponse( @Schema(description = "신고 아이디", example = "1", requiredMode = REQUIRED) Long id) { diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedDetailResponse.java index 9b45b41d..a1ab2939 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedDetailResponse.java @@ -4,9 +4,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotNull; -import lombok.Builder; - import java.time.LocalDateTime; +import lombok.Builder; @Builder public record ReportRepliedDetailResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedSummaryResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedSummaryResponse.java index a7e2553d..62d57ac5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedSummaryResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRepliedSummaryResponse.java @@ -4,9 +4,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotNull; -import lombok.Builder; - import java.time.LocalDateTime; +import lombok.Builder; @Builder public record ReportRepliedSummaryResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportReportedDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportReportedDetailResponse.java index 96c895da..c89e6852 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportReportedDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportReportedDetailResponse.java @@ -4,9 +4,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotNull; -import lombok.Builder; - import java.time.LocalDateTime; +import lombok.Builder; @Builder public record ReportReportedDetailResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedDetailResponse.java index 7c47e165..53e15a0b 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedDetailResponse.java @@ -4,9 +4,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotNull; -import lombok.Builder; - import java.time.LocalDateTime; +import lombok.Builder; @Builder public record ReportRevivedDetailResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedSummaryResponse.java b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedSummaryResponse.java index 0e96568f..d577a14c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedSummaryResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/dto/response/ReportRevivedSummaryResponse.java @@ -4,9 +4,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.validation.constraints.NotNull; -import lombok.Builder; - import java.time.LocalDateTime; +import lombok.Builder; @Builder public record ReportRevivedSummaryResponse( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/entitiy/Report.java b/src/main/java/until/the/eternity/dcs/domain/report/entitiy/Report.java index 0bf37c62..15587973 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/entitiy/Report.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/entitiy/Report.java @@ -1,6 +1,9 @@ package until.the.eternity.dcs.domain.report.entitiy; +import static until.the.eternity.dcs.domain.report.enums.ReportStatus.REPORTED; + import jakarta.persistence.*; +import java.time.LocalDateTime; import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -8,10 +11,6 @@ import until.the.eternity.dcs.domain.report.enums.ReportStatus; import until.the.eternity.dcs.domain.report.enums.ReportTargetType; -import java.time.LocalDateTime; - -import static until.the.eternity.dcs.domain.report.enums.ReportStatus.REPORTED; - @Entity @Table(name = "report") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportCategory.java b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportCategory.java index 2815ff56..040e7f9d 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportCategory.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportCategory.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.report.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportStatus.java b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportStatus.java index 802c0a18..5ca931f5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportStatus.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportStatus.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.report.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportTargetType.java b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportTargetType.java index cf9ef73c..7af87a2c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportTargetType.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/enums/ReportTargetType.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.report.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/CategoryNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/CategoryNotFoundException.java index 8658cb50..3819913b 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/CategoryNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/CategoryNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.report.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.CATEGORY_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class CategoryNotFoundException extends CustomException { public CategoryNotFoundException(String category) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportExceptionCode.java index e5684ab5..7472dc4e 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportExceptionCode.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.report.exception; +import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.FORBIDDEN; -import static org.springframework.http.HttpStatus.NOT_FOUND; - @Getter @RequiredArgsConstructor public enum ReportExceptionCode implements ExceptionCode { @@ -15,7 +15,9 @@ public enum ReportExceptionCode implements ExceptionCode { STATUS_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 상태를 찾을 수 없습니다."), REPORT_MODIFY_FORBIDDEN_EXCEPTION(FORBIDDEN, "수정 권한이 부족합니다."), TARGET_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 대상을 찾을 수 없습니다."), - CATEGORY_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 카테고리를 찾을 수 없습니다"); + CATEGORY_NOT_FOUND_EXCEPTION(NOT_FOUND, "해당 카테고리를 찾을 수 없습니다"), + STATUS_NOT_MATCH_EXCEPTION(NOT_FOUND, "요청한 API와 현재 신고의 상태가 일치하지 않습니다"); + private final HttpStatus status; private final String message; diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportModifyForbiddenException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportModifyForbiddenException.java index 4bf935b8..4e48b917 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportModifyForbiddenException.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportModifyForbiddenException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.report.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.REPORT_MODIFY_FORBIDDEN_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class ReportModifyForbiddenException extends CustomException { public ReportModifyForbiddenException() { super(REPORT_MODIFY_FORBIDDEN_EXCEPTION, REPORT_MODIFY_FORBIDDEN_EXCEPTION.getMessage()); diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportNotFoundException.java index b2885d8a..f2da9c61 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.report.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.REPORT_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class ReportNotFoundException extends CustomException { public ReportNotFoundException(Long id) { super(REPORT_NOT_FOUND_EXCEPTION, REPORT_NOT_FOUND_EXCEPTION.getMessage() + " ID : " + id); diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportStatusNotMatchException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportStatusNotMatchException.java new file mode 100644 index 00000000..581e73a2 --- /dev/null +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/ReportStatusNotMatchException.java @@ -0,0 +1,14 @@ +package until.the.eternity.dcs.domain.report.exception; + +import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.STATUS_NOT_MATCH_EXCEPTION; + +import until.the.eternity.dcs.common.exception.CustomException; +import until.the.eternity.dcs.domain.report.enums.ReportStatus; + +public class ReportStatusNotMatchException extends CustomException { + public ReportStatusNotMatchException(ReportStatus reportStatus) { + super( + STATUS_NOT_MATCH_EXCEPTION, + STATUS_NOT_MATCH_EXCEPTION.getMessage() + " - 요청한 신고의 상태: " + reportStatus); + } +} diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/StatusNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/StatusNotFoundException.java index fc041b07..34c1e41f 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/StatusNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/StatusNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.report.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.STATUS_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class StatusNotFoundException extends CustomException { public StatusNotFoundException(String message) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/exception/TargetNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/report/exception/TargetNotFoundException.java index bf6c09c2..3246b391 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/exception/TargetNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/exception/TargetNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.report.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.report.exception.ReportExceptionCode.TARGET_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class TargetNotFoundException extends CustomException { public TargetNotFoundException(String target) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/report/persentation/ReportController.java b/src/main/java/until/the/eternity/dcs/domain/report/persentation/ReportController.java index 952fccb1..66a0a98c 100644 --- a/src/main/java/until/the/eternity/dcs/domain/report/persentation/ReportController.java +++ b/src/main/java/until/the/eternity/dcs/domain/report/persentation/ReportController.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.report.persentation; +import static org.springframework.http.HttpStatus.*; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,8 +17,6 @@ import until.the.eternity.dcs.domain.report.dto.request.ReportUpdateRequest; import until.the.eternity.dcs.domain.report.dto.response.*; -import static org.springframework.http.HttpStatus.*; - @RestController @RequiredArgsConstructor @RequestMapping("/api/reports") diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/application/PostTagService.java b/src/main/java/until/the/eternity/dcs/domain/tag/application/PostTagService.java index 78592cef..00df0ea2 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/application/PostTagService.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/application/PostTagService.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.tag.application; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import until.the.eternity.dcs.domain.tag.entity.PostTag; import until.the.eternity.dcs.domain.tag.infrastructure.PostTagRepository; -import java.util.List; - @Service @Transactional(readOnly = true) @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/application/TagService.java b/src/main/java/until/the/eternity/dcs/domain/tag/application/TagService.java index f87b9d1f..ff9ce67f 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/application/TagService.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/application/TagService.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.tag.application; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -7,8 +8,6 @@ import until.the.eternity.dcs.domain.tag.entity.Tag; import until.the.eternity.dcs.domain.tag.infrastructure.TagRepository; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/entity/Tag.java b/src/main/java/until/the/eternity/dcs/domain/tag/entity/Tag.java index 62f2f9de..9e92abf1 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/entity/Tag.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/entity/Tag.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.tag.entity; import jakarta.persistence.*; +import java.time.LocalDateTime; +import java.util.List; import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; -import java.util.List; - @Entity @Table(name = "tag") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/PostTagRepository.java b/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/PostTagRepository.java index 1b7f694b..d6cc4c15 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/PostTagRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/PostTagRepository.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.tag.infrastructure; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import until.the.eternity.dcs.domain.tag.entity.PostTag; -import java.util.List; - public interface PostTagRepository extends JpaRepository { @Modifying diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/TagRepository.java b/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/TagRepository.java index dbbe77c0..41ed5d24 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/TagRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/infrastructure/TagRepository.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.tag.infrastructure; +import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import until.the.eternity.dcs.domain.tag.entity.Tag; -import java.util.List; -import java.util.Optional; - public interface TagRepository extends JpaRepository { Optional findByName(String name); diff --git a/src/main/java/until/the/eternity/dcs/domain/tag/presentation/TagController.java b/src/main/java/until/the/eternity/dcs/domain/tag/presentation/TagController.java index cf08779f..ac75705f 100644 --- a/src/main/java/until/the/eternity/dcs/domain/tag/presentation/TagController.java +++ b/src/main/java/until/the/eternity/dcs/domain/tag/presentation/TagController.java @@ -4,13 +4,12 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import until.the.eternity.dcs.domain.tag.application.TagService; import until.the.eternity.dcs.domain.tag.dto.response.TagResponse; -import java.util.List; - @RestController @RequiredArgsConstructor @RequestMapping("/api/tags") diff --git a/src/main/java/until/the/eternity/dcs/domain/user/application/UserSummaryService.java b/src/main/java/until/the/eternity/dcs/domain/user/application/UserSummaryService.java index 10e6949d..0e1edb5b 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/application/UserSummaryService.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/application/UserSummaryService.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.user.application; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,8 +15,6 @@ import until.the.eternity.dcs.domain.user.exception.UserNotFoundException; import until.the.eternity.dcs.domain.user.infrastructure.UserSummaryRepository; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryCreateRequest.java b/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryCreateRequest.java index eb6eaa93..e42c6102 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryCreateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryCreateRequest.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.user.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record UserSummaryCreateRequest( @Schema(description = "사용자 ID", example = "1L", requiredMode = REQUIRED) @NotBlank(message = "사용자 ID값은 공란일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryUpdateRequest.java b/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryUpdateRequest.java index 812888f8..0537e782 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryUpdateRequest.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/dto/request/UserSummaryUpdateRequest.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.user.dto.request; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - public record UserSummaryUpdateRequest( @Schema(description = "사용자 ID", example = "1L", requiredMode = REQUIRED) @NotBlank(message = "사용자 ID값은 공란일 수 없습니다.") diff --git a/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryDetailResponse.java b/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryDetailResponse.java index bb0676c8..62193107 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryDetailResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryDetailResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.user.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record UserSummaryDetailResponse( @Schema(description = "사용자 ID", example = "1L", requiredMode = REQUIRED) Long userId, diff --git a/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryPersistResponse.java b/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryPersistResponse.java index 9a6d0d59..e9502dbb 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryPersistResponse.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/dto/response/UserSummaryPersistResponse.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.user.dto.response; +import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; - @Builder public record UserSummaryPersistResponse( @Schema(description = "사용자 ID", example = "1L", requiredMode = REQUIRED) Long userId) { diff --git a/src/main/java/until/the/eternity/dcs/domain/user/entity/UserSummary.java b/src/main/java/until/the/eternity/dcs/domain/user/entity/UserSummary.java index be798233..6d93308e 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/entity/UserSummary.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/entity/UserSummary.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.user.entity; +import static until.the.eternity.dcs.domain.user.enums.UserGrade.USER; + import jakarta.persistence.*; import lombok.*; import until.the.eternity.dcs.domain.user.enums.UserGrade; -import static until.the.eternity.dcs.domain.user.enums.UserGrade.USER; - @Entity @Table(name = "user_summary") @Getter diff --git a/src/main/java/until/the/eternity/dcs/domain/user/enums/UserGrade.java b/src/main/java/until/the/eternity/dcs/domain/user/enums/UserGrade.java index 3231e601..21485bb5 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/enums/UserGrade.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/enums/UserGrade.java @@ -1,13 +1,12 @@ package until.the.eternity.dcs.domain.user.enums; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import java.util.Arrays; import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor diff --git a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserAlreadyExistsException.java b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserAlreadyExistsException.java index 7d18d167..bf1de4df 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserAlreadyExistsException.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserAlreadyExistsException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.user.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.user.exception.UserSummaryExceptionCode.USER_ALREADY_EXISTS_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class UserAlreadyExistsException extends CustomException { public UserAlreadyExistsException(Long userId) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserGradeNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserGradeNotFoundException.java index 71a93acb..232010de 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserGradeNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserGradeNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.user.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.user.exception.UserSummaryExceptionCode.USER_GRADE_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class UserGradeNotFoundException extends CustomException { public UserGradeNotFoundException(String grade) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserNotFoundException.java b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserNotFoundException.java index 730b6f54..f6dfb887 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserNotFoundException.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserNotFoundException.java @@ -1,9 +1,9 @@ package until.the.eternity.dcs.domain.user.exception; -import until.the.eternity.dcs.common.exception.CustomException; - import static until.the.eternity.dcs.domain.user.exception.UserSummaryExceptionCode.USER_NOT_FOUND_EXCEPTION; +import until.the.eternity.dcs.common.exception.CustomException; + public class UserNotFoundException extends CustomException { public UserNotFoundException(Long userId) { super( diff --git a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserSummaryExceptionCode.java b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserSummaryExceptionCode.java index 93921612..cfff3bfe 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/exception/UserSummaryExceptionCode.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/exception/UserSummaryExceptionCode.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.user.exception; +import static org.springframework.http.HttpStatus.CONFLICT; +import static org.springframework.http.HttpStatus.NOT_FOUND; + import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import until.the.eternity.dcs.common.exception.ExceptionCode; -import static org.springframework.http.HttpStatus.CONFLICT; -import static org.springframework.http.HttpStatus.NOT_FOUND; - @Getter @RequiredArgsConstructor public enum UserSummaryExceptionCode implements ExceptionCode { diff --git a/src/main/java/until/the/eternity/dcs/domain/user/infrastructure/UserSummaryRepository.java b/src/main/java/until/the/eternity/dcs/domain/user/infrastructure/UserSummaryRepository.java index 33be6f5f..99e368d9 100644 --- a/src/main/java/until/the/eternity/dcs/domain/user/infrastructure/UserSummaryRepository.java +++ b/src/main/java/until/the/eternity/dcs/domain/user/infrastructure/UserSummaryRepository.java @@ -1,10 +1,9 @@ package until.the.eternity.dcs.domain.user.infrastructure; -import org.springframework.data.jpa.repository.JpaRepository; -import until.the.eternity.dcs.domain.user.entity.UserSummary; - import java.util.List; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import until.the.eternity.dcs.domain.user.entity.UserSummary; public interface UserSummaryRepository extends JpaRepository { Optional findFirstByOrderByIdDesc(); diff --git a/src/test/java/until/the/eternity/dcs/domain/Tag/application/TagServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/Tag/application/TagServiceTest.java index b823c286..928e3dca 100644 --- a/src/test/java/until/the/eternity/dcs/domain/Tag/application/TagServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/Tag/application/TagServiceTest.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.Tag.application; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,14 +21,6 @@ import until.the.eternity.dcs.domain.tag.entity.Tag; import until.the.eternity.dcs.domain.tag.infrastructure.TagRepository; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) @DisplayName("TagServiceTest 단위 테스트") public class TagServiceTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementConverterTest.java index 2a066811..ab30bee9 100644 --- a/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementConverterTest.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.announcement.application; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,8 +14,6 @@ import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.post.entity.PostMeta; -import static org.assertj.core.api.Assertions.assertThat; - class AnnouncementConverterTest { AnnouncementConverter announcementConverter; Long id = 1L; diff --git a/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementServiceTest.java index 26ab6b36..a318e695 100644 --- a/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/announcement/application/AnnouncementServiceTest.java @@ -1,5 +1,13 @@ package until.the.eternity.dcs.domain.announcement.application; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -21,15 +29,6 @@ import until.the.eternity.dcs.domain.post.infrastructure.PostMetaRepository; import until.the.eternity.dcs.domain.post.infrastructure.PostRepository; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class AnnouncementServiceTest { AnnouncementService announcementService; AnnouncementRepository announcementRepository; @@ -138,7 +137,8 @@ void getAnnouncements_WithBoardIdSuccess() { // given when(boardRepository.findByIdAndIsDeletedIsFalse(id)) .thenReturn(Optional.of(Board.builder().id(id).build())); - when(announcementRepository.findActiveByBoardIdOrGlobal(id)).thenReturn(List.of(announcement)); + when(announcementRepository.findActiveByBoardIdOrGlobal(id)) + .thenReturn(List.of(announcement)); // when List response = announcementService.getAnnouncements(id); diff --git a/src/test/java/until/the/eternity/dcs/domain/announcement/entity/AnnouncementTest.java b/src/test/java/until/the/eternity/dcs/domain/announcement/entity/AnnouncementTest.java index 3db218b5..4bb842fb 100644 --- a/src/test/java/until/the/eternity/dcs/domain/announcement/entity/AnnouncementTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/announcement/entity/AnnouncementTest.java @@ -1,10 +1,10 @@ package until.the.eternity.dcs.domain.announcement.entity; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - class AnnouncementTest { @Test diff --git a/src/test/java/until/the/eternity/dcs/domain/board/application/BoardConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/board/application/BoardConverterTest.java index 12b4f3f7..e1d57ba2 100644 --- a/src/test/java/until/the/eternity/dcs/domain/board/application/BoardConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/board/application/BoardConverterTest.java @@ -1,5 +1,10 @@ package until.the.eternity.dcs.domain.board.application; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import until.the.eternity.dcs.domain.board.dto.request.BoardCreateRequest; @@ -7,12 +12,6 @@ import until.the.eternity.dcs.domain.board.dto.response.BoardPersistResponse; import until.the.eternity.dcs.domain.board.entity.Board; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - class BoardConverterTest { BoardConverter boardConverter = new BoardConverter(); String name = "board name"; diff --git a/src/test/java/until/the/eternity/dcs/domain/board/application/BoardServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/board/application/BoardServiceTest.java index 7d16697f..f7ac9ca5 100644 --- a/src/test/java/until/the/eternity/dcs/domain/board/application/BoardServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/board/application/BoardServiceTest.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.board.application; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,14 +18,6 @@ import until.the.eternity.dcs.domain.board.infrastructure.BoardRepository; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; -import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; - class BoardServiceTest { BoardRepository boardRepository = mock(BoardRepository.class); BoardConverter boardConverter = new BoardConverter(); diff --git a/src/test/java/until/the/eternity/dcs/domain/board/entity/BoardTest.java b/src/test/java/until/the/eternity/dcs/domain/board/entity/BoardTest.java index 114183cb..8af1a654 100644 --- a/src/test/java/until/the/eternity/dcs/domain/board/entity/BoardTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/board/entity/BoardTest.java @@ -1,11 +1,11 @@ package until.the.eternity.dcs.domain.board.entity; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - class BoardTest { static Board board; static String name = "board name"; diff --git a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentConverterTest.java index f35c4b9e..f7f428fd 100644 --- a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentConverterTest.java @@ -1,5 +1,10 @@ package until.the.eternity.dcs.domain.comment.application; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,12 +16,6 @@ import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.post.infrastructure.PostRepository; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class CommentConverterTest { CommentRepository commentRepository = mock(CommentRepository.class); PostRepository postRepository = mock(PostRepository.class); diff --git a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentLikeConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentLikeConverterTest.java index 736559c3..5ba9a2b1 100644 --- a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentLikeConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentLikeConverterTest.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.comment.application; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import until.the.eternity.dcs.domain.comment.dto.request.CommentLikeToggleRequest; import until.the.eternity.dcs.domain.comment.entity.CommentLike; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - class CommentLikeConverterTest { CommentLikeConverter commentLikeConverter = new CommentLikeConverter(); diff --git a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentServiceTest.java index ec6de8e0..d8a2d1b0 100644 --- a/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/comment/application/CommentServiceTest.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.comment.application; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -27,14 +34,6 @@ import until.the.eternity.dcs.domain.user.application.UserSummaryService; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; -import static until.the.eternity.dcs.domain.user.enums.UserGrade.ADMIN; - class CommentServiceTest { CommentRepository commentRepository = mock(CommentRepository.class); CommentLikeRepository commentLikeRepository = mock(CommentLikeRepository.class); diff --git a/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeConverterTest.java index ccb88981..60205596 100644 --- a/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeConverterTest.java @@ -1,5 +1,9 @@ package until.the.eternity.dcs.domain.notice.application; +import static org.assertj.core.api.Assertions.assertThat; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; + +import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import until.the.eternity.dcs.domain.notice.dto.request.NoticeSendRequest; @@ -9,11 +13,6 @@ import until.the.eternity.dcs.domain.notice.entity.NoticeUser; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.time.LocalDateTime; - -import static org.assertj.core.api.Assertions.assertThat; -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; - class NoticeConverterTest { NoticeConverter noticeConverter = new NoticeConverter(); diff --git a/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeServiceTest.java index de8b2037..9e5c14c5 100644 --- a/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/notice/application/NoticeServiceTest.java @@ -1,5 +1,16 @@ package until.the.eternity.dcs.domain.notice.application; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.EVENT; +import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; +import static until.the.eternity.dcs.domain.user.enums.UserGrade.USER; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -19,18 +30,6 @@ import until.the.eternity.dcs.domain.user.entity.UserSummary; import until.the.eternity.dcs.domain.user.infrastructure.UserSummaryRepository; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.*; -import static org.mockito.Mockito.mock; -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.EVENT; -import static until.the.eternity.dcs.domain.notice.enums.NoticeType.POST_LIKE; -import static until.the.eternity.dcs.domain.user.enums.UserGrade.USER; - class NoticeServiceTest { NoticeRepository noticeRepository = mock(NoticeRepository.class); NoticeConverter noticeConverter = new NoticeConverter(); diff --git a/src/test/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponseTest.java b/src/test/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponseTest.java index fab3d217..f10534ee 100644 --- a/src/test/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponseTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/notice/dto/response/NoticeCommonResponseTest.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.notice.dto.response; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.LocalDateTime; import org.junit.jupiter.api.Test; import until.the.eternity.dcs.domain.notice.entity.Notice; import until.the.eternity.dcs.domain.notice.entity.NoticeUser; import until.the.eternity.dcs.domain.notice.enums.NoticeType; -import java.time.LocalDateTime; - -import static org.assertj.core.api.Assertions.assertThat; - class NoticeCommonResponseTest { @Test diff --git a/src/test/java/until/the/eternity/dcs/domain/post/application/PostConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/post/application/PostConverterTest.java index 52c752d4..fd944378 100644 --- a/src/test/java/until/the/eternity/dcs/domain/post/application/PostConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/post/application/PostConverterTest.java @@ -1,5 +1,11 @@ package until.the.eternity.dcs.domain.post.application; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,13 +22,6 @@ import until.the.eternity.dcs.domain.tag.entity.PostTag; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - @ExtendWith(MockitoExtension.class) @DisplayName("PostConverter 테스트") public class PostConverterTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/post/application/PostLikeConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/post/application/PostLikeConverterTest.java index a156e8fb..961d1139 100644 --- a/src/test/java/until/the/eternity/dcs/domain/post/application/PostLikeConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/post/application/PostLikeConverterTest.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.post.application; +import static org.assertj.core.api.Assertions.*; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -9,8 +11,6 @@ import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.post.entity.PostLike; -import static org.assertj.core.api.Assertions.*; - @ExtendWith(MockitoExtension.class) @DisplayName("PostLikeConverter 테스트") public class PostLikeConverterTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/post/application/PostServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/post/application/PostServiceTest.java index 637e4800..3eb835b1 100644 --- a/src/test/java/until/the/eternity/dcs/domain/post/application/PostServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/post/application/PostServiceTest.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.post.application; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.BDDMockito.*; +import static org.mockito.Mockito.verify; + +import java.time.LocalDateTime; +import java.util.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -36,14 +43,6 @@ import until.the.eternity.dcs.domain.user.dto.response.UserSummaryDetailResponse; import until.the.eternity.dcs.domain.user.entity.UserSummary; -import java.time.LocalDateTime; -import java.util.*; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.BDDMockito.*; -import static org.mockito.Mockito.verify; - @ExtendWith(MockitoExtension.class) @DisplayName("PostService 단위 테스트") class PostServiceTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/post/entity/PostTest.java b/src/test/java/until/the/eternity/dcs/domain/post/entity/PostTest.java index 9997f8ad..fa8cc160 100644 --- a/src/test/java/until/the/eternity/dcs/domain/post/entity/PostTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/post/entity/PostTest.java @@ -1,14 +1,13 @@ package until.the.eternity.dcs.domain.post.entity; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import until.the.eternity.dcs.domain.tag.entity.PostTag; -import java.util.ArrayList; -import java.util.List; - public class PostTest { Post post; String title = "test title"; diff --git a/src/test/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryTest.java b/src/test/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryTest.java index 2231da0e..d7a46b40 100644 --- a/src/test/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/post/infrastructure/PostRepositoryTest.java @@ -1,6 +1,11 @@ package until.the.eternity.dcs.domain.post.infrastructure; +import static org.assertj.core.api.Assertions.assertThat; + import jakarta.persistence.EntityManager; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -15,12 +20,6 @@ import until.the.eternity.dcs.domain.post.entity.Post; import until.the.eternity.dcs.domain.post.entity.PostMeta; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - @DataJpaTest @Import(QueryDslConfig.class) public class PostRepositoryTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/report/application/ReportConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/report/application/ReportConverterTest.java index e16cfc86..0ec400bc 100644 --- a/src/test/java/until/the/eternity/dcs/domain/report/application/ReportConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/report/application/ReportConverterTest.java @@ -1,39 +1,30 @@ package until.the.eternity.dcs.domain.report.application; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.time.LocalDateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import until.the.eternity.dcs.domain.report.dto.request.ReportCreateRequest; import until.the.eternity.dcs.domain.report.dto.response.*; import until.the.eternity.dcs.domain.report.entitiy.Report; import until.the.eternity.dcs.domain.report.enums.ReportCategory; import until.the.eternity.dcs.domain.report.enums.ReportTargetType; -import until.the.eternity.dcs.domain.user.application.UserSummaryService; -import until.the.eternity.dcs.domain.user.dto.response.UserSummaryDetailResponse; -import until.the.eternity.dcs.domain.user.entity.UserSummary; - -import java.time.LocalDateTime; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @DisplayName("ReportConverter 테스트") class ReportConverterTest { - @Mock private UserSummaryService userSummaryService; @InjectMocks private ReportConverter reportConverter; private ReportCreateRequest reportCreateRequest; private Report report; Long userId = 1L; String username = "userName"; - private UserSummaryDetailResponse userSummaryDetailResponse; @BeforeEach void setUp() { @@ -62,9 +53,6 @@ void setUp() { .repliedAt(testDateTime.plusDays(1)) .repliedBy(2L) .build(); - - UserSummary userSummary = UserSummary.builder().id(userId).nickname("username").build(); - userSummaryDetailResponse = UserSummaryDetailResponse.from(userSummary); } @Test @@ -125,12 +113,10 @@ void fromReportToReportRevivedDetailResponse_WithNullInput() { @Test @DisplayName("Report를 ReportRevivedSummaryResponse로 변환 - 정상 케이스") void fromReportToReportRevivedSummaryResponse_Success() { - // given - when(userSummaryService.findUserSummary(anyLong())).thenReturn(userSummaryDetailResponse); // when ReportRevivedSummaryResponse result = - reportConverter.fromReportToReportRevivedSummaryResponse(report); + reportConverter.fromReportToReportRevivedSummaryResponse(report, username); // then assertThat(result).isNotNull(); @@ -146,19 +132,19 @@ void fromReportToReportRevivedSummaryResponse_Success() { @DisplayName("Report를 ReportRevivedSummaryResponse로 변환 - null 입력값") void fromReportToReportRevivedSummaryResponse_WithNullInput() { // when & then - assertThatThrownBy(() -> reportConverter.fromReportToReportRevivedSummaryResponse(null)) + assertThatThrownBy( + () -> + reportConverter.fromReportToReportRevivedSummaryResponse( + null, username)) .isInstanceOf(NullPointerException.class); } @Test @DisplayName("Report를 ReportRepliedDetailResponse로 변환 - 정상 케이스") void fromReportToReportRepliedDetailResponse_Success() { - // given - when(userSummaryService.findUserSummary(anyLong())).thenReturn(userSummaryDetailResponse); - // when ReportRepliedDetailResponse result = - reportConverter.fromReportToReportRepliedDetailResponse(report); + reportConverter.fromReportToReportRepliedDetailResponse(report, username); // then assertThat(result).isNotNull(); @@ -177,19 +163,19 @@ void fromReportToReportRepliedDetailResponse_Success() { @DisplayName("Report를 ReportRepliedDetailResponse로 변환 - null 입력값") void fromReportToReportRepliedDetailResponse_WithNullInput() { // when & then - assertThatThrownBy(() -> reportConverter.fromReportToReportRepliedDetailResponse(null)) + assertThatThrownBy( + () -> + reportConverter.fromReportToReportRepliedDetailResponse( + null, username)) .isInstanceOf(NullPointerException.class); } @Test @DisplayName("Report를 ReportRepliedSummaryResponse로 변환 - 정상 케이스") void fromReportToReportRepliedSummaryResponse_Success() { - // given - when(userSummaryService.findUserSummary(anyLong())).thenReturn(userSummaryDetailResponse); - // when ReportRepliedSummaryResponse result = - reportConverter.fromReportToReportRepliedSummaryResponse(report); + reportConverter.fromReportToReportRepliedSummaryResponse(report, username); // then assertThat(result).isNotNull(); @@ -205,19 +191,19 @@ void fromReportToReportRepliedSummaryResponse_Success() { @DisplayName("Report를 ReportRepliedSummaryResponse로 변환 - null 입력값") void fromReportToReportRepliedSummaryResponse_WithNullInput() { // when & then - assertThatThrownBy(() -> reportConverter.fromReportToReportRepliedSummaryResponse(null)) + assertThatThrownBy( + () -> + reportConverter.fromReportToReportRepliedSummaryResponse( + null, username)) .isInstanceOf(NullPointerException.class); } @Test @DisplayName("Report를 ReportReportedDetailResponse로 변환 - 정상 케이스") void fromReportToReportReportedDetailResponse_Success() { - // given - when(userSummaryService.findUserSummary(anyLong())).thenReturn(userSummaryDetailResponse); - // when ReportReportedDetailResponse result = - reportConverter.fromReportToReportReportedDetailResponse(report); + reportConverter.fromReportToReportReportedDetailResponse(report, username); // then assertThat(result).isNotNull(); @@ -234,19 +220,19 @@ void fromReportToReportReportedDetailResponse_Success() { @DisplayName("Report를 ReportReportedDetailResponse로 변환 - null 입력값") void fromReportToReportReportedDetailResponse_WithNullInput() { // when & then - assertThatThrownBy(() -> reportConverter.fromReportToReportReportedDetailResponse(null)) + assertThatThrownBy( + () -> + reportConverter.fromReportToReportReportedDetailResponse( + null, username)) .isInstanceOf(NullPointerException.class); } @Test @DisplayName("Report를 ReportReportedSummaryResponse로 변환 - 정상 케이스") void fromReportToReportReportedSummaryResponse_Success() { - // given - when(userSummaryService.findUserSummary(anyLong())).thenReturn(userSummaryDetailResponse); - // when ReportReportedSummaryResponse result = - reportConverter.fromReportToReportReportedSummaryResponse(report); + reportConverter.fromReportToReportReportedSummaryResponse(report, username); // then assertThat(result).isNotNull(); @@ -260,7 +246,10 @@ void fromReportToReportReportedSummaryResponse_Success() { @DisplayName("Report를 ReportReportedSummaryResponse로 변환 - null 입력값") void fromReportToReportReportedSummaryResponse_WithNullInput() { // when & then - assertThatThrownBy(() -> reportConverter.fromReportToReportReportedSummaryResponse(null)) + assertThatThrownBy( + () -> + reportConverter.fromReportToReportReportedSummaryResponse( + null, username)) .isInstanceOf(NullPointerException.class); } diff --git a/src/test/java/until/the/eternity/dcs/domain/report/application/ReportServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/report/application/ReportServiceTest.java index f00c6cd4..ab535b46 100644 --- a/src/test/java/until/the/eternity/dcs/domain/report/application/ReportServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/report/application/ReportServiceTest.java @@ -1,5 +1,11 @@ package until.the.eternity.dcs.domain.report.application; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.BDDMockito.*; + +import java.util.List; +import java.util.Optional; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -26,13 +32,6 @@ import until.the.eternity.dcs.domain.user.entity.UserSummary; import until.the.eternity.dcs.domain.user.enums.UserGrade; -import java.util.List; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.BDDMockito.*; - @ExtendWith(MockitoExtension.class) @DisplayName("ReportService 단위 테스트") class ReportServiceTest { @@ -56,10 +55,11 @@ class ReportServiceTest { Long userId = 1L; Long adminId = 2L; String username = "username"; + String unknownUsername = "알수없음"; @BeforeEach void setUp() { - mockReport = Report.builder().id(1L).build(); + mockReport = Report.builder().id(1L).targetUserId(userId).build(); mockUser = UserSummary.builder().id(userId).nickname(username).grade(UserGrade.USER).build(); mockAdmin = UserSummary.builder().id(adminId).grade(UserGrade.ADMIN).build(); @@ -114,8 +114,11 @@ void getRepliedReport_Success() { Long reportId = 1L; ReportRepliedDetailResponse expectedResponse = mock(ReportRepliedDetailResponse.class); + mockReport.update(ReportStatus.ACCEPT, null, null, null, null); + given(userSummaryService.findUserSummary(anyLong())) + .willReturn(UserSummaryDetailResponse.from(mockUser)); given(reportRepository.findById(reportId)).willReturn(Optional.of(mockReport)); - given(reportConverter.fromReportToReportRepliedDetailResponse(mockReport)) + given(reportConverter.fromReportToReportRepliedDetailResponse(mockReport, username)) .willReturn(expectedResponse); // when @@ -124,7 +127,7 @@ void getRepliedReport_Success() { // then assertThat(result).isEqualTo(expectedResponse); verify(reportRepository).findById(reportId); - verify(reportConverter).fromReportToReportRepliedDetailResponse(mockReport); + verify(reportConverter).fromReportToReportRepliedDetailResponse(mockReport, username); } @Test @@ -146,6 +149,7 @@ void getRevivedReport_Success() { Long reportId = 1L; ReportRevivedDetailResponse expectedResponse = mock(ReportRevivedDetailResponse.class); + mockReport.update(ReportStatus.REJECT, null, null, null, null); given(reportRepository.findById(reportId)).willReturn(Optional.of(mockReport)); given( reportConverter.fromReportToReportRevivedDetailResponse( @@ -169,8 +173,10 @@ void getReportedReport_Success() { ReportReportedDetailResponse expectedResponse = mock(ReportReportedDetailResponse.class); + given(userSummaryService.findUserSummary(anyLong())) + .willReturn(UserSummaryDetailResponse.from(mockUser)); given(reportRepository.findById(reportId)).willReturn(Optional.of(mockReport)); - given(reportConverter.fromReportToReportReportedDetailResponse(mockReport)) + given(reportConverter.fromReportToReportReportedDetailResponse(mockReport, username)) .willReturn(expectedResponse); // when @@ -196,7 +202,9 @@ void findRepliedReports_Success() { given(reportRepository.findAllByStatusCd(ReportStatus.ACCEPT, pageable)) .willReturn(reportPage); - given(reportConverter.fromReportToReportRepliedSummaryResponse(mockReport)) + given( + reportConverter.fromReportToReportRepliedSummaryResponse( + mockReport, unknownUsername)) .willReturn(summaryResponse); // when @@ -218,7 +226,9 @@ void findRevivedReports_Success() { given(reportRepository.findAllByStatusCd(ReportStatus.REJECT, pageable)) .willReturn(reportPage); - given(reportConverter.fromReportToReportRevivedSummaryResponse(mockReport)) + given( + reportConverter.fromReportToReportRevivedSummaryResponse( + mockReport, unknownUsername)) .willReturn(summaryResponse); // when @@ -241,7 +251,9 @@ void findReportedReports_Success() { given(reportRepository.findAllByStatusCd(ReportStatus.REPORTED, pageable)) .willReturn(reportPage); - given(reportConverter.fromReportToReportReportedSummaryResponse(mockReport)) + given( + reportConverter.fromReportToReportReportedSummaryResponse( + mockReport, unknownUsername)) .willReturn(summaryResponse); // when diff --git a/src/test/java/until/the/eternity/dcs/domain/report/entity/ReportTest.java b/src/test/java/until/the/eternity/dcs/domain/report/entity/ReportTest.java index 1bb033c5..50963410 100644 --- a/src/test/java/until/the/eternity/dcs/domain/report/entity/ReportTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/report/entity/ReportTest.java @@ -1,5 +1,6 @@ package until.the.eternity.dcs.domain.report.entity; +import java.time.LocalDateTime; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -7,8 +8,6 @@ import until.the.eternity.dcs.domain.report.entitiy.Report; import until.the.eternity.dcs.domain.report.enums.ReportStatus; -import java.time.LocalDateTime; - public class ReportTest { Report report; diff --git a/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryConverterTest.java b/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryConverterTest.java index c29e7d52..85075707 100644 --- a/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryConverterTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryConverterTest.java @@ -1,5 +1,7 @@ package until.the.eternity.dcs.domain.user.application; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,8 +13,6 @@ import until.the.eternity.dcs.domain.user.entity.UserSummary; import until.the.eternity.dcs.domain.user.enums.UserGrade; -import static org.assertj.core.api.Assertions.assertThat; - @ExtendWith(MockitoExtension.class) @DisplayName("UserSummaryConverterTest 단위 테스트") public class UserSummaryConverterTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryServiceTest.java b/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryServiceTest.java index 4720675f..5f5adb9c 100644 --- a/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryServiceTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/user/application/UserSummaryServiceTest.java @@ -1,5 +1,12 @@ package until.the.eternity.dcs.domain.user.application; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -19,14 +26,6 @@ import until.the.eternity.dcs.domain.user.exception.UserNotFoundException; import until.the.eternity.dcs.domain.user.infrastructure.UserSummaryRepository; -import java.util.Optional; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - @ExtendWith(MockitoExtension.class) @DisplayName("UserSummaryService 단위 테스트") class UserSummaryServiceTest { diff --git a/src/test/java/until/the/eternity/dcs/domain/user/entity/UserSummaryTest.java b/src/test/java/until/the/eternity/dcs/domain/user/entity/UserSummaryTest.java index 33ec72c8..a518be9e 100644 --- a/src/test/java/until/the/eternity/dcs/domain/user/entity/UserSummaryTest.java +++ b/src/test/java/until/the/eternity/dcs/domain/user/entity/UserSummaryTest.java @@ -1,13 +1,13 @@ package until.the.eternity.dcs.domain.user.entity; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import until.the.eternity.dcs.domain.user.enums.UserGrade; -import static org.assertj.core.api.Assertions.assertThat; - @ExtendWith(MockitoExtension.class) @DisplayName("UserSummary update 테스트") public class UserSummaryTest {