diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java b/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java index 860088a..b202e56 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java @@ -13,8 +13,6 @@ import org.tenten.tentenstomp.domain.trip.dto.request.*; import org.tenten.tentenstomp.domain.trip.dto.response.TripItemAddResponse; import org.tenten.tentenstomp.domain.trip.service.TripService; -import org.tenten.tentenstomp.global.common.constant.ResponseConstant; -import org.tenten.tentenstomp.global.response.GlobalDataResponse; @RestController @RequiredArgsConstructor @@ -24,10 +22,10 @@ public class TripController { private final TripService tripService; @PostMapping("/trips/{tripId}") - public ResponseEntity> addTripItemFromMainPage( + public ResponseEntity addTripItemFromMainPage( @PathVariable Long tripId, @RequestBody TripItemAddRequest tripItemAddRequest) { - return ResponseEntity.ok(GlobalDataResponse.ok(ResponseConstant.SUCCESS, tripService.addTripItemFromMainPage(tripId, tripItemAddRequest))); + return ResponseEntity.ok(tripService.addTripItemFromMainPage(tripId, tripItemAddRequest)); } @MessageMapping("/trips/{tripId}/connectMember") diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java index 14c3548..b903710 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripItemService.java @@ -21,7 +21,10 @@ import org.tenten.tentenstomp.global.messaging.kafka.producer.KafkaProducer; import java.time.LocalDate; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; import static org.tenten.tentenstomp.global.common.enums.Transportation.CAR; @@ -49,9 +52,6 @@ public void updateTripItemPrice(String tripItemId, TripItemPriceUpdateMsg priceU Long newPrice = priceUpdateMsg.price(); Trip trip = tripItem.getTrip(); Map tripTransportationMap = trip.getTripTransportationMap(); - if (tripTransportationMap == null) { - tripTransportationMap = new HashMap<>(); - } Transportation transportation = tripTransportationMap.getOrDefault(priceUpdateMsg.visitDate(), CAR); trip.updateTripItemPriceSum(oldPrice, newPrice); tripItem.updatePrice(newPrice); @@ -83,9 +83,6 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs TripItem tripItem = optionalTripItem.get(); Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId()); Map tripTransportationMap = trip.getTripTransportationMap(); - if (tripTransportationMap == null) { - tripTransportationMap = new HashMap<>(); - } LocalDate pastDate = tripItem.getVisitDate(); Transportation pastDateTransportation = tripTransportationMap.getOrDefault(pastDate.toString(), CAR); LocalDate newDate = LocalDate.parse(visitDateUpdateMsg.newVisitDate()); @@ -115,9 +112,6 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs TripPathCalculationResult newDateTripPath = pathComponent.getTripPath(TripPlace.fromTripItems(newDateTripItems), newDateTransportation); Map tripPathPriceMap = trip.getTripPathPriceMap(); - if (tripPathPriceMap == null) { - tripPathPriceMap = new HashMap<>(); - } trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(pastDate.toString(), 0), pastDateTripPath.pathPriceSum()); trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(newDate.toString(), 0), newDateTripPath.pathPriceSum()); tripPathPriceMap.put(pastDate.toString(), pastDateTripPath.pathPriceSum()); @@ -151,9 +145,6 @@ public void deleteTripItem(String tripItemId, TripItemDeleteMsg tripItemDeleteMs TripItem tripItem = optionalTripItem.get(); Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId()); Map tripTransportationMap = trip.getTripTransportationMap(); - if (tripTransportationMap == null) { - tripTransportationMap = new HashMap<>(); - } LocalDate visitDate = tripItem.getVisitDate(); Transportation transportation = tripTransportationMap.getOrDefault(visitDate.toString(), CAR); @@ -173,9 +164,6 @@ public void deleteTripItem(String tripItemId, TripItemDeleteMsg tripItemDeleteMs tripItemRepository.delete(tripItem); TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(newTripItems), transportation); Map tripPathPriceMap = trip.getTripPathPriceMap(); - if (tripPathPriceMap == null) { - tripPathPriceMap = new HashMap<>(); - } trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(visitDate.toString(), 0), tripPath.pathPriceSum()); tripPathPriceMap.put(visitDate.toString(), tripPath.pathPriceSum()); trip.updateTripTransportationMap(tripTransportationMap); diff --git a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java index 67a2273..3456e1a 100644 --- a/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java +++ b/src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java @@ -139,15 +139,9 @@ public void addTripItem(String tripId, TripItemAddMsg tripItemAddMsg) { private void updateBudgetAndItemsAndPath(Trip trip, List tripItems, String visitDate) { Map tripTransportationMap = trip.getTripTransportationMap(); - if (tripTransportationMap == null) { - tripTransportationMap = new HashMap<>(); - } Transportation transportation = tripTransportationMap.getOrDefault(visitDate, CAR); TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(tripItems), transportation); Map tripPathPriceMap = trip.getTripPathPriceMap(); - if (tripPathPriceMap == null) { - tripPathPriceMap = new HashMap<>(); - } trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(visitDate, 0), tripPath.pathPriceSum()); tripPathPriceMap.put(visitDate, tripPath.pathPriceSum()); trip.updateTripPathPriceMap(tripPathPriceMap); @@ -207,17 +201,11 @@ public void updateTripBudget(String tripId, TripBudgetUpdateMsg tripBudgetUpdate public void updateTripTransportation(String tripId, TripTransportationUpdateMsg tripTransportationUpdateMsg) { Trip trip = tripRepository.findTripForUpdate(Long.parseLong(tripId)).orElseThrow(() -> new GlobalException("해당 아이디로 존재하는 여정이 없습니다 " + tripId, NOT_FOUND)); Map tripTransportationMap = trip.getTripTransportationMap(); - if (tripTransportationMap == null) { - tripTransportationMap = new HashMap<>(); - } String visitDate = tripTransportationUpdateMsg.visitDate(); List tripItems = tripItemRepository.findTripItemByTripIdAndVisitDate(trip.getId(), LocalDate.parse(visitDate)); TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(tripItems), tripTransportationUpdateMsg.transportation()); Map tripPathPriceMap = trip.getTripPathPriceMap(); - if (tripPathPriceMap == null) { - tripPathPriceMap = new HashMap<>(); - } trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(visitDate, 0), tripPath.pathPriceSum()); tripTransportationMap.put(visitDate, tripTransportationUpdateMsg.transportation());