Skip to content

Commit 58072f9

Browse files
authored
Merge pull request #211 from SEMOSAN/fix/#204-semofeed-user-reader
[Fix] SemoFeedService 탈퇴 유저 체크 누락 수정
2 parents 43ba300 + dc4d4da commit 58072f9

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/main/java/com/semosan/api/domain/semofeed/service/SemoFeedService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.semosan.api.domain.semofeed.repository.SemoFeedEmojiRepository;
99
import com.semosan.api.domain.semofeed.repository.SemoFeedRepository;
1010
import com.semosan.api.domain.user.entity.User;
11-
import com.semosan.api.domain.user.repository.UserRepository;
11+
import com.semosan.api.domain.user.service.UserReader;
1212
import lombok.RequiredArgsConstructor;
1313
import org.springframework.data.domain.Page;
1414
import org.springframework.data.domain.Pageable;
@@ -28,12 +28,11 @@ public class SemoFeedService {
2828

2929
private final SemoFeedRepository semoFeedRepository;
3030
private final SemoFeedEmojiRepository semoFeedEmojiRepository;
31-
private final UserRepository userRepository;
31+
private final UserReader userReader;
3232

3333
@Transactional
3434
public SemoFeedResponse create(Long userId, String imageUrl) {
35-
User user = userRepository.findById(userId)
36-
.orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
35+
User user = userReader.findActiveUserById(userId);
3736
SemoFeed semoFeed = SemoFeed.create(user, imageUrl);
3837
return SemoFeedResponse.from(semoFeedRepository.save(semoFeed));
3938
}

src/test/java/com/semosan/api/domain/semofeed/service/SemoFeedServiceTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.semosan.api.domain.semofeed.repository.SemoFeedRepository;
88
import com.semosan.api.domain.user.entity.User;
99
import com.semosan.api.domain.user.enums.user.DeviceType;
10-
import com.semosan.api.domain.user.repository.UserRepository;
10+
import com.semosan.api.domain.user.service.UserReader;
1111
import org.junit.jupiter.api.Test;
1212
import org.junit.jupiter.api.extension.ExtendWith;
1313
import org.mockito.InjectMocks;
@@ -19,7 +19,6 @@
1919
import org.springframework.test.util.ReflectionTestUtils;
2020

2121
import java.util.List;
22-
import java.util.Optional;
2322

2423
import static org.assertj.core.api.Assertions.assertThat;
2524
import static org.mockito.ArgumentMatchers.any;
@@ -36,7 +35,7 @@ class SemoFeedServiceTest {
3635
private SemoFeedEmojiRepository semoFeedEmojiRepository;
3736

3837
@Mock
39-
private UserRepository userRepository;
38+
private UserReader userReader;
4039

4140
@InjectMocks
4241
private SemoFeedService semoFeedService;
@@ -45,7 +44,7 @@ class SemoFeedServiceTest {
4544
void createReturnsDefaultEmojiFields() {
4645
User user = user(1L, "author", "https://example.com/profile.png");
4746

48-
when(userRepository.findById(1L)).thenReturn(Optional.of(user));
47+
when(userReader.findActiveUserById(1L)).thenReturn(user);
4948
when(semoFeedRepository.save(any(SemoFeed.class))).thenAnswer(invocation -> {
5049
SemoFeed semoFeed = invocation.getArgument(0);
5150
ReflectionTestUtils.setField(semoFeed, "id", 10L);

0 commit comments

Comments
 (0)