diff --git a/backend/src/main/java/com/team14/cherrybnb/auth/domain/Member.java b/backend/src/main/java/com/team14/cherrybnb/auth/domain/Member.java index 77c9e5994..bebe871e6 100644 --- a/backend/src/main/java/com/team14/cherrybnb/auth/domain/Member.java +++ b/backend/src/main/java/com/team14/cherrybnb/auth/domain/Member.java @@ -1,14 +1,13 @@ package com.team14.cherrybnb.auth.domain; -import com.team14.cherrybnb.room.domain.Room; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import javax.persistence.*; -import java.util.List; @Entity +@Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Member { @@ -29,5 +28,4 @@ public class Member { private String oauthRefreshToken; private String resourceServer; - } diff --git a/backend/src/main/java/com/team14/cherrybnb/common/config/SpringDataJpaConfig.java b/backend/src/main/java/com/team14/cherrybnb/common/config/SpringDataJpaConfig.java index 7efb08eea..5a72b600d 100644 --- a/backend/src/main/java/com/team14/cherrybnb/common/config/SpringDataJpaConfig.java +++ b/backend/src/main/java/com/team14/cherrybnb/common/config/SpringDataJpaConfig.java @@ -7,4 +7,4 @@ @EnableJpaAuditing public class SpringDataJpaConfig { - } +} diff --git a/backend/src/main/java/com/team14/cherrybnb/common/config/SwaggerConfig.java b/backend/src/main/java/com/team14/cherrybnb/common/config/SwaggerConfig.java index 6de2a8344..b2998a02c 100644 --- a/backend/src/main/java/com/team14/cherrybnb/common/config/SwaggerConfig.java +++ b/backend/src/main/java/com/team14/cherrybnb/common/config/SwaggerConfig.java @@ -43,5 +43,4 @@ private Set getProduceContentTypes() { produces.add("application/json;charset=UTF-8"); return produces; } - } diff --git a/backend/src/main/java/com/team14/cherrybnb/common/domain/Address.java b/backend/src/main/java/com/team14/cherrybnb/common/domain/Address.java index d4adefd67..f61363655 100644 --- a/backend/src/main/java/com/team14/cherrybnb/common/domain/Address.java +++ b/backend/src/main/java/com/team14/cherrybnb/common/domain/Address.java @@ -1,6 +1,5 @@ package com.team14.cherrybnb.common.domain; - import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/backend/src/main/java/com/team14/cherrybnb/common/util/GeometryUtils.java b/backend/src/main/java/com/team14/cherrybnb/common/util/GeometryUtils.java index d804f3fb9..875a0c0b2 100644 --- a/backend/src/main/java/com/team14/cherrybnb/common/util/GeometryUtils.java +++ b/backend/src/main/java/com/team14/cherrybnb/common/util/GeometryUtils.java @@ -6,8 +6,6 @@ import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; import org.locationtech.jts.util.GeometricShapeFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; public class GeometryUtils { diff --git a/backend/src/main/java/com/team14/cherrybnb/dummy/DummyDataService.java b/backend/src/main/java/com/team14/cherrybnb/dummy/DummyDataService.java index e7710c08f..0bd87ad1c 100644 --- a/backend/src/main/java/com/team14/cherrybnb/dummy/DummyDataService.java +++ b/backend/src/main/java/com/team14/cherrybnb/dummy/DummyDataService.java @@ -26,12 +26,10 @@ public class DummyDataService { private final RoomRepository roomRepository; - public DummyDataService(RoomRepository roomRepository) { this.roomRepository = roomRepository; } - private void requestDummyData() throws JsonProcessingException, org.locationtech.jts.io.ParseException { String url = "http://openapi.seoul.go.kr:8088/454b52746e79687331303668466a544a/json/LOCALDATA_031101/1/1000/"; diff --git a/backend/src/main/java/com/team14/cherrybnb/revervation/application/ReservationService.java b/backend/src/main/java/com/team14/cherrybnb/revervation/application/ReservationService.java index ec95bf37f..7ea50487d 100644 --- a/backend/src/main/java/com/team14/cherrybnb/revervation/application/ReservationService.java +++ b/backend/src/main/java/com/team14/cherrybnb/revervation/application/ReservationService.java @@ -62,6 +62,4 @@ public ReservationDetailResponse showReservationDetail(Long reservationId) { return new ReservationDetailResponse(reservation); } - - } diff --git a/backend/src/main/java/com/team14/cherrybnb/revervation/domain/Reservation.java b/backend/src/main/java/com/team14/cherrybnb/revervation/domain/Reservation.java index c5bfe75e0..1524ad88e 100644 --- a/backend/src/main/java/com/team14/cherrybnb/revervation/domain/Reservation.java +++ b/backend/src/main/java/com/team14/cherrybnb/revervation/domain/Reservation.java @@ -54,5 +54,4 @@ public Reservation(LocalDateTime checkIn, LocalDateTime checkOut, public void cancel() { this.state = ReservationState.CANCEL; } - } diff --git a/backend/src/main/java/com/team14/cherrybnb/revervation/domain/ReservationRepository.java b/backend/src/main/java/com/team14/cherrybnb/revervation/domain/ReservationRepository.java index 5d6acdd04..078485861 100644 --- a/backend/src/main/java/com/team14/cherrybnb/revervation/domain/ReservationRepository.java +++ b/backend/src/main/java/com/team14/cherrybnb/revervation/domain/ReservationRepository.java @@ -4,29 +4,20 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; - public interface ReservationRepository extends JpaRepository { /** * 로그인한 회원의 예약 리스트 조회하기 (ReservationState: 예약 완료) */ - @Query("select r from Reservation r join fetch r.member" + - " join fetch r.room.roomImages join fetch r.room.address" + - " where r.member = :member") - Page findByMember(Pageable pageable, @Param("member")Member member); - - /** - * 예약 취소하기 - */ - - /** - * 예약 상세 정보 보기 - */ - @Query("select r from Reservation r join fetch r.room where r.id = :id") - Reservation findReservationDetailById(@Param("id") Long id); + @Query(value = "select distinct r from Reservation r" + + " join fetch r.member m" + + " join fetch r.room ro" + + " join fetch ro.roomImages" + + " join fetch ro.address" + + " where r.member = :member", + countQuery = "select count(r) from Reservation r where r.member = :member") + Page findByMember(Pageable pageable, @Param("member") Member member); } diff --git a/backend/src/main/java/com/team14/cherrybnb/revervation/dto/ReservationRequest.java b/backend/src/main/java/com/team14/cherrybnb/revervation/dto/ReservationRequest.java index a78519489..ea65369f2 100644 --- a/backend/src/main/java/com/team14/cherrybnb/revervation/dto/ReservationRequest.java +++ b/backend/src/main/java/com/team14/cherrybnb/revervation/dto/ReservationRequest.java @@ -28,5 +28,4 @@ public Reservation toEntity(Member member, Room room) { return new Reservation(this.checkIn, this.checkOut, this.guestCount, this.totalPrice, ReservationState.COMPLETE, room, member); } - } diff --git a/backend/src/main/java/com/team14/cherrybnb/revervation/ui/ReservationController.java b/backend/src/main/java/com/team14/cherrybnb/revervation/ui/ReservationController.java index f39342161..fff2a31f5 100644 --- a/backend/src/main/java/com/team14/cherrybnb/revervation/ui/ReservationController.java +++ b/backend/src/main/java/com/team14/cherrybnb/revervation/ui/ReservationController.java @@ -14,7 +14,6 @@ @RequestMapping("/reservations") public class ReservationController { - //예약하기 //예약취소 //예약 상세 조회 @@ -65,7 +64,4 @@ public ResponseEntity getReservationDetail(@PathVaria public ResponseEntity> getReservations() { return null; } - - - } diff --git a/backend/src/main/java/com/team14/cherrybnb/room/domain/Review.java b/backend/src/main/java/com/team14/cherrybnb/room/domain/Review.java index 24b946f01..6d087e499 100644 --- a/backend/src/main/java/com/team14/cherrybnb/room/domain/Review.java +++ b/backend/src/main/java/com/team14/cherrybnb/room/domain/Review.java @@ -2,7 +2,6 @@ import com.team14.cherrybnb.auth.domain.Member; import lombok.AccessLevel; -import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; diff --git a/backend/src/main/java/com/team14/cherrybnb/room/domain/Room.java b/backend/src/main/java/com/team14/cherrybnb/room/domain/Room.java index 94ca86c57..3db6caff7 100644 --- a/backend/src/main/java/com/team14/cherrybnb/room/domain/Room.java +++ b/backend/src/main/java/com/team14/cherrybnb/room/domain/Room.java @@ -3,7 +3,6 @@ import com.team14.cherrybnb.auth.domain.Member; import com.team14.cherrybnb.common.domain.Address; import lombok.AccessLevel; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -38,7 +37,7 @@ public class Room { @JoinColumn(name = "member_id") private Member member; - @OneToMany(mappedBy = "room") + @OneToMany(mappedBy = "room", fetch = FetchType.LAZY) private List roomImages; public Room(String name, RoomInfo roomInfo, String description, diff --git a/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomImage.java b/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomImage.java index c69205487..6c0a12b6d 100644 --- a/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomImage.java +++ b/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomImage.java @@ -17,7 +17,7 @@ public class RoomImage { private String imageUrl; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "room_id") private Room room; } diff --git a/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomInfo.java b/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomInfo.java index 9d8d5003a..e5df69432 100644 --- a/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomInfo.java +++ b/backend/src/main/java/com/team14/cherrybnb/room/domain/RoomInfo.java @@ -12,6 +12,4 @@ public class RoomInfo { private int bedCount; private int restroomCount; - - } diff --git a/backend/src/main/java/com/team14/cherrybnb/room/dto/ReviewSummary.java b/backend/src/main/java/com/team14/cherrybnb/room/dto/ReviewSummary.java index c86ac4721..4fe7d5b54 100644 --- a/backend/src/main/java/com/team14/cherrybnb/room/dto/ReviewSummary.java +++ b/backend/src/main/java/com/team14/cherrybnb/room/dto/ReviewSummary.java @@ -6,7 +6,6 @@ public class ReviewSummary { private final Long reviewCount; - private final Double averageRating; - + private final Double averageRating; }