Merge pull request #105 from Team-KeepGoing/feature/book

Feat :: book 대여자 반환값 추가
Team-KeepGoing · Nov 7, 2024 · b567bef · b567bef
2 parents e8106e6 + 2e9f1d9
commit b567bef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/src/main/java/com/keepgoing/keepserver/domain/book/mapper/BookMapper.java b/src/main/java/com/keepgoing/keepserver/domain/book/mapper/BookMapper.java
@@ -11,27 +11,28 @@
 public class BookMapper {
     public BookResponseDto entityToDto(Book entity) {
         return BookResponseDto.builder()
-                .id(entity.getId())
-                .bookName(entity.getBookName())
-                .registrationDate(entity.getRegistrationDate())
-                .writer(entity.getWriter())
-                .imageUrl(entity.getImageUrl())
-                .nfcCode(entity.getNfcCode())
-                .lastBorrowerMail(entity.getLastBorrowerMail())
-                .rentDate(entity.getRentDate())
-                .state(entity.getState())
-                .build();
+                              .id(entity.getId())
+                              .bookName(entity.getBookName())
+                              .registrationDate(entity.getRegistrationDate())
+                              .writer(entity.getWriter())
+                              .imageUrl(entity.getImageUrl())
+                              .borrower(entity.getBorrower() != null ? entity.getBorrower().getName() : "대여자 없음")
+                              .nfcCode(entity.getNfcCode())
+                              .lastBorrowerMail(entity.getLastBorrowerMail())
+                              .rentDate(entity.getRentDate())
+                              .state(entity.getState())
+                              .build();
     }
 
     public Book dtoToEntity(BookDto dto, String nfcCode) {
         return Book.builder()
-                .bookName(dto.bookName())
-                .imageUrl(dto.imageUrl())
-                .registrationDate(LocalDateTime.now())
-                .rentDate(dto.rentDate())
-                .writer(dto.writer())
-                .state(BookState.AVAILABLE)
-                .nfcCode(nfcCode)
-                .build();
+                   .bookName(dto.bookName())
+                   .imageUrl(dto.imageUrl())
+                   .registrationDate(LocalDateTime.now())
+                   .rentDate(dto.rentDate())
+                   .writer(dto.writer())
+                   .state(BookState.AVAILABLE)
+                   .nfcCode(nfcCode)
+                   .build();
     }
 }
diff --git a/src/main/java/com/keepgoing/keepserver/domain/book/payload/response/BookResponseDto.java b/src/main/java/com/keepgoing/keepserver/domain/book/payload/response/BookResponseDto.java
@@ -12,6 +12,7 @@ public record BookResponseDto(
         String bookName,
         String writer,
         String imageUrl,
+        String borrower,
         String nfcCode,
         String lastBorrowerMail,
         LocalDateTime registrationDate,

diff --git a/.../com/keepgoing/keepserver/domain/user/domain/repository/user/UserQueryRepositoryImpl.java b/.../com/keepgoing/keepserver/domain/user/domain/repository/user/UserQueryRepositoryImpl.java
@@ -59,6 +59,7 @@ public UserDto getProfileById(long id) {
                                                 book.bookName,
                                                 book.writer,
                                                 book.imageUrl,
+                                                book.borrower.name,
                                                 book.nfcCode,
                                                 book.lastBorrowerMail,
                                                 book.registrationDate,
@@ -82,7 +83,6 @@ public UserDto getProfileById(long id) {
                                           .collect(Collectors.toSet()))
                       .borrowedBooks(dto.borrowedBooks().stream().filter(r -> r.id() != 0).collect(Collectors.toSet()))
                       .build();
-//        return null;
     }
 
     @Override