Style: main 소스 코드

Mini-Team-6 · Nov 30, 2023 · d65f149 · d65f149
1 parent 58d8f39
commit d65f149
Show file tree

Hide file tree

Showing 42 changed files with 95 additions and 124 deletions.
diff --git a/src/main/java/ybe/mini/travelserver/TravelServerApplication.java b/src/main/java/ybe/mini/travelserver/TravelServerApplication.java
@@ -6,8 +6,8 @@
 @SpringBootApplication
 public class TravelServerApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(TravelServerApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(TravelServerApplication.class, args);
+    }
 
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/accommodation/dto/AccommodationGetResponse.java b/src/main/java/ybe/mini/travelserver/domain/accommodation/dto/AccommodationGetResponse.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Builder;
-import ybe.mini.travelserver.domain.accommodation.entity.Location;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
+import ybe.mini.travelserver.domain.accommodation.entity.Location;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AccommodationGetResponse(

diff --git a/src/main/java/ybe/mini/travelserver/domain/accommodation/entity/Location.java b/src/main/java/ybe/mini/travelserver/domain/accommodation/entity/Location.java
@@ -1,13 +1,14 @@
 package ybe.mini.travelserver.domain.accommodation.entity;
 
 import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
 
 @Getter
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
 @SuperBuilder
 public class Location {

diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartCreateResponse.java b/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartCreateResponse.java
@@ -4,8 +4,8 @@
 import jakarta.validation.constraints.Positive;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record CartCreateResponse (
+public record CartCreateResponse(
         @Positive
         Long id
-){
+) {
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartDeleteResponse.java b/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartDeleteResponse.java
@@ -4,8 +4,8 @@
 import jakarta.validation.constraints.Positive;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record CartDeleteResponse (
+public record CartDeleteResponse(
         @Positive
         Long id
-){
+) {
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartGetResponse.java b/src/main/java/ybe/mini/travelserver/domain/cart/dto/response/CartGetResponse.java
@@ -13,24 +13,24 @@
 import java.time.LocalDate;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record CartGetResponse (
-    @Positive
-    Long id,
+public record CartGetResponse(
+        @Positive
+        Long id,
 
-    @Positive
-    Integer guestNumber,
+        @Positive
+        Integer guestNumber,
 
-    @FutureOrPresent
-    LocalDate checkIn,
+        @FutureOrPresent
+        LocalDate checkIn,
 
-    @FutureOrPresent
-    LocalDate checkOut,
+        @FutureOrPresent
+        LocalDate checkOut,
 
-    @Valid
-    RoomGetResponse roomGetResponse,
+        @Valid
+        RoomGetResponse roomGetResponse,
 
-    @Valid
-    AccommodationGetResponse accommodationGetResponse
+        @Valid
+        AccommodationGetResponse accommodationGetResponse
 ) {
     public static CartGetResponse fromEntity(
             Cart cart,

diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/exception/CartErrorMessage.java b/src/main/java/ybe/mini/travelserver/domain/cart/exception/CartErrorMessage.java
@@ -2,17 +2,18 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import ybe.mini.travelserver.global.exception.ErrorMessage;
 import org.springframework.http.HttpStatus;
+import ybe.mini.travelserver.global.exception.ErrorMessage;
+
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
+
 @Getter
 @AllArgsConstructor
 public enum CartErrorMessage implements ErrorMessage {
 
     CART_ALREADY_EXIST(BAD_REQUEST, "해당 정보가 이미 장바구니에 담겨있습니다."),
 
-    CART_NOT_FOUND(BAD_REQUEST, "해당 ID의 장바구니 정보가 없습니다.")
-    ;
+    CART_NOT_FOUND(BAD_REQUEST, "해당 ID의 장바구니 정보가 없습니다.");
     private final HttpStatus status;
     private final String message;
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/exception/CartExceptionHandler.java b/src/main/java/ybe/mini/travelserver/domain/cart/exception/CartExceptionHandler.java
@@ -7,7 +7,8 @@
 import ybe.mini.travelserver.domain.cart.controller.CartController;
 import ybe.mini.travelserver.global.exception.ProblemDetailCreator;
 
-import static ybe.mini.travelserver.domain.cart.exception.CartErrorMessage.*;
+import static ybe.mini.travelserver.domain.cart.exception.CartErrorMessage.CART_ALREADY_EXIST;
+import static ybe.mini.travelserver.domain.cart.exception.CartErrorMessage.CART_NOT_FOUND;
 
 @RestControllerAdvice(basePackageClasses = CartController.class)
 public class CartExceptionHandler extends ProblemDetailCreator<CartErrorMessage> {

diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/repository/CartRepository.java b/src/main/java/ybe/mini/travelserver/domain/cart/repository/CartRepository.java
@@ -4,7 +4,6 @@
 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);

diff --git a/src/main/java/ybe/mini/travelserver/domain/cart/service/CartService.java b/src/main/java/ybe/mini/travelserver/domain/cart/service/CartService.java
@@ -50,7 +50,6 @@ public CartCreateResponse createCart(Long userId, CartCreateRequest cartCreateRe
         return new CartCreateResponse(createdCart.getId());
     }
 
-    // TODO
     @Transactional(readOnly = true)
     public List<CartGetResponse> getMyCarts(Long userId) {
         return cartRepository.findALLByMemberId(userId).stream()
@@ -61,10 +60,10 @@ public List<CartGetResponse> getMyCarts(Long userId) {
 
     @Transactional
     public CartDeleteResponse deleteCart(Long cartId) {
-        cartRepository.findById(cartId)
+        Cart cart = cartRepository.findById(cartId)
                 .orElseThrow(CartNotFoundException::new);
-        cartRepository.deleteById(cartId);
-        return new CartDeleteResponse(cartId);
+        cartRepository.deleteById(cart.getId());
+        return new CartDeleteResponse(cart.getId());
     }
 
     private Member getMemberById(Long id) {

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageRequest.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageRequest.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageResponse.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageResponse.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageUpdateResponse.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/MypageUpdateResponse.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/SigninRequest.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/SigninRequest.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/SigninResponse.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/SigninResponse.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.NotBlank;
 
 import java.io.Serializable;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/SignupRequest.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/SignupRequest.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/src/main/java/ybe/mini/travelserver/domain/member/dto/SignupResponse.java b/src/main/java/ybe/mini/travelserver/domain/member/dto/SignupResponse.java
@@ -1,8 +1,6 @@
 package ybe.mini.travelserver.domain.member.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import ybe.mini.travelserver.domain.member.entity.Member;

diff --git a/...ain/java/ybe/mini/travelserver/domain/member/exception/CanNotControlOtherMembersData.java b/...ain/java/ybe/mini/travelserver/domain/member/exception/CanNotControlOtherMembersData.java
@@ -1,4 +1,4 @@
 package ybe.mini.travelserver.domain.member.exception;
 
-public class CanNotControlOtherMembersData extends RuntimeException{
+public class CanNotControlOtherMembersData extends RuntimeException {
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/controller/ReservationController.java b/src/main/java/ybe/mini/travelserver/domain/reservation/controller/ReservationController.java
@@ -29,7 +29,7 @@ public class ReservationController {
 
     @PreAuthorize(HAS_ROLE_USER)
     @PostMapping
-    public ResponseDto<ReservationCreateResponse> tryReservation (
+    public ResponseDto<ReservationCreateResponse> tryReservation(
             @RequestBody ReservationCreateRequest createRequest,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     ) {
@@ -41,7 +41,7 @@ public ResponseDto<ReservationCreateResponse> tryReservation (
 
     @PreAuthorize(HAS_ROLE_USER)
     @PostMapping("/from-cart")
-    public ResponseDto<ReservationCreateResponse> tryReservationFromCart (
+    public ResponseDto<ReservationCreateResponse> tryReservationFromCart(
             @RequestBody @Valid ReservationCreateFromCartRequest createRequest,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     ) {
@@ -53,7 +53,7 @@ public ResponseDto<ReservationCreateResponse> tryReservationFromCart (
 
     @PreAuthorize(HAS_ROLE_USER)
     @GetMapping
-    public ResponseDto<List<ReservationGetResponse>> getMyReservations (
+    public ResponseDto<List<ReservationGetResponse>> getMyReservations(
             @AuthenticationPrincipal PrincipalDetails principalDetails
     ) {
         return new ResponseDto<>(

diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/dto/ReservationCreateRequest.java b/src/main/java/ybe/mini/travelserver/domain/reservation/dto/ReservationCreateRequest.java
@@ -1,7 +1,5 @@
 package ybe.mini.travelserver.domain.reservation.dto;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;

diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/dto/ReservationGetResponse.java b/src/main/java/ybe/mini/travelserver/domain/reservation/dto/ReservationGetResponse.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Builder;
-import ybe.mini.travelserver.domain.reservation.entity.Reservation;
 import ybe.mini.travelserver.domain.reservation.entity.PaymentType;
+import ybe.mini.travelserver.domain.reservation.entity.Reservation;
 import ybe.mini.travelserver.domain.reservation_room.dto.ReservationRoomGetResponse;
 
 import java.io.Serializable;
@@ -22,16 +22,16 @@ public record ReservationGetResponse(
 
 ) implements Serializable {
 
-        public static ReservationGetResponse fromEntity(Reservation reservation) {
-                return ReservationGetResponse.builder()
-                        .id(reservation.getId())
-                        .reservationRooms(
-                                Optional.ofNullable(reservation.getReservationRooms())
-                                        .orElseGet(Collections::emptyList).stream()
-                                        .map(ReservationRoomGetResponse::fromEntity).toList()
-                        )
-                        .createdAt(reservation.getCreatedAt())
-                        .paymentType(reservation.getPaymentType())
-                        .build();
-        }
+    public static ReservationGetResponse fromEntity(Reservation reservation) {
+        return ReservationGetResponse.builder()
+                .id(reservation.getId())
+                .reservationRooms(
+                        Optional.ofNullable(reservation.getReservationRooms())
+                                .orElseGet(Collections::emptyList).stream()
+                                .map(ReservationRoomGetResponse::fromEntity).toList()
+                )
+                .createdAt(reservation.getCreatedAt())
+                .paymentType(reservation.getPaymentType())
+                .build();
+    }
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/entity/PaymentType.java b/src/main/java/ybe/mini/travelserver/domain/reservation/entity/PaymentType.java
@@ -10,8 +10,7 @@ public enum PaymentType {
     KAKAO_PAY("카카오페이 결제"),
     CARD("카드 결제"),
     MOBILE("휴대폰 결제"),
-    ACCOUNT("계좌 이체")
-    ;
+    ACCOUNT("계좌 이체");
 
     private final String name;
 

diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/entity/Reservation.java b/src/main/java/ybe/mini/travelserver/domain/reservation/entity/Reservation.java
@@ -15,8 +15,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import static ybe.mini.travelserver.domain.reservation.entity.PaymentType.*;
-
 @SuperBuilder
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -39,7 +37,7 @@ public class Reservation extends BaseTimeEntity {
             orphanRemoval = true
     )
     @Builder.Default
-    private List<ReservationRoom> reservationRooms = new ArrayList<>();
+    private final List<ReservationRoom> reservationRooms = new ArrayList<>();
 
     @Enumerated(EnumType.STRING)
     @Comment("예약 상태")

diff --git a/...main/java/ybe/mini/travelserver/domain/reservation/exception/ReservationErrorMessage.java b/...main/java/ybe/mini/travelserver/domain/reservation/exception/ReservationErrorMessage.java
@@ -12,8 +12,7 @@
 public enum ReservationErrorMessage implements ErrorMessage {
 
     RESERVATION_NOT_FOUND(BAD_REQUEST, "해당 ID의 예약 정보가 없습니다."),
-    ROOM_STOCK_IS_EMPTY(BAD_REQUEST, "예약하려는 객실 상품이 이미 품절되었습니다.")
-    ;
+    ROOM_STOCK_IS_EMPTY(BAD_REQUEST, "예약하려는 객실 상품이 이미 품절되었습니다.");
     private final HttpStatus status;
     private final String message;
 }
diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/repository/ReservationRepository.java b/src/main/java/ybe/mini/travelserver/domain/reservation/repository/ReservationRepository.java
@@ -1,7 +1,6 @@
 package ybe.mini.travelserver.domain.reservation.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import ybe.mini.travelserver.domain.member.entity.Member;
 import ybe.mini.travelserver.domain.reservation.entity.Reservation;
 
 import java.util.List;

diff --git a/src/main/java/ybe/mini/travelserver/domain/reservation/service/ReservationService.java b/src/main/java/ybe/mini/travelserver/domain/reservation/service/ReservationService.java
@@ -6,6 +6,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
 import ybe.mini.travelserver.domain.accommodation.repository.AccommodationRepository;
+import ybe.mini.travelserver.domain.cart.entity.Cart;
+import ybe.mini.travelserver.domain.cart.exception.CartNotFoundException;
 import ybe.mini.travelserver.domain.cart.repository.CartRepository;
 import ybe.mini.travelserver.domain.member.entity.Member;
 import ybe.mini.travelserver.domain.member.exception.MemberNotFoundException;
@@ -64,7 +66,7 @@ private void isEnableReservation(ReservationRoom resRoom) {
         int restStock = getRestStock(
                 resRoom.getRoom(), resRoom.getCheckIn(), resRoom.getCheckOut()
         );
-        if(restStock==0) throw new RoomStockIsEmptyException();
+        if (restStock == 0) throw new RoomStockIsEmptyException();
     }
 
     private Integer getRestStock(Room room, LocalDate checkIn, LocalDate checkOut) {
@@ -106,7 +108,7 @@ public Long deleteReservation(Long reservationId) {
 
     private List<ReservationRoom> reservationRoomDtosToEntityList(List<ReservationRoomCreateRequest> roomCreateRequests) {
         List<ReservationRoom> reservationRooms = new ArrayList<>();
-        for(ReservationRoomCreateRequest roomRequest : roomCreateRequests) {
+        for (ReservationRoomCreateRequest roomRequest : roomCreateRequests) {
             ReservationRoom reservationRoom = reservationRoomDtoToEntity(roomRequest);
             reservationRooms.add(reservationRoom);
         }
@@ -155,8 +157,8 @@ private Member getMemberByEmail(String email) {
     }
 
     private void deleteCart(Long cartId) {
-        cartRepository.findById(cartId).orElseThrow(RuntimeException::new);  //todo : CustomException, 민정님 구현 후 적용
-        cartRepository.deleteById(cartId);
+        Cart cart = cartRepository.findById(cartId).orElseThrow(CartNotFoundException::new);
+        cartRepository.deleteById(cart.getId());
     }
 
 }