Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #20

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Develop #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27925a0
Refactor : TripStatus 계산 방식
Kim-Dong-Jun99 Jan 11, 2024
4014212
Merge pull request #18 from FinalDoubleTen/BE-68-Async-Trip-Path
Kim-Dong-Jun99 Jan 11, 2024
8808180
Merge pull request #19 from FinalDoubleTen/BE-66-Refactor-STOMP
Kim-Dong-Jun99 Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/org/tenten/tentenstomp/domain/trip/dto/request/TripUpdateMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 22 additions & 6 deletions src/main/java/org/tenten/tentenstomp/domain/trip/entity/Trip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand All @@ -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());
}

Expand Down