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,14 +1,12 @@
package com.hubEleven.common.annotation;

import org.hibernate.annotations.SQLRestriction;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.hibernate.annotations.SQLRestriction;

@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@SQLRestriction("deleted_at IS NULL")
public @interface SoftDeletable {
}
public @interface SoftDeletable {}
18 changes: 9 additions & 9 deletions common/src/main/java/com/hubEleven/common/code/ErrorCode.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.hubEleven.common.code;

import static org.springframework.http.HttpStatus.*;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;

import static org.springframework.http.HttpStatus.*;

@RequiredArgsConstructor
@Getter
public enum ErrorCode implements StatusCode {
SERVER_ERROR(INTERNAL_SERVER_ERROR, "서버 에러가 발생하였습니다.");
SERVER_ERROR(INTERNAL_SERVER_ERROR, "서버 에러가 발생하였습니다.");

private final HttpStatus httpStatus;
private final String message;
private final HttpStatus httpStatus;
private final String message;

@Override
public String getName() {
return this.name();
}
@Override
public String getName() {
return this.name();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import org.springframework.http.HttpStatus;

public interface StatusCode {
HttpStatus getHttpStatus();
String getMessage();
String getName();
HttpStatus getHttpStatus();

String getMessage();

String getName();
}
11 changes: 5 additions & 6 deletions common/src/main/java/com/hubEleven/common/code/SuccessCode.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.hubEleven.common.code;

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 SuccessCode {
SUCCESS(OK, "성공했습니다.");

SUCCESS(OK, "성공했습니다.");

private final HttpStatus status;
private final String message;
private final HttpStatus status;
private final String message;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
@Getter
@RequiredArgsConstructor
public class GlobalException extends RuntimeException {
private final StatusCode errorCode;
private final StatusCode errorCode;
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
package com.hubEleven.common.exception;

import static com.hubEleven.common.code.ErrorCode.*;

import com.hubEleven.common.response.ApiResponse;
import com.hubEleven.common.response.ApiResponseEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;

import static com.hubEleven.common.code.ErrorCode.*;

@RestControllerAdvice
public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {

@ExceptionHandler(GlobalException.class)
ResponseEntity<?> globalExceptionHandler(GlobalException e) {
return ApiResponseEntity.onFailure(e.getErrorCode());
}
@ExceptionHandler(GlobalException.class)
ResponseEntity<?> globalExceptionHandler(GlobalException e) {
return ApiResponseEntity.onFailure(e.getErrorCode());
}

@ExceptionHandler(Exception.class)
public ResponseEntity<ApiResponse<Object>> handleException(final Exception e) {
return ApiResponseEntity.onFailure(SERVER_ERROR);
}
@ExceptionHandler(Exception.class)
public ResponseEntity<ApiResponse<Object>> handleException(final Exception e) {
return ApiResponseEntity.onFailure(SERVER_ERROR);
}
}
39 changes: 18 additions & 21 deletions common/src/main/java/com/hubEleven/common/model/BaseEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,41 @@
import jakarta.persistence.Column;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.MappedSuperclass;
import java.time.LocalDateTime;
import lombok.Getter;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;

@Getter
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class BaseEntity {

@CreatedDate
@Column(updatable = false, nullable = false)
private LocalDateTime createdAt;
@CreatedDate
@Column(updatable = false, nullable = false)
private LocalDateTime createdAt;

@CreatedBy
@Column(updatable = false)
private Long createdBy;
@CreatedBy
@Column(updatable = false)
private Long createdBy;

@LastModifiedDate
private LocalDateTime updatedAt;
@LastModifiedDate private LocalDateTime updatedAt;

@LastModifiedBy
private Long updatedBy;
@LastModifiedBy private Long updatedBy;

private LocalDateTime deletedAt;
private LocalDateTime deletedAt;

private Long deletedBy;
private Long deletedBy;

public void delete(Long deletedBy) {
this.deletedAt = LocalDateTime.now();
this.deletedBy = deletedBy;
}
public void delete(Long deletedBy) {
this.deletedAt = LocalDateTime.now();
this.deletedBy = deletedBy;
}

public boolean isDeleted() {
return this.deletedAt != null;
}
public boolean isDeleted() {
return this.deletedAt != null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,41 @@
import org.springframework.data.domain.Sort;

public record CommonPageRequest(
int page,
int size,
SortType sortType,
Sort.Direction direction,
String keyword
) {
public CommonPageRequest {
if (page < 0) {
page = 0;
}

if (size != 10 && size != 30 && size != 50) {
size = 10;
}

if (sortType == null) {
sortType = SortType.CREATED_AT;
}

if (direction == null) {
direction = Sort.Direction.DESC;
}
}

public Pageable toPageable() {
return PageRequest.of(page, size, Sort.by(direction, sortType.getFieldName()));
}

public enum SortType {
CREATED_AT("createdAt"),
UPDATED_AT("updatedAt");

private final String fieldName;

SortType(String fieldName) {
this.fieldName = fieldName;
}

public String getFieldName() {
return fieldName;
}
}
int page, int size, SortType sortType, Sort.Direction direction, String keyword) {
public CommonPageRequest {
if (page < 0) {
page = 0;
}

if (size != 10 && size != 30 && size != 50) {
size = 10;
}

if (sortType == null) {
sortType = SortType.CREATED_AT;
}

if (direction == null) {
direction = Sort.Direction.DESC;
}
}

public Pageable toPageable() {
return PageRequest.of(page, size, Sort.by(direction, sortType.getFieldName()));
}

public enum SortType {
CREATED_AT("createdAt"),
UPDATED_AT("updatedAt");

private final String fieldName;

SortType(String fieldName) {
this.fieldName = fieldName;
}

public String getFieldName() {
return fieldName;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

@JsonPropertyOrder({"code", "message", "result"})
public record ApiResponse<T> (
String code,
String message,
@JsonInclude(JsonInclude.Include.NON_NULL) T result
) {
}
public record ApiResponse<T>(
String code, String message, @JsonInclude(JsonInclude.Include.NON_NULL) T result) {}
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,40 @@

import com.hubEleven.common.code.StatusCode;
import com.hubEleven.common.code.SuccessCode;
import java.net.URI;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.net.URI;

public class ApiResponseEntity {

public static <T> ResponseEntity<ApiResponse<T>> success(T result) {
return ResponseEntity.ok().body(new ApiResponse<>(SuccessCode.SUCCESS.name(), SuccessCode.SUCCESS.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> from(StatusCode code, T result) {
return ResponseEntity.status(code.getHttpStatus())
.body(new ApiResponse<>(code.getName(), code.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> create(StatusCode code, String url, T result) {
return ResponseEntity.created(URI.create(url))
.body(new ApiResponse<>(code.getName(), code.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> onFailure(StatusCode code) {
return ResponseEntity.status(code.getHttpStatus())
.body(new ApiResponse<>(code.getName(), code.getMessage(), null));
}

public static <T> ResponseEntity<ApiResponse<T>> badRequest(String message) {
return ResponseEntity.badRequest()
.body(new ApiResponse<>(HttpStatus.BAD_REQUEST.name(), message, null));
}

public static <T> ResponseEntity<ApiResponse<T>> ok(String message) {
return ResponseEntity.ok().body(new ApiResponse<>(HttpStatus.OK.name(), message, null));
}
public static <T> ResponseEntity<ApiResponse<T>> success(T result) {
return ResponseEntity.ok()
.body(
new ApiResponse<>(
SuccessCode.SUCCESS.name(), SuccessCode.SUCCESS.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> from(StatusCode code, T result) {
return ResponseEntity.status(code.getHttpStatus())
.body(new ApiResponse<>(code.getName(), code.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> create(StatusCode code, String url, T result) {
return ResponseEntity.created(URI.create(url))
.body(new ApiResponse<>(code.getName(), code.getMessage(), result));
}

public static <T> ResponseEntity<ApiResponse<T>> onFailure(StatusCode code) {
return ResponseEntity.status(code.getHttpStatus())
.body(new ApiResponse<>(code.getName(), code.getMessage(), null));
}

public static <T> ResponseEntity<ApiResponse<T>> badRequest(String message) {
return ResponseEntity.badRequest()
.body(new ApiResponse<>(HttpStatus.BAD_REQUEST.name(), message, null));
}

public static <T> ResponseEntity<ApiResponse<T>> ok(String message) {
return ResponseEntity.ok().body(new ApiResponse<>(HttpStatus.OK.name(), message, null));
}
}
Loading