Merge pull request #142 from lemonssoju/develop-v2

[develop-v2] main merge

Author: JoongHyun-Kim

src/main/java/com/lesso/neverland/album/domain/Album.java

@@ -5,6 +5,7 @@
 import com.lesso.neverland.puzzle.domain.Puzzle;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
@@ -25,13 +26,17 @@ public class Album extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "puzzle")
     private Puzzle puzzle;
-
-    @Column(nullable = false)
     private String albumImage;
 
     @Column(nullable = false)
     private String content;
 
     @OneToMany(mappedBy = "album")
     private List<Comment> comments = new ArrayList<>();
+
+    @Builder
+    public Album(Puzzle puzzle, String content) {
+        this.puzzle = puzzle;
+        this.content = content;
+    }
 }

src/main/java/com/lesso/neverland/common/base/BaseResponseStatus.java

@@ -46,6 +46,8 @@ public enum BaseResponseStatus {
     INVALID_PUZZLE_IDX(false, HttpStatus.BAD_REQUEST, "잘못된 puzzle idx 입니다."),
     NO_PUZZLE_WRITER(false, HttpStatus.BAD_REQUEST, "해당 post의 작성자가 아닙니다."),
     ALREADY_DELETED_PUZZLE(false, HttpStatus.CONFLICT, "이미 삭제된 puzzle 입니다."),
+    NO_PUZZLER(false, HttpStatus.FORBIDDEN, "해당 퍼즐의 퍼즐러가 아닙니다."),
+    TOO_LONG_CONTENT(false, HttpStatus.BAD_REQUEST, "퍼즐피스의 길이는 100자 이하여야 합니다."),
 
 
     // group(2300-2399)

src/main/java/com/lesso/neverland/gpt/application/GptService.java

@@ -1,6 +1,6 @@
 package com.lesso.neverland.gpt.application;
 
-import com.lesso.neverland.gpt.dto.CompletePuzzleResponse;
+import com.lesso.neverland.gpt.dto.GptResponseDto;
 import com.lesso.neverland.gpt.dto.GptRequest;
 import com.lesso.neverland.gpt.dto.GptResponse;
 import com.theokanning.openai.completion.chat.ChatCompletionResult;
@@ -39,7 +39,7 @@ public String toText(List<String> puzzleTextList) {
         return result.toString();
     }
 
-    public CompletePuzzleResponse parseResponse(String response) {
+    public GptResponseDto parseResponse(String response) {
         // 영어 부분 추출을 위한 정규 표현식 패턴 (괄호로 묶인 부분)
         Pattern pattern = Pattern.compile("\\((.*?)\\)");
         Matcher matcher = pattern.matcher(response);
@@ -54,6 +54,6 @@ public CompletePuzzleResponse parseResponse(String response) {
         String koreanPart = response.replace("(" + englishPart + ")", "").trim();
 
         // 추출된 한글 부분과 영어 부분으로 CompletePuzzleResponse 객체 생성
-        return new CompletePuzzleResponse(englishPart, koreanPart);
+        return new GptResponseDto(englishPart, koreanPart);
     }
 }

src/main/java/com/lesso/neverland/gpt/dto/CompletePuzzleResponse.java

@@ -0,0 +1,4 @@
+package com.lesso.neverland.gpt.dto;
+
+public record GptResponseDto(String prompt,
+                             String description) {}

src/main/java/com/lesso/neverland/gpt/dto/GptResponseDto.java

@@ -2,8 +2,8 @@
 
 import com.lesso.neverland.common.base.BaseResponse;
 import com.lesso.neverland.gpt.application.GptService;
-import com.lesso.neverland.gpt.dto.CompletePuzzleRequest;
-import com.lesso.neverland.gpt.dto.CompletePuzzleResponse;
+import com.lesso.neverland.gpt.dto.GptResponseDto;
+import com.lesso.neverland.puzzle.dto.CompletePuzzleRequest;
 import com.lesso.neverland.gpt.dto.GptResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +19,7 @@ public class GptController {
     private final GptService gptService;
 
     @PostMapping("/completePuzzle")
-    public BaseResponse<CompletePuzzleResponse> completePuzzle(@RequestBody CompletePuzzleRequest completePuzzleRequest) {
+    public BaseResponse<GptResponseDto> completePuzzle(@RequestBody CompletePuzzleRequest completePuzzleRequest) {
         GptResponse response = gptService.completion(gptService.toText(completePuzzleRequest.puzzleTextList()));
         return new BaseResponse<>(gptService.parseResponse(response.messages().get(0).message()));
     }

src/main/java/com/lesso/neverland/gpt/presentation/GptController.java

@@ -1,8 +1,15 @@
 package com.lesso.neverland.puzzle.application;
 
+import com.lesso.neverland.album.domain.Album;
+import com.lesso.neverland.album.repository.AlbumRepository;
 import com.lesso.neverland.common.base.BaseException;
 import com.lesso.neverland.common.base.BaseResponse;
 import com.lesso.neverland.common.image.ImageService;
+import com.lesso.neverland.gpt.application.GptService;
+import com.lesso.neverland.gpt.dto.GptResponseDto;
+import com.lesso.neverland.puzzle.dto.CompletePuzzleRequest;
+import com.lesso.neverland.puzzle.dto.CompletePuzzleResponse;
+import com.lesso.neverland.gpt.dto.GptResponse;
 import com.lesso.neverland.group.domain.Team;
 import com.lesso.neverland.group.dto.GroupPuzzleDto;
 import com.lesso.neverland.group.dto.GroupPuzzleListResponse;
@@ -12,6 +19,7 @@
 import com.lesso.neverland.puzzle.domain.PuzzlePiece;
 import com.lesso.neverland.puzzle.dto.*;
 import com.lesso.neverland.puzzle.repository.PuzzleMemberRepository;
+import com.lesso.neverland.puzzle.repository.PuzzlePieceRepository;
 import com.lesso.neverland.puzzle.repository.PuzzleRepository;
 import com.lesso.neverland.user.application.UserService;
 import com.lesso.neverland.user.domain.User;
@@ -41,6 +49,9 @@ public class PuzzleService {
     private final GroupRepository groupRepository;
     private final ImageService imageService;
     private final PuzzleMemberRepository puzzleMemberRepository;
+    private final PuzzlePieceRepository puzzlePieceRepository;
+    private final GptService gptService;
+    private final AlbumRepository albumRepository;
 
     // 퍼즐 목록 조회
     public BaseResponse<GroupPuzzleListResponse> getGroupPuzzleList(Long groupIdx) {
@@ -148,13 +159,15 @@ private Puzzle createPuzzle(CreatePuzzleRequest createPuzzleRequest, Team group,
         return puzzle;
     }
 
-    // [작성자] 피드 수정 화면 조회
-    public BaseResponse<PuzzleEditViewResponse> getPuzzleEditView(Long puzzleIdx) {
+    // [작성자] 퍼즐 수정
+    public BaseResponse<String> editPuzzle(Long groupIdx, Long puzzleIdx, MultipartFile image, EditPuzzleRequest editPuzzleRequest) {
         User user = userRepository.findById(userService.getUserIdxWithValidation()).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
         Puzzle puzzle = puzzleRepository.findById(puzzleIdx).orElseThrow(() -> new BaseException(INVALID_PUZZLE_IDX));
         validateWriter(user, puzzle);
 
-        return new BaseResponse<>(new PuzzleEditViewResponse(puzzle.getTitle(), puzzle.getPuzzleImage(), puzzle.getContent()));
+
+
+        return new BaseResponse<>(SUCCESS);
     }
 
     // [작성자] 퍼즐 삭제
@@ -199,4 +212,50 @@ public BaseResponse<PuzzlerListResponse> getPuzzlerList(Long groupIdx) {
                         .toList());
         return new BaseResponse<>(puzzlerList);
     }
+
+    // 퍼즐피스 추가
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse<String> addPuzzlePiece(Long groupIdx, Long puzzleIdx, PuzzlePieceRequest puzzlePieceRequest) {
+        User user = userRepository.findById(userService.getUserIdxWithValidation()).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Puzzle puzzle = puzzleRepository.findById(puzzleIdx).orElseThrow(() -> new BaseException(INVALID_PUZZLE_IDX));
+        validatePuzzler(user, puzzle);
+
+        if (puzzlePieceRequest.content().length() > 100) throw new BaseException(TOO_LONG_CONTENT);
+        PuzzlePiece puzzlePiece = PuzzlePiece.builder()
+                .puzzle(puzzle)
+                .user(user)
+                .content(puzzlePieceRequest.content()).build();
+        puzzlePiece.setPuzzle(puzzle);
+        puzzlePiece.setUser(user);
+        puzzlePieceRepository.save(puzzlePiece);
+
+        return new BaseResponse<>(SUCCESS);
+    }
+
+    // 퍼즐러 validation
+    private void validatePuzzler(User user, Puzzle puzzle) {
+        if (!puzzleMemberRepository.existsByUserAndPuzzle(user, puzzle)) throw new BaseException(NO_PUZZLER);
+        if (puzzle.getStatus().equals(INACTIVE)) throw new BaseException(ALREADY_DELETED_PUZZLE);
+    }
+
+    // [작성자] 퍼즐 완성하기
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse<CompletePuzzleResponse> completePuzzle(Long groupIdx, Long puzzleIdx, CompletePuzzleRequest completePuzzleRequest) {
+        User user = userRepository.findById(userService.getUserIdxWithValidation()).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        Puzzle puzzle = puzzleRepository.findById(puzzleIdx).orElseThrow(() -> new BaseException(INVALID_PUZZLE_IDX));
+        validateWriter(user, puzzle);
+
+        // GPT 요약 수행
+        GptResponse response = gptService.completion(gptService.toText(completePuzzleRequest.puzzleTextList()));
+        GptResponseDto gptResponseDto = gptService.parseResponse(response.messages().get(0).message());
+
+        // Album 생성
+        Album newAlbum = Album.builder()
+                .puzzle(puzzle)
+                .content(gptResponseDto.description()).build();
+        albumRepository.save(newAlbum);
+
+        CompletePuzzleResponse completePuzzleResponse = new CompletePuzzleResponse(gptResponseDto.prompt(), gptResponseDto.description(), newAlbum.getAlbumIdx());
+        return new BaseResponse<>(completePuzzleResponse);
+    }
 }

src/main/java/com/lesso/neverland/puzzle/application/PuzzleService.java

@@ -1,4 +1,4 @@
-package com.lesso.neverland.gpt.dto;
+package com.lesso.neverland.puzzle.dto;
 
 import java.util.List;
 

src/main/java/com/lesso/neverland/gpt/dto/CompletePuzzleRequest.java renamed to src/main/java/com/lesso/neverland/puzzle/dto/CompletePuzzleRequest.java

@@ -0,0 +1,5 @@
+package com.lesso.neverland.puzzle.dto;
+
+public record CompletePuzzleResponse(String prompt,
+                                     String description,
+                                     Long albumIdx) {}

src/main/java/com/lesso/neverland/puzzle/dto/CompletePuzzleResponse.java

@@ -0,0 +1,3 @@
+package com.lesso.neverland.puzzle.dto;
+
+public record EditPuzzleRequest(String content) {}

src/main/java/com/lesso/neverland/puzzle/dto/EditPuzzleRequest.java

@@ -0,0 +1,3 @@
+package com.lesso.neverland.puzzle.dto;
+
+public record PuzzlePieceRequest(String content) {}

src/main/java/com/lesso/neverland/puzzle/dto/PuzzlePieceRequest.java

@@ -2,6 +2,9 @@
 
 import com.lesso.neverland.common.base.BaseException;
 import com.lesso.neverland.common.base.BaseResponse;
+import com.lesso.neverland.gpt.application.GptService;
+import com.lesso.neverland.puzzle.dto.CompletePuzzleRequest;
+import com.lesso.neverland.puzzle.dto.CompletePuzzleResponse;
 import com.lesso.neverland.group.dto.GroupPuzzleListResponse;
 import com.lesso.neverland.puzzle.application.PuzzleService;
 import com.lesso.neverland.puzzle.dto.*;
@@ -19,6 +22,7 @@
 @RequestMapping(puzzle)
 public class PuzzleController {
     private final PuzzleService puzzleService;
+    private final GptService gptService;
 
     // 퍼즐 목록 조회
     @GetMapping("")
@@ -42,10 +46,10 @@ public BaseResponse<String> createPuzzle(@PathVariable Long groupIdx, @RequestPa
         }
     }
 
-    // [작성자] 피드 수정 화면 조회
-    @GetMapping("/{puzzleIdx}/editView")
-    public BaseResponse<PuzzleEditViewResponse> getPuzzleEditView(@PathVariable Long puzzleIdx) {
-        return puzzleService.getPuzzleEditView(puzzleIdx);
+    // [작성자] 퍼즐 수정
+    @GetMapping("/{puzzleIdx}/edit")
+    public BaseResponse<String> editPuzzle(@PathVariable("groupIdx") Long groupIdx, @PathVariable("puzzleIdx") Long puzzleIdx, @RequestPart MultipartFile image, @RequestPart EditPuzzleRequest editPuzzleRequest) {
+        return puzzleService.editPuzzle(groupIdx, puzzleIdx, image, editPuzzleRequest);
     }
 
     // [작성자] 퍼즐 삭제
@@ -60,4 +64,19 @@ public BaseResponse<PuzzlerListResponse> getPuzzlerList(@PathVariable Long group
         return puzzleService.getPuzzlerList(groupIdx);
     }
 
+    // [멤버] 퍼즐피스 추가
+    @PostMapping("/{puzzleIdx}/puzzlePiece")
+    public BaseResponse<String> addPuzzlePiece(@PathVariable("groupIdx") Long groupIdx, @PathVariable("puzzleIdx") Long puzzleIdx, @RequestBody PuzzlePieceRequest puzzlePieceRequest) {
+        return puzzleService.addPuzzlePiece(groupIdx, puzzleIdx, puzzlePieceRequest);
+    }
+
+    // [작성자] 퍼즐 완성하기
+    @PostMapping("/{puzzleIdx}}")
+    public BaseResponse<CompletePuzzleResponse> completePuzzle(@PathVariable("groupIdx") Long groupIdx,
+                                                               @PathVariable("puzzleIdx") Long puzzleIdx,
+                                                               @RequestBody CompletePuzzleRequest completePuzzleRequest)
+    {
+        return puzzleService.completePuzzle(groupIdx, puzzleIdx, completePuzzleRequest);
+    }
+
 }

src/main/java/com/lesso/neverland/puzzle/presentation/PuzzleController.java

@@ -1,7 +1,10 @@
 package com.lesso.neverland.puzzle.repository;
 
+import com.lesso.neverland.puzzle.domain.Puzzle;
 import com.lesso.neverland.puzzle.domain.PuzzleMember;
+import com.lesso.neverland.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PuzzleMemberRepository extends JpaRepository<PuzzleMember, Long> {
+    boolean existsByUserAndPuzzle(User user, Puzzle puzzle);
 }

src/main/java/com/lesso/neverland/puzzle/repository/PuzzleMemberRepository.java

@@ -0,0 +1,7 @@
+package com.lesso.neverland.puzzle.repository;
+
+import com.lesso.neverland.puzzle.domain.PuzzlePiece;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PuzzlePieceRepository extends JpaRepository<PuzzlePiece, Long> {
+}