feat: 작가 마이페이지 조회시 나의 책 리스트도 반환하게 기능 추가

SOPT-SOPHY · Jul 13, 2023 · 7e7376b · 7e7376b
1 parent 1e0283e
commit 7e7376b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/main/java/org/sophy/sophy/InitDb.java b/src/main/java/org/sophy/sophy/InitDb.java
@@ -63,7 +63,7 @@ public void dbInit() {
                     .isOperator(false)
                     .authority(Authority.ROLE_USER)
                     .build();
-            author.setAuthor(memauthor);
+            author.setAuthorProperty(memauthor);
             author.setCompleteBookTalkCounto(3);
             author.setWaitingBookTalkCount(3);
             em.persist(author);

diff --git a/src/main/java/org/sophy/sophy/domain/Booktalk.java b/src/main/java/org/sophy/sophy/domain/Booktalk.java
@@ -28,7 +28,7 @@ public class Booktalk extends AuditingTimeEntity {
 
     private String booktalkImageUrl;
 
-    @OneToOne
+    @ManyToOne
     @JoinColumn(name = "member_id")
     private Member member; //작가 = 북토크당 1명
 
@@ -85,10 +85,10 @@ public void setAuthor(Member member) {
         }
         this.member = member;
         this.authorProperty = member.getAuthorProperty();
-        authorProperty.getMyBookTalkList().add(this);
-        if (!member.getAuthorProperty().getMyBookTalkList().contains(this)) {
-            member.getAuthorProperty().getMyBookTalkList().add(this);
-        }
+        member.getAuthorProperty().getMyBookTalkList().add(this);
+//        if (!member.getAuthorProperty().getMyBookTalkList().contains(this)) {
+//            member.getAuthorProperty().getMyBookTalkList().add(this);
+//        }
     }
 
     @Builder

diff --git a/src/main/java/org/sophy/sophy/domain/Member.java b/src/main/java/org/sophy/sophy/domain/Member.java
@@ -71,7 +71,7 @@ public Member(String name, String email, String password, String phoneNum, boole
         this.userBookTalkList = new ArrayList<>();
     }
 
-    public void setAuthor(AuthorProperty authorProperty) {
+    public void setAuthorProperty(AuthorProperty authorProperty) {
         this.authorProperty = authorProperty;
     }
 

diff --git a/src/main/java/org/sophy/sophy/service/MemberService.java b/src/main/java/org/sophy/sophy/service/MemberService.java
@@ -2,9 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import org.sophy.sophy.controller.dto.request.MemberAdditionalInfoDto;
+import org.sophy.sophy.domain.Book;
 import org.sophy.sophy.domain.Booktalk;
 import org.sophy.sophy.domain.Member;
 import org.sophy.sophy.domain.MemberBooktalk;
+import org.sophy.sophy.domain.dto.MyBookDto;
 import org.sophy.sophy.domain.dto.MyPageBooktalkDto;
 import org.sophy.sophy.domain.dto.MyPageDto;
 import org.sophy.sophy.domain.dto.MyInfoDto;
@@ -34,6 +36,7 @@ public MyPageDto getMyPage(Long memberId) {
                     .waitingBookTalkCount(member.getWaitingBookTalkCount())
                     .completeBookTalkCount(member.getCompleteBookTalkCount())
                     .myPageBooktalkDtos(getBooktalksByMemberId(memberId))
+                    .myBookDtos(getAuthorBooksByMemberId(memberId))
                     .build();
         } else {
             return MyPageDto.builder()
@@ -118,4 +121,19 @@ public List<MyPageBooktalkDto> getAuthorBooktalksByMemberId(Long memberId) { //
         return booktalkResponseDtoList;
     }
 
+    @Transactional
+    public List<MyBookDto> getAuthorBooksByMemberId(Long memberId) { //작가가 쓴 책 조회 메서드
+        List<Book> authorBookList = getMemberById(memberId).getAuthorProperty().getMyBookList();
+        List<MyBookDto> bookResponseDtoList = new ArrayList<>();
+        authorBookList.forEach(book -> {
+            bookResponseDtoList.add(MyBookDto.builder()
+                    .title(book.getTitle())
+                    .bookCategory(book.getBookCategory())
+                    .booktalkOpenCount(book.getBooktalkOpenCount())
+                    .isRegistration(book.getIsRegistration())
+                    .build());
+        });
+        return bookResponseDtoList;
+    }
+
 }