Merge pull request #91 from dongkyun0713/dongkyun

경험치 증감서비스

Titto_Backend/src/main/java/com/example/titto_backend/auth/service/ExperienceService.java

@@ -15,15 +15,20 @@ public class ExperienceService {
 
     // 경험치 추가
     @Transactional
-    public void addExperience(User user, int experienceToAdd) {
-        int currentExperience = user.getCurrentExperience();
-        int totalExperience = user.getTotalExperience();
+    public void addExperience(User questionAuthor, User answerAuthor, int experienceToAdd) {
+        if (questionAuthor != answerAuthor) {
 
-        currentExperience += experienceToAdd;
-        totalExperience += experienceToAdd;
+            int currentExperience = answerAuthor.getCurrentExperience();
+            int totalExperience = answerAuthor.getTotalExperience();
 
-        user.setCurrentExperience(currentExperience);
-        user.setTotalExperience(totalExperience);
+            currentExperience += experienceToAdd;
+            totalExperience += experienceToAdd;
+
+            answerAuthor.setCurrentExperience(currentExperience);
+            answerAuthor.setTotalExperience(totalExperience);
+        } else {
+            throw new CustomException(ErrorCode.CANNOT_ACCEPTED);
+        }
     }
 
     // 경험치 차감

Titto_Backend/src/main/java/com/example/titto_backend/common/exception/ErrorCode.java

@@ -19,6 +19,8 @@ public enum ErrorCode {
     ALREADY_ACCEPTED_ANSWER(HttpStatus.BAD_REQUEST, "이미 채택된 답변이 존재합니다."),
     INSUFFICIENT_EXPERIENCE(HttpStatus.BAD_REQUEST, "차감할 경험치가 부족합니다."),
     INVALID_ACCESS(HttpStatus.BAD_REQUEST, "잘못된 접근입니다."),
+    CANNOT_ACCEPTED(HttpStatus.BAD_REQUEST, "채택이 불가능합니다"),
+    DELETE_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "삭제가 불가능합니다"),
 
     /* 401 UNAUTHORIZED : 인증되지 않은 사용자 */
     INVALID_AUTH_TOKEN(HttpStatus.UNAUTHORIZED, "인증 토큰이 유효하지 않습니다."),

Titto_Backend/src/main/java/com/example/titto_backend/questionBoard/domain/Question.java

@@ -60,6 +60,10 @@ public class Question extends BaseEntity {
     @JoinColumn(name = "accepted_answer")
     private Answer acceptedAnswer;
 
+    @Setter
+    @JoinColumn(name = "is_accepted_answer")
+    private boolean isAnswerAccepted;
+
     public void update(String title, String content, Department department, Status status) {
         this.title = title;
         this.content = content;

Titto_Backend/src/main/java/com/example/titto_backend/questionBoard/service/AnswerService.java

@@ -29,9 +29,11 @@ public AnswerDTO.Response save(AnswerDTO.Request request, Long questionId, Strin
         User user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
+        Question question = questionRepository.findById(questionId)
+                .orElseThrow(() -> new CustomException(ErrorCode.QUESTION_NOT_FOUND));
+
         Answer answer = Answer.builder()
-                .question(questionRepository.findById(questionId)
-                        .orElseThrow(() -> new CustomException(ErrorCode.QUESTION_NOT_FOUND)))
+                .question(question)
                 .author(user)
                 .content(request.getContent())
                 .build();
@@ -41,7 +43,7 @@ public AnswerDTO.Response save(AnswerDTO.Request request, Long questionId, Strin
         user.setCountAnswer(updateUserCountAnswer);
 
         // 답변을 작성한 사용자의 경험치 추가
-        experienceService.addExperience(user, 20);
+        experienceService.addExperience(question.getAuthor(), user, 20);
 
         return new AnswerDTO.Response(savedAnswer);
     }
@@ -78,11 +80,12 @@ public void acceptAnswer(Long questionId, Long answerId, Long userId) {
         answer.setAccepted(true);
         question.setAcceptedAnswer(answer);
 
+        question.setAnswerAccepted(true);  // 일단 임시 추가
+
         Integer updateCountAccept = answer.getAuthor().getCountAccept() + 1;
         answer.getAuthor().setCountAccept(updateCountAccept);
 
-        experienceService.deductExperience(answer.getAuthor(), question.getSendExperience());
-        experienceService.addExperience(question.getAuthor(), 35 + question.getSendExperience());
+        experienceService.addExperience(question.getAuthor(), answer.getAuthor(), 35 + question.getSendExperience());
     }
 
     private void verifyAcceptedAnswer(Long questionId) {

Titto_Backend/src/main/java/com/example/titto_backend/questionBoard/service/QuestionService.java

@@ -2,6 +2,7 @@
 
 import com.example.titto_backend.auth.domain.User;
 import com.example.titto_backend.auth.repository.UserRepository;
+import com.example.titto_backend.auth.service.ExperienceService;
 import com.example.titto_backend.common.exception.CustomException;
 import com.example.titto_backend.common.exception.ErrorCode;
 import com.example.titto_backend.questionBoard.domain.Department;
@@ -31,12 +32,16 @@ public class QuestionService {
     private final QuestionRepository questionRepository;
     private final UserRepository userRepository;
 
+    private final ExperienceService experienceService;
+
     //Create
     @Transactional
     public String save(String email, QuestionDTO.Request request) throws CustomException {
         User user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
+        experienceService.deductExperience(user, request.getSendExperience()); // 유저 경험치 차감
+
         questionRepository.save(Question.builder()
                 .title(request.getTitle())
                 .author(user)
@@ -45,6 +50,7 @@ public String save(String email, QuestionDTO.Request request) throws CustomExcep
                 .status(Status.valueOf(request.getStatus().toUpperCase()))
                 .sendExperience(request.getSendExperience())
                 .viewCount(0)
+                .isAnswerAccepted(false)
                 .build());
         return "질문이 성공적으로 등록되었습니다.";
     }
@@ -90,12 +96,23 @@ public void delete(Long id, Long userId) {
         questionRepository.deleteById(id);
     }
 
+    // 질문 게시판에 채택된 답변이 없으면 경험치 되돌려줌, 채택된 답변 있을 시 삭제 불가능
+    private void isAcceptAnswer(Question question, User user) {
+        if (!question.isAnswerAccepted()) {
+            user.setCurrentExperience(user.getCurrentExperience() + question.getSendExperience());
+        } else {
+            throw new CustomException(ErrorCode.DELETE_NOT_ALLOWED);
+        }
+    }
+
     // 글을 쓴 사람과 현재 로그인한 사람이 같은지 확인
     private void validateAuthorIsLoggedInUser(Long id, Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
         Question question = questionRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.QUESTION_NOT_FOUND));
+
+        isAcceptAnswer(question, user);
         if (question.getAuthor().getId().equals(user.getId())) {
             throw new CustomException(ErrorCode.MISMATCH_AUTHOR);
         }