diff --git a/src/main/kotlin/com/msksbr/bookmgr/dto/BorrowInfoDto.kt b/src/main/kotlin/com/msksbr/bookmgr/dto/BorrowInfoDto.kt index a9ba63e..13a89eb 100644 --- a/src/main/kotlin/com/msksbr/bookmgr/dto/BorrowInfoDto.kt +++ b/src/main/kotlin/com/msksbr/bookmgr/dto/BorrowInfoDto.kt @@ -1,13 +1,13 @@ package com.msksbr.bookmgr.dto -import com.msksbr.bookmgr.entity.Book +import com.msksbr.bookmgr.dto.borrow.BookBorrowDto +import com.msksbr.bookmgr.dto.borrow.UserBorrowDto import java.util.Date class BorrowInfoDto( val id: Long, - val book: Book, - val userId: Long, - val username: String, + val bookBorrowDto: BookBorrowDto, + val userBorrowDto: UserBorrowDto, val borrowTime: Date, val returnTime: Date?, val string: String diff --git a/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/BookBorrowDto.kt b/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/BookBorrowDto.kt new file mode 100644 index 0000000..151e7af --- /dev/null +++ b/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/BookBorrowDto.kt @@ -0,0 +1,8 @@ +package com.msksbr.bookmgr.dto.borrow + +data class BookBorrowDto( + val id: Long, + val name: String, + val author: String, + val number: Int = 1 +) \ No newline at end of file diff --git a/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/UserBorrowDto.kt b/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/UserBorrowDto.kt new file mode 100644 index 0000000..04063b0 --- /dev/null +++ b/src/main/kotlin/com/msksbr/bookmgr/dto/borrow/UserBorrowDto.kt @@ -0,0 +1,7 @@ +package com.msksbr.bookmgr.dto.borrow + +data class UserBorrowDto( + val id: Long, + val username: String, + val role: String +) \ No newline at end of file