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 #103

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Develop #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733449f
Refactor : TripItem 정렬 추가
Kim-Dong-Jun99 Jan 18, 2024
462a4c2
Merge pull request #102 from FinalDoubleTen/BE-66-Refactor-STOMP
Kim-Dong-Jun99 Jan 18, 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
17 changes: 16 additions & 1 deletion src/main/java/org/tenten/tentenstomp/domain/trip/dto/response/TripItemMsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@ public record TripItemMsg(
) {
public static TripItemMsg fromTripItemList(Long tripId, String visitDate, Transportation transportation, List<TripItem> tripItems) {

return new TripItemMsg(tripId, visitDate, transportation, tripItems.stream().map(t -> new TripItemInfoMsg(t.getId(), t.getTourItem().getId(), t.getTourItem().getTitle(), t.getTourItem().getOriginalThumbnailUrl(), Category.fromCode(t.getTourItem().getContentTypeId()).getName(), t.getSeqNum(), t.getVisitDate().toString(), t.getPrice())).toList());
List<TripItemInfoMsg> tripItemInfoMsgs = new ArrayList<>(tripItems.stream().map(t -> new TripItemInfoMsg(t.getId(), t.getTourItem().getId(), t.getTourItem().getTitle(), t.getTourItem().getOriginalThumbnailUrl(), Category.fromCode(t.getTourItem().getContentTypeId()).getName(), t.getSeqNum(), t.getVisitDate().toString(), t.getPrice())).toList());
tripItemInfoMsgs.sort((a, b) -> {
if (!a.seqNum().equals(b.seqNum())) {

return Integer.parseInt(Long.toString(a.seqNum() - b.seqNum()));
}
return Integer.parseInt(Long.toString(a.tripItemId() - b.tripItemId()));
});
return new TripItemMsg(tripId, visitDate, transportation, tripItemInfoMsgs);
}

public static TripItemMsg fromTripItemList(Long tripId, String visitDate, List<TripItem> tripItems, Long tripItemId, Transportation transportation, TripItemPriceUpdateMsg updateMsg) {
Expand All @@ -28,6 +36,13 @@ public static TripItemMsg fromTripItemList(Long tripId, String visitDate, List<T
tripItemInfoMsgs.add(new TripItemInfoMsg(t.getId(), t.getTourItem().getId(), t.getTourItem().getTitle(), t.getTourItem().getOriginalThumbnailUrl(), Category.fromCode(t.getTourItem().getContentTypeId()).getName(), t.getSeqNum(), t.getVisitDate().toString(), t.getPrice()));
}
}
tripItemInfoMsgs.sort((a, b) -> {
if (!a.seqNum().equals(b.seqNum())) {

return Integer.parseInt(Long.toString(a.seqNum() - b.seqNum()));
}
return Integer.parseInt(Long.toString(a.tripItemId() - b.tripItemId()));
});
return new TripItemMsg(tripId, visitDate, transportation, tripItemInfoMsgs );
}
}
6 changes: 2 additions & 4 deletions src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public void updateTripItemPrice(String tripItemId, TripItemPriceUpdateMsg priceU
TripBudgetMsg tripBudgetMsg = new TripBudgetMsg(trip.getId(), trip.getBudget(), trip.getTripItemPriceSum() + trip.getTransportationPriceSum());
TripItemMsg tripItemMsg = fromTripItemList(trip.getId(), tripItem.getVisitDate().toString(), tripItems, tripItem.getId(), fromName(transportation), priceUpdateMsg);

trip.updateTripTransportationMap(tripTransportationMap);
tripRepository.save(trip);

kafkaProducer.sendAndSaveToRedis(tripBudgetMsg, tripItemMsg);
Expand All @@ -83,7 +82,7 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs
);
} else {
TripItem tripItem = optionalTripItem.get();
Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId());
Trip trip = tripItem.getTrip();
Map<String, String> tripTransportationMap = trip.getTripTransportationMap();
LocalDate pastDate = tripItem.getVisitDate();
String pastDateTransportation = tripTransportationMap.getOrDefault(pastDate.toString(), CAR.getName());
Expand Down Expand Up @@ -124,7 +123,6 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs
trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(newDate.toString(), 0), newDateTripPath.pathPriceSum());
tripPathPriceMap.put(pastDate.toString(), pastDateTripPath.pathPriceSum());
tripPathPriceMap.put(newDate.toString(), newDateTripPath.pathPriceSum());
trip.updateTripTransportationMap(tripTransportationMap);
trip.updateTripPathPriceMap(tripPathPriceMap);
tripRepository.save(trip);

Expand Down Expand Up @@ -153,7 +151,7 @@ public void deleteTripItem(String tripItemId, TripItemDeleteMsg tripItemDeleteMs
);
} else {
TripItem tripItem = optionalTripItem.get();
Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId());
Trip trip = tripItem.getTrip();
Map<String, String> tripTransportationMap = trip.getTripTransportationMap();
LocalDate visitDate = tripItem.getVisitDate();
String transportation = tripTransportationMap.getOrDefault(visitDate.toString(), CAR.getName());
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ private void updateBudgetAndItemsAndPath(Trip trip, List<TripItem> tripItems, St
trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(visitDate, 0), tripPath.pathPriceSum());
tripPathPriceMap.put(visitDate, tripPath.pathPriceSum());
trip.updateTripPathPriceMap(tripPathPriceMap);
trip.updateTripTransportationMap(tripTransportationMap);
tripRepository.save(trip);

TripBudgetMsg tripBudgetMsg = new TripBudgetMsg(trip.getId(), trip.getBudget(), trip.getTripItemPriceSum() + trip.getTransportationPriceSum());
Expand Down