From 27925a02df080af4a177988f6255779c09f7bb2f Mon Sep 17 00:00:00 2001 From: Kim-Dong-Jun99 Date: Thu, 11 Jan 2024 15:10:40 +0900 Subject: [PATCH] =?UTF-8?q?Refactor=20:=20TripStatus=20=EA=B3=84=EC=82=B0?= =?UTF-8?q?=20=EB=B0=A9=EC=8B=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trip/dto/request/TripUpdateMsg.java | 3 -- .../tentenstomp/domain/trip/entity/Trip.java | 28 +++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java b/src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java index db9b139..7432110 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java @@ -1,13 +1,10 @@ package org.tenten.tentenstomp.domain.trip.dto.request; -import org.tenten.tentenstomp.global.common.enums.TripStatus; - public record TripUpdateMsg( String startDate, String endDate, Long numberOfPeople, String tripName, - TripStatus tripStatus, String area, String subarea, Long budget diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/entity/Trip.java b/src/main/java/org/tenten/tentenstomp/domain/trip/entity/Trip.java index 53738fe..25ea271 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/entity/Trip.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/entity/Trip.java @@ -18,10 +18,10 @@ import java.util.Map; import static jakarta.persistence.CascadeType.REMOVE; -import static jakarta.persistence.EnumType.STRING; import static jakarta.persistence.FetchType.LAZY; import static jakarta.persistence.GenerationType.IDENTITY; import static jakarta.persistence.InheritanceType.JOINED; +import static org.tenten.tentenstomp.global.common.enums.TripStatus.*; @Entity @Getter @@ -39,8 +39,6 @@ public class Trip extends BaseTimeEntity { private LocalDate endDate; private String area; private String subarea; - @Enumerated(STRING) - private TripStatus tripStatus; private Boolean isDeleted; private String tripName; private Long budget; @@ -66,17 +64,35 @@ public TripInfoMsg changeTripInfo(TripUpdateMsg request) { this.endDate = LocalDate.parse(request.endDate()); this.numberOfPeople = request.numberOfPeople(); this.tripName = request.tripName(); - this.tripStatus = request.tripStatus(); this.area = request.area(); this.subarea = request.subarea(); this.budget = request.budget(); + LocalDate currentDate = LocalDate.now(); - return new TripInfoMsg(this.getId(), request.startDate(), request.endDate(), this.getNumberOfPeople(), this.getTripName(), this.getTripStatus(), + TripStatus tripStatus = null; + if (currentDate.isBefore(this.startDate)) { + tripStatus = BEFORE; + } else if (currentDate.isAfter(this.endDate)) { + tripStatus = AFTER; + } else { + tripStatus = ING; + } + + return new TripInfoMsg(this.getId(), request.startDate(), request.endDate(), this.getNumberOfPeople(), this.getTripName(), tripStatus, this.getArea(), this.getSubarea(), this.getBudget()); } public TripInfoMsg toTripInfo() { - return new TripInfoMsg(this.getId(), this.startDate.toString(), this.endDate.toString(), this.getNumberOfPeople(), this.getTripName(), this.getTripStatus(), + LocalDate currentDate = LocalDate.now(); + TripStatus tripStatus = null; + if (currentDate.isBefore(this.startDate)) { + tripStatus = BEFORE; + } else if (currentDate.isAfter(this.endDate)) { + tripStatus = AFTER; + } else { + tripStatus = ING; + } + return new TripInfoMsg(this.getId(), this.startDate.toString(), this.endDate.toString(), this.getNumberOfPeople(), this.getTripName(), tripStatus, this.getArea(), this.getSubarea(), this.getBudget()); }