Skip to content

Commit 79252f8

Browse files
committed
feat: 거래 요청시 qr 이미지 제공
1 parent 4756e19 commit 79252f8

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/main/java/com/sookmyung/concon/Order/controller/TransactionController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public ResponseEntity<? extends BasicResponse> requestOrder(
5252
@PostMapping("/cancel/{order-id}")
5353
public ResponseEntity<OrderDetailResponseDto> cancelTransaction(
5454
@PathVariable("order-id") Long orderId) {
55-
return ResponseEntity.ok(transactionService.cancelTransaction(orderId));
55+
transactionService.cancelTransaction(orderId);
56+
return ResponseEntity.noContent().build();
5657
}
5758

5859
// 거래 완료

src/main/java/com/sookmyung/concon/Order/dto/OrderRequestResponseDto.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
@Builder @Getter
99
public class OrderRequestResponseDto {
1010
private Long orderId;
11-
private String orderTitle;
1211
private Long requesterId;
1312
private String requesterName;
13+
private String qrImage;
1414

15-
public static OrderRequestResponseDto toDto(Orders orders, User requester) {
15+
public static OrderRequestResponseDto toDto(Orders orders, User requester, String qrImage) {
1616
return OrderRequestResponseDto.builder()
1717
.orderId(orders.getId())
1818
.requesterId(requester.getId())
1919
.requesterName(requester.getUsername())
20+
.qrImage(qrImage)
2021
.build();
2122
}
2223
}

src/main/java/com/sookmyung/concon/Order/service/TransactionService.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.sookmyung.concon.Order.exception.OrderInProgressException;
1111
import com.sookmyung.concon.Order.repository.OrderRepository;
1212
import com.sookmyung.concon.Order.repository.OrderRequestRedisRepository;
13+
import com.sookmyung.concon.Photo.service.PhotoFacade;
1314
import com.sookmyung.concon.Photo.service.PhotoService;
1415
import com.sookmyung.concon.User.Entity.User;
1516
import com.sookmyung.concon.User.Jwt.JwtUtil;
@@ -43,6 +44,7 @@ public class TransactionService {
4344
private final UserFacade userFacade;
4445
private final CouponFacade couponFacade;
4546
private final OrderFacade orderFacade;
47+
private final PhotoFacade photoFacade;
4648

4749

4850
// order 아이디로 거래 찾기
@@ -108,7 +110,7 @@ private OrderDetailResponseDto toOrderDetailDto(Orders order) {
108110

109111
// 거래 요청 시 바로 거래 중으로 변경
110112
@Transactional
111-
public OrderDetailResponseDto requestOrder(Long orderId, String token) {
113+
public OrderRequestResponseDto requestOrder(Long orderId, String token) {
112114
Orders orders = findOrdersById(orderId);
113115
User buyer = userFacade.findUserByToken(token);
114116
if (orders.getStatus() != OrderStatus.AVAILABLE) {
@@ -122,12 +124,14 @@ public OrderDetailResponseDto requestOrder(Long orderId, String token) {
122124
Long sellerId = orders.getSeller().getId();
123125
OrderEventAlarmDto response = OrderEventAlarmDto.toDto(orders, buyer);
124126
eventPublisher.publishEvent(sellerId, ORDER_REQUESTED, response);
125-
return toOrderDetailDto(orders);
127+
128+
String userQRPhotoUrl = photoFacade.getUserQRPhotoUrl(orders.getBuyer());
129+
return OrderRequestResponseDto.toDto(orders, buyer, userQRPhotoUrl);
126130
}
127131

128132
// 거래 중 취소
129133
@Transactional
130-
public OrderDetailResponseDto cancelTransaction(Long orderId) {
134+
public void cancelTransaction(Long orderId) {
131135
Orders order = findOrdersById(orderId);
132136
User buyer = order.getBuyer();
133137
order.setBuyer(null);
@@ -137,8 +141,6 @@ public OrderDetailResponseDto cancelTransaction(Long orderId) {
137141
List<Long> userIds = List.of(order.getSeller().getId(), buyer.getId());
138142
OrderEventAlarmDto response = OrderEventAlarmDto.toDto(order, buyer);
139143
eventPublisher.publishEventToMultipleUsers(userIds, ORDER_CANCELED, response);
140-
141-
return toOrderDetailDto(order);
142144
}
143145

144146
// 거래 완료

0 commit comments

Comments
 (0)