Skip to content

Commit a0e1718

Browse files
borntocode2borntocode2
committed
임시커밋
1 parent 9bd0c0d commit a0e1718

12 files changed

Lines changed: 75 additions & 77 deletions

File tree

‎src/main/java/goodspace/backend/delivery/controller/DeliveryController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import goodspace.backend.delivery.service.DeliveryService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.http.ResponseEntity;
7-
import org.springframework.web.bind.annotation.PostMapping;
7+
import org.springframework.web.bind.annotation.GetMapping;
88
import org.springframework.web.bind.annotation.RequestBody;
99
import org.springframework.web.bind.annotation.RestController;
1010

@@ -13,7 +13,7 @@
1313
public class DeliveryController {
1414
private final DeliveryService deliveryService;
1515

16-
@PostMapping("/delivery/callTrace")
16+
@GetMapping("/delivery/callTrace")
1717
public ResponseEntity<String> callTrace(@RequestBody DeliveryRequestDto request) {
1818
try {
1919
return ResponseEntity.ok(deliveryService.RegistrationMappingWithOrderIdAfterCallTrace(

‎src/main/java/goodspace/backend/delivery/domain/DeliveryStatus.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package goodspace.backend.delivery.domain;
22

3-
import goodspace.backend.delivery.dto.DeliveryStatusDto;
43
import goodspace.backend.order.domain.Order;
54
import jakarta.persistence.*;
65
import lombok.*;
7-
import lombok.experimental.SuperBuilder;
86

97
@Getter
108
@Builder

‎src/main/java/goodspace/backend/delivery/dto/CmmMsgHeaderDto.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package goodspace.backend.delivery.dto;
2+
3+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
4+
import lombok.Data;
5+
6+
@Data
7+
public class CmmMsgHeaderDto {
8+
@JacksonXmlProperty(localName = "requestMsgId")
9+
private String requestMsgId;
10+
11+
@JacksonXmlProperty(localName = "responseMsgId")
12+
private String responseMsgId;
13+
14+
@JacksonXmlProperty(localName = "responseTime")
15+
private String responseTime;
16+
17+
@JacksonXmlProperty(localName = "successYN")
18+
private String successYN;
19+
20+
@JacksonXmlProperty(localName = "returnCode")
21+
private String returnCode;
22+
23+
@JacksonXmlProperty(localName = "errMsg")
24+
private String errMsg;
25+
}

‎src/main/java/goodspace/backend/delivery/dto/DeliveryHistoryAndStatusResponseDto.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/main/java/goodspace/backend/delivery/dto/DeliveryHistoryDto.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package goodspace.backend.delivery.dto;
22

33
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
4-
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
54
import lombok.Data;
65

76
@Data
8-
@JacksonXmlRootElement(localName = "LongitudinalDomesticListResponse")
97
public class DeliveryHistoryDto {
108
@JacksonXmlProperty(localName = "dlvyDate")
119
private String date;
@@ -18,4 +16,7 @@ public class DeliveryHistoryDto {
1816

1917
@JacksonXmlProperty(localName = "processSttus")
2018
private String processStatus;
21-
}
19+
20+
@JacksonXmlProperty(localName = "detailDc")
21+
private String detailDescription;
22+
}

src/main/java/goodspace/backend/delivery/dto/DeliveryStatusDto.java renamed to src/main/java/goodspace/backend/delivery/dto/DeliveryResponseDto.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
package goodspace.backend.delivery.dto;
22

3+
4+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
35
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
6+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
47
import lombok.Data;
58

9+
import java.util.List;
10+
611
@Data
7-
public class DeliveryStatusDto {
12+
@JacksonXmlRootElement(localName = "LongitudinalDomesticListResponse")
13+
public class DeliveryResponseDto {
14+
15+
@JacksonXmlProperty(localName = "cmmMsgHeader")
16+
private CmmMsgHeaderDto cmmMsgHeader;
17+
818
@JacksonXmlProperty(localName = "applcntNm")
919
private String sender;
1020

@@ -26,9 +36,7 @@ public class DeliveryStatusDto {
2636
@JacksonXmlProperty(localName = "trtmntSe")
2737
private String treatType;
2838

29-
30-
31-
32-
33-
34-
}
39+
@JacksonXmlElementWrapper(useWrapping = false)
40+
@JacksonXmlProperty(localName = "longitudinalDomesticList")
41+
private List<DeliveryHistoryDto> longitudinalDomesticList;
42+
}

‎src/main/java/goodspace/backend/delivery/dto/OnlyHistoryWrapper.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/main/java/goodspace/backend/delivery/service/DeliveryService.java‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
package goodspace.backend.delivery.service;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
54
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
65
import goodspace.backend.delivery.domain.DeliveryHistory;
76
import goodspace.backend.delivery.domain.DeliveryStatus;
87
import goodspace.backend.delivery.dto.DeliveryHistoryDto;
9-
import goodspace.backend.delivery.dto.DeliveryStatusDto;
10-
import goodspace.backend.delivery.dto.OnlyHistoryWrapper;
8+
import goodspace.backend.delivery.dto.DeliveryResponseDto;
119
import goodspace.backend.order.domain.Order;
1210
import goodspace.backend.order.repository.OrderRepository;
1311
import org.springframework.beans.factory.annotation.Value;
1412
import org.springframework.http.*;
1513
import org.springframework.stereotype.Service;
14+
import org.springframework.transaction.annotation.Transactional;
1615
import org.springframework.web.client.RestTemplate;
1716

1817
import java.util.List;
19-
2018
@Service
19+
@Transactional
2120
public class DeliveryService {
2221
private final OrderRepository orderRepository;
22+
2323
@Value("${api.epost.service-key}")
2424
String serviceKey;
2525

@@ -39,52 +39,45 @@ public String RegistrationMappingWithOrderIdAfterCallTrace(Long orderId, String
3939

4040
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
4141

42-
ObjectMapper xmlMapper = new XmlMapper();
42+
XmlMapper xmlMapper = new XmlMapper();
43+
44+
// 최상위 DTO로 한번에 파싱
45+
DeliveryResponseDto deliveryResponseDto = xmlMapper.readValue(response.getBody(), DeliveryResponseDto.class);
4346

44-
DeliveryStatusDto deliveryStatusDto = xmlMapper.readValue(response.getBody(), DeliveryStatusDto.class);
45-
OnlyHistoryWrapper parsed = xmlMapper.readValue(response.getBody(), OnlyHistoryWrapper.class);
46-
List<DeliveryHistoryDto> historyList = parsed.getLongitudinalDomesticList();
47+
List<DeliveryHistoryDto> historyList = deliveryResponseDto.getLongitudinalDomesticList();
4748

4849
Order order = orderRepository.findById(orderId).orElseThrow(() -> new IllegalStateException("Order not found"));
4950

50-
orderMappingWithDeliveryDtos(order, deliveryStatusDto, historyList);
51+
// DeliveryStatusDto 대신 LongitudinalDomesticListResponseDto에서 필요한 필드를 꺼내서 사용
52+
mapOrderWithResponseDto(order, deliveryResponseDto , historyList);
5153

5254
if (order.getDeliveryHistorys() != null && !order.getDeliveryHistorys().isEmpty()) {
5355
return "save completed";
54-
}
55-
56-
else{
57-
return "save failed";
56+
} else {
57+
return deliveryResponseDto.getLongitudinalDomesticList().toString();
5858
}
5959
}
6060

61-
62-
private void orderMappingWithDeliveryDtos(Order order, DeliveryStatusDto deliveryStatusDto, List<DeliveryHistoryDto> deliveryHistoryDtos) throws JsonProcessingException {
63-
if (order != null && deliveryStatusDto != null && deliveryHistoryDtos != null) {
61+
private void mapOrderWithResponseDto(Order order, DeliveryResponseDto responseDto, List<DeliveryHistoryDto> deliveryHistoryDtos) {
62+
if (order != null && responseDto != null && deliveryHistoryDtos != null) {
6463
order.setDeliveryStatus(DeliveryStatus.builder()
65-
.sender(deliveryStatusDto.getSender())
66-
.receiver(deliveryStatusDto.getReceiver())
67-
.completeDate(deliveryStatusDto.getCompleteDate())
68-
.status(deliveryStatusDto.getStatus())
69-
.postType(deliveryStatusDto.getPostType())
70-
.registrationNumber(deliveryStatusDto.getRegistrationNumber())
71-
.treatType(deliveryStatusDto.getTreatType())
64+
.sender(responseDto.getSender())
65+
.receiver(responseDto.getReceiver())
66+
.completeDate(responseDto.getCompleteDate())
67+
.status(responseDto.getStatus())
68+
.postType(responseDto.getPostType())
69+
.registrationNumber(responseDto.getRegistrationNumber())
70+
.treatType(responseDto.getTreatType())
7271
.build());
7372

74-
for(DeliveryHistoryDto deliveryHistoryDto : deliveryHistoryDtos) {
73+
for (DeliveryHistoryDto deliveryHistoryDto : deliveryHistoryDtos) {
7574
order.addDeliveryHistory(DeliveryHistory.builder()
76-
.date(deliveryHistoryDto.getDate())
77-
.time(deliveryHistoryDto.getTime())
78-
.location(deliveryHistoryDto.getLocation())
79-
.processStatus(deliveryHistoryDto.getProcessStatus())
75+
.date(deliveryHistoryDto.getDate())
76+
.time(deliveryHistoryDto.getTime())
77+
.location(deliveryHistoryDto.getLocation())
78+
.processStatus(deliveryHistoryDto.getProcessStatus())
8079
.build());
8180
}
8281
}
83-
84-
8582
}
86-
}
87-
88-
89-
90-
83+
}

‎src/main/java/goodspace/backend/order/controller/NicePayController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public String showPaymentPage(@RequestParam int amount,
4848
" AUTHNICE.requestPay({\n" +
4949
" clientId: 'S2_fb903ce81792411ab6c459ec3a2a82c6',\n" +
5050
" method: 'card',\n" +
51-
" appScheme: 'nicepaysample://,'\n" +
51+
" appScheme: 'nicepaysample://',\n" +
5252
" orderId: '" + orderId + "',\n" +
5353
" amount: " + amount + ",\n" +
5454
" goodsName: '" + goodsName + "',\n" +

‎var/folders/mz/hrwhm44j0hqbw9ysd2kyxlqc0000gn/T/junit-6442771747160206661/test/test_file.png‎

22.6 KB
Loading

0 commit comments

Comments
 (0)