diff --git a/backend/src/main/java/hanglog/trip/domain/Trip.java b/backend/src/main/java/hanglog/trip/domain/Trip.java index c2d1152e1..e2fba043d 100644 --- a/backend/src/main/java/hanglog/trip/domain/Trip.java +++ b/backend/src/main/java/hanglog/trip/domain/Trip.java @@ -8,7 +8,6 @@ import static lombok.AccessLevel.PROTECTED; import hanglog.global.BaseEntity; -import hanglog.global.type.StatusType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -19,7 +18,6 @@ import java.util.List; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; @@ -38,8 +36,8 @@ public class Trip extends BaseEntity { private String title; @Column(nullable = false) - @ColumnDefault("https://github.com/woowacourse-teams/2023-hang-log/assets/64852591/65607364-3bf7-4920-abd1-edfdbc8d4df0") private String imageUrl; + @Column(nullable = false) private LocalDate startDate; @@ -47,38 +45,11 @@ public class Trip extends BaseEntity { private LocalDate endDate; @Column(nullable = false) - @ColumnDefault("''") private String description; @OneToMany(mappedBy = "trip", cascade = {PERSIST, REMOVE, MERGE}, orphanRemoval = true) private List dayLogs = new ArrayList<>(); - private Trip( - final Long id, - final String title, - final LocalDate startDate, - final LocalDate endDate, - final String description, - final StatusType status - ) { - super(status); - this.id = id; - this.title = title; - this.startDate = startDate; - this.endDate = endDate; - this.description = description; - } - - public Trip( - final Long id, - final String title, - final LocalDate startDate, - final LocalDate endDate, - final String description - ) { - this(id, title, startDate, endDate, description, USABLE); - } - public Trip( final Long id, final String title, @@ -98,17 +69,15 @@ public Trip( this.dayLogs = dayLogs; } - public Trip( - final String title, - final LocalDate startDate, - final LocalDate endDate, - final String description - ) { - this(null, title, startDate, endDate, description); - } - - public Trip(final String title, final LocalDate startDate, final LocalDate endDate - ) { - this(title, startDate, endDate, ""); + public static Trip of(final String title, final LocalDate startDate, final LocalDate endDate) { + return new Trip( + null, + title, + "https://github.com/woowacourse-teams/2023-hang-log/assets/64852591/65607364-3bf7-4920-abd1-edfdbc8d4df0", + startDate, + endDate, + "", + new ArrayList<>() + ); } } diff --git a/backend/src/main/java/hanglog/trip/dto/response/TripDetailResponse.java b/backend/src/main/java/hanglog/trip/dto/response/TripDetailResponse.java index a2ac04260..6bcb12667 100644 --- a/backend/src/main/java/hanglog/trip/dto/response/TripDetailResponse.java +++ b/backend/src/main/java/hanglog/trip/dto/response/TripDetailResponse.java @@ -38,7 +38,7 @@ public static TripDetailResponse of(final Trip trip, final List cities) { trip.getStartDate(), trip.getEndDate(), trip.getDescription(), - "https://a.cdn-hotels.com/gdcs/production153/d1371/e6c1f55e-51ac-41d5-8c63-2d0c63faf59e.jpg", + trip.getImageUrl(), dayLogGetResponses ); } diff --git a/backend/src/main/java/hanglog/trip/dto/response/TripResponse.java b/backend/src/main/java/hanglog/trip/dto/response/TripResponse.java index 81be28fa6..692089ea8 100644 --- a/backend/src/main/java/hanglog/trip/dto/response/TripResponse.java +++ b/backend/src/main/java/hanglog/trip/dto/response/TripResponse.java @@ -33,7 +33,7 @@ public static TripResponse of(final Trip trip, final List cities) { trip.getStartDate(), trip.getEndDate(), trip.getDescription(), - "https://a.cdn-hotels.com/gdcs/production153/d1371/e6c1f55e-51ac-41d5-8c63-2d0c63faf59e.jpg" + trip.getImageUrl() ); } } diff --git a/backend/src/main/java/hanglog/trip/service/TripService.java b/backend/src/main/java/hanglog/trip/service/TripService.java index eadfb6fac..61464f9e2 100644 --- a/backend/src/main/java/hanglog/trip/service/TripService.java +++ b/backend/src/main/java/hanglog/trip/service/TripService.java @@ -39,7 +39,7 @@ public Long save(final TripCreateRequest tripCreateRequest) { .orElseThrow(() -> new BadRequestException(NOT_FOUND_CITY_ID))) .toList(); - final Trip newTrip = new Trip( + final Trip newTrip = Trip.of( getInitTitle(cites), tripCreateRequest.getStartDate(), tripCreateRequest.getEndDate() @@ -101,6 +101,7 @@ public void update(final Long tripId, final TripUpdateRequest updateRequest) { updateRequest.getDescription(), trip.getDayLogs() ); + System.out.println(updatedTrip.getImageUrl()); tripRepository.save(updatedTrip); } diff --git a/backend/src/test/java/hanglog/trip/service/TripServiceTest.java b/backend/src/test/java/hanglog/trip/service/TripServiceTest.java index 246c84853..a2b6c7877 100644 --- a/backend/src/test/java/hanglog/trip/service/TripServiceTest.java +++ b/backend/src/test/java/hanglog/trip/service/TripServiceTest.java @@ -161,7 +161,7 @@ void delete_InvalidTripId() { class UpdateTripTests { TripUpdateRequest updateRequest; - Trip trip = new Trip( + Trip trip = Trip.of( "파리 여행", LocalDate.of(2023, 7, 1), LocalDate.of(2023, 7, 3)