refactor: 제안 취소 이후에 제안 다시 가능하도록 수정

Author: chw1230

src/main/java/swyp/dodream/domain/suggestion/controller/SuggestionController.java

@@ -19,6 +19,8 @@
 import swyp.dodream.domain.suggestion.service.SuggestionService;
 import swyp.dodream.jwt.dto.UserPrincipal;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping("/api/my/suggestions")
 @RequiredArgsConstructor
@@ -97,15 +99,15 @@ public ResponseEntity<Void> cancelSuggestion(
             @ApiResponse(responseCode = "200", description = "조회 성공")
     })
     @GetMapping("/{postId}/suggestions/status")
-    public ResponseEntity<java.util.Map<String, Object>> getSuggestionStatus(
+    public ResponseEntity<Map<String, Object>> getSuggestionStatus(
             Authentication authentication,
             @PathVariable Long postId,
             @RequestParam Long toUserId
     ) {
         UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
         boolean exists = suggestionService.hasActiveSuggestion(userPrincipal.getUserId(), postId, toUserId);
         Long suggestionId = suggestionService.getActiveSuggestionId(postId, toUserId).orElse(null);
-        java.util.Map<String, Object> body = new java.util.LinkedHashMap<>();
+        Map<String, Object> body = new java.util.LinkedHashMap<>();
         body.put("suggested", exists);
         body.put("suggestionId", suggestionId);
         return ResponseEntity.ok(body);

src/main/java/swyp/dodream/domain/suggestion/domain/Suggestion.java

@@ -66,4 +66,18 @@ public void markAsAccepted() {
     public void markAsRejected() {
         this.status = SuggestionStatus.REJECTED;
     }
+
+    public void resend(String suggestionMessage) {
+        // 다시 보낼 수 있는 상태만 허용(CANCELED, REJECTED)
+        if (this.status != SuggestionStatus.CANCELED && this.status != SuggestionStatus.REJECTED) {
+            throw new IllegalStateException("현재 상태에서는 제안을 다시 보낼 수 없습니다.");
+        }
+
+        this.status = SuggestionStatus.SENT;
+        this.withdrawnAt = null;
+
+        if (suggestionMessage != null && !suggestionMessage.isBlank()) {
+            this.suggestionMessage = suggestionMessage;
+        }
+    }
 }

src/main/java/swyp/dodream/domain/suggestion/repository/SuggestionRepository.java

@@ -1,5 +1,6 @@
 package swyp.dodream.domain.suggestion.repository;
 
+import jakarta.validation.constraints.NotNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -118,4 +119,6 @@ Optional<Suggestion> findActiveByPostIdAndToUserId(@Param("postId") Long postId,
       AND s.status IN :validStatuses
     """)
     Optional<Long> findValidSuggestionId(@Param("postId") Long postId, @Param("userId") Long userId, @Param("validStatuses") List<SuggestionStatus> validStatuses);
+
+    Optional<Suggestion> findByPostIdAndToUserId(Long postId, Long toUserId);
 }

src/main/java/swyp/dodream/domain/suggestion/service/SuggestionService.java

@@ -63,15 +63,26 @@ public SuggestionResponse createSuggestion(Long fromUserId, Long postId, Suggest
         User toUser = userRepository.findById(request.toUserId())
                 .orElseThrow(() -> new CustomException(ExceptionType.NOT_FOUND, "제안 대상 회원을 찾을 수 없습니다."));
 
-        // 5. 제안 생성
-        Suggestion suggestion = new Suggestion(
-                snowflakeIdService.generateId(),
-                request.suggestionMessage(),
-                post,
-                post.getOwner(),   // fromUser
-                toUser,
-                LocalDateTime.now()
-        );
+        // 5. 기존 제안 있는지 조회 (상태 무관: CANCELED, REJECTED 포함)
+        java.util.Optional<Suggestion> existingOpt =
+                suggestionRepository.findByPostIdAndToUserId(postId, request.toUserId());
+
+        Suggestion suggestion;
+
+        if (existingOpt.isPresent()) {
+            suggestion = existingOpt.get();
+            suggestion.resend(request.suggestionMessage());
+        } else {
+            suggestion = new Suggestion(
+                    snowflakeIdService.generateId(),
+                    request.suggestionMessage(),
+                    post,
+                    post.getOwner(),
+                    toUser,
+                    LocalDateTime.now()
+            );
+            suggestionRepository.save(suggestion);
+        }
 
         suggestionRepository.save(suggestion);