Merge pull request #108 from dongkyun0713/dongkyun

fix() : content LONGTEXT로 변경
SKHU-TITTO · Feb 27, 2024 · f872a79 · f872a79
2 parents 0e1e4b3 + a7a6d45
commit f872a79
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/...Backend/src/main/java/com/example/titto_backend/auth/dto/response/UserProfileViewDto.java b/...Backend/src/main/java/com/example/titto_backend/auth/dto/response/UserProfileViewDto.java
@@ -3,6 +3,7 @@
 import com.example.titto_backend.auth.domain.User;
 import com.example.titto_backend.matchingBoard.domain.matchingBoard.MatchingPost;
 import com.example.titto_backend.questionBoard.domain.Answer;
+import com.example.titto_backend.questionBoard.domain.Question;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -28,9 +29,11 @@ public class UserProfileViewDto {
     private Integer countAccept;
     private Integer level;
     private List<MatchingPost> matchingPosts;
+    private List<Question> questions;
     private List<Answer> answers;
 
-    public static UserProfileViewDto of(User user, List<MatchingPost> matchingPosts, List<Answer> answers) {
+    public static UserProfileViewDto of(User user, List<MatchingPost> matchingPosts, List<Question> questions,
+                                        List<Answer> answers) {
         return new UserProfileViewDto(
                 user.getProfile(),
                 user.getName(),
@@ -46,6 +49,7 @@ public static UserProfileViewDto of(User user, List<MatchingPost> matchingPosts,
                 user.getCountAccept(),
                 user.getLevel(),
                 matchingPosts,
+                questions,
                 answers
         );
     }

diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java
@@ -12,7 +12,9 @@
 import com.example.titto_backend.matchingBoard.domain.matchingBoard.MatchingPost;
 import com.example.titto_backend.matchingBoard.repository.matchingBoard.MatchingPostRepository;
 import com.example.titto_backend.questionBoard.domain.Answer;
+import com.example.titto_backend.questionBoard.domain.Question;
 import com.example.titto_backend.questionBoard.repository.AnswerRepository;
+import com.example.titto_backend.questionBoard.repository.QuestionRepository;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +28,7 @@ public class UserService {
     private final UserRepository userRepository;
     private final MatchingPostRepository matchingPostRepository;
     private final AnswerRepository answerRepository;
+    private final QuestionRepository questionRepository;
 
     @Transactional
     public void signUp(SignUpDTO signUpDTO, String email) {
@@ -70,9 +73,10 @@ public void updateUserProfile(String email, UserProfileUpdateDTO userProfileUpda
     public UserProfileViewDto userProfileView(Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-        List<MatchingPost> matchingPost = matchingPostRepository.findMatchingPostByUser(user);
+        List<MatchingPost> matchingPosts = matchingPostRepository.findMatchingPostByUser(user);
+        List<Question> questions = questionRepository.findQuestionByAuthor(user);
         List<Answer> answers = answerRepository.findAnswerByAuthor(user);
-        return UserProfileViewDto.of(user, matchingPost, answers);
+        return UserProfileViewDto.of(user, matchingPosts, questions,answers);
     }
 
     //닉네임 중복 여부

diff --git a/.../main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java b/.../main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java
@@ -2,13 +2,27 @@
 
 //import com.example.titto_backend.converter.CategoryToIntegerConverter;
 
-import com.example.titto_backend.common.BaseEntity;
 import com.example.titto_backend.auth.domain.User;
-import jakarta.persistence.*;
+import com.example.titto_backend.common.BaseEntity;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrePersist;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Entity
 @Getter
@@ -33,7 +47,7 @@ public class MatchingPost extends BaseEntity {
 
     // 카테고리(멘토, 멘티, 한솥밥, 스터디)
 //    @Convert(converter = CategoryToIntegerConverter.class)
-  
+
     @Enumerated(EnumType.STRING)
     private Category category;
 
@@ -47,10 +61,11 @@ public class MatchingPost extends BaseEntity {
 
     //내용
     @Lob
-    @Column(name = "content",columnDefinition = "TEXT", nullable = false)
+    @Column(name = "content", columnDefinition = "LONGTEXT", nullable = false)
     private String content;
 
     // 조회수
+    @Setter
     @Column(name = "view_count", columnDefinition = "integer default 0")
     private Integer viewCount;
 

diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/questionBoard/domain/Answer.java b/Titto_Backend/src/main/java/com/example/titto_backend/questionBoard/domain/Answer.java
@@ -36,7 +36,7 @@ public class Answer extends BaseEntity {
     private User author;
 
     // 답글 내용
-    @Column(name = "answer_content", nullable = false, columnDefinition = "TEXT")
+    @Column(name = "answer_content", nullable = false, columnDefinition = "LONGTEXT")
     @Setter
     private String content;
 

diff --git a/.../src/main/java/com/example/titto_backend/questionBoard/repository/QuestionRepository.java b/.../src/main/java/com/example/titto_backend/questionBoard/repository/QuestionRepository.java
@@ -1,7 +1,9 @@
 package com.example.titto_backend.questionBoard.repository;
 
+import com.example.titto_backend.auth.domain.User;
 import com.example.titto_backend.questionBoard.domain.Department;
 import com.example.titto_backend.questionBoard.domain.Question;
+import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -13,5 +15,5 @@ public interface QuestionRepository extends JpaRepository<Question, Long> {
 
     boolean existsByIdAndAcceptedAnswerIsNotNull(Long id); // 채택된 답변이 있는지 확인
 
-
+    List<Question> findQuestionByAuthor(User user);
 }