refactor: erd 변경과 코드 수정

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/dto/request/AccommodationOptionRequest.java

@@ -1,5 +1,6 @@
 package com.backoffice.upjuyanolja.domain.accommodation.dto.request;
 
+import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
 import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationOption;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
@@ -34,8 +35,12 @@ public record AccommodationOptionRequest(
     boolean seminar
 ) {
 
-    public static AccommodationOption toEntity(AccommodationOptionRequest request) {
+    public static AccommodationOption toEntity(
+        AccommodationOptionRequest request,
+        Accommodation accommodation
+    ) {
         return AccommodationOption.builder()
+            .accommodation(accommodation)
             .cooking(request.cooking)
             .parking(request.parking)
             .pickup(request.pickup)

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/dto/request/AccommodationRegisterRequest.java

@@ -1,7 +1,6 @@
 package com.backoffice.upjuyanolja.domain.accommodation.dto.request;
 
 import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
-import com.backoffice.upjuyanolja.domain.accommodation.entity.Address;
 import com.backoffice.upjuyanolja.domain.accommodation.entity.Category;
 import com.backoffice.upjuyanolja.domain.room.dto.request.RoomRegisterRequest;
 import jakarta.validation.constraints.NotBlank;
@@ -51,16 +50,12 @@ public static Accommodation toEntity(
     ) {
         return Accommodation.builder()
             .name(request.name())
-            .address(Address.builder()
-                .address(request.address())
-                .detailAddress(request.detailAddress())
-                .zipCode(request.zipCode())
-                .build())
+            .address(request.address())
+            .detailAddress(request.detailAddress())
+            .zipCode(request.zipCode())
             .category(category)
             .description(request.description())
             .thumbnail(request.thumbnail())
-            .images(new ArrayList<>())
-            .option(AccommodationOptionRequest.toEntity(request.option()))
             .rooms(new ArrayList<>())
             .build();
     }

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/dto/response/AccommodationDetailResponse.java

@@ -1,6 +1,7 @@
 package com.backoffice.upjuyanolja.domain.accommodation.dto.response;
 
 import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
+import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationOption;
 import com.backoffice.upjuyanolja.domain.room.dto.response.RoomResponse;
 import java.util.List;
 import lombok.Builder;
@@ -19,26 +20,21 @@ public record AccommodationDetailResponse(
 ) {
 
     public static AccommodationDetailResponse of(
-        Accommodation accommodation, String mainCoupon, List<RoomResponse> rooms
+        Accommodation accommodation, String mainCoupon, AccommodationOption option,
+        List<String> images, List<RoomResponse> rooms
     ) {
         return AccommodationDetailResponse.builder()
             .id(accommodation.getId())
             .name(accommodation.getName())
             .address(
-                accommodation.getAddress().getAddress() + "\n"
-                    + accommodation.getAddress().getDetailAddress()
+                accommodation.getAddress() + "\n"
+                    + accommodation.getDetailAddress()
             )
             .description(accommodation.getDescription())
             .category(accommodation.getCategory().getName())
             .mainCoupon(mainCoupon)
-            .images(
-                accommodation.getImages().stream()
-                    .map(image -> image.getUrl())
-                    .toList()
-            )
-            .option(
-                AccommodationOptionResponse.of(accommodation.getOption())
-            )
+            .option(AccommodationOptionResponse.of(option))
+            .images(images)
             .rooms(rooms)
             .build();
     }

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/dto/response/AccommodationInfoResponse.java

@@ -1,8 +1,9 @@
 package com.backoffice.upjuyanolja.domain.accommodation.dto.response;
 
 import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
+import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationImage;
+import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationOption;
 import com.backoffice.upjuyanolja.domain.room.dto.response.RoomInfoResponse;
-import java.util.ArrayList;
 import java.util.List;
 import lombok.Builder;
 
@@ -18,19 +19,20 @@ public record AccommodationInfoResponse(
     List<RoomInfoResponse> rooms
 ) {
 
-    public static AccommodationInfoResponse of(Accommodation accommodation) {
-        List<RoomInfoResponse> rooms = new ArrayList<>();
-        accommodation.getRooms().forEach(room -> rooms.add(RoomInfoResponse.of(room)));
+    public static AccommodationInfoResponse of(
+        Accommodation accommodation, AccommodationOption option, List<AccommodationImage> images,
+        List<RoomInfoResponse> rooms
+    ) {
         return AccommodationInfoResponse.builder()
             .accommodationId(accommodation.getId())
             .name(accommodation.getName())
             .category(accommodation.getCategory().getName())
             .description(accommodation.getDescription())
-            .address(accommodation.getAddress().getAddress()
+            .address(accommodation.getAddress()
                 + " "
-                + accommodation.getAddress().getDetailAddress())
-            .images(AccommodationImageResponse.of(accommodation.getImages()))
-            .option(AccommodationOptionResponse.of(accommodation.getOption()))
+                + accommodation.getDetailAddress())
+            .option(AccommodationOptionResponse.of(option))
+            .images(AccommodationImageResponse.of(images))
             .rooms(rooms)
             .build();
     }

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/dto/response/AccommodationSummaryResponse.java

@@ -23,7 +23,7 @@ public static AccommodationSummaryResponse of(
         return AccommodationSummaryResponse.builder()
             .id(accommodation.getId())
             .name(accommodation.getName())
-            .address(accommodation.getAddress().getAddress())
+            .address(accommodation.getAddress())
             .category(accommodation.getCategory().getName())
             .lowestPrice(lowestPrice)
             .discountPrice(discountPrice)

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/entity/Accommodation.java

@@ -12,7 +12,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -36,15 +35,6 @@ public class Accommodation extends BaseTime {
     @Comment("숙소 이름")
     private String name;
 
-    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    @Comment("숙소 위치")
-    private Address address;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "category_id")
-    @Comment("숙소 카테고리")
-    private Category category;
-
     @Column(columnDefinition = "TEXT", nullable = false)
     @Comment("숙소 설명")
     private String description;
@@ -53,12 +43,22 @@ public class Accommodation extends BaseTime {
     @Comment("숙소 대표 이미지 URL")
     private String thumbnail;
 
-    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    @Comment("숙소 옵션 식별자")
-    private AccommodationOption option;
+    @Column(nullable = false)
+    @Comment("주소")
+    private String address;
 
-    @OneToMany(mappedBy = "accommodation", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<AccommodationImage> images = new ArrayList<>();
+    @Column(nullable = false)
+    @Comment("상세 주소")
+    private String detailAddress;
+
+    @Column(nullable = false)
+    @Comment("우편번호")
+    private String zipCode;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "category_id")
+    @Comment("숙소 카테고리")
+    private Category category;
 
     @OneToMany(mappedBy = "accommodation", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Room> rooms = new ArrayList<>();
@@ -67,26 +67,25 @@ public class Accommodation extends BaseTime {
     public Accommodation(
         Long id,
         String name,
-        Address address,
+        String address,
+        String detailAddress,
+        String zipCode,
         Category category,
         String description,
         String thumbnail,
-        AccommodationOption option,
-        List<AccommodationImage> images,
         List<Room> rooms
     ) {
         this.id = id;
         this.name = name;
         this.address = address;
+        this.detailAddress = detailAddress;
+        this.zipCode = zipCode;
         this.category = category;
         this.description = description;
         this.thumbnail = thumbnail;
-        this.option = option;
-        this.images = images;
         this.rooms = rooms;
     }
 
-    // 숙소의 ID로 동등 비교를 하기 위해 추가함.
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/entity/AccommodationOption.java

@@ -1,10 +1,13 @@
 package com.backoffice.upjuyanolja.domain.accommodation.entity;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -21,6 +24,10 @@ public class AccommodationOption {
     @Comment("숙소 옵션 식별자")
     private Long id;
 
+    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+    @Comment("숙소 식별자")
+    private Accommodation accommodation;
+
     @Column(nullable = false)
     @Comment("객실 내 취사 여부")
     private boolean cooking;
@@ -60,6 +67,7 @@ public class AccommodationOption {
     @Builder
     public AccommodationOption(
         Long id,
+        Accommodation accommodation,
         boolean cooking,
         boolean parking,
         boolean pickup,
@@ -71,6 +79,7 @@ public AccommodationOption(
         boolean seminar
     ) {
         this.id = id;
+        this.accommodation = accommodation;
         this.cooking = cooking;
         this.parking = parking;
         this.pickup = pickup;

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/exception/AccommodationOptionNotFoundException.java

@@ -0,0 +1,11 @@
+package com.backoffice.upjuyanolja.domain.accommodation.exception;
+
+import com.backoffice.upjuyanolja.global.exception.ApplicationException;
+import com.backoffice.upjuyanolja.global.exception.ErrorCode;
+
+public class AccommodationOptionNotFoundException extends ApplicationException {
+
+    public AccommodationOptionNotFoundException() {
+        super(ErrorCode.ACCOMMODATION_OPTION_NOT_FOUND);
+    }
+}

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/repository/AccommodationImageRepository.java

@@ -1,8 +1,12 @@
 package com.backoffice.upjuyanolja.domain.accommodation.repository;
 
+import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
 import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationImage;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AccommodationImageRepository extends JpaRepository<AccommodationImage, Long> {
 
+    List<AccommodationImage> findByAccommodation(Accommodation accommodation);
+
 }

src/main/java/com/backoffice/upjuyanolja/domain/accommodation/repository/AccommodationOptionRepository.java

@@ -1,8 +1,12 @@
 package com.backoffice.upjuyanolja.domain.accommodation.repository;
 
+import com.backoffice.upjuyanolja.domain.accommodation.entity.Accommodation;
 import com.backoffice.upjuyanolja.domain.accommodation.entity.AccommodationOption;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AccommodationOptionRepository extends JpaRepository<AccommodationOption, Long> {
 
+    Optional<AccommodationOption> findByAccommodation(Accommodation accommodation);
+
 }