[멀티 모듈 연동] 킬리안(박명규) 제출합니다 🚀

application/api/roomescape-reservation-api/build.gradle

@@ -0,0 +1,18 @@
+bootJar {
+    enabled = true
+}
+
+jar {
+    enabled = false
+}
+
+dependencies {
+    implementation project(':core:core-domain:roomescape-reservation-domain')
+    implementation project(':core:core-db:roomescape-mysql-jdbc-db')
+
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
+}

src/main/java/roomescape/RoomEscapeApplication.java → application/api/roomescape-reservation-api/src/main/java/roomescape/RoomEscapeApplication.java

@@ -5,8 +5,8 @@
 
 @SpringBootApplication
 public class RoomEscapeApplication {
+
     public static void main(String[] args) {
         SpringApplication.run(RoomEscapeApplication.class, args);
     }
-
 }

src/main/java/roomescape/application/error/code/ApplicationErrorCode.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/code/ApplicationErrorCode.java

@@ -7,7 +7,8 @@ public enum ApplicationErrorCode {
     CANNOT_DELETE_EXIST_RESERVATION_AT_THIS_TIME("이 시간에 존재하는 예약이 있어 삭제할 수 없습니다."),
     CANNOT_CREATE_EXIST_RESERVATION_AT_THIS_TIME("이 시간에 존재하는 예약이 있어 예약을 생성할 수 없습니다."),
     CANNOT_CREATE_EXIST_RESERVATION_TIME("이 시간의 예약 시간은 이미 존재하여 생성할 수 없습니다."),
-    NOT_FOUND_ENTITY("엔티티를 찾을 수 없습니다.");
+    NOT_FOUND_ENTITY_RESERVATION_TIME("예약 시간 엔티티를 찾을 수 없습니다."),
+    NOT_FOUND_ENTITY_THEME("테마 엔티티를 찾을 수 없습니다.");
 
     private final String message;
 

src/main/java/roomescape/application/error/dto/ErrorResponse.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/dto/ErrorResponse.java

@@ -4,7 +4,7 @@
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 import roomescape.application.error.exception.ApplicationException;
-import roomescape.domain.error.exception.DomainException;
+import roomescape.error.exception.DomainException;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/roomescape/application/error/exception/ApplicationException.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/exception/ApplicationException.java

@@ -1,19 +1,19 @@
 package roomescape.application.error.exception;
 
+
 import roomescape.application.error.code.ApplicationErrorCode;
+import roomescape.application.error.key.ApplicationErrorKeys;
 
 public class ApplicationException extends RuntimeException {
 
     private final ApplicationErrorCode code;
 
-    public ApplicationException(ApplicationErrorCode code) {
-        super(code.getMessage());
-        this.code = code;
-    }
+    private final ApplicationErrorKeys keys;
 
-    public ApplicationException(ApplicationErrorCode code, String message) {
-        super(message);
+    public ApplicationException(ApplicationErrorCode code, ApplicationErrorKeys keys) {
+        super(keys.toMessage() + code.getMessage());
         this.code = code;
+        this.keys = keys;
     }
 
     public ApplicationErrorCode getCode() {

application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/exception/CreateReservationTimeValidateException.java

@@ -0,0 +1,30 @@
+package roomescape.application.error.exception;
+
+import roomescape.application.error.code.ApplicationErrorCode;
+import roomescape.application.error.key.ApplicationErrorKey;
+import roomescape.application.error.key.ApplicationErrorKeys;
+import roomescape.domain.reservationtime.ReservationTime;
+
+import static roomescape.application.error.code.ApplicationErrorCode.CANNOT_CREATE_EXIST_RESERVATION_TIME;
+
+public class CreateReservationTimeValidateException extends ApplicationException {
+
+    private static final String TIME_FORMAT = "HH:mm";
+
+    private static final String ERROR_KEY_NAME_START_AT = "startAt";
+
+    public CreateReservationTimeValidateException(ApplicationErrorCode code, ApplicationErrorKeys keys) {
+        super(code, keys);
+    }
+
+    public static CreateReservationTimeValidateException existTime(ReservationTime reservationTime) {
+        return new CreateReservationTimeValidateException(
+                CANNOT_CREATE_EXIST_RESERVATION_TIME,
+                ApplicationErrorKeys.of(
+                        new ApplicationErrorKey(
+                                ERROR_KEY_NAME_START_AT,
+                                reservationTime.getFormatStartAt(TIME_FORMAT)
+                        ))
+        );
+    }
+}

application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/exception/CreateReservationValidateException.java

@@ -0,0 +1,33 @@
+package roomescape.application.error.exception;
+
+import roomescape.application.error.code.ApplicationErrorCode;
+import roomescape.application.error.key.ApplicationErrorKey;
+import roomescape.application.error.key.ApplicationErrorKeys;
+import roomescape.domain.reservation.vo.ReservationDate;
+import roomescape.domain.reservationtime.ReservationTime;
+
+import static roomescape.application.error.code.ApplicationErrorCode.CANNOT_CREATE_EXIST_RESERVATION_AT_THIS_TIME;
+
+public class CreateReservationValidateException extends ApplicationException {
+
+    private static final String ERROR_KEY_NAME_DATE = "date";
+    private static final String ERROR_KEY_TIME_ID = "timeId";
+    private static final String DATE_FORMAT = "yyyy-MM-dd";
+
+    public CreateReservationValidateException(ApplicationErrorCode code, ApplicationErrorKeys keys) {
+        super(code, keys);
+    }
+
+    public static CreateReservationValidateException existTime(
+            ReservationDate reservationDate,
+            ReservationTime reservationTime
+    ) {
+        return new CreateReservationValidateException(
+                CANNOT_CREATE_EXIST_RESERVATION_AT_THIS_TIME,
+                ApplicationErrorKeys.of(
+                        new ApplicationErrorKey(ERROR_KEY_NAME_DATE, reservationDate.getFormatted(DATE_FORMAT)),
+                        new ApplicationErrorKey(ERROR_KEY_TIME_ID, reservationTime.getId().toString())
+                )
+        );
+    }
+}

application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/exception/DeleteReservationTimeValidateException.java

@@ -0,0 +1,26 @@
+package roomescape.application.error.exception;
+
+import roomescape.application.error.code.ApplicationErrorCode;
+import roomescape.application.error.key.ApplicationErrorKey;
+import roomescape.application.error.key.ApplicationErrorKeys;
+import roomescape.domain.reservationtime.vo.ReservationTimeId;
+
+import static roomescape.application.error.code.ApplicationErrorCode.CANNOT_DELETE_EXIST_RESERVATION_AT_THIS_TIME;
+
+public class DeleteReservationTimeValidateException extends ApplicationException {
+
+    private static final String ERROR_KEY_TIME_ID = "timeId";
+
+    public DeleteReservationTimeValidateException(ApplicationErrorCode code, ApplicationErrorKeys keys) {
+        super(code, keys);
+    }
+
+    public static DeleteReservationTimeValidateException existReservation(ReservationTimeId reservationTimeId) {
+        return new DeleteReservationTimeValidateException(
+                CANNOT_DELETE_EXIST_RESERVATION_AT_THIS_TIME,
+                ApplicationErrorKeys.of(
+                        new ApplicationErrorKey(ERROR_KEY_TIME_ID, reservationTimeId.id().toString())
+                )
+        );
+    }
+}

src/main/java/roomescape/application/error/handler/DomainExceptionHandler.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/handler/DomainExceptionHandler.java

@@ -8,14 +8,22 @@
 import roomescape.application.error.dto.ErrorResponse;
 import roomescape.application.error.logger.ExceptionLogger;
 import roomescape.application.error.util.ResponseEntityFactory;
-import roomescape.domain.error.exception.DomainException;
+import roomescape.error.exception.DomainException;
+import roomescape.error.exception.NotFoundDomainException;
 
 @Order(Ordered.HIGHEST_PRECEDENCE)
 @RestControllerAdvice
 public class DomainExceptionHandler {
 
     private final ExceptionLogger exceptionLogger = new ExceptionLogger(this.getClass());
 
+    @ExceptionHandler(NotFoundDomainException.class)
+    public ResponseEntity<ErrorResponse> handleException(NotFoundDomainException ex) {
+        exceptionLogger.log(ex);
+
+        return ResponseEntityFactory.notFound(ex);
+    }
+
     @ExceptionHandler(DomainException.class)
     public ResponseEntity<ErrorResponse> handleException(DomainException ex) {
         exceptionLogger.log(ex);

src/main/java/roomescape/application/error/handler/ServiceExceptionHandler.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/handler/ServiceExceptionHandler.java

@@ -7,7 +7,6 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import roomescape.application.error.dto.ErrorResponse;
 import roomescape.application.error.exception.ApplicationException;
-import roomescape.application.error.exception.NotFoundException;
 import roomescape.application.error.logger.ExceptionLogger;
 import roomescape.application.error.util.ResponseEntityFactory;
 
@@ -17,13 +16,6 @@ public class ServiceExceptionHandler {
 
     private final ExceptionLogger exceptionLogger = new ExceptionLogger(this.getClass());
 
-    @ExceptionHandler(NotFoundException.class)
-    public ResponseEntity<ErrorResponse> handleException(NotFoundException ex) {
-        exceptionLogger.log(ex);
-
-        return ResponseEntityFactory.notFound(ex);
-    }
-
     @ExceptionHandler(ApplicationException.class)
     public ResponseEntity<ErrorResponse> handleException(ApplicationException ex) {
         exceptionLogger.log(ex);

application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/key/ApplicationErrorKey.java

@@ -0,0 +1,18 @@
+package roomescape.application.error.key;
+
+public class ApplicationErrorKey {
+
+    private static final String MESSAGE_FORMAT = "[%s : %s] ";
+
+    private final String name;
+    private final String value;
+
+    public ApplicationErrorKey(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String toMessage() {
+        return String.format(MESSAGE_FORMAT, this.name, this.value);
+    }
+}

application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/key/ApplicationErrorKeys.java

@@ -0,0 +1,25 @@
+package roomescape.application.error.key;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ApplicationErrorKeys {
+
+    private final List<ApplicationErrorKey> keys;
+
+    public ApplicationErrorKeys(List<ApplicationErrorKey> keys) {
+        this.keys = keys;
+    }
+
+    public static ApplicationErrorKeys of(ApplicationErrorKey... keys) {
+        return new ApplicationErrorKeys(new ArrayList<>(Arrays.asList(keys)));
+    }
+
+    public String toMessage() {
+        return keys.stream()
+                .map(ApplicationErrorKey::toMessage)
+                .collect(Collectors.joining(", "));
+    }
+}

src/main/java/roomescape/application/error/util/ResponseEntityFactory.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/error/util/ResponseEntityFactory.java

@@ -4,16 +4,16 @@
 import org.springframework.validation.BindException;
 import roomescape.application.error.dto.ErrorResponse;
 import roomescape.application.error.exception.ApplicationException;
-import roomescape.application.error.exception.NotFoundException;
-import roomescape.domain.error.exception.DomainException;
+import roomescape.error.exception.DomainException;
+import roomescape.error.exception.NotFoundDomainException;
 
 import static org.springframework.http.HttpStatus.*;
 import static roomescape.application.error.code.ApplicationErrorCode.RUN_TIME_EXCEPTION;
 
 public final class ResponseEntityFactory {
 
     private ResponseEntityFactory() {
-        throw new UnsupportedOperationException(ResponseEntityFactory.class.getName() + "의 인스턴스는 생성되어서 안됩니다.");
+        throw new UnsupportedOperationException(this.getClass().getName() + "의 인스턴스는 생성되어서 안됩니다.");
     }
 
     public static ResponseEntity<ErrorResponse> internalServerError(RuntimeException runtimeException) {
@@ -40,7 +40,7 @@ public static ResponseEntity<ErrorResponse> badRequest(DomainException domainExc
                 .body(ErrorResponse.from(domainException));
     }
 
-    public static ResponseEntity<ErrorResponse> notFound(NotFoundException notFoundException) {
+    public static ResponseEntity<ErrorResponse> notFound(NotFoundDomainException notFoundException) {
         return ResponseEntity
                 .status(NOT_FOUND)
                 .body(ErrorResponse.from(notFoundException));

src/main/java/roomescape/application/api/ReservationCommandApi.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/presentation/api/ReservationCommandApi.java

@@ -1,10 +1,10 @@
-package roomescape.application.api;
+package roomescape.application.presentation.api;
 
 import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import roomescape.application.api.dto.request.CreateReservationRequest;
-import roomescape.application.api.dto.response.CreateReservationResponse;
+import roomescape.application.presentation.api.dto.request.CreateReservationRequest;
+import roomescape.application.presentation.api.dto.response.CreateReservationResponse;
 import roomescape.application.service.ReservationCommandService;
 import roomescape.application.service.command.DeleteReservationCommand;
 import roomescape.domain.reservation.Reservation;
@@ -22,15 +22,15 @@ public ReservationCommandApi(ReservationCommandService reservationCommandService
 
     @PostMapping("/reservations")
     public ResponseEntity<CreateReservationResponse> createReservation(@RequestBody @Valid CreateReservationRequest request) {
-        Reservation reservation = reservationCommandService.createReservation(request.toCreateReservationCommand());
+        Reservation reservation = reservationCommandService.create(request.toCreateReservationCommand());
 
         return ResponseEntity.created(URI.create(String.format("/reservations/%d", reservation.getId())))
                 .body(CreateReservationResponse.from(reservation));
     }
 
     @DeleteMapping("/reservations/{reservationId}")
     public ResponseEntity<Void> deleteReservation(@PathVariable Long reservationId) {
-        reservationCommandService.deleteReservation(new DeleteReservationCommand(reservationId));
+        reservationCommandService.delete(new DeleteReservationCommand(reservationId));
 
         return ResponseEntity.noContent().build();
     }

src/main/java/roomescape/application/api/ReservationQueryApi.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/presentation/api/ReservationQueryApi.java

@@ -1,9 +1,9 @@
-package roomescape.application.api;
+package roomescape.application.presentation.api;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.application.api.dto.response.FindAllReservationsResponse;
+import roomescape.application.presentation.api.dto.response.FindAllReservationsResponse;
 import roomescape.application.service.ReservationQueryService;
 import roomescape.domain.reservation.ReservationViews;
 
@@ -19,8 +19,8 @@ public ReservationQueryApi(ReservationQueryService reservationQueryService) {
     }
 
     @GetMapping("/reservations")
-    public ResponseEntity<List<FindAllReservationsResponse>> findAllReservations() {
-        ReservationViews reservationViews = reservationQueryService.findAllReservations();
+    public ResponseEntity<List<FindAllReservationsResponse>> findAll() {
+        ReservationViews reservationViews = reservationQueryService.findAll();
 
         return ResponseEntity.ok(FindAllReservationsResponse.toFindAllReservationsResponses(reservationViews));
     }

src/main/java/roomescape/application/api/ReservationTimeCommandApi.java → application/api/roomescape-reservation-api/src/main/java/roomescape/application/presentation/api/ReservationTimeCommandApi.java

@@ -1,10 +1,10 @@
-package roomescape.application.api;
+package roomescape.application.presentation.api;
 
 import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import roomescape.application.api.dto.request.CreateReservationTimeRequest;
-import roomescape.application.api.dto.response.CreateReservationTimeResponse;
+import roomescape.application.presentation.api.dto.request.CreateReservationTimeRequest;
+import roomescape.application.presentation.api.dto.response.CreateReservationTimeResponse;
 import roomescape.application.service.ReservationTimeService;
 import roomescape.application.service.command.DeleteReservationTimeCommand;
 import roomescape.domain.reservationtime.ReservationTime;
@@ -21,20 +21,19 @@ public ReservationTimeCommandApi(ReservationTimeService reservationTimeService)
     }
 
     @PostMapping("/times")
-    public ResponseEntity<CreateReservationTimeResponse> createReservationTime(
+    public ResponseEntity<CreateReservationTimeResponse> create(
             @RequestBody @Valid CreateReservationTimeRequest request
     ) {
-        ReservationTime reservationTime =
-                reservationTimeService.createReservationTime(request.toCreateReservationTimeCommand());
+        ReservationTime reservationTime = reservationTimeService.create(request.toCommand());
 
         return ResponseEntity
                 .created(URI.create(String.format("/times/%d", reservationTime.getId())))
                 .body(CreateReservationTimeResponse.from(reservationTime));
     }
 
     @DeleteMapping("/times/{reservationTimeId}")
-    public ResponseEntity<Void> deleteReservationTime(@PathVariable Long reservationTimeId) {
-        reservationTimeService.deleteReservationTime(new DeleteReservationTimeCommand(reservationTimeId));
+    public ResponseEntity<Void> delete(@PathVariable Long reservationTimeId) {
+        reservationTimeService.delete(new DeleteReservationTimeCommand(reservationTimeId));
 
         return ResponseEntity.noContent().build();
     }