Skip to content

Refactor: isWaiting 필드 추가 #163

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

Merged
Jjiggu merged 3 commits into from
Jul 25, 2025
Merged

Refactor: isWaiting 필드 추가 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ef8c73
refactor(Store): notice, openTime 필드 추가
Jjiggu Jul 25, 2025
9d09680
refactor(Store): Store 상세 조회를 위한 StoreDetailReadResponse 생성
Jjiggu Jul 25, 2025
f299051
refactor(Store): isWaiting 필드 추가
Jjiggu Jul 25, 2025
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
12 changes: 11 additions & 1 deletion ...in/java/com/nowait/applicationuser/reservation/repository/WaitingUserRedisRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,20 @@ public boolean addToWaitingQueue(Long storeId, String userId, Integer partySize,
}
return Boolean.TRUE.equals(added);
}

// 예약한 사람이 등록한 동반인원(partySize) 조회
public Integer getPartySize(Long storeId, String userId) {
String partyKey = RedisKeyUtils.buildWaitingPartySizeKeyPrefix() + storeId;
Object value = redisTemplate.opsForHash().get(partyKey, userId);
return Integer.valueOf(value.toString());
}

// 예약자 대기순위 조회
public Long getRank(Long storeId, String userId) {
String key = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;
return redisTemplate.opsForZSet().rank(key, userId);
}

// 예약 취소
public boolean removeWaiting(Long storeId, String userId) {
String key = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;
Expand All @@ -56,6 +59,7 @@ public boolean removeWaiting(Long storeId, String userId) {
redisTemplate.opsForHash().delete(statusKey, userId);
return true;
}

// 예약 등록 시간
public Long getWaitingTimestamp(Long storeId, String userId) {
String key = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;
Expand All @@ -67,7 +71,8 @@ public Long getWaitingTimestamp(Long storeId, String userId) {
public List<Long> getUserWaitingStoreIds(String userId) {
// key pattern으로 모든 매장 대기열 조회 (keys: waiting:*)
Set<String> keys = redisTemplate.keys(RedisKeyUtils.buildWaitingKeyPrefix() + "*");
if (keys == null) return List.of();
if (keys == null)
return List.of();

List<Long> result = new ArrayList<>();
for (String key : keys) {
Expand All @@ -84,13 +89,18 @@ public List<Long> getUserWaitingStoreIds(String userId) {
}
return result;
}

// 상태값 조회
public String getWaitingStatus(Long storeId, String userId) {
String statusKey = RedisKeyUtils.buildWaitingStatusKeyPrefix() + storeId;
Object value = redisTemplate.opsForHash().get(statusKey, userId);
return value == null ? null : value.toString();
}

// 사용자가 해당 스토어 대기열에 있는지 여부 반환
public boolean isUserWaiting(Long storeId, String userId) {
return getRank(storeId, userId) != null;
}
}


97 changes: 97 additions & 0 deletions ...-user-api/src/main/java/com/nowait/applicationuser/store/dto/StoreDetailReadResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package com.nowait.applicationuser.store.dto;

import java.time.LocalDateTime;
import java.util.List;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.Store;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

@Getter
@AllArgsConstructor
@Builder
public class StoreDetailReadResponse {
private Long storeId;
private Long waitingCount;
private Boolean isWaiting;
private Long departmentId;
private String departmentName;
private String name;
private String location;
private String description;
private String notice;
private String openTime;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
private Boolean isActive;
private Boolean deleted;
private LocalDateTime createdAt;
private Boolean isBookmarked;

public static StoreDetailReadResponse fromEntity(Store store, List<StoreImageUploadResponse> allImages, String departmentName, Long waitingCount, Boolean isWaiting) {

StoreImageUploadResponse profile = allImages.stream()
.filter(image -> image.getImageType() == ImageType.PROFILE)
.findFirst()
.orElse(null);

List<StoreImageUploadResponse> banners = allImages.stream()
.filter(image -> image.getImageType() == ImageType.BANNER)
.toList();

return StoreDetailReadResponse.builder()
.createdAt(store.getCreatedAt())
.storeId(store.getStoreId())
.waitingCount(waitingCount)
.isWaiting(isWaiting)
.departmentId(store.getDepartmentId())
.departmentName(departmentName)
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.profileImage(profile)
.bannerImages(banners)
.isBookmarked(false)
.build();
}

public static StoreDetailReadResponse fromEntityWithBookmark(
Store store, List<StoreImageUploadResponse> allImages, String departmentName, Long waitingCount, Boolean isBookmarked, Boolean isWaiting
) {

StoreImageUploadResponse profile = allImages.stream()
.filter(image -> image.getImageType() == ImageType.PROFILE)
.findFirst()
.orElse(null);

List<StoreImageUploadResponse> banners = allImages.stream()
.filter(image -> image.getImageType() == ImageType.BANNER)
.toList();

return StoreDetailReadResponse.builder()
.createdAt(store.getCreatedAt())
.storeId(store.getStoreId())
.waitingCount(waitingCount)
.isWaiting(isWaiting)
.departmentId(store.getDepartmentId())
.departmentName(departmentName)
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.profileImage(profile)
.bannerImages(banners)
.isBookmarked(isBookmarked)
.build();
}
}
6 changes: 6 additions & 0 deletions nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StorePageReadDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class StorePageReadDto {
private String name;
private String location;
private String description;
private String notice;
private String openTime;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
private Boolean isActive;
Expand Down Expand Up @@ -48,6 +50,8 @@ public static StorePageReadDto fromEntity(Store store, List<StoreImageUploadResp
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.profileImage(profile)
Expand Down Expand Up @@ -78,6 +82,8 @@ public static StorePageReadDto fromEntityWithBookmark(
.name(store.getName())
.location(store.getLocation())
.description(store.getDescription())
.notice(store.getNotice())
.openTime(store.getOpenTime())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.profileImage(profile)
Expand Down
3 changes: 2 additions & 1 deletion nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.data.domain.Pageable;

import com.nowait.applicationuser.store.dto.StoreDepartmentReadResponse;
import com.nowait.applicationuser.store.dto.StoreDetailReadResponse;
import com.nowait.applicationuser.store.dto.StorePageReadDto;
import com.nowait.applicationuser.store.dto.StoreReadDto;
import com.nowait.applicationuser.store.dto.StoreReadResponse;
Expand All @@ -15,7 +16,7 @@ public interface StoreService {

StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable pageable);

StorePageReadDto getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User);
StoreDetailReadResponse getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User);

List<StorePageReadDto> searchByKeywordNative(String name);

Expand Down
17 changes: 8 additions & 9 deletions ...app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.nowait.applicationuser.reservation.repository.WaitingUserRedisRepository;
import com.nowait.applicationuser.store.dto.StoreDepartmentReadResponse;
import com.nowait.applicationuser.store.dto.StoreDetailReadResponse;
import com.nowait.applicationuser.store.dto.StoreImageUploadResponse;
import com.nowait.applicationuser.store.dto.StorePageReadDto;
import com.nowait.applicationuser.store.dto.StoreWaitingInfo;
Expand Down Expand Up @@ -52,6 +54,7 @@ public class StoreServiceImpl implements StoreService {
private final StringRedisTemplate redisTemplate;
private final BookmarkRepository bookmarkRepository;
private final UserRepository userRepository;
private final WaitingUserRedisRepository waitingRepo;

@Override
@Transactional(readOnly = true)
Expand Down Expand Up @@ -121,7 +124,7 @@ public StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable page

@Override
@Transactional(readOnly = true)
public StorePageReadDto getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User) {
public StoreDetailReadResponse getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User) {
if (storeId == null) throw new StoreParamEmptyException();
User user = userRepository.findById(customOAuth2User.getUserId())
.orElseThrow(UserNotFoundException::new);
Expand All @@ -135,22 +138,18 @@ public StorePageReadDto getStoreByStoreId(Long storeId, CustomOAuth2User customO

// 2-1) Redis에서 각 Store의 웨이팅 사이즈 조회
String key = "waiting:" + storeId;
Long waitingSize = 0L;
try {
redisTemplate.opsForZSet().zCard(key);
} catch (Exception e) {
waitingSize = 0L; // Redis 접근 실패 시 0으로 처리
}
long waitingSize = redisTemplate.opsForZSet().zCard(key);
boolean userWaiting = waitingRepo.isUserWaiting(storeId, String.valueOf(customOAuth2User.getUserId()));

List<StoreImage> images = storeImageRepository.findByStore(store);
List<StoreImageUploadResponse> imageDto = images.stream()
.map(StoreImageUploadResponse::fromEntity)
.toList();

if (bookmarkRepository.existsByUserAndStore(user, store)) {
return StorePageReadDto.fromEntityWithBookmark(store, imageDto, departmentName, waitingSize, true);
return StoreDetailReadResponse.fromEntityWithBookmark(store, imageDto, departmentName, waitingSize, true, userWaiting);
} else {
return StorePageReadDto.fromEntity(store, imageDto, departmentName, waitingSize);
return StoreDetailReadResponse.fromEntity(store, imageDto, departmentName, waitingSize, userWaiting);
}
}

Expand Down