패키지 구조 설계

src/main/java/com/livable/server/config/JpaConfig.java → src/main/java/com/livable/server/core/config/JpaConfig.java

@@ -1,4 +1,4 @@
-package com.livable.server.config;
+package com.livable.server.core.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

src/main/java/com/livable/server/core/exception/ErrorCode.java

@@ -0,0 +1,10 @@
+package com.livable.server.core.exception;
+
+import org.springframework.http.HttpStatus;
+
+public interface ErrorCode {
+
+    String getMessage();
+
+    HttpStatus getHttpStatus();
+}

src/main/java/com/livable/server/core/exception/GlobalExceptionHandler.java

@@ -0,0 +1,48 @@
+package com.livable.server.core.exception;
+
+import com.livable.server.core.response.ApiResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    public ResponseEntity<ApiResponse.Error> methodMethodArgumentTypeMismatchExceptionHandle(MethodArgumentTypeMismatchException e) {
+        return ApiResponse.error(e.getMessage(), HttpStatus.BAD_REQUEST);
+    }
+
+    @ExceptionHandler(BindException.class)
+    public ResponseEntity<ApiResponse.Error> bindException(BindException e) {
+        log.error("bindException", e);
+
+        return ApiResponse.error(e.getBindingResult().getFieldError().getDefaultMessage(), HttpStatus.BAD_REQUEST);
+    }
+
+    @ExceptionHandler(GlobalRuntimeException.class)
+    public ResponseEntity<ApiResponse.Error> globalRuntimeExceptionHandle(GlobalRuntimeException e) {
+        log.error("globalRuntimeExceptionHandle", e);
+
+        return ApiResponse.error(e.getErrorCode());
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<ApiResponse.Error> runtimeExceptionHandle(RuntimeException e) {
+        log.error("runtimeExceptionHandle", e);
+
+        return ApiResponse.error(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<ApiResponse.Error> exceptionHandle(Exception e) {
+        log.error("exceptionHandle", e);
+
+        return ApiResponse.error(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+}

src/main/java/com/livable/server/core/exception/GlobalRuntimeException.java

@@ -0,0 +1,14 @@
+package com.livable.server.core.exception;
+
+import lombok.Getter;
+
+@Getter
+public class GlobalRuntimeException extends RuntimeException {
+
+    private final ErrorCode errorCode;
+
+    public GlobalRuntimeException(ErrorCode errorCode) {
+        super();
+        this.errorCode = errorCode;
+    }
+}

src/main/java/com/livable/server/core/response/ApiResponse.java

@@ -0,0 +1,56 @@
+package com.livable.server.core.response;
+
+import com.livable.server.core.exception.ErrorCode;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.lang.NonNull;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ApiResponse {
+
+    public static <T> ResponseEntity<Success<T>> success(@NonNull HttpStatus httpStatus) {
+        return ResponseEntity.status(httpStatus)
+                .build();
+    }
+
+    public static <T> ResponseEntity<Success<T>> success(@NonNull T data, @NonNull HttpStatus httpStatus) {
+        return ResponseEntity.status(httpStatus)
+                .body(Success.of(data));
+    }
+
+    public static ResponseEntity<Error> error(@NonNull String message, @NonNull HttpStatus httpStatus) {
+        return ResponseEntity.status(httpStatus)
+                .body(Error.of(message));
+    }
+
+    public static ResponseEntity<Error> error(@NonNull ErrorCode errorCode) {
+        return ResponseEntity.status(errorCode.getHttpStatus())
+                .body(Error.of(errorCode.getMessage()));
+    }
+
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class Error {
+
+        private String message;
+
+        public static Error of(@NonNull String errorMessage) {
+            return new Error(errorMessage);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class Success<T> {
+
+        private T data;
+
+        public static <T> Success<T> of(@NonNull T data) {
+            return new Success<>(data);
+        }
+    }
+}

src/main/java/com/livable/server/entity/BaseTimeEntity.java

@@ -2,12 +2,10 @@
 
 
 import lombok.Getter;
-import lombok.experimental.SuperBuilder;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
 import java.time.LocalDateTime;

src/main/java/com/livable/server/entity/Building.java

@@ -1,11 +1,8 @@
 package com.livable.server.entity;
 
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 @Getter

src/main/java/com/livable/server/entity/CafeteriaReview.java

@@ -17,6 +17,7 @@ public class CafeteriaReview extends Review {
     @Column(nullable = false)
     private Evaluation taste;
 
+    @JoinColumn(nullable = false)
     @ManyToOne(fetch = FetchType.LAZY)
     private Building building;
 }

src/main/java/com/livable/server/entity/CommonPlace.java

@@ -19,9 +19,12 @@ public class CommonPlace extends BaseTimeEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     private Building building;
 
+    @Column(nullable = false)
     private String name;
 
+    @Column(nullable = false)
     private String floor;
 
+    @Column(nullable = false)
     private String roomNumber;
 }

src/main/java/com/livable/server/entity/Evaluation.java

@@ -3,6 +3,5 @@
 public enum Evaluation {
 
     GOOD,
-    BAD,
-    ;
+    BAD;
 }

src/main/java/com/livable/server/entity/Invitation.java

@@ -1,11 +1,9 @@
 package com.livable.server.entity;
 
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
 
 import javax.persistence.*;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 @Getter
@@ -43,5 +41,4 @@ public class Invitation extends BaseTimeEntity {
 
     @Column(nullable = false)
     private LocalTime endTime;
-
 }

src/main/java/com/livable/server/entity/InvitationPurpose.java

@@ -7,6 +7,5 @@ public enum InvitationPurpose {
     PERIOD_WORK,
     SEMINAR,
     AFTER_SERVICE,
-    ETC,
-    ;
+    ETC;
 }

src/main/java/com/livable/server/entity/LunchBoxReview.java

@@ -1,9 +1,11 @@
 package com.livable.server.entity;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/com/livable/server/entity/Member.java

@@ -1,7 +1,6 @@
 package com.livable.server.entity;
 
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
 
 import javax.persistence.*;
 

src/main/java/com/livable/server/entity/MenuChoiceResult.java

@@ -1,7 +1,6 @@
 package com.livable.server.entity;
 
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
 
 import javax.persistence.*;
 import java.time.LocalDate;

src/main/java/com/livable/server/entity/Point.java

@@ -1,7 +1,6 @@
 package com.livable.server.entity;
 
 import lombok.*;
-import org.hibernate.annotations.ColumnDefault;
 
 import javax.persistence.*;
 

src/main/java/com/livable/server/entity/PointCode.java

@@ -13,8 +13,7 @@ public enum PointCode {
     PA03("오점완 7일차 달성 보상"),
     PA04("오점완 14일차 달성 보상"),
     PA05("오점완 21일차 달성 보상"),
-    PM00("제휴 카페 메뉴 할인에 대한 포인트 사용"),
-    ;
+    PM00("제휴 카페 메뉴 할인에 대한 포인트 사용");
 
     private final String description;
 }

src/main/java/com/livable/server/entity/PointLog.java

@@ -3,7 +3,6 @@
 import lombok.*;
 
 import javax.persistence.*;
-import java.time.LocalDate;
 
 @Getter
 @Builder

src/main/java/com/livable/server/entity/Reservation.java

@@ -4,7 +4,6 @@
 
 import javax.persistence.*;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 @Getter

src/main/java/com/livable/server/entity/RestaurantCategory.java

@@ -3,6 +3,5 @@
 public enum RestaurantCategory {
 
     RESTAURANT,
-    CAFE,
-    ;
+    CAFE;
 }

src/main/java/com/livable/server/entity/RestaurantReview.java

@@ -1,6 +1,9 @@
 package com.livable.server.entity;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import javax.persistence.*;

src/main/java/com/livable/server/entity/Review.java

@@ -2,7 +2,6 @@
 
 import lombok.*;
 import lombok.experimental.SuperBuilder;
-import org.hibernate.annotations.DynamicInsert;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;

src/main/java/com/livable/server/entity/Role.java

@@ -1,5 +1,6 @@
 package com.livable.server.entity;
 
 public enum Role {
-    ADMIN, USER
+    ADMIN,
+    USER;
 }

src/test/java/com/livable/server/LivableServerApplicationTests.java

@@ -1,5 +1,6 @@
 package com.livable.server;
 
+import com.livable.server.core.response.ApiResponse;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;