fix: question entity(questionService 제외)

Team-baebae · Apr 27, 2024 · 534cd6b · 534cd6b
1 parent 04a8aaf
commit 534cd6b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/entity/Question.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/entity/Question.java
@@ -3,17 +3,15 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.time.LocalDateTime;
+
 @Getter
 @AllArgsConstructor
 
 public class Question {
     private Long questionId;
     private Long memberId;
     private String content;
-    public Question(Long questionId, Long memberId, String content) {
-        this.questionId = questionId;
-        this.memberId = memberId;
-        this.content = content;
-    }
+    private LocalDateTime createdDate;
 }
 
diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/entity/QuestionEntity.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/entity/QuestionEntity.java
@@ -29,12 +29,6 @@ public class QuestionEntity {
     @Column(name = "created_date", nullable = false, length = 30)
     private LocalDateTime createdDate;
 
-    public QuestionEntity(Long id, String content, Member member, LocalDateTime createdDate) {
-        this.id = id;
-        this.content = content;
-        this.member = member;
-        this.createdDate = createdDate;
-    }
     public void updateContent(String content) {
         this.content = content;
     }

diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/repository/QuestionMapper.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/repository/QuestionMapper.java
@@ -4,7 +4,6 @@
 import com.web.baebaeBE.infra.member.repository.MemberRepository;
 import com.web.baebaeBE.infra.question.entity.Question;
 import com.web.baebaeBE.infra.question.entity.QuestionEntity;
-import com.web.baebaeBE.presentation.question.dto.QuestionDetailResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +12,7 @@
 @Component
 @RequiredArgsConstructor
 public class QuestionMapper {
-    private MemberRepository memberRepository;
+    private final MemberRepository memberRepository;
 
     public QuestionEntity toEntity(Question question, String email) {
         Optional<Member> optionalMember = memberRepository.findByEmail(email);
@@ -25,12 +24,21 @@ public QuestionEntity toEntity(Question question, String email) {
                 .build();
     }
 
-    public QuestionDetailResponse toDomain(QuestionEntity questionEntity) {
-        return new QuestionDetailResponse(
+    public QuestionEntity toEntity(Question question, Long memberId) {
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new IllegalArgumentException("No member found with id: " + memberId));
+
+        return QuestionEntity.builder()
+                .content(question.getContent())
+                .member(member)
+                .build();
+    }
+
+    public Question toDomain(QuestionEntity questionEntity) {
+        return new Question(
                 questionEntity.getId(),
-                questionEntity.getContent(),
-                questionEntity.getMember().getNickname(),
-                questionEntity.getCreatedDate()
+                questionEntity.getMember().getId(),
+                questionEntity.getContent()
         );
     }
 }

diff --git a/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/repository/QuestionRepository.java b/baebae-BE/src/main/java/com/web/baebaeBE/infra/question/repository/QuestionRepository.java
@@ -10,7 +10,7 @@
 
 public interface QuestionRepository{
     Optional<Question> findById(Long questionId);
-    Question save(QuestionEntity questionEntity, Long memberId);
+    Question save(Question question, Long memberId);
     Page<Question> findAllByMemberId(Long memberId, Pageable pageable);
 }