Trip과 DayLog 영속 관계 수정 #137

mcodnjs · 2023-07-25T08:37:04Z

📄 Summary

#131

🙋🏻 More

~~영속화 왜안돼!~~
안되는줄 알았지만? 나의 능지? 였고 ?
Trip을 처음 저장하거나 완전히 삭제할 경우 DayLog에 Cascade 적용

LJW25 · 2023-07-25T14:30:47Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ private void addEmptyDayLogs(Trip trip, int currentPeriod, int requestPeriod) {
+ final List<DayLog> emptyDayLogs = new ArrayList<>();
+ for (int i = currentPeriod; i < requestPeriod; i++) {
+ final DayLog emptyDayLog = DayLog.generateEmpty(i + 1, trip);
+ emptyDayLogs.add(emptyDayLog);
+ }
+ trip.getDayLogs().addAll(emptyDayLogs);
+ dayLogRepository.saveAll(emptyDayLogs);
+ }
+
+ private void removeRemainingDayLogs(Trip trip, int currentPeriod, int requestPeriod) {
+ final List<DayLog> dayLogsToRemove = new ArrayList<>();
+ trip.getDayLogs().removeIf(dayLog -> {
+ final boolean isRemovable = dayLog.getOrdinal() >= requestPeriod + 1 && dayLog.getOrdinal() <= currentPeriod;
+ if (isRemovable) {
+ dayLogsToRemove.add(dayLog);
+ }
+ return isRemovable;
+ });
+ dayLogRepository.deleteAll(dayLogsToRemove);
+ }


파라미터 final 실종사건

😱😱😱😱😱😱😱😱😱

진짜 충격 그 자체네 ?

refactor: final 접근 제한자 붙이기

LJW25 · 2023-07-25T14:32:15Z

backend/src/main/java/hanglog/trip/domain/DayLog.java

@@ -35,7 +41,7 @@ public class DayLog extends BaseEntity {
 @JoinColumn(name = "trip_id", nullable = false)
 private Trip trip;

- @OneToMany(mappedBy = "dayLog")
+ @OneToMany(mappedBy = "dayLog", cascade = REMOVE)


얘는 PERSIST 필요없나요?

DayLog 영속화할 때 Item 저장할 일은 없을 것 같아서 안넣었는데 혹시 필요할까요 ?! ?
orphanRemoval = true 옵션은 추가했스빈다 ~

LJW25 · 2023-07-25T14:34:13Z

backend/src/test/java/hanglog/trip/service/TripServiceTest.java

+ @Mock
+ private DayLogRepository dayLogRepository;
+


이거 테스트에서 안쓰여도 TripService에 있어서 선언해야하는건가요?

넵 .. 메소드 테스트할 때 호출되는 레포라 목 안해놓으면 NPE가 발생합니더

hgo641 · 2023-07-26T01:24:36Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ saveAllTripCities(cites, newTrip);
+ saveDayLogs(newTrip);
+ final Trip trip = tripRepository.save(newTrip);
+ return trip.getId();
 }

 private void saveDayLogs(final Trip savedTrip) {


진짜 별거아닌디 인자 이름 그냥 trip이어도 되지않을까요?.?

final로 강제하고 싶어서 .. 그대로 유지했습니다 .. 🫠

hgo641 · 2023-07-26T01:27:10Z

backend/src/main/java/hanglog/trip/domain/DayLog.java

@@ -35,7 +41,7 @@ public class DayLog extends BaseEntity {
 @JoinColumn(name = "trip_id", nullable = false)
 private Trip trip;

- @OneToMany(mappedBy = "dayLog")
+ @OneToMany(mappedBy = "dayLog", cascade = REMOVE)


얘는 PERSIST 필요없나요?

hgo641 · 2023-07-26T01:37:56Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ emptyDayLogs.add(emptyDayLog);
+ }
+ trip.getDayLogs().addAll(emptyDayLogs);
+ dayLogRepository.saveAll(emptyDayLogs);


아하 dayLogRepo로 직접 save해서 cascadeType PERSIST 지우신 거 였군요. 왜 영속성 전이를 이용한 방법에서 repo로 save하는 방법으로 바꾸셨나요?

👍👍👍

Trip이 생성될 때 바뀌는 DayLog들이 아니라, Trip 수정 시 발생하는 DayLog 영속화를 위해 직접 save 했는데요!
아래와 같이 변경하였습니다 ~~

Merge 옵션으로 일부 DayLog 추가

orphanRemoval = true 옵션으로 일부 DayLog 삭제

refactor: Cascade Merge 조건 및 orphanRemoval 옵션 추가

jjongwa · 2023-07-27T01:35:21Z

backend/src/main/java/hanglog/trip/domain/Trip.java

@@ -41,7 +47,7 @@ public class Trip extends BaseEntity {
 @ColumnDefault("''")
 private String description;

- @OneToMany(mappedBy = "trip", cascade = CascadeType.PERSIST)
+ @OneToMany(mappedBy = "trip", cascade = {PERSIST, REMOVE, MERGE}, orphanRemoval = true)


이게 뭔가요? 설명좀 (진짜 몰라서 그럼)

아니다 직접 들어야겠다

jjongwa · 2023-07-27T01:39:53Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ final Trip newTrip = new Trip(getInitTitle(cites), tripCreateRequest.getStartDate(), tripCreateRequest.getEndDate());
+ saveAllTripCities(cites, newTrip);


Suggested change

final Trip newTrip = new Trip(getInitTitle(cites), tripCreateRequest.getStartDate(), tripCreateRequest.getEndDate());

saveAllTripCities(cites, newTrip);

final Trip newTrip = new Trip(

getInitTitle(cites),

tripCreateRequest.getStartDate(),

tripCreateRequest.getEndDate()

);

라인 넘어가서 바꿔주는게 좋을듯 합니다.

refactor: 개행 및 변수명 변경

jjongwa · 2023-07-27T01:40:31Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ final Period period = Period.between(savedTrip.getStartDate(), savedTrip.getEndDate().plusDays(1));
+ final List<DayLog> dayLogs = IntStream.rangeClosed(1, period.getDays() + 1)


네이밍이 멋지네요

jjongwa · 2023-07-27T01:41:21Z

backend/src/main/java/hanglog/trip/service/TripService.java

+ .mapToObj(i -> DayLog.generateEmpty(i + 1, trip))
+ .toList();


네이밍 잘하는거 같은데 i도 다른걸로 바꿔주실 수 있나요? (의견임 그냥 이대로 가도 됨,,)

refactor: 개행 및 변수명 변경

github-actions · 2023-07-27T05:41:54Z

📝 Jacoco Test Coverage

Total Project Coverage	81.73%	🍏

File	Coverage [87.87%]
Trip.java	100%	🍏
DayLog.java	100%	🍏
TripService.java	85.76%	🍏
GlobalExceptionHandler.java	48.65%	❌

fix: Trip과 DayLog 영속 관계 삭제

f838e1a

mcodnjs added 🐞 Bug BE labels Jul 25, 2023

mcodnjs self-assigned this Jul 25, 2023

mcodnjs requested review from LJW25, hgo641, jjongwa and waterricecake July 25, 2023 08:37

refactor: Cascade 조건 변경 및 DayLog 업데이트 로직 수정

cbba793

mcodnjs changed the title ~~Trip과 DayLog 영속 관계 삭제~~ Trip과 DayLog 영속 관계 수정 Jul 25, 2023

LJW25 reviewed Jul 25, 2023

View reviewed changes

refactor: final 접근 제한자 붙이기

60e78aa

hgo641 reviewed Jul 26, 2023

View reviewed changes

mcodnjs added 2 commits July 26, 2023 13:53

refactor: Cascade Merge 조건 및 orphanRemoval 옵션 추가

c7d7dc2

refactor: DayLog의 아이템 리스트에 orphanRemoval 옵션 추가

9dfaa47

LJW25 approved these changes Jul 26, 2023

View reviewed changes

jjongwa approved these changes Jul 27, 2023

View reviewed changes

refactor: 개행 및 변수명 변경

ed5b0ba

mcodnjs merged commit ea00d12 into develop Jul 27, 2023
1 check passed

jjongwa deleted the feature/#131-trip-bug branch August 1, 2023 01:58

mcodnjs linked an issue Aug 2, 2023 that may be closed by this pull request

Trip 생성, 수정 API 버그 수정 #131

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Trip과 DayLog 영속 관계 수정 #137

Trip과 DayLog 영속 관계 수정 #137

mcodnjs commented Jul 25, 2023 •

edited

Loading

LJW25 Jul 25, 2023

jjongwa Jul 25, 2023

mcodnjs Jul 25, 2023

mcodnjs Jul 26, 2023

LJW25 Jul 25, 2023

hgo641 Jul 26, 2023

mcodnjs Jul 26, 2023

LJW25 Jul 25, 2023

mcodnjs Jul 26, 2023

hgo641 Jul 26, 2023

mcodnjs Jul 26, 2023

hgo641 Jul 26, 2023

hgo641 Jul 26, 2023

mcodnjs Jul 26, 2023

mcodnjs Jul 26, 2023

jjongwa Jul 27, 2023

jjongwa Jul 27, 2023

jjongwa Jul 27, 2023

mcodnjs Jul 27, 2023

jjongwa Jul 27, 2023

mcodnjs Jul 27, 2023

jjongwa Jul 27, 2023

mcodnjs Jul 27, 2023

github-actions bot commented Jul 27, 2023

		final Trip newTrip = new Trip(getInitTitle(cites), tripCreateRequest.getStartDate(), tripCreateRequest.getEndDate());
		saveAllTripCities(cites, newTrip);

		final Period period = Period.between(savedTrip.getStartDate(), savedTrip.getEndDate().plusDays(1));
		final List<DayLog> dayLogs = IntStream.rangeClosed(1, period.getDays() + 1)

Trip과 DayLog 영속 관계 수정 #137

Trip과 DayLog 영속 관계 수정 #137

Conversation

mcodnjs commented Jul 25, 2023 • edited Loading

📄 Summary

🙋🏻 More

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 27, 2023

📝 Jacoco Test Coverage

mcodnjs commented Jul 25, 2023 •

edited

Loading