Skip to content

Commit 7a04aa6

Browse files
authored
Merge pull request #240 from prgrms-web-devcourse-final-project/#0
refactor: 경매방 단건 조회 시 현재 가격을 redis에서 읽어오게 변경
2 parents 4f3e622 + cbe3415 commit 7a04aa6

File tree

1 file changed

+18
-28
lines changed

1 file changed

+18
-28
lines changed

src/main/java/devut/buzzerbidder/domain/auctionroom/service/AuctionRoomService.java

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
package devut.buzzerbidder.domain.auctionroom.service;
22

3-
import static reactor.netty.http.HttpConnectionLiveness.log;
4-
5-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionDaysDto;
6-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionRoomDto;
7-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionRoomItemDto;
8-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionRoomListResponse;
9-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionRoomResponse;
10-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionRoomSlotDto;
11-
import devut.buzzerbidder.domain.auctionroom.dto.response.AuctionScheduleResponse;
12-
import devut.buzzerbidder.domain.auctionroom.dto.response.LiveItemDto;
3+
import devut.buzzerbidder.domain.auctionroom.dto.response.*;
134
import devut.buzzerbidder.domain.auctionroom.entity.AuctionRoom;
145
import devut.buzzerbidder.domain.auctionroom.entity.AuctionRoom.AuctionStatus;
156
import devut.buzzerbidder.domain.auctionroom.entity.AuctionRoom.RoomStatus;
@@ -23,21 +14,19 @@
2314
import devut.buzzerbidder.domain.liveitem.repository.LiveItemRepository;
2415
import devut.buzzerbidder.global.exeption.BusinessException;
2516
import devut.buzzerbidder.global.exeption.ErrorCode;
26-
import java.time.LocalDate;
27-
import java.time.LocalDateTime;
28-
import java.util.ArrayList;
29-
import java.util.Collections;
30-
import java.util.HashSet;
31-
import java.util.LinkedHashMap;
32-
import java.util.List;
33-
import java.util.Map;
34-
import java.util.Set;
3517
import lombok.RequiredArgsConstructor;
3618
import org.springframework.context.ApplicationEventPublisher;
19+
import org.springframework.data.redis.core.RedisTemplate;
3720
import org.springframework.stereotype.Service;
3821
import org.springframework.transaction.annotation.Propagation;
3922
import org.springframework.transaction.annotation.Transactional;
4023

24+
import java.time.LocalDate;
25+
import java.time.LocalDateTime;
26+
import java.util.*;
27+
28+
import static reactor.netty.http.HttpConnectionLiveness.log;
29+
4130
@Service
4231
@RequiredArgsConstructor
4332
public class AuctionRoomService {
@@ -47,6 +36,7 @@ public class AuctionRoomService {
4736
private final ApplicationEventPublisher eventPublisher;
4837
private final LiveItemRepository liveItemRepository;
4938
private final LikeLiveRepository likeLiveRepository;
39+
private final RedisTemplate<String, String> redisTemplate;
5040

5141
public AuctionRoom assignRoom(LocalDateTime liveTime, long roomIndex) {
5242

@@ -254,19 +244,19 @@ public AuctionRoomResponse getAuctionRoom(Long auctionRoomId) {
254244
remainingMs = liveBidRedisService.getCurrentItemRemainingMs(progressItem.getId());
255245
}
256246
if(remainingMs == null && nextItem != null) {
257-
remainingMs = liveBidRedisService.getRemainingToStartMs(nextItem.getId());;
247+
remainingMs = liveBidRedisService.getRemainingToStartMs(nextItem.getId());
258248
}
259249

260250
List<AuctionRoomItemDto> response = items.stream()
261251
.map(item -> new AuctionRoomItemDto(
262-
item.getId(),
263-
item.getName(),
264-
item.getImages().stream()
265-
.map(LiveItemImage::getImageUrl)
266-
.toList(),
267-
item.getInitPrice(),
268-
item.getCurrentPrice(),
269-
item.getAuctionStatus()
252+
item.getId(),
253+
item.getName(),
254+
item.getImages().stream()
255+
.map(LiveItemImage::getImageUrl)
256+
.toList(),
257+
item.getInitPrice(),
258+
Long.parseLong((String) redisTemplate.opsForHash().get("liveItem:" + item.getId(), "maxBidPrice")),
259+
item.getAuctionStatus()
270260
))
271261
.toList();
272262

0 commit comments

Comments
 (0)