Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .gradle/8.4/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified .gradle/8.4/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/8.4/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
12 changes: 2 additions & 10 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -265,18 +266,26 @@ public List<PodResponse> getInprogressJoinedPods(Long userId) {
List<Pod> pods = getPodList(userId, POD_MEMBER, PodStatus.IN_PROGRESS);
return pods.stream()
.map(pod -> {
Delivery delivery = deliveryRepository.findByPod_Id(pod.getId())
.orElseThrow(() -> new DeliveryNotFoundException());

PodResponseDto.DeliveryDto deliveryDto = PodResponseDto.DeliveryDto.builder()
.courierCompany(delivery.getCourierCompany())
.trackingNum(delivery.getTrackingNum())
.build();

if (pod.getPodType() == PodType.MINIMUM) {
return buildMinimumInprogressJoinedResponseDto(pod, deliveryDto);
} else {
return buildGroupBuyInprogressJoinedResponseDto(pod, deliveryDto);
Optional<Delivery> deliveryOpt = deliveryRepository.findByPod_Id(pod.getId());

if(deliveryOpt.isPresent()) {
PodResponseDto.DeliveryDto deliveryDto = PodResponseDto.DeliveryDto.builder()
.courierCompany(deliveryOpt.get().getCourierCompany())
.trackingNum(deliveryOpt.get().getTrackingNum())
.build();

if (pod.getPodType() == PodType.MINIMUM) {
return buildMinimumInprogressJoinedResponseDto(pod, deliveryDto);
} else {
return buildGroupBuyInprogressJoinedResponseDto(pod, deliveryDto);
}
}
else{
if (pod.getPodType() == PodType.MINIMUM) {
return buildMinimumStatusResponseDto(pod);
} else {
return buildGroupBuyStatusResponseDto(pod);
}
}
})
.collect(Collectors.toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
"refreshToken", refreshToken
)
);
//response.getWriter().write(body);
//gresponse.getWriter().write(body);
String redirectUrl = UriComponentsBuilder
.fromUriString("http://localhost:5173/oauth/redirect") // ✅ 프론트 리디렉션 주소
.queryParam("status", "success")
Expand Down