Skip to content

Commit

Permalink
refactor: Modify set to builder (#56)
Browse files Browse the repository at this point in the history
Co-authored-by: Ahyun0326 <[email protected]>
  • Loading branch information
chaeeun-Han and Ahyun0326 committed Apr 4, 2024
1 parent ec61bf8 commit 18c8419
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,15 @@ public ResponseEntity<? super CommentsResponseDto> saveComment(Long postId, Long
return CommentsResponseDto.notExistedUser();
} else {
// 댓글 엔티티 생성
Comments comment = dto.toEntity(postId);
comment.setContent(dto.getContent());
comment.setUserUid(userUid);
Comments comment = dto.toEntity(postId, userUid);

// 댓글 저장
commentRepo.save(comment);

// postRespo의 commentCount 업데이트
int commentCount = commentRepo.countByPostId(postId);
Posts post = postRepo.findByPostId(postId);
post.setCommentCount(commentCount);
post.updateCommentCount(commentCount);
}
} catch (Exception exception) {
log.info("error " + exception.getMessage());
Expand Down Expand Up @@ -101,7 +99,7 @@ public ResponseEntity<? super CommentsResponseDto> patchComment(Long postId, Lon
if (!comment.getUserUid().equals(userUid)) {
return CommentsResponseDto.noPermission();
}
comment.setContent(dto.getContent());
comment.updateContent(dto.getContent());
}
} catch (Exception exception) {
log.info("error " + exception.getMessage());
Expand Down Expand Up @@ -130,7 +128,7 @@ public ResponseEntity<? super DeleteCommentsResponseDto> deleteComment(Long post
// postRespo의 commentCount 업데이트
int commentCount = commentRepo.countByPostId(postId);
Posts post = postRepo.findByPostId(postId);
post.setCommentCount(commentCount);
post.updateCommentCount(commentCount);
}
} catch (Exception exception) {
log.info("error " + exception.getMessage());
Expand Down
34 changes: 15 additions & 19 deletions src/main/java/com/beotkkot/qtudy/service/posts/PostsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ public ResponseEntity<? super PostsResponseDto> savePost(Long kakao_uid, PostsRe

if (userRepo.findByKakaoId(kakao_uid) != null) {

// 포스트 엔티티 생성
Posts post = dto.toEntity(kakao_uid);

// 태그 처리
List<String> postTags = dto.getTag();

Expand All @@ -66,23 +63,21 @@ public ResponseEntity<? super PostsResponseDto> savePost(Long kakao_uid, PostsRe
increasedTag.add(tagName);
} else {
// 새로운 태그인 경우 태그를 생성하고 count를 1로 초기화함
Tags newTag = new Tags();
newTag.setName(tagName);
newTag.setCount(1); // 새로운 태그의 count를 1로 초기화
newTag.setCategoryId(dto.getCategoryId());
Tags newTag = Tags.builder()
.name(tagName)
.count(1)
.categoryId(dto.getCategoryId())
.build();

newTagList.add(newTag);
}
}

// 저장된 태그 목록을 포스트에 설정
String tagString = String.join(",", postTags);
post.setTag(tagString);

// postRepo에 해당 유저가 작성한 글에 대한 요약본 저장하는 부분 추가
String summary = summaryService.summary(dto.getContent());
post.setContent(dto.getContent());
post.setSummary(summary);

// 포스트 엔티티 생성
Posts post = dto.toEntity(kakao_uid, summary);

// 포스트 저장 후 postId 반환
Posts savedPost = postsRepo.save(post);
Expand Down Expand Up @@ -196,22 +191,23 @@ public ResponseEntity<? super PostsResponseDto> patchPost(Long postId, Long kaka
tag.increaseTagCount();
} else {
// 새로운 태그인 경우 태그를 생성하고 count를 1로 초기화함
Tags newTag = new Tags();
newTag.setName(tagName);
newTag.setCount(1); // 새로운 태그의 count를 1로 초기화
Tags newTag = Tags.builder()
.name(tagName)
.count(1)
.categoryId(dto.getCategoryId())
.build();

// 새로운 태그를 저장
tagRepo.save(newTag);
}
}
}

post.patchPost(dto);

// 요약
String summary = summaryService.summary(dto.getContent());
post.setContent(dto.getContent());
post.setSummary(summary);

post.patchPost(dto, summary);

postsRepo.save(post);

Expand Down
49 changes: 27 additions & 22 deletions src/main/java/com/beotkkot/qtudy/service/quiz/QuizService.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public String generateQuiz(GenerateQuizRequestDto genQuizReqDto) throws JsonProc

Map<String, Object> requestBody = new HashMap<>();
requestBody.put("messages", messages);
requestBody.put("model", "gpt-4-1106-preview");
requestBody.put("model","gpt-3.5-turbo"); // "gpt-4-1106-preview"
requestBody.put("temperature", 0.0f);
requestBody.put("max_tokens", 4000);

Expand Down Expand Up @@ -103,15 +103,18 @@ public String generateQuiz(GenerateQuizRequestDto genQuizReqDto) throws JsonProc

@Transactional
public void saveQuiz(PostQuizRequestDto saveQuizDto) {
Quiz quiz = new Quiz();

String optionsString = String.join(",", saveQuizDto.getQuizDto().getOptions());

quiz.setPostId(saveQuizDto.getPostId());
quiz.setTags(saveQuizDto.getTags());
quiz.setQuestion(saveQuizDto.getQuizDto().getQuestion());
quiz.setAnswer(saveQuizDto.getQuizDto().getAnswer());
quiz.setOptions(optionsString);
quiz.setExplanation(saveQuizDto.getQuizDto().getExplanation());
Quiz quiz = Quiz.builder()
.postId(saveQuizDto.getPostId())
.tags(saveQuizDto.getTags())
.question(saveQuizDto.getQuizDto().getQuestion())
.answer(saveQuizDto.getQuizDto().getAnswer())
.options(optionsString)
.explanation(saveQuizDto.getQuizDto().getExplanation())
.build();


quizRepo.save(quiz);
}
Expand Down Expand Up @@ -197,20 +200,22 @@ public ResponseEntity<? super QuizGradeResponseDto> gradeQuiz(GradeQuizRequestDt
}

// 오답노트 entity에 저장
Review newReview = new Review();
newReview.setUserId(uuid);
newReview.setPostId(quiz.getPostId());
newReview.setQuizId(quiz.getQuizId());
newReview.setReviewId(reviewId);
newReview.setType(dto.getType());
newReview.setCreatedAt(writeDatetime);
newReview.setUserAnswer(userAnswerList.get(i));
newReview.setAnswer(answerList.get(i));
newReview.setCorrect(correct);
newReview.setExplanation(quiz.getExplanation());
newReview.setCategoryId(post.getCategoryId());
newReview.setScore(score);
newReview.setTags(quiz.getTags());
Review newReview = Review.builder()
.userId(uuid)
.postId(quiz.getPostId())
.quizId(quiz.getQuizId())
.reviewId(reviewId)
.type(dto.getType())
.createdAt(writeDatetime)
.userAnswer(userAnswerList.get((i)))
.answer(answerList.get(i))
.correct(correct)
.explanation(quiz.getExplanation())
.categoryId(post.getCategoryId())
.score(score)
.tags(quiz.getTags())
.build();

reviewRepo.save(newReview);

gradeList.add(QuizGradeListItem.of(quiz, correct, userAnswerList.get(i)));
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/beotkkot/qtudy/service/user/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ public Long saveUser(KakaoUserInfo kakaoUserInfo) {
*/

// User 엔티티 생성
Users user = new Users();
user.setName(name);
user.setKakaoId(kakaoUserInfo.getId());
user.setProfileImageUrl(kakaoUserInfo.getProfileImageUrl());
Users user = Users.builder()
.name(name)
.kakaoId(kakaoUserInfo.getId())
.profileImageUrl(kakaoUserInfo.getProfileImageUrl())
.first(true)
.build();

// 유저 저장
userRepository.save(user);
Expand Down

0 comments on commit 18c8419

Please sign in to comment.