Replaced user-book model with finished-book

app/src/main/java/me/vadik/knigopis/adapters/books/BooksAdapter.kt

@@ -7,9 +7,10 @@ import me.vadik.knigopis.createNewBookIntent
 import me.vadik.knigopis.dialog.DialogFactory
 import me.vadik.knigopis.dialog.createDialogItem
 import me.vadik.knigopis.inflate
+import me.vadik.knigopis.model.FinishedBook
 
 class BooksAdapter(
-    private val books: List<UserBook>,
+    private val books: List<FinishedBook>,
     private val dialogs: DialogFactory
 ) : RecyclerView.Adapter<BookViewHolder>() {
 

app/src/main/java/me/vadik/knigopis/adapters/books/UserBook.kt

@@ -1,11 +0,0 @@
-package me.vadik.knigopis.adapters.books
-
-class UserBook(
-    val id: String,
-    val title: String,
-    val author: String,
-    val readDay: String,
-    val readMonth: String,
-    val readYear: String,
-    val notes: String
-)

app/src/main/java/me/vadik/knigopis/api/Endpoint.kt

@@ -2,7 +2,6 @@ package me.vadik.knigopis.api
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.adapters.books.UserBook
 import me.vadik.knigopis.model.*
 import me.vadik.knigopis.model.note.Note
 import me.vadik.knigopis.model.subscription.Subscription
@@ -71,7 +70,7 @@ interface Endpoint {
     ): Single<Credentials.UserFull>
 
     @GET("users/{id}/books")
-    fun getUserBooks(@Path("id") userId: String): Single<List<UserBook>>
+    fun getUserBooks(@Path("id") userId: String): Single<List<FinishedBook>>
 
     @PUT("users/{id}")
     fun updateProfile(

app/src/main/java/me/vadik/knigopis/model/FinishedBook.kt

@@ -7,8 +7,7 @@ class FinishedBook(
     val readDay: String,
     val readMonth: String,
     val readYear: String,
-    val notes: String,
-    val createdAt: String
+    val notes: String
 ) : Book {
     val order
         get() = arrayOf(readYear, readMonth, readDay)

app/src/main/java/me/vadik/knigopis/user/UserActivity.kt

@@ -12,9 +12,9 @@ import android.view.MenuItem
 import kotlinx.android.synthetic.main.user_activity.*
 import me.vadik.knigopis.*
 import me.vadik.knigopis.adapters.books.BooksAdapter
-import me.vadik.knigopis.adapters.books.UserBook
 import me.vadik.knigopis.common.setCircleImage
 import me.vadik.knigopis.dialog.DialogFactory
+import me.vadik.knigopis.model.FinishedBook
 import me.vadik.knigopis.utils.systemClipboardManager
 import org.koin.android.ext.android.inject
 
@@ -33,7 +33,7 @@ class UserActivity : AppCompatActivity() {
     private val interactor by inject<UserInteractor>()
     private val dialogs by inject<DialogFactory> { mapOf("activity" to this) }
     private val userId by lazy { intent.getStringExtra(EXTRA_USER_ID) }
-    private val books = mutableListOf<UserBook>()
+    private val books = mutableListOf<FinishedBook>()
     private val booksAdapter = BooksAdapter(books, dialogs)
     private lateinit var unsubscribeOption: MenuItem
 

app/src/main/java/me/vadik/knigopis/user/UserInteractor.kt

@@ -2,10 +2,10 @@ package me.vadik.knigopis.user
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.adapters.books.UserBook
 import me.vadik.knigopis.api.Endpoint
 import me.vadik.knigopis.auth.KAuth
 import me.vadik.knigopis.io2main
+import me.vadik.knigopis.model.FinishedBook
 
 interface UserInteractor {
 
@@ -15,7 +15,7 @@ interface UserInteractor {
 
     fun isSubscribed(userId: String): Single<Boolean>
 
-    fun getBooks(userId: String): Single<List<UserBook>>
+    fun getBooks(userId: String): Single<List<FinishedBook>>
 
 }