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 index b4a277d..fe22a77 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/book/mapper/BookMapper.java +++ b/src/main/java/com/keepgoing/keepserver/domain/book/mapper/BookMapper.java @@ -1,7 +1,7 @@ package com.keepgoing.keepserver.domain.book.mapper; -import com.keepgoing.keepserver.domain.book.entity.enums.BookState; import com.keepgoing.keepserver.domain.book.entity.Book; +import com.keepgoing.keepserver.domain.book.entity.enums.BookState; import com.keepgoing.keepserver.domain.book.payload.request.BookDto; import com.keepgoing.keepserver.domain.book.payload.response.BookResponseDto; import org.springframework.stereotype.Component; @@ -22,15 +22,15 @@ public BookResponseDto entityToDto(Book entity) { .build(); } - public Book dtoToEntity(BookDto dto) { + public Book dtoToEntity(BookDto dto, String nfcCode) { return Book.builder() - .bookName(dto.getBookName()) - .imageUrl(dto.getImageUrl()) + .bookName(dto.bookName()) + .imageUrl(dto.imageUrl()) .registrationDate(LocalDateTime.now()) - .rentDate(dto.getRentDate()) - .writer(dto.getWriter()) + .rentDate(dto.rentDate()) + .writer(dto.writer()) .state(BookState.AVAILABLE) - .nfcCode(dto.getNfcCode()) + .nfcCode(nfcCode) .build(); } diff --git a/src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookDto.java b/src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookDto.java index 2eefc03..2730f7a 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookDto.java +++ b/src/main/java/com/keepgoing/keepserver/domain/book/payload/request/BookDto.java @@ -2,8 +2,6 @@ import com.keepgoing.keepserver.domain.book.entity.enums.BookState; import lombok.Builder; -import lombok.Getter; -import lombok.Setter; import java.time.LocalDateTime; diff --git a/src/main/java/com/keepgoing/keepserver/domain/book/service/BookServiceImpl.java b/src/main/java/com/keepgoing/keepserver/domain/book/service/BookServiceImpl.java index b875f2c..108efce 100644 --- a/src/main/java/com/keepgoing/keepserver/domain/book/service/BookServiceImpl.java +++ b/src/main/java/com/keepgoing/keepserver/domain/book/service/BookServiceImpl.java @@ -29,8 +29,7 @@ public class BookServiceImpl implements BookService { @Override public BaseResponse bookRegister(BookDto bookDto) { String nfcCode = createNfcCode(); - bookDto.setNfcCode(nfcCode); - bookRepository.save(bookMapper.dtoToEntity(bookDto)); + bookRepository.save(bookMapper.dtoToEntity(bookDto, nfcCode)); return new BaseResponse(HttpStatus.OK, "책 생성 성공"); } @@ -81,9 +80,9 @@ public String createNfcCode() { public BaseResponse editBook(String nfcCode, BookRequestDto bookRequest) { Book book = bookRepository.findBookByNfcCode(nfcCode); - if (bookRequest.getState() != null) book.setState(bookRequest.getState()); - if (bookRequest.getImageUrl() != null) book.setImageUrl(bookRequest.getImageUrl()); - if (bookRequest.getName() != null) book.setBookName(bookRequest.getName()); + if (bookRequest.state() != null) book.setState(bookRequest.state()); + if (bookRequest.imageUrl() != null) book.setImageUrl(bookRequest.imageUrl()); + if (bookRequest.name() != null) book.setBookName(bookRequest.name()); bookRepository.save(book); return new BaseResponse(HttpStatus.OK, "책 정보 수정 성공"); }