feat: Fairy-Emotion 도메인 간 의존성 정리

hyh1016 · hyh1016 · commit 7a23eda70e9a · 2025-07-31T19:56:43.000+09:00
diff --git a/src/main/java/com/nexters/teamace/common/exception/ErrorType.java b/src/main/java/com/nexters/teamace/common/exception/ErrorType.java
@@ -24,6 +24,7 @@ public enum ErrorType {
     /** 404 NOT_FOUND */
     RESOURCE_NOT_FOUND(HttpStatus.NOT_FOUND, ErrorCode.E404, "Resource not found"),
     USER_NOT_FOUND(HttpStatus.NOT_FOUND, ErrorCode.E404, "User not found"),
+    ENTITY_NOT_FOUND(HttpStatus.NOT_FOUND, ErrorCode.E404, "Entity not found"),
 
     /** 409 CONFLICT */
     USER_ALREADY_EXISTS(HttpStatus.CONFLICT, ErrorCode.E409, "User already exists"),
diff --git a/src/main/java/com/nexters/teamace/common/presentation/GlobalExceptionHandler.java b/src/main/java/com/nexters/teamace/common/presentation/GlobalExceptionHandler.java
@@ -2,6 +2,7 @@
 
 import com.nexters.teamace.common.exception.CustomException;
 import com.nexters.teamace.common.exception.ErrorType;
+import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.ConstraintViolationException;
 import java.util.List;
 import java.util.Map;
@@ -127,6 +128,15 @@ public ResponseEntity<ApiResponse<Void>> handleNoResourceFoundException(
                 ErrorType.RESOURCE_NOT_FOUND.getStatus());
     }
 
+    @ExceptionHandler(EntityNotFoundException.class)
+    public ResponseEntity<ApiResponse<Void>> handleEntityNotFoundException(
+            NoResourceFoundException e) {
+        log.warn("Entity not found error occurred: {}", e.getMessage(), e);
+        return new ResponseEntity<>(
+                ApiResponse.error(ErrorType.ENTITY_NOT_FOUND),
+                ErrorType.ENTITY_NOT_FOUND.getStatus());
+    }
+
     @ExceptionHandler(CustomException.class)
     public ResponseEntity<ApiResponse<Void>> handleNoSuchElement(CustomException e) {
         final String message = e.getMessage();
diff --git a/src/main/java/com/nexters/teamace/emotion/application/EmotionService.java b/src/main/java/com/nexters/teamace/emotion/application/EmotionService.java
diff --git a/src/main/java/com/nexters/teamace/emotion/domain/EmotionRepository.java b/src/main/java/com/nexters/teamace/emotion/domain/EmotionRepository.java
diff --git a/src/main/java/com/nexters/teamace/emotion/infrastructure/EmotionRepositoryImpl.java b/src/main/java/com/nexters/teamace/emotion/infrastructure/EmotionRepositoryImpl.java
diff --git a/src/main/java/com/nexters/teamace/fairy/application/FairyResult.java b/src/main/java/com/nexters/teamace/fairy/application/FairyResult.java
@@ -1,5 +1,6 @@
 package com.nexters.teamace.fairy.application;
 
+import com.nexters.teamace.fairy.application.dto.FairyInfo;
 import java.util.List;
 
-public record FairyResult(List<FairyCandidate> fairies) {}
+public record FairyResult(List<FairyInfo> fairies) {}
diff --git a/src/main/java/com/nexters/teamace/fairy/application/FairyService.java b/src/main/java/com/nexters/teamace/fairy/application/FairyService.java
@@ -6,10 +6,9 @@
 import com.nexters.teamace.conversation.application.ConversationService;
 import com.nexters.teamace.conversation.domain.ConversationType;
 import com.nexters.teamace.conversation.domain.EmotionSelectConversation;
-import com.nexters.teamace.emotion.application.EmotionService;
-import com.nexters.teamace.emotion.domain.Emotion;
-import com.nexters.teamace.fairy.domain.Fairy;
+import com.nexters.teamace.fairy.application.dto.FairyInfo;
 import com.nexters.teamace.fairy.domain.FairyRepository;
+import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -20,7 +19,6 @@ public class FairyService {
 
     private final ConversationService conversationService;
     private final ChatRoomService chatRoomService;
-    private final EmotionService emotionService;
     private final FairyRepository fairyRepository;
 
     public FairyResult getFairy(UserInfo user, Long chatRoomId) {
@@ -39,29 +37,27 @@ public FairyResult getFairy(UserInfo user, Long chatRoomId) {
                 (EmotionSelectConversation)
                         conversationService.chat(type.getType(), type, context, "");
 
-        // 3. 감정 후보 기반으로 emotion 조회
-        List<Emotion> emotions =
-                emotionService.findAllByNamesIn(
+        // 3. 감정 후보 기반으로 fairy 후보 조회
+        List<FairyProjection> fairyProjections =
+                fairyRepository.findAllByEmotionNames(
                         emotionSelectConversation.emotions().stream()
                                 .map(EmotionSelectConversation.Emotions::name)
                                 .toList());
 
-        // 4. emotion 기반으로 fairy 조회 (fairy -> emotion의 단방향 참조를 유지하고 싶다면?)
-        List<Fairy> fairies =
-                fairyRepository.findAllByEmotionIdIn(
-                        emotions.stream().map(Emotion::getId).toList());
+        // 4. FairyInfo로 변환
+        List<FairyInfo> fairyInfos =
+                fairyProjections.stream()
+                        .map(
+                                p ->
+                                        new FairyInfo(
+                                                p.id(),
+                                                p.name(),
+                                                p.image(),
+                                                p.silhouetteImage(),
+                                                p.emotion()))
+                        .toList();
 
         // 5. FairyResult에 맞게 정제하여 반환
-        return new FairyResult(
-                fairies.stream()
-                        .map(
-                                f ->
-                                        new FairyCandidate(
-                                                f.getId(),
-                                                f.getName(),
-                                                f.getImageUrl(),
-                                                f.getSilhouetteImageUrl(),
-                                                f.getEmotion().getName()))
-                        .toList());
+        return new FairyResult(fairyInfos);
     }
 }
diff --git a/src/main/java/com/nexters/teamace/fairy/application/dto/FairyInfo.java b/src/main/java/com/nexters/teamace/fairy/application/dto/FairyInfo.java
@@ -1,4 +1,4 @@
-package com.nexters.teamace.fairy.application;
+package com.nexters.teamace.fairy.application.dto;
 
-public record FairyCandidate(
+public record FairyInfo(
         Long id, String name, String image, String silhouetteImage, String emotion) {}
diff --git a/src/main/java/com/nexters/teamace/fairy/domain/Fairy.java b/src/main/java/com/nexters/teamace/fairy/domain/Fairy.java
@@ -2,7 +2,6 @@
 
 import static lombok.AccessLevel.PROTECTED;
 
-import com.nexters.teamace.emotion.domain.Emotion;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -14,29 +13,29 @@ public class Fairy {
     private String name;
     private String imageUrl;
     private String silhouetteImageUrl;
-    private Emotion emotion;
+    private Long emotionId;
 
     public Fairy(
             final String name,
             final String imageUrl,
             final String silhouetteImageUrl,
-            final Emotion emotion) {
+            final Long emotionId) {
         this.name = name;
         this.imageUrl = imageUrl;
         this.silhouetteImageUrl = silhouetteImageUrl;
-        this.emotion = emotion;
+        this.emotionId = emotionId;
     }
 
     public Fairy(
             final Long id,
             final String name,
             final String imageUrl,
             final String silhouetteImageUrl,
-            final Emotion emotion) {
+            final Long emotionId) {
         this.id = id;
         this.name = name;
         this.imageUrl = imageUrl;
         this.silhouetteImageUrl = silhouetteImageUrl;
-        this.emotion = emotion;
+        this.emotionId = emotionId;
     }
 }
diff --git a/src/main/java/com/nexters/teamace/fairy/domain/FairyRepository.java b/src/main/java/com/nexters/teamace/fairy/domain/FairyRepository.java
@@ -1,5 +1,6 @@
 package com.nexters.teamace.fairy.domain;
 
+import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
 import java.util.List;
 import java.util.Optional;
 
@@ -8,5 +9,5 @@ public interface FairyRepository {
 
     Optional<Fairy> findById(Long id);
 
-    List<Fairy> findAllByEmotionIdIn(List<Long> emotionIds);
+    List<FairyProjection> findAllByEmotionNames(List<String> emotionNames);
 }
diff --git a/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyJpaRepository.java b/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyJpaRepository.java
@@ -1,9 +1,16 @@
 package com.nexters.teamace.fairy.infrastructure;
 
+import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface FairyJpaRepository extends JpaRepository<FairyEntity, Long> {
 
-    List<FairyEntity> findAllByEmotionIdIn(List<Long> emotionIds);
+    @Query(
+            "SELECT new com.nexters.teamace.fairy.infrastructure.dto.FairyProjection(f.id, f.name, f.imageUrl, f.silhouetteImageUrl, e.name) "
+                    + "FROM FairyEntity f JOIN f.emotion e "
+                    + "WHERE e.name IN :emotionNames")
+    List<FairyProjection> findAllByEmotionNames(@Param("emotionNames") List<String> emotionNames);
 }
diff --git a/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyMapper.java b/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyMapper.java
@@ -1,6 +1,5 @@
 package com.nexters.teamace.fairy.infrastructure;
 
-import com.nexters.teamace.emotion.domain.Emotion;
 import com.nexters.teamace.emotion.infrastructure.EmotionEntity;
 import com.nexters.teamace.fairy.domain.Fairy;
 import org.springframework.stereotype.Component;
@@ -12,34 +11,22 @@ public Fairy toDomain(FairyEntity entity) {
         if (entity == null) {
             return null;
         }
-        Emotion emotion = null;
-        if (entity.getEmotion() != null) {
-            emotion =
-                    new Emotion(
-                            entity.getEmotion().getId(),
-                            entity.getEmotion().getName(),
-                            entity.getEmotion().getDescription());
-        }
+
+        Long emotionId = (entity.getEmotion() != null) ? entity.getEmotion().getId() : null;
+
         return new Fairy(
                 entity.getId(),
                 entity.getName(),
                 entity.getImageUrl(),
                 entity.getSilhouetteImageUrl(),
-                emotion);
+                emotionId);
     }
 
-    public FairyEntity toEntity(Fairy fairy) {
+    public FairyEntity toEntity(Fairy fairy, EmotionEntity emotionEntity) {
         if (fairy == null) {
             return null;
         }
 
-        EmotionEntity emotionEntity = null;
-        if (fairy.getEmotion() != null) {
-            emotionEntity =
-                    new EmotionEntity(
-                            fairy.getEmotion().getName(), fairy.getEmotion().getDescription());
-        }
-
         return FairyEntity.builder()
                 .id(fairy.getId())
                 .name(fairy.getName())
diff --git a/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyRepositoryImpl.java b/src/main/java/com/nexters/teamace/fairy/infrastructure/FairyRepositoryImpl.java
@@ -1,7 +1,11 @@
 package com.nexters.teamace.fairy.infrastructure;
 
+import com.nexters.teamace.emotion.infrastructure.EmotionEntity;
+import com.nexters.teamace.emotion.infrastructure.EmotionJpaRepository;
 import com.nexters.teamace.fairy.domain.Fairy;
 import com.nexters.teamace.fairy.domain.FairyRepository;
+import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -12,11 +16,20 @@
 public class FairyRepositoryImpl implements FairyRepository {
 
     private final FairyJpaRepository fairyJpaRepository;
+    private final EmotionJpaRepository emotionJpaRepository;
     private final FairyMapper fairyMapper;
 
     @Override
     public Fairy save(Fairy fairy) {
-        FairyEntity entity = fairyMapper.toEntity(fairy);
+        EmotionEntity emotionEntity =
+                emotionJpaRepository
+                        .findById(fairy.getEmotionId())
+                        .orElseThrow(
+                                () ->
+                                        new EntityNotFoundException(
+                                                "Emotion not found: " + fairy.getEmotionId()));
+
+        FairyEntity entity = fairyMapper.toEntity(fairy, emotionEntity);
         FairyEntity savedEntity = fairyJpaRepository.save(entity);
         return fairyMapper.toDomain(savedEntity);
     }
@@ -27,9 +40,7 @@ public Optional<Fairy> findById(Long id) {
     }
 
     @Override
-    public List<Fairy> findAllByEmotionIdIn(List<Long> emotionIds) {
-        return fairyJpaRepository.findAllByEmotionIdIn(emotionIds).stream()
-                .map(fairyMapper::toDomain)
-                .toList();
+    public List<FairyProjection> findAllByEmotionNames(List<String> emotionNames) {
+        return fairyJpaRepository.findAllByEmotionNames(emotionNames);
     }
 }
diff --git a/src/main/java/com/nexters/teamace/fairy/infrastructure/dto/FairyProjection.java b/src/main/java/com/nexters/teamace/fairy/infrastructure/dto/FairyProjection.java
@@ -0,0 +1,4 @@
+package com.nexters.teamace.fairy.infrastructure.dto;
+
+public record FairyProjection(
+        Long id, String name, String image, String silhouetteImage, String emotion) {}
diff --git a/src/main/java/com/nexters/teamace/fairy/presentation/FairyResponse.java b/src/main/java/com/nexters/teamace/fairy/presentation/FairyResponse.java
@@ -1,6 +1,6 @@
 package com.nexters.teamace.fairy.presentation;
 
-import com.nexters.teamace.fairy.application.FairyCandidate;
+import com.nexters.teamace.fairy.application.dto.FairyInfo;
 import java.util.List;
 
-public record FairyResponse(List<FairyCandidate> fairies) {}
+public record FairyResponse(List<FairyInfo> fairies) {}
diff --git a/src/test/java/com/nexters/teamace/fairy/presentation/FairyControllerTest.java b/src/test/java/com/nexters/teamace/fairy/presentation/FairyControllerTest.java
@@ -15,36 +15,33 @@
 
 import com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper;
 import com.epages.restdocs.apispec.ResourceSnippetParameters;
+import com.nexters.teamace.common.annotation.WithMockCustomUser;
 import com.nexters.teamace.common.presentation.UserInfo;
 import com.nexters.teamace.common.utils.ControllerTest;
-import com.nexters.teamace.fairy.application.FairyCandidate;
 import com.nexters.teamace.fairy.application.FairyResult;
-import com.nexters.teamace.user.domain.User;
+import com.nexters.teamace.fairy.application.dto.FairyInfo;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.restdocs.payload.JsonFieldType;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.ResultActions;
 
 class FairyControllerTest extends ControllerTest {
 
     @Test
     @DisplayName("인증된 사용자는 요정 추천을 받을 수 있다")
-    @WithMockUser
+    @WithMockCustomUser
     void getFairy_success() throws Exception {
         // given
         long chatRoomId = 100L;
-        User user = new User("test-user", "테스트유저");
 
         given(authUserArgumentResolver.supportsParameter(any())).willReturn(true);
         given(authUserArgumentResolver.resolveArgument(any(), any(), any(), any()))
                 .willReturn(new UserInfo(1L, "test-user", "테스트유저"));
 
-        List<FairyCandidate> candidates =
-                List.of(new FairyCandidate(1L, "눈물방울 요정", "sad.png", "sad_sil.png", "슬픔"));
-        List.of(new FairyCandidate(1L, "분노끄아앙 요정", "angry.png", "angry_sil.png", "분노"));
-        FairyResult fairyResult = new FairyResult(candidates);
+        List<FairyInfo> fairyInfos =
+                List.of(new FairyInfo(1L, "눈물방울 요정", "sad.png", "sad_sil.png", "슬픔"));
+        FairyResult fairyResult = new FairyResult(fairyInfos);
 
         given(fairyService.getFairy(any(UserInfo.class), any(Long.class))).willReturn(fairyResult);
 
@@ -54,7 +51,7 @@ void getFairy_success() throws Exception {
                         get("/api/v1/fairies").param("chatRoomId", String.valueOf(chatRoomId)));
 
         // then
-        FairyResponse expectedResponse = new FairyResponse(candidates);
+        FairyResponse expectedResponse = new FairyResponse(fairyInfos);
 
         resultActions
                 .andExpect(status().isOk())

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.nexters.teamace.fairy.domain;`
`2`	`2`
	`3`	`+import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;`
`3`	`4`	`import java.util.List;`
`4`	`5`	`import java.util.Optional;`
`5`	`6`
`@@ -8,5 +9,5 @@ public interface FairyRepository {`
`8`	`9`
`9`	`10`	`Optional<Fairy> findById(Long id);`
`10`	`11`
`11`		`- List<Fairy> findAllByEmotionIdIn(List<Long> emotionIds);`
	`12`	`+ List<FairyProjection> findAllByEmotionNames(List<String> emotionNames);`
`12`	`13`	`}`