[#58] feat: emotion 도메인 클래스를 제거하고 이름 검증용 enum 클래스만 유지

Author: hyh1016

src/main/java/com/nexters/teamace/emotion/domain/Emotion.java

@@ -7,7 +7,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum EmotionType {
+public enum EmotionName {
     ANGER("분노"),
     SADNESS("슬픔"),
     JEALOUSY("질투"),
@@ -20,11 +20,11 @@ public enum EmotionType {
     SOLITUDE("고독"),
     SHAME("부끄러움");
 
-    private final String description;
-    private static final List<String> EMOTION_NAMES =
-            Arrays.stream(values()).map(EmotionType::name).toList();
+    private final String displayName;
+    private static final List<String> NAMES =
+            Arrays.stream(values()).map(EmotionName::name).toList();
 
-    public static List<String> getEmotionNames() {
-        return EMOTION_NAMES;
+    public static List<String> getNames() {
+        return NAMES;
     }
 }

…/teamace/emotion/domain/EmotionType.java …/teamace/emotion/domain/EmotionName.javasrc/main/java/com/nexters/teamace/emotion/domain/EmotionType.java renamed to src/main/java/com/nexters/teamace/emotion/domain/EmotionName.java src/main/java/com/nexters/teamace/emotion/domain/EmotionType.java renamed to src/main/java/com/nexters/teamace/emotion/domain/EmotionName.java

@@ -1,7 +1,7 @@
 package com.nexters.teamace.emotion.infrastructure;
 
 import com.nexters.teamace.common.infrastructure.entity.BaseEntity;
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -16,12 +16,12 @@ public class EmotionEntity extends BaseEntity {
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false, unique = true, length = 255)
-    private EmotionType name;
+    private EmotionName name;
 
     private String description;
 
     @Builder
-    public EmotionEntity(long id, EmotionType name, String description) {
+    public EmotionEntity(long id, EmotionName name, String description) {
         super(id);
         this.name = name;
         this.description = description;

src/main/java/com/nexters/teamace/emotion/infrastructure/EmotionEntity.java

@@ -11,7 +11,7 @@
 import com.nexters.teamace.conversation.domain.ConversationContextType;
 import com.nexters.teamace.conversation.domain.ConversationType;
 import com.nexters.teamace.conversation.domain.EmotionSelectConversation;
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 import com.nexters.teamace.fairy.application.dto.FairyInfo;
 import com.nexters.teamace.fairy.domain.Fairy;
 import com.nexters.teamace.fairy.domain.FairyBook;
@@ -20,7 +20,6 @@
 import com.nexters.teamace.fairy.infrastructure.AcquiredFairyEntity;
 import com.nexters.teamace.fairy.infrastructure.AcquiredFairyJpaRepository;
 import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
-
 import java.util.*;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
@@ -37,7 +36,7 @@ public class FairyService {
     private final FairyRepository fairyRepository;
     private final AcquiredFairyJpaRepository acquiredFairyJpaRepository;
 
-    private static final String EMOTION_NAMES_STRING = EmotionType.getEmotionNames().toString();
+    private static final String EMOTION_NAMES_STRING = EmotionName.getNames().toString();
 
     @ReadOnlyTransactional
     public FairyResult getFairy(UserInfo user, Long chatRoomId) {
@@ -82,10 +81,11 @@ private EmotionSelectConversation analyzeEmotions(List<String> conversationHisto
 
     private List<FairyProjection> findFairyCandidates(
             EmotionSelectConversation emotionSelectConversation) {
-        var emotions = emotionSelectConversation.emotions().stream()
-            .map(e -> EmotionType.valueOf(e.name()))
-            .distinct()
-            .toList();
+        var emotions =
+                emotionSelectConversation.emotions().stream()
+                        .map(e -> EmotionName.valueOf(e.name()))
+                        .distinct()
+                        .toList();
         if (emotions.isEmpty()) {
             return List.of();
         }
@@ -101,7 +101,7 @@ private List<FairyInfo> convertToFairyInfo(List<FairyProjection> fairyProjection
                                         p.name(),
                                         p.image(),
                                         p.silhouetteImage(),
-                                        p.emotion().getDescription()))
+                                        p.emotionName().getDisplayName()))
                 .toList();
     }
 

src/main/java/com/nexters/teamace/fairy/application/FairyService.java

@@ -1,7 +1,7 @@
 package com.nexters.teamace.fairy.domain;
 
 import com.nexters.teamace.common.exception.CustomException;
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
 import java.util.List;
 import java.util.Optional;
@@ -13,7 +13,7 @@ public interface FairyRepository {
 
     List<Fairy> findAll();
 
-    List<FairyProjection> findAllByEmotionNames(List<EmotionType> emotionNames);
+    List<FairyProjection> findAllByEmotionNames(List<EmotionName> emotionNames);
 
     default Fairy getById(Long id) {
         return findById(id).orElseThrow(() -> CustomException.FAIRY_NOT_FOUND);

src/main/java/com/nexters/teamace/fairy/domain/FairyRepository.java

@@ -1,6 +1,6 @@
 package com.nexters.teamace.fairy.infrastructure;
 
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 import com.nexters.teamace.fairy.infrastructure.dto.FairyProjection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,5 +14,5 @@ public interface FairyJpaRepository extends JpaRepository<FairyEntity, Long> {
                     + "FROM FairyEntity f JOIN f.emotion e "
                     + "WHERE e.name IN :emotionNames")
     List<FairyProjection> findAllByEmotionNames(
-            @Param("emotionNames") List<EmotionType> emotionNames);
+            @Param("emotionNames") List<EmotionName> emotionNames);
 }

src/main/java/com/nexters/teamace/fairy/infrastructure/FairyJpaRepository.java

@@ -1,6 +1,6 @@
 package com.nexters.teamace.fairy.infrastructure;
 
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 import com.nexters.teamace.emotion.infrastructure.EmotionEntity;
 import com.nexters.teamace.emotion.infrastructure.EmotionJpaRepository;
 import com.nexters.teamace.fairy.domain.Fairy;
@@ -41,7 +41,7 @@ public Optional<Fairy> findById(Long id) {
     }
 
     @Override
-    public List<FairyProjection> findAllByEmotionNames(List<EmotionType> emotionNames) {
+    public List<FairyProjection> findAllByEmotionNames(List<EmotionName> emotionNames) {
         return fairyJpaRepository.findAllByEmotionNames(emotionNames);
     }
 

src/main/java/com/nexters/teamace/fairy/infrastructure/FairyRepositoryImpl.java

@@ -1,6 +1,6 @@
 package com.nexters.teamace.fairy.infrastructure.dto;
 
-import com.nexters.teamace.emotion.domain.EmotionType;
+import com.nexters.teamace.emotion.domain.EmotionName;
 
 public record FairyProjection(
-        Long id, String name, String image, String silhouetteImage, EmotionType emotion) {}
+        Long id, String name, String image, String silhouetteImage, EmotionName emotionName) {}