Merge pull request #61 from DropThe8bit/feature/story

[refactor] Animal 전용 enum 추가, Personality 중복 오류 해결

Author: hhongyeahh

src/main/java/everTale/everTale_be/domain/character/entity/Personality.java

@@ -1,9 +1,6 @@
 package everTale.everTale_be.domain.character.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.*;
 
 @Entity
@@ -16,6 +13,7 @@ public class Personality {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(unique = true, nullable = false)
     private String personality;
 
     public static Personality from(String personality) {

src/main/java/everTale/everTale_be/domain/character/entity/StoryCharacter.java

@@ -43,11 +43,14 @@ public void setStory(Story story) {
     }
 
     public void addCharacterPersonality(Personality personality) {
-        CharacterPersonality cp = CharacterPersonality.builder()
-                .character(this)
-                .personality(personality)
-                .build();
-        this.characterPersonalities.add(cp);
+        boolean exists = this.characterPersonalities.stream()
+                .anyMatch(cp -> cp.getPersonality().equals(personality));
+        if (!exists) {
+            CharacterPersonality cp = CharacterPersonality.builder()
+                    .character(this)
+                    .personality(personality)
+                    .build();
+            this.characterPersonalities.add(cp);
+        }
     }
-
 }

src/main/java/everTale/everTale_be/domain/character/entity/enums/Gender.java

@@ -1,5 +1,5 @@
 package everTale.everTale_be.domain.character.entity.enums;
 
 public enum Gender {
-    MALE,FEMALE;
+    MALE,FEMALE,ANIMAL;
 }

src/main/java/everTale/everTale_be/domain/story/entity/Scene.java

@@ -11,6 +11,7 @@
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = {"story_id", "page"}))
 public class Scene {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/everTale/everTale_be/domain/story/service/StoryService.java

@@ -167,9 +167,10 @@ public String saveInitialCharacterInfo(Long storyId,
 
         // Personality 리스트 저장
         for (String pDesc : request.getPersonalities()) {
+            String normalized = pDesc.trim();
             Personality personality = personalityRepository
-                    .findByPersonality(pDesc)
-                    .orElseGet(() -> personalityRepository.save(Personality.from(pDesc)));
+                    .findByPersonality(normalized)
+                    .orElseGet(() -> personalityRepository.save(Personality.from(normalized)));
 
             character.addCharacterPersonality(personality);
         }
@@ -240,8 +241,11 @@ public String generateNextScene(Long storyId, int pageNum) {
         String nextContent = storyApiClient.callFastApiForNextStory(dto);
 
         // 5. 새 Scene 저장
-        saveNewScene(story,pageNum,nextContent);
-
+        sceneRepository.findByStoryIdAndPage(story.getId(), pageNum)
+                .ifPresentOrElse(
+                        scene -> scene.updateContent(nextContent),
+                        () -> saveNewScene(story, pageNum, nextContent)
+                );
         return nextContent;
     }
 
@@ -265,8 +269,12 @@ public String generateNextSceneWithAnswer(Long storyId, int pageNum, StoryReques
 
         var dto = buildNextStoryDto(prevScene, story, character, pageNum);
         String nextContent = storyApiClient.callFastApiForNextStoryWithAnswer(dto, request.getQuestion(), request.getAnswer());
-        saveNewScene(story, pageNum, nextContent);
 
+        sceneRepository.findByStoryIdAndPage(story.getId(), pageNum)
+                .ifPresentOrElse(
+                        scene -> scene.updateContent(nextContent),
+                        () -> saveNewScene(story, pageNum, nextContent)
+                );
         return nextContent;
     }