Skip to content

Commit 10a24fd

Browse files
authored
Merge pull request #310 from CELEBIT/develop
fix : 로그인 없을 때 홈 화면에서 조회가 안되던 버그 수정
2 parents a95e711 + a2eb4ea commit 10a24fd

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

sluv-api/src/main/java/com/sluv/api/item/service/ItemService.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,12 @@ public List<ItemSimpleDto> getCurationItem(Long userId) {
491491
@Transactional(readOnly = true)
492492
public List<ItemSimpleDto> getHowAboutItem(Long userId) {
493493
User user = userDomainService.findByIdOrNull(userId);
494-
List<Long> blockUserIds = userBlockDomainService.getAllBlockedUser(userId).stream()
495-
.map(userBlock -> userBlock.getBlockedUser().getId())
496-
.toList();
494+
List<Long> blockUserIds = new ArrayList<>();
495+
if (userId != null) {
496+
blockUserIds = userBlockDomainService.getAllBlockedUser(userId).stream()
497+
.map(userBlock -> userBlock.getBlockedUser().getId())
498+
.toList();
499+
}
497500

498501
List<Item> items = itemDomainService.getAllByItemStatus(blockUserIds, ACTIVE);
499502
Collections.shuffle(items, new Random());

sluv-api/src/main/java/com/sluv/api/user/service/UserService.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.springframework.stereotype.Service;
4141
import org.springframework.transaction.annotation.Transactional;
4242

43+
import java.util.ArrayList;
4344
import java.util.List;
4445
import java.util.Objects;
4546

@@ -218,9 +219,12 @@ public PaginationCountResponse<CommentSimpleResponse> getUserUploadComment(Long
218219
@Transactional(readOnly = true)
219220
public List<UserSearchInfoDto> getHotSluver(Long userId, Long celebId) {
220221
User user = userDomainService.findByIdOrNull(userId);
221-
List<Long> blockUserIds = userBlockDomainService.getAllBlockedUser(userId).stream()
222-
.map(userBlock -> userBlock.getBlockedUser().getId())
223-
.toList();
222+
List<Long> blockUserIds = new ArrayList<>();
223+
if (userId != null) {
224+
blockUserIds = userBlockDomainService.getAllBlockedUser(userId).stream()
225+
.map(userBlock -> userBlock.getBlockedUser().getId())
226+
.toList();
227+
}
224228

225229
List<User> userList = userDomainService.getHotSluver(celebId, blockUserIds);
226230

0 commit comments

Comments
 (0)