Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
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;
import until.the.eternity.dcs.domain.board.application.BoardArchiveService;
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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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;
import org.springframework.data.domain.Sort;
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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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<T> {

Expand Down
Original file line number Diff line number Diff line change
@@ -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<T>(
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {}
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading