diff --git a/client/app/src/main/java/com/example/chattingapp/db/dao/BookmarkDao.kt b/client/app/src/main/java/com/example/chattingapp/db/dao/BookmarkDao.kt index 9842c01..1822fe2 100644 --- a/client/app/src/main/java/com/example/chattingapp/db/dao/BookmarkDao.kt +++ b/client/app/src/main/java/com/example/chattingapp/db/dao/BookmarkDao.kt @@ -7,9 +7,13 @@ import com.example.chattingapp.dto.Message @Dao interface BookmarkDao { + @Query("SELECT * FROM BOOKMARK WHERE room_id == :roomID") fun getAll(roomID : Int) : LiveData> + @Query("SELECT count(*) FROM BOOKMARK") + fun getAllCount() : Int + @Insert(onConflict = OnConflictStrategy.REPLACE) fun insert(bookmark : Bookmark) diff --git a/client/app/src/main/java/com/example/chattingapp/view/AddBookmarkActivity.kt b/client/app/src/main/java/com/example/chattingapp/view/AddBookmarkActivity.kt index 8a88365..0c86c31 100644 --- a/client/app/src/main/java/com/example/chattingapp/view/AddBookmarkActivity.kt +++ b/client/app/src/main/java/com/example/chattingapp/view/AddBookmarkActivity.kt @@ -26,7 +26,7 @@ class AddBookmarkActivity : AppCompatActivity() { val r = Runnable { val bookmark = Bookmark( - 1, + AppDatabase.getInstance(this).BookmarkDao().getAllCount() + 1, roomId, bookmark_input.text.toString(), bookmark_contents.text.toString()) diff --git a/client/app/src/main/java/com/example/chattingapp/view/BookmarkActivity.kt b/client/app/src/main/java/com/example/chattingapp/view/BookmarkActivity.kt index 6c1ddfa..2692fe5 100644 --- a/client/app/src/main/java/com/example/chattingapp/view/BookmarkActivity.kt +++ b/client/app/src/main/java/com/example/chattingapp/view/BookmarkActivity.kt @@ -23,8 +23,6 @@ class BookmarkActivity : AppCompatActivity() { AppDatabase.getInstance(this).BookmarkDao().getAll(roomId).observe(this) { bookmarkList = it as ArrayList; - Log.e("isis", it[0].toString()) - total_bookmark_nums.text = bookmarkList.size.toString(); // 북마크 갯수 출력