[refactor] 팔로워 목록 조회 코드 수정 (#341)

ahdeka · web-flow · commit 0aeb2504b8e1 · 2025-10-14T12:05:14.000+09:00
diff --git a/src/main/java/com/back/domain/follow/service/FollowService.java b/src/main/java/com/back/domain/follow/service/FollowService.java
@@ -86,10 +86,11 @@ public List<FollowingListResponse> getMyFollowingList(Long userId) {
     /**
      * 작가의 팔로워 목록 조회 (작가 본인만 조회 가능)
      */
-    public List<FollowerListResponse> getMyFollowerList(Long artistId) {
-        ArtistProfile artist = getArtistById(artistId);
+    public List<FollowerListResponse> getMyFollowerList(Long userId) {
+        ArtistProfile artist = artistProfileRepository.findByUserId(userId)
+                .orElseThrow(() -> new ServiceException("404", "작가 본인만 팔로워 목록을 조회할 수 있습니다."));
 
-        List<Follow> follows = followRepository.findFollowersByArtistId(artistId);
+        List<Follow> follows = followRepository.findFollowersByArtistId(artist.getId());
 
         return follows.stream()
                 .map(FollowerListResponse::from)
diff --git a/src/main/java/com/back/domain/user/entity/User.java b/src/main/java/com/back/domain/user/entity/User.java
@@ -151,6 +151,7 @@ public boolean isArtist() {
      */
     public void becomeArtist() {
         this.role = Role.ARTIST;
+        this.grade = Grade.GUARDIAN;
         this.isArtistVerified = true;
         this.artistVerifiedAt = LocalDateTime.now();
     }
@@ -164,6 +165,7 @@ public void revokeArtistRole() {
         }
 
         this.role = Role.USER;
+        this.grade = Grade.SPROUT;
         this.isArtistVerified = false;
         this.artistVerifiedAt = null;
     }
diff --git a/src/main/java/com/back/global/initData/DevInitData.java b/src/main/java/com/back/global/initData/DevInitData.java
@@ -1,5 +1,9 @@
 package com.back.global.initData;
 
+import com.back.domain.artist.entity.ArtistApplication;
+import com.back.domain.artist.entity.ArtistProfile;
+import com.back.domain.artist.repository.ArtistApplicationRepository;
+import com.back.domain.artist.repository.ArtistProfileRepository;
 import com.back.domain.user.entity.Role;
 import com.back.domain.user.entity.User;
 import com.back.domain.user.repository.UserRepository;
@@ -25,6 +29,8 @@ public class DevInitData {
     private DevInitData self;
 
     private final UserRepository userRepository;
+    private final ArtistApplicationRepository artistApplicationRepository;
+    private final ArtistProfileRepository artistProfileRepository;
     private final PasswordEncoder passwordEncoder;
 
     @Bean
@@ -47,7 +53,10 @@ public void createUsers() {
             String email = String.format("artist%d@artist.com", i);
             String name = String.format("아티스트%d", i);
             String phone = String.format("010-1%03d-%04d", i, 1000 + i);
-            createUser(email, "1234qwer!", name, phone, Role.ARTIST);
+            User artist = createUser(email, "1234qwer!", name, phone, Role.ARTIST);
+
+            // 아티스트 프로필 생성
+            createArtistProfile(artist, name);
         }
         log.info("아티스트 계정 3개 생성 완료");
 
@@ -64,10 +73,10 @@ public void createUsers() {
         log.info("총 생성된 계정: 9개 (관리자 1개, 아티스트 3개, 일반 사용자 5개)");
     }
 
-    private void createUser(String email, String password, String name, String phone, Role role) {
+    private User createUser(String email, String password, String name, String phone, Role role) {
         if (userRepository.existsByEmail(email)) {
             log.debug("계정 이미 존재 ({}): 스킵", email);
-            return;
+            return userRepository.findByEmail(email).orElseThrow();
         }
 
         String encodedPassword = passwordEncoder.encode(password);
@@ -81,7 +90,46 @@ private void createUser(String email, String password, String name, String phone
             default -> throw new IllegalArgumentException("지원하지 않는 Role: " + role);
         }
 
-        userRepository.save(user);
+        User savedUser = userRepository.save(user);
         log.debug("{} 계정 생성: {}", role, email);
+
+        return savedUser;
+    }
+
+    private void createArtistProfile(User artist, String artistName) {
+        // 이미 프로필이 있으면 스킵
+        if (artistProfileRepository.findByUserId(artist.getId()).isPresent()) {
+            log.debug("아티스트 프로필 이미 존재 (userId: {}): 스킵", artist.getId());
+            return;
+        }
+
+        // 더미 ArtistApplication 생성
+        ArtistApplication application = ArtistApplication.builder()
+                .user(artist)
+                .ownerName(artist.getName())
+                .email(artist.getEmail())
+                .phone(artist.getPhone())
+                .artistName(artistName)
+                .businessNumber("123-45-67890")
+                .businessName("테스트 사업자")
+                .businessAddress("서울시 테스트구 테스트로 123")
+                .businessAddressDetail("테스트빌딩 101호")
+                .businessZipCode("12345")
+                .telecomSalesNumber("2024-서울-0001")
+                .snsAccount("@test_artist")
+                .mainProducts("일러스트, 디지털 아트")
+                .managerPhone(artist.getPhone())
+                .bankName("테스트은행")
+                .bankAccount("1234567890")
+                .accountName(artist.getName())
+                .build();
+
+        ArtistApplication savedApplication = artistApplicationRepository.save(application);
+
+        // ArtistProfile 생성
+        ArtistProfile profile = ArtistProfile.fromApplication(artist, savedApplication);
+        artistProfileRepository.save(profile);
+
+        log.debug("아티스트 프로필 생성 완료: {}", artistName);
     }
 }
diff --git a/src/main/java/com/back/global/initData/ProdInitData.java b/src/main/java/com/back/global/initData/ProdInitData.java
@@ -111,7 +111,6 @@ private void createArtistAccount() {
         String encodedPassword = passwordEncoder.encode(artistPassword);
         User artist = User.createLocalUser(artistEmail, encodedPassword, name, phone);
         userRepository.save(artist);
-        log.info("✓ 작가 유저 생성 완료: {} ({})", name, artistEmail);
 
         // 2. ArtistApplication 생성 (신청서)
         ArtistApplication application = ArtistApplication.builder()
@@ -135,15 +134,14 @@ private void createArtistAccount() {
                 .build();
 
         artistApplicationRepository.save(application);
-        log.info("✓ 작가 신청서 생성 완료 (PENDING 상태)");
 
         // 3. 신청서 자동 승인 및 작가 권한 부여
         application.approve(1L, "시스템");
         artist.becomeArtist();
 
         userRepository.save(artist);
         artistApplicationRepository.save(application);
-        log.info("✓ 작가 신청서 승인 완료 및 작가 권한 부여 완료");
+        log.info("✓ 작가 유저 생성 완료: {} ({})", name, artistEmail);
     }
 
     /**
diff --git a/src/test/java/com/back/domain/follow/service/FollowServiceTest.java b/src/test/java/com/back/domain/follow/service/FollowServiceTest.java
@@ -28,6 +28,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 @ActiveProfiles("test")
@@ -327,32 +328,48 @@ class GetFollowerListTest {
         @DisplayName("팔로워 목록 조회 성공")
         void getFollowerList_Success() {
             // given
-            given(artistProfileRepository.findById(1L)).willReturn(Optional.of(testArtist));
-            given(followRepository.findFollowersByArtistId(1L))
+            Long userId = 5L;
+            Long artistProfileId = 1L;
+
+            given(testArtist.getId()).willReturn(artistProfileId);
+
+            given(artistProfileRepository.findByUserId(userId))
+                    .willReturn(Optional.of(testArtist));
+
+            given(followRepository.findFollowersByArtistId(artistProfileId))
                     .willReturn(List.of(testFollow));
 
             // when
-            List<FollowerListResponse> response = followService.getMyFollowerList(1L);
+            List<FollowerListResponse> response = followService.getMyFollowerList(userId);
 
             // then
             assertThat(response).hasSize(1);
             assertThat(response.get(0).userName()).isEqualTo("테스트유저");
-            verify(followRepository).findFollowersByArtistId(1L);
+
+            verify(artistProfileRepository).findByUserId(userId);
+            verify(followRepository).findFollowersByArtistId(artistProfileId);
         }
 
         @Test
-        @DisplayName("팔로워 목록 조회 실패 - 작가 없음")
+        @DisplayName("팔로워 목록 조회 실패 - 작가 프로필 없음")
         void getFollowerList_ArtistNotFound() {
             // given
-            given(artistProfileRepository.findById(999L)).willReturn(Optional.empty());
+            Long userId = 999L;
+            given(artistProfileRepository.findByUserId(userId))
+                    .willReturn(Optional.empty());
 
             // when & then
-            assertThatThrownBy(() -> followService.getMyFollowerList(999L))
+            assertThatThrownBy(() -> followService.getMyFollowerList(userId))
                     .isInstanceOf(ServiceException.class)
                     .satisfies(ex -> {
                         ServiceException serviceEx = (ServiceException) ex;
                         assertThat(serviceEx.getResultCode()).isEqualTo("404");
+                        assertThat(serviceEx.getMessage())
+                                .contains("작가 본인만 팔로워 목록을 조회할 수 있습니다");
                     });
+
+            verify(artistProfileRepository).findByUserId(userId);
+            verify(followRepository, never()).findFollowersByArtistId(any());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ public boolean isArtist() {`
`151`	`151`	`*/`
`152`	`152`	`public void becomeArtist() {`
`153`	`153`	`this.role = Role.ARTIST;`
	`154`	`+ this.grade = Grade.GUARDIAN;`
`154`	`155`	`this.isArtistVerified = true;`
`155`	`156`	`this.artistVerifiedAt = LocalDateTime.now();`
`156`	`157`	`}`
`@@ -164,6 +165,7 @@ public void revokeArtistRole() {`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`this.role = Role.USER;`
	`168`	`+ this.grade = Grade.SPROUT;`
`167`	`169`	`this.isArtistVerified = false;`
`168`	`170`	`this.artistVerifiedAt = null;`
`169`	`171`	`}`