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

Refactor : Http 응답 형식 수정 #77

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Refactor : Http 응답 형식 수정 #77

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
f4d7ee0
Refactor : Http 응답 형식 수정
Kim-Dong-Jun99 Jan 17, 2024
4b61579
Refactor : map null 체크 코드 제거
Kim-Dong-Jun99 Jan 17, 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
6 changes: 2 additions & 4 deletions src/main/java/org/tenten/tentenstomp/domain/trip/controller/TripController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,10 +22,10 @@ public class TripController {
private final TripService tripService;

@PostMapping("/trips/{tripId}")
public ResponseEntity<GlobalDataResponse<TripItemAddResponse>> addTripItemFromMainPage(
public ResponseEntity<TripItemAddResponse> 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")
Expand Down
20 changes: 4 additions & 16 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 @@ -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;

Expand Down Expand Up @@ -49,9 +52,6 @@ public void updateTripItemPrice(String tripItemId, TripItemPriceUpdateMsg priceU
Long newPrice = priceUpdateMsg.price();
Trip trip = tripItem.getTrip();
Map<String, Transportation> tripTransportationMap = trip.getTripTransportationMap();
if (tripTransportationMap == null) {
tripTransportationMap = new HashMap<>();
}
Transportation transportation = tripTransportationMap.getOrDefault(priceUpdateMsg.visitDate(), CAR);
trip.updateTripItemPriceSum(oldPrice, newPrice);
tripItem.updatePrice(newPrice);
Expand Down Expand Up @@ -83,9 +83,6 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs
TripItem tripItem = optionalTripItem.get();
Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId());
Map<String, Transportation> 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());
Expand Down Expand Up @@ -115,9 +112,6 @@ public void updateTripItemVisitDate(String tripItemId, TripItemVisitDateUpdateMs
TripPathCalculationResult newDateTripPath = pathComponent.getTripPath(TripPlace.fromTripItems(newDateTripItems), newDateTransportation);

Map<String, Integer> 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());
Expand Down Expand Up @@ -151,9 +145,6 @@ public void deleteTripItem(String tripItemId, TripItemDeleteMsg tripItemDeleteMs
TripItem tripItem = optionalTripItem.get();
Trip trip = tripRepository.getReferenceById(tripItem.getTrip().getId());
Map<String, Transportation> tripTransportationMap = trip.getTripTransportationMap();
if (tripTransportationMap == null) {
tripTransportationMap = new HashMap<>();
}
LocalDate visitDate = tripItem.getVisitDate();
Transportation transportation = tripTransportationMap.getOrDefault(visitDate.toString(), CAR);

Expand All @@ -173,9 +164,6 @@ public void deleteTripItem(String tripItemId, TripItemDeleteMsg tripItemDeleteMs
tripItemRepository.delete(tripItem);
TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(newTripItems), transportation);
Map<String, Integer> 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);
Expand Down
12 changes: 0 additions & 12 deletions 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 @@ -139,15 +139,9 @@ public void addTripItem(String tripId, TripItemAddMsg tripItemAddMsg) {

private void updateBudgetAndItemsAndPath(Trip trip, List<TripItem> tripItems, String visitDate) {
Map<String, Transportation> tripTransportationMap = trip.getTripTransportationMap();
if (tripTransportationMap == null) {
tripTransportationMap = new HashMap<>();
}
Transportation transportation = tripTransportationMap.getOrDefault(visitDate, CAR);
TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(tripItems), transportation);
Map<String, Integer> 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);
Expand Down Expand Up @@ -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<String, Transportation> tripTransportationMap = trip.getTripTransportationMap();
if (tripTransportationMap == null) {
tripTransportationMap = new HashMap<>();
}
String visitDate = tripTransportationUpdateMsg.visitDate();
List<TripItem> tripItems = tripItemRepository.findTripItemByTripIdAndVisitDate(trip.getId(), LocalDate.parse(visitDate));

TripPathCalculationResult tripPath = pathComponent.getTripPath(TripPlace.fromTripItems(tripItems), tripTransportationUpdateMsg.transportation());
Map<String, Integer> tripPathPriceMap = trip.getTripPathPriceMap();
if (tripPathPriceMap == null) {
tripPathPriceMap = new HashMap<>();
}
trip.updateTransportationPriceSum(tripPathPriceMap.getOrDefault(visitDate, 0), tripPath.pathPriceSum());

tripTransportationMap.put(visitDate, tripTransportationUpdateMsg.transportation());
Expand Down
Loading