선편지 기능개발

src/docs/asciidoc/pet.adoc

@@ -16,10 +16,6 @@ operation::pet-e2e-test/should_-pet-response_-when_-authenticated[snippets='http
 
 operation::pet-e2e-test/should_-create-pet_-when_-valid-request[snippets='http-request,request-headers,request-fields,http-response,response-headers']
 
-=== 좋아요 증가
-
-operation::pet-e2e-test/should_-pet-increase-favorite_-when_-valid-request[snippets='http-request,path-parameters,request-headers,http-response']
-
 === 수정
 
 operation::pet-e2e-test/should_-update-pet_-when_-valid-request[snippets='http-request,path-parameters,request-headers,request-fields,http-response']

src/main/java/com/rainbowletter/server/ai/adapter/in/web/GetAiPromptParameterController.java

@@ -3,6 +3,7 @@
 import com.rainbowletter.server.ai.application.port.in.GetAiPromptParameterUseCase;
 import com.rainbowletter.server.ai.application.port.in.dto.AiPromptParameterResponse;
 import com.rainbowletter.server.common.annotation.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -14,11 +15,12 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admins/ai")
-@Tag(name = "ai")
+@Tag(name = "ai", description = "AI 관련")
 class GetAiPromptParameterController {
 
     private final GetAiPromptParameterUseCase getAiPromptParameterUseCase;
 
+    @Operation(summary = "파라미터 조회")
     @GetMapping("/parameters")
     ResponseEntity<AiPromptParameterResponse> getParameters() {
         final AiPromptParameterResponse response = getAiPromptParameterUseCase.getPromptParameters();

src/main/java/com/rainbowletter/server/ai/adapter/in/web/GetAiSettingController.java

@@ -3,6 +3,7 @@
 import com.rainbowletter.server.ai.application.port.in.GetAiSettingUseCase;
 import com.rainbowletter.server.ai.application.port.in.dto.AiSettingResponse;
 import com.rainbowletter.server.common.annotation.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -14,15 +15,23 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admins/ai")
-@Tag(name = "ai")
+@Tag(name = "ai", description = "AI 관련")
 class GetAiSettingController {
 
     private final GetAiSettingUseCase getAiSettingUseCase;
 
+    @Operation(summary = "일반 편지 프롬프트 옵션 조회")
     @GetMapping("/setting")
     ResponseEntity<AiSettingResponse> getSetting() {
         final AiSettingResponse response = getAiSettingUseCase.getSetting();
         return ResponseEntity.ok(response);
     }
 
+    @Operation(summary = "선편지 프롬프트 옵션 조회")
+    @GetMapping("/setting/pet-initiated-letter")
+    ResponseEntity<AiSettingResponse> getPetInitiatedLetterSetting() {
+        final AiSettingResponse response = getAiSettingUseCase.getPetInitiatedLetterSetting();
+        return ResponseEntity.ok(response);
+    }
+
 }

src/main/java/com/rainbowletter/server/ai/adapter/in/web/UpdateAiConfigController.java

@@ -4,6 +4,7 @@
 import com.rainbowletter.server.ai.application.port.in.UpdateAiConfigCommand;
 import com.rainbowletter.server.ai.application.port.in.UpdateAiConfigUseCase;
 import com.rainbowletter.server.common.annotation.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -15,15 +16,23 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admins/ai")
-@Tag(name = "ai")
+@Tag(name = "ai", description = "AI 관련")
 class UpdateAiConfigController {
 
     private final UpdateAiConfigUseCase updateAiConfigUseCase;
 
+    @Operation(summary = "일반 편지 프롬프트 타입/AB 테스트 설정")
     @PutMapping("/config")
     void updateConfig(@RequestBody final UpdateAiConfigRequest request) {
         final var command = new UpdateAiConfigCommand(request.useABTest(), request.selectPrompt());
         updateAiConfigUseCase.updateConfig(command);
     }
 
+    @Operation(summary = "선편지 프롬프트 타입/AB 테스트 설정")
+    @PutMapping("/config/pet-initiated-letter")
+    void updatePetInitiatedLetterConfig(@RequestBody final UpdateAiConfigRequest request) {
+        final var command = new UpdateAiConfigCommand(request.useABTest(), request.selectPrompt());
+        updateAiConfigUseCase.updatePetInitiatedLetterConfig(command);
+    }
+
 }

src/main/java/com/rainbowletter/server/ai/adapter/in/web/UpdateAiOptionController.java

@@ -6,6 +6,7 @@
 import com.rainbowletter.server.ai.application.port.in.UpdateAiOptionCommand;
 import com.rainbowletter.server.ai.application.port.in.UpdateAiOptionUseCase;
 import com.rainbowletter.server.common.annotation.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -18,11 +19,12 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admins/ai")
-@Tag(name = "ai")
+@Tag(name = "ai", description = "AI 관련")
 class UpdateAiOptionController {
 
     private final UpdateAiOptionUseCase updateAiOptionUseCase;
 
+    @Operation(summary = "프롬프트 옵션 수정")
     @PutMapping("/options/{id}")
     void updatePrompt(
         @PathVariable("id") final Long id,

src/main/java/com/rainbowletter/server/ai/adapter/in/web/UpdateAiPromptController.java

@@ -5,6 +5,7 @@
 import com.rainbowletter.server.ai.application.port.in.UpdateAiPromptCommand;
 import com.rainbowletter.server.ai.application.port.in.UpdateAiPromptUseCase;
 import com.rainbowletter.server.common.annotation.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -17,11 +18,12 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/admins/ai")
-@Tag(name = "ai")
+@Tag(name = "ai", description = "AI 관련")
 class UpdateAiPromptController {
 
     private final UpdateAiPromptUseCase updateAiPromptUseCase;
 
+    @Operation(summary = "프롬프트 수정")
     @PutMapping("/prompts/{id}")
     void updatePrompt(
         @PathVariable("id") final Long id,

src/main/java/com/rainbowletter/server/ai/adapter/out/persistence/AiSettingPersistenceAdapter.java

@@ -9,9 +9,11 @@
 import com.rainbowletter.server.ai.application.port.out.UpdateSettingStatePort;
 import com.rainbowletter.server.common.annotation.PersistenceAdapter;
 import com.rainbowletter.server.common.application.domain.exception.RainbowLetterException;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+import java.util.stream.Stream;
+
 @PersistenceAdapter
 @RequiredArgsConstructor
 class AiSettingPersistenceAdapter implements LoadSettingPort, UpdateSettingStatePort {
@@ -26,14 +28,22 @@ public AiSetting loadSetting() {
         final AiConfigJpaEntity aiConfig = aiConfigJpaRepository.findById(1L)
             .orElseThrow(() -> new RainbowLetterException("not.exists.ai.setting"));
 
-        final List<AiPromptJpaEntity> aiPromptJpaEntities = aiPromptJpaRepository.findAll();
-        if (aiPromptJpaEntities.isEmpty()) {
-            throw new RainbowLetterException("not.exists.ai.prompt");
-        }
+        List<AiPrompt> prompts = Stream.of(1L, 2L)
+            .map(id -> loadPrompt(new AiPromptId(id)))
+            .toList();
+
+        return aiSettingMapper.mapToDomain(aiConfig, prompts);
+    }
 
-        final List<AiPrompt> prompts = aiPromptJpaEntities.stream()
-            .map(aiPromptJpaEntity -> loadPrompt(new AiPromptId(aiPromptJpaEntity.getId())))
+    @Override
+    public AiSetting loadPetInitiatedLetterSetting() {
+        final AiConfigJpaEntity aiConfig = aiConfigJpaRepository.findById(2L)
+            .orElseThrow(() -> new RainbowLetterException("not.exists.ai.letter.setting"));
+
+        List<AiPrompt> prompts = Stream.of(3L, 4L)
+            .map(id -> loadPrompt(new AiPromptId(id)))
             .toList();
+
         return aiSettingMapper.mapToDomain(aiConfig, prompts);
     }
 

src/main/java/com/rainbowletter/server/ai/application/domain/model/Parameter.java

@@ -4,6 +4,8 @@
 import com.rainbowletter.server.letter.application.domain.model.Letter;
 import com.rainbowletter.server.pet.application.domain.model.Pet;
 import java.util.Arrays;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -13,42 +15,50 @@ public enum Parameter {
     PET_NAME(Pet.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, Pet.class);
+            validateInstanceType(instance, Pet.class);
             return ((Pet) instance).getName();
         }
     },
     PET_OWNER(Pet.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, Pet.class);
+            validateInstanceType(instance, Pet.class);
             return ((Pet) instance).getOwner();
         }
     },
     PET_SPECIES(Pet.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, Pet.class);
+            validateInstanceType(instance, Pet.class);
             return ((Pet) instance).getSpecies();
         }
     },
+    PET_CHARACTER(Pet.class) {
+        @Override
+        public String value(final Object instance) {
+            validateInstanceType(instance, Pet.class);
+            List<String> personalities = ((Pet) instance).getPersonalities();
+            return String.join(", ", personalities);
+        }
+    },
     LETTER_CONTENT(Letter.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, Letter.class);
+            validateInstanceType(instance, Letter.class);
             return ((Letter) instance).getContent();
         }
     },
     LETTER_COUNT(LetterCount.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, LetterCount.class);
+            validateInstanceType(instance, LetterCount.class);
             return String.valueOf(instance);
         }
     },
     FIRST_LETTER(FirstLetter.class) {
         @Override
         public String value(final Object instance) {
-            Parameter.validateInstanceType(instance, FirstLetter.class);
+            validateInstanceType(instance, FirstLetter.class);
             return String.valueOf(instance);
         }
     };
@@ -70,12 +80,8 @@ public static Parameter get(final String name) {
 
     public abstract String value(Object instance);
 
-    public record LetterCount(Long count) {
+    public record LetterCount(Long count) { }
 
-    }
-
-    public record FirstLetter(Boolean isFirstLetter) {
-
-    }
+    public record FirstLetter(Boolean isFirstLetter) { }
 
 }

src/main/java/com/rainbowletter/server/ai/application/domain/service/GetAiSettingService.java

@@ -21,4 +21,10 @@ public AiSettingResponse getSetting() {
         return AiSettingResponse.from(aiSetting);
     }
 
+    @Override
+    public AiSettingResponse getPetInitiatedLetterSetting() {
+        final AiSetting aiSetting = loadSettingPort.loadPetInitiatedLetterSetting();
+        return AiSettingResponse.from(aiSetting);
+    }
+
 }

src/main/java/com/rainbowletter/server/ai/application/domain/service/UpdateAiConfigService.java

@@ -24,4 +24,11 @@ public void updateConfig(final UpdateAiConfigCommand command) {
         updateSettingStatePort.updateConfig(aiSetting);
     }
 
+    @Override
+    public void updatePetInitiatedLetterConfig(UpdateAiConfigCommand command) {
+        final AiSetting aiSetting = loadSettingPort.loadPetInitiatedLetterSetting();
+        aiSetting.update(command.getUseABTest(), command.getSelectPrompt());
+        updateSettingStatePort.updateConfig(aiSetting);
+    }
+
 }

src/main/java/com/rainbowletter/server/ai/application/port/in/GetAiSettingUseCase.java

@@ -6,4 +6,6 @@ public interface GetAiSettingUseCase {
 
     AiSettingResponse getSetting();
 
+    AiSettingResponse getPetInitiatedLetterSetting();
+
 }

src/main/java/com/rainbowletter/server/ai/application/port/in/UpdateAiConfigUseCase.java

@@ -4,4 +4,6 @@ public interface UpdateAiConfigUseCase {
 
     void updateConfig(UpdateAiConfigCommand command);
 
+    void updatePetInitiatedLetterConfig(UpdateAiConfigCommand command);
+
 }

src/main/java/com/rainbowletter/server/ai/application/port/out/AiClientCommand.java

@@ -29,6 +29,10 @@ public AiClientCommand(final AiPrompt aiPrompt, final List<Object> parameterInst
         this.messages = buildMessages(aiPrompt, parameterInstances, recentLetters);
     }
 
+    public AiClientCommand(final AiPrompt aiPrompt, final List<Object> parameterInstances) {
+        this(aiPrompt, parameterInstances, List.of());
+    }
+
     private List<Message> buildMessages(
         final AiPrompt aiPrompt,
         final List<Object> parameterInstances,
@@ -53,27 +57,21 @@ private List<Message> buildMessages(
             aiPrompt.getParameters(),
             parameterInstances
         );
-        messages.add(new Message(USER, currentPrompt));
 
+        messages.add(new Message(USER, currentPrompt));
         return messages;
     }
 
-    private String combineUserParameters(
-        final String userPrompt,
-        final List<Parameter> parameters,
-        final List<Object> parameterInstances
-    ) {
-        final ArrayList<String> formatValues = new ArrayList<>();
-        for (final Parameter parameter : parameters) {
-            final String value = parameter.value(
-                parameterInstances.stream()
-                    .filter(parameterInstance -> parameter.getClazz().isInstance(parameterInstance))
+    private String combineUserParameters(String userPrompt, List<Parameter> parameters, List<Object> instances) {
+        List<String> values = parameters.stream()
+            .map(parameter -> parameter.value(
+                instances.stream()
+                    .filter(parameter.getClazz()::isInstance)
                     .findAny()
-                    .orElseThrow(() -> new RainbowLetterException("Ai 파라미터 인스턴스가 존재하지 않습니다."))
-            );
-            formatValues.add(value);
-        }
-        return String.format(userPrompt, formatValues.toArray());
+                    .orElseThrow(() -> new RainbowLetterException("Ai 파라미터 인스턴스가 존재하지 않습니다."))))
+            .toList();
+
+        return String.format(userPrompt, values.toArray());
     }
 
     @Value

src/main/java/com/rainbowletter/server/ai/application/port/out/LoadSettingPort.java

@@ -10,6 +10,8 @@ public interface LoadSettingPort {
 
     AiSetting loadSetting();
 
+    AiSetting loadPetInitiatedLetterSetting();
+
     AiPrompt loadPrompt(AiPromptId id);
 
     AiOption loadOption(AiOptionId id);

src/main/java/com/rainbowletter/server/common/config/security/SecurityConfig.java

@@ -73,6 +73,7 @@ private void configureAuthorizationSecurity(final HttpSecurity http) throws Exce
                         .requestMatchers(convertUriToPathMatcher(AnonymousAllowUri.values())).anonymous()
                         .requestMatchers(convertUriToPathMatcher(AdminAllowUri.values())).hasRole("ADMIN")
                         .requestMatchers(HttpMethod.GET, "/api/letters/**").permitAll()
+                        .requestMatchers(HttpMethod.GET, "/api/pet-initiated-letters/**").permitAll()
                     .requestMatchers(PERMIT_PATHS).permitAll()
                         .anyRequest().authenticated()
         );

src/main/java/com/rainbowletter/server/common/config/security/uri/AccessAllowUri.java

@@ -10,6 +10,7 @@ public enum AccessAllowUri implements AllowUri {
     GET_FAQS("/api/faqs"),
     GET_IMAGES("/api/images/resources/**"),
     SHARE_LETTER("/api/letters/share/**"),
+    SHARE_PET_INITIATED_LETTER("/api/pet-initiated-letters/share/**"),
     LOG_USER_AGENT("/api/data/**"),
     ;
 

src/main/java/com/rainbowletter/server/image/application/domain/service/ImageUploadEventHandler.java

@@ -30,7 +30,7 @@ public void handleImageUpload(ImageUploadEvent event) {
             storageService.uploadFile(webpData, "image/webp", event.filePath());
         } catch (Exception e) {
             log.error("[이벤트 처리 중 이미지 업로드 실패] {}", event.filePath(), e);
-            slackErrorReportService.sendErrorReportToSlack(event.filePath(), e);
+            slackErrorReportService.sendImageUploadErrorReportToSlack(event.filePath(), e);
         }
     }