Develop

build.gradle

@@ -53,6 +53,8 @@ dependencies {
     //javers
     implementation 'org.javers:javers-core:7.2.0'
 
+    // xml jaxb
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:+'
 
 
 }

src/main/java/ybe/mini/travelserver/domain/accommodation/controller/AccommodationController.java

@@ -31,7 +31,7 @@ public ResponseDto<List<AccommodationGetResponse>> searchAccommodations(
     }
 
     @GetMapping
-    public ResponseDto<AccommodationDetailGetResponse> searchAccommodations(
+    public ResponseDto<AccommodationDetailGetResponse> searchAccommodation(
             @RequestParam String keyword,
             @RequestParam(value = "area-code") AreaCode areaCode
     ) {

src/main/java/ybe/mini/travelserver/domain/accommodation/dto/AccommodationDetailGetResponse.java

@@ -3,9 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Builder;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
-import ybe.mini.travelserver.domain.room.dto.RoomGetResponse;
-
-import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AccommodationDetailGetResponse(

src/main/java/ybe/mini/travelserver/domain/accommodation/repository/AccommodationRepository.java

@@ -3,15 +3,6 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
 
-import java.util.List;
-
 public interface AccommodationRepository extends JpaRepository<Accommodation, Long> {
-
-    List<Accommodation> findByNameContainingAndLocationAreaCode(String keyword, String areaCode);
-
-    List<Accommodation> findByNameContaining(String keyword);
-
-    List<Accommodation> findByLocationAreaCode(String areaCode);
-
 }
 

src/main/java/ybe/mini/travelserver/domain/accommodation/service/AccommodationService.java

@@ -2,32 +2,28 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import ybe.mini.travelserver.domain.accommodation.dto.AccommodationDetailGetResponse;
 import ybe.mini.travelserver.domain.accommodation.dto.AccommodationGetResponse;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
 import ybe.mini.travelserver.domain.accommodation.entity.AreaCode;
-import ybe.mini.travelserver.domain.accommodation.repository.AccommodationRepository;
 import ybe.mini.travelserver.global.api.TourAPIService;
+import ybe.mini.travelserver.global.exception.api.NoAccommodationsFromAPIException;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 
 @Service
 @RequiredArgsConstructor
 public class AccommodationService {
 
-    private final AccommodationRepository accommodationRepository;
     private final TourAPIService tourAPIService;
 
     public List<AccommodationGetResponse> bringAccommodations(
             int pageNo, int numOfRows,
             String keyword, AreaCode areaCode
     ) {
         if (pageNo <= 0) {
-            return Collections.emptyList();
+            throw new NoAccommodationsFromAPIException();
         }
 
         String areaCodeString = (areaCode != null) ? String.valueOf(areaCode.getCode()) : null;
@@ -39,7 +35,9 @@ public List<AccommodationGetResponse> bringAccommodations(
                         keyword,
                         areaCodeString);
 
-        return getResponseList(accommodations);
+        return accommodations.stream()
+                .map(AccommodationGetResponse::fromEntity)
+                .toList();
     }
 
     public AccommodationDetailGetResponse bringAccommodationFromAPI(String keyword, AreaCode areaCode) {
@@ -50,34 +48,5 @@ public AccommodationDetailGetResponse bringAccommodationFromAPI(String keyword,
         return AccommodationDetailGetResponse.fromEntity(accommodation);
     }
 
-    @Transactional(readOnly = true)
-    public List<AccommodationGetResponse> bringAccommodations(String keyword, String areaCode) {
-        List<Accommodation> accommodations;
-
-        if (!Objects.isNull(keyword) && !Objects.isNull(areaCode)) {
-            accommodations = accommodationRepository.findByNameContainingAndLocationAreaCode(keyword, areaCode);
-        } else if (!Objects.isNull(keyword)) {
-            accommodations = accommodationRepository.findByNameContaining(keyword);
-        } else if (!Objects.isNull(areaCode)) {
-            accommodations = accommodationRepository.findByLocationAreaCode(areaCode);
-        } else {
-            accommodations = accommodationRepository.findAll();
-        }
-
-        return getResponseList(accommodations);
-    }
-
-
-    private Accommodation bringAccommodation(Long accommodationId) {
-        return accommodationRepository
-                .findById(accommodationId).orElseThrow(RuntimeException::new);
-    }
-
-    private static List<AccommodationGetResponse> getResponseList(List<Accommodation> accommodations) {
-        return accommodations.stream()
-                .map(AccommodationGetResponse::fromEntity)
-                .toList();
-    }
-
 }
 

src/main/java/ybe/mini/travelserver/domain/cart/controller/CartController.java

@@ -53,7 +53,7 @@ public ResponseDto<CartDeleteResponse> deleteCart(
             @AuthenticationPrincipal PrincipalDetails principalDetails,
             @PathVariable Long cartId) {
         CartDeleteResponse cartDeleteResponse =
-                cartService.deleteCart(principalDetails.getMemberId(), cartId);
+                cartService.deleteCart(cartId);
         return new ResponseDto<>(HttpStatus.OK.value(), cartDeleteResponse);
     }
 }

src/main/java/ybe/mini/travelserver/domain/cart/dto/request/CartCreateRequest.java

@@ -1,30 +1,25 @@
 package ybe.mini.travelserver.domain.cart.dto.request;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.validation.constraints.FutureOrPresent;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Positive;
 import lombok.Builder;
 import ybe.mini.travelserver.domain.accommodation.entity.AreaCode;
 
-import java.time.LocalDate;
-
 @Builder
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record CartCreateRequest(
 
         @Positive
         Long roomTypeId,
 
-        @FutureOrPresent
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-        LocalDate checkIn,
+        @Pattern(regexp = "\\d{8}", message = "날짜 입력은 8자리 숫자이어야 합니다.")
+        String checkIn,
 
-        @FutureOrPresent
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-        LocalDate checkOut,
+        @Pattern(regexp = "\\d{8}", message = "날짜 입력은 8자리 숫자이어야 합니다.")
+        String checkOut,
 
         @Positive
         Integer guestNumber,

src/main/java/ybe/mini/travelserver/domain/cart/exception/CartErrorMessage.java

@@ -9,8 +9,7 @@
 @AllArgsConstructor
 public enum CartErrorMessage implements ErrorMessage {
 
-    CART_INVALID_MEMBER(BAD_REQUEST, "해당 ID가 유효하지 않습니다."),
-    CART_ALREADY_EXIST(BAD_REQUEST, "해당 정보가 장바구니에 담겨있습니다."),
+    CART_ALREADY_EXIST(BAD_REQUEST, "해당 정보가 이미 장바구니에 담겨있습니다."),
 
     CART_NOT_FOUND(BAD_REQUEST, "해당 ID의 장바구니 정보가 없습니다.")
     ;

src/main/java/ybe/mini/travelserver/domain/cart/exception/CartExceptionHandler.java

@@ -21,11 +21,6 @@ public ProblemDetail handelCartNotFoundException(HttpServletRequest request) {
         return createProblemDetail(CART_NOT_FOUND, request);
     }
 
-    @ExceptionHandler(CartInvalidMemberException.class)
-    public ProblemDetail handelCartInvalidMemberException(HttpServletRequest request) {
-        return createProblemDetail(CART_INVALID_MEMBER, request);
-    }
-
     @ExceptionHandler(CartAleadyExistException.class)
     public ProblemDetail handelCartAleadyExistException(HttpServletRequest request) {
         return createProblemDetail(CART_ALREADY_EXIST, request);

src/main/java/ybe/mini/travelserver/domain/cart/repository/CartRepository.java

@@ -4,8 +4,9 @@
 import ybe.mini.travelserver.domain.cart.entity.Cart;
 
 import java.util.List;
+import java.util.Optional;
+
 public interface CartRepository extends JpaRepository<Cart, Long> {
     List<Cart> findALLByMemberId(Long userId);
 
-    List<Cart> deleteAllByMemberId(Long userId);
 }

src/main/java/ybe/mini/travelserver/domain/cart/service/CartService.java

@@ -12,7 +12,6 @@
 import ybe.mini.travelserver.domain.cart.dto.response.CartDeleteResponse;
 import ybe.mini.travelserver.domain.cart.dto.response.CartGetResponse;
 import ybe.mini.travelserver.domain.cart.entity.Cart;
-import ybe.mini.travelserver.domain.cart.exception.CartInvalidMemberException;
 import ybe.mini.travelserver.domain.cart.exception.CartNotFoundException;
 import ybe.mini.travelserver.domain.cart.repository.CartRepository;
 import ybe.mini.travelserver.domain.member.entity.Member;
@@ -22,8 +21,11 @@
 import ybe.mini.travelserver.domain.room.repository.RoomRepository;
 import ybe.mini.travelserver.global.api.TourAPIService;
 
+import java.time.LocalDate;
 import java.util.List;
 
+import static ybe.mini.travelserver.global.util.Validation.validateDateFormat;
+
 @Slf4j
 @RequiredArgsConstructor
 @Service
@@ -38,9 +40,9 @@ public class CartService {
     @Transactional
     public CartCreateResponse createCart(Long userId, CartCreateRequest cartCreateRequest) {
         Member member = getMemberById(userId);
-        createAccommodationById(cartCreateRequest.keyword(), cartCreateRequest.areaCode());
-        Room room = createRoomById(
-                cartCreateRequest.accommodationId(), cartCreateRequest.roomTypeId());
+        Accommodation accommodation =
+                createAccommodationById(cartCreateRequest.keyword(), cartCreateRequest.areaCode());
+        Room room = createRoomById(accommodation, cartCreateRequest.roomTypeId());
 
         Cart cart = createCart(cartCreateRequest, room, member);
         Cart createdCart = cartRepository.save(cart);
@@ -57,15 +59,11 @@ public List<CartGetResponse> getMyCarts(Long userId) {
     }
 
     @Transactional
-    public CartDeleteResponse deleteCart(Long memberId, Long cartId) {
-        Cart cart = cartRepository.findById(cartId)
+    public CartDeleteResponse deleteCart(Long cartId) {
+        cartRepository.findById(cartId)
                 .orElseThrow(CartNotFoundException::new);
-        if (cart.getMember().getId() == memberId) {
-            cartRepository.deleteById(cartId);
-            return new CartDeleteResponse(cartId);
-        } else {
-            throw new CartInvalidMemberException();
-        }
+        cartRepository.deleteById(cartId);
+        return new CartDeleteResponse(cartId);
     }
 
     private Member getMemberById(Long id) {
@@ -80,25 +78,25 @@ private Accommodation createAccommodationById(String keyword, AreaCode areaCode)
         return getOrSaveAccommodation(accommodation);
     }
 
-    private Room createRoomById(Long accommodationId, Long roomId) {
-        Room room = tourAPIService.bringRoom(accommodationId, roomId);
+    private Room createRoomById(Accommodation accommodation, Long roomId) {
+        Room room = tourAPIService.bringRoom(accommodation.getId(), roomId);
         return getOrSaveRoom(room);
     }
 
     private Cart createCart(CartCreateRequest cartCreateRequest, Room room, Member member) {
-        // TODO : 성수님 roomId 관련 논의
-        roomRepository.findById(room.getId())
-                .orElseThrow(CartInvalidMemberException::new);
 
+        LocalDate checkIn = validateDateFormat(cartCreateRequest.checkIn());
+        LocalDate checkOut = validateDateFormat(cartCreateRequest.checkOut());
         return Cart.builder()
                 .guestNumber(cartCreateRequest.guestNumber())
                 .room(room)
                 .member(member)
-                .checkOut(cartCreateRequest.checkOut())
-                .checkIn(cartCreateRequest.checkIn())
+                .checkOut(checkOut)
+                .checkIn(checkIn)
                 .build();
     }
 
+
     private Room getOrSaveRoom(Room room) {
         return roomRepository.findByRoomTypeId(room.getRoomTypeId())
                 .orElseGet(() -> roomRepository.save(room));

src/main/java/ybe/mini/travelserver/domain/reservation/controller/ReservationController.java

@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+import static ybe.mini.travelserver.global.security.Role.HAS_ROLE_USER;
 import static ybe.mini.travelserver.global.security.Role.ROLE_USER;
 
 @Slf4j
@@ -27,10 +28,10 @@ public class ReservationController {
 
     private final ReservationService reservationService;
 
-    @PreAuthorize("hasRole('ROLE_USER')")
+    @PreAuthorize(HAS_ROLE_USER)
     @PostMapping
     public ResponseDto<ReservationCreateResponse> tryReservation (
-            @RequestBody @Valid ReservationCreateRequest createRequest,
+            @RequestBody ReservationCreateRequest createRequest,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     ) {
         return new ResponseDto<>(
@@ -39,7 +40,7 @@ public ResponseDto<ReservationCreateResponse> tryReservation (
         );
     }
 
-    @PreAuthorize("hasRole('ROLE_USER')")
+    @PreAuthorize(HAS_ROLE_USER)
     @PostMapping("/from-cart")
     public ResponseDto<ReservationCreateResponse> tryReservationFromCart (
             @RequestBody @Valid ReservationCreateFromCartRequest createRequest,
@@ -51,7 +52,7 @@ public ResponseDto<ReservationCreateResponse> tryReservationFromCart (
         );
     }
 
-    @PreAuthorize("hasRole('ROLE_USER')")
+    @PreAuthorize(HAS_ROLE_USER)
     @GetMapping
     public ResponseDto<List<ReservationGetResponse>> getMyReservations (
             @AuthenticationPrincipal PrincipalDetails principalDetails

src/main/java/ybe/mini/travelserver/domain/reservation/exception/ReservationErrorMessage.java

@@ -11,7 +11,6 @@
 @AllArgsConstructor
 public enum ReservationErrorMessage implements ErrorMessage {
 
-    HTTP_MESSAGE_NOT_READABLE(BAD_REQUEST, "DTO 양식이 맞지 않습니다."),
     RESERVATION_NOT_FOUND(BAD_REQUEST, "해당 ID의 예약 정보가 없습니다.")
     ;
     private final HttpStatus status;

src/main/java/ybe/mini/travelserver/domain/reservation/exception/ReservationExceptionHandler.java

@@ -2,12 +2,10 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.ProblemDetail;
-import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import ybe.mini.travelserver.global.exception.ProblemDetailCreator;
 
-import static ybe.mini.travelserver.domain.reservation.exception.ReservationErrorMessage.HTTP_MESSAGE_NOT_READABLE;
 import static ybe.mini.travelserver.domain.reservation.exception.ReservationErrorMessage.RESERVATION_NOT_FOUND;
 
 @RestControllerAdvice
@@ -17,11 +15,6 @@ protected ReservationExceptionHandler() {
         super("예약 처리 실패");
     }
 
-    @ExceptionHandler(HttpMessageNotReadableException.class)
-    public ProblemDetail handleHttpMessageNotReadableException(HttpServletRequest request) {
-        return createProblemDetail(HTTP_MESSAGE_NOT_READABLE, request); //todo : Global로 분리할지 논의
-    }
-
     @ExceptionHandler(ReservationNotFoundException.class)
     public ProblemDetail handleReservationNotFoundException(HttpServletRequest request) {
         return createProblemDetail(RESERVATION_NOT_FOUND, request);

src/main/java/ybe/mini/travelserver/domain/reservation/service/ReservationService.java

@@ -22,10 +22,13 @@
 import ybe.mini.travelserver.domain.room.entity.Room;
 import ybe.mini.travelserver.domain.room.repository.RoomRepository;
 import ybe.mini.travelserver.global.api.TourAPIService;
+import ybe.mini.travelserver.global.util.Validation;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static ybe.mini.travelserver.global.util.Validation.validateDateFormat;
+
 @Slf4j
 @RequiredArgsConstructor
 @Service
@@ -101,7 +104,10 @@ private ReservationRoom reservationRoomDtoToEntity(ReservationRoomCreateRequest
         room = getOrSaveRoom(room);
 
         return ReservationRoom.createReservationRoom(
-                room, roomRequest.checkIn(), roomRequest.checkOut(), roomRequest.guestNumber()
+                room,
+                validateDateFormat(roomRequest.checkIn()),
+                validateDateFormat(roomRequest.checkOut()),
+                roomRequest.guestNumber()
         );
     }