From fd6f505864d55177ad290b62ba263a5c0bff5e52 Mon Sep 17 00:00:00 2001
From: cherrylime69 <zerolecture0922@gmail.com>
Date: Wed, 29 Jun 2022 19:42:13 +0900
Subject: [PATCH 01/13] =?UTF-8?q?feat=20:=20=EB=92=A4=EB=A1=9C=20=EA=B0=80?=
 =?UTF-8?q?=EA=B8=B0=EB=A5=BC=20=EB=88=8C=EB=9F=AC=EB=8F=84=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=EB=AA=A9=EB=A1=9D=EC=9D=B4=20=EB=B3=B4=EC=97=AC?=
 =?UTF-8?q?=EC=A7=80=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 필터된 이슈 목록 리스트가 빈값이 아닐 때만 이슈 목록이 갱신되도록 수정
---
 .../example/issu_tracker/ui/issue/IssueFragment.kt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index ca754f3cf1..80d244a186 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -119,11 +119,13 @@ class IssueFragment : Fragment() {
                         issueAdapter.submitList(it.filter { it.state })
                     }
                 }
-//                launch {
-//                    homeViewModel.filteredIssueList.collect {
-//                        issueAdapter.submitList(it)
-//                    }
-//                }
+                launch {
+                    homeViewModel.filteredIssueList.collect {
+                        if (it.isNotEmpty()) {
+                            issueAdapter.submitList(it)
+                        }
+                    }
+                }
             }
         }
     }
@@ -151,7 +153,7 @@ class IssueFragment : Fragment() {
                 issueAdapter.isEditMode = false
                 binding.clIssueOriginalModeTop.visibility = View.VISIBLE
                 binding.clIssueEditModeTop.visibility = View.GONE
-                Log.d("sdsd" , "sdsd")
+                Log.d("sdsd", "sdsd")
                 itemTouchHelper.attachToRecyclerView(binding.rvIssue)
             }
 

From 56123e7db1706c8a2b68d35ec9dab8d7819e044c Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Thu, 30 Jun 2022 14:39:25 +0900
Subject: [PATCH 02/13] =?UTF-8?q?feat=20:=20=EB=A7=88=EC=A7=80=EB=A7=89=20?=
 =?UTF-8?q?pr=20=EB=B0=98=EC=98=81=20:=20joinToString=20=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EB=A6=AC=ED=8E=99=ED=84=B0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/issu_tracker/ui/detail/DetailEditDialogFragment.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
index af7621b3d7..399ce5a52b 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
@@ -28,7 +28,7 @@ class DetailEditDialogFragment(val labelNameList: List<String>, mileStoneName: S
     ): View? {
         binding = DetailEditDialogFragmentBinding.inflate(inflater, container, false)
 
-        binding.tvLabelContent.text = labelNameList.stringListToText()
+        binding.tvLabelContent.text = labelNameList.joinToString(", ")
         return binding.root
     }
 

From ba55b74113037408f514106a24853451f38206c3 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Thu, 30 Jun 2022 23:42:24 +0900
Subject: [PATCH 03/13] =?UTF-8?q?feat=20:=20=EB=84=A4=ED=8A=B8=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=20=EC=83=81=ED=83=9C=20=EA=B4=80=EB=A6=AC=20=ED=81=B4?=
 =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issu_tracker/data/network/NetworkResult.kt       | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 app/src/main/java/com/example/issu_tracker/data/network/NetworkResult.kt

diff --git a/app/src/main/java/com/example/issu_tracker/data/network/NetworkResult.kt b/app/src/main/java/com/example/issu_tracker/data/network/NetworkResult.kt
new file mode 100644
index 0000000000..aac01e88d1
--- /dev/null
+++ b/app/src/main/java/com/example/issu_tracker/data/network/NetworkResult.kt
@@ -0,0 +1,12 @@
+package com.example.issu_tracker.data.network
+
+sealed class NetworkResult<T : Any> {
+    class Success<T : Any>(val data: T) : NetworkResult<T>()
+    class Cached<T : Any>(val data: T) : NetworkResult<T>()
+    class Loading<T : Any> : NetworkResult<T>()
+    class Error<T : Any>(val code: Int = EMPTY) : NetworkResult<T>()
+    class Exception<T : Any>(val e: Throwable) : NetworkResult<T>()
+    companion object {
+        const val EMPTY = 0
+    }
+}

From 8140a53b6aa3b4acea9d75aaf826d82c62c14319 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Thu, 30 Jun 2022 23:43:20 +0900
Subject: [PATCH 04/13] =?UTF-8?q?feat=20:=20=EC=B9=9C=EA=B5=AC=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B6=80=EB=B6=84=20=EB=84=A4=ED=8A=B8=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=20=EC=83=81=ED=83=9C=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
 =?UTF-8?q?=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 네트워크 O -> 리모트에서 로컬에 캐시해줌, 로컬에서 내려주기
2. 네트워크 X -> 로컬에서 내려주기
---
 .../data/repository/FriendRemoteRepository.kt |  3 +-
 .../repository/FriendRemoteRepositoryIml.kt   | 46 ++++++++++++-------
 .../data/repository/Repository.kt             | 30 ++++++------
 .../issu_tracker/di/RepositoryModule.kt       |  6 ++-
 .../ui/account/AccountViewModel.kt            | 21 +++++----
 .../ui/account/MyAccountFragment.kt           | 18 ++++++--
 .../ui/detail/DetailEditDialogFragment.kt     |  2 +-
 7 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
index aa564ddeab..b79dfcdecf 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
@@ -2,11 +2,12 @@ package com.example.issu_tracker.data.repository
 
 import android.util.Log
 import com.example.issu_tracker.data.User
+import com.example.issu_tracker.data.network.NetworkResult
 import kotlinx.coroutines.tasks.await
 
 interface FriendRemoteRepository {
 
-    suspend fun loadFriendList(): List<User>
+    suspend fun loadFriendList(): NetworkResult<List<User>>
     suspend fun updateFriend(users: List<User>)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
index afdaa9a836..e194c98eb1 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
@@ -2,9 +2,13 @@ package com.example.issu_tracker.data.repository
 
 import android.util.Log
 import com.example.issu_tracker.data.User
+import com.example.issu_tracker.data.network.NetworkResult
+import com.example.issu_tracker.data.network.NetworkResult.Companion.EMPTY
 import com.example.issu_tracker.ui.home.userUid
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.protobuf.Empty
 import kotlinx.coroutines.tasks.await
+import java.lang.Exception
 import java.lang.StringBuilder
 import javax.inject.Inject
 
@@ -12,24 +16,32 @@ import javax.inject.Inject
 class FriendRemoteRepositoryIml @Inject constructor(private val fireStore: FirebaseFirestore) :
     FriendRemoteRepository {
 
-    override suspend fun loadFriendList(): List<User> {
-        val userData =
-            fireStore.collection(HomeRepositoryImpl.FIREBASE_COLLECTION_FRIEND_PATH)
-                .document(userUid).get().await()
-        val friendData = userData["friend"] as List<Map<String, String>>
-        Log.d("friend", friendData.toString())
-
-        val friendList = mutableListOf<User>()
-
-        friendData.forEach {
-            val user =
-                User(
-                    it["UID"] ?: "", it["name"] ?: "",
-                    it["userPhoto"] ?: ""
-                )
-            friendList.add(user)
+    override suspend fun loadFriendList(): NetworkResult<List<User>> {
+        try {
+            val userData =
+                fireStore.collection(HomeRepositoryImpl.FIREBASE_COLLECTION_FRIEND_PATH)
+                    .document(userUid).get().await()
+            val friendData = userData["friend"] as List<Map<String, String>>
+            Log.d("friend", friendData.toString())
+
+            val friendList = mutableListOf<User>()
+
+            friendData.forEach {
+                val user =
+                    User(
+                        it["UID"] ?: "", it["name"] ?: "",
+                        it["userPhoto"] ?: ""
+                    )
+                friendList.add(user)
+            }
+            return if (friendList.isNotEmpty()) {
+                NetworkResult.Success(friendList)
+            } else {
+                NetworkResult.Error(EMPTY)
+            }
+        } catch (e: Exception) {
+            return NetworkResult.Exception(e)
         }
-        return friendList
     }
 
     override suspend fun updateFriend(users: List<User>) {
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
index 01fac9c3aa..d8b568a4e5 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
@@ -3,31 +3,33 @@ package com.example.issu_tracker.data.repository
 import android.util.Log
 import com.example.issu_tracker.data.User
 import com.example.issu_tracker.data.local.FriendDatabase
+import com.example.issu_tracker.data.network.NetworkResult
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.lang.Exception
 import javax.inject.Inject
 
 class Repository @Inject constructor(
     private val friendLocalDatabase: FriendDatabase,
     private val friendRemoteDatabase: FriendRemoteRepository
 ) {
-    suspend fun loadFriendList(): List<User> {
-        // TODO  네트워크 상태에 따른 분기 처리 필요
-        Log.d("sdd","0")
-        // 1. 리모트에서 로컬에 캐시해줌
-        updateRemoteDatabase()
+    suspend fun loadFriendList(): NetworkResult<List<User>> {
+        // 1. 네트워크 O -> 리모트에서 로컬에 캐시해줌, 로컬에서 내려주기
+        // 2. 네트워크 X -> 로컬에서 내려주기
 
+        val loadResult = friendRemoteDatabase.loadFriendList()
 
-        // 2. 업데이트된 로컬을 통해서 반환해줌
-        val result = friendLocalDatabase.userDao().getAll()
-        return result
+        return if (loadResult is NetworkResult.Success) {
+            updateRemoteDatabase(loadResult.data)
+            NetworkResult.Success(friendLocalDatabase.userDao().getAll())
+        } else {
+            NetworkResult.Cached(friendLocalDatabase.userDao().getAll())
+        }
     }
 
-    suspend fun updateRemoteDatabase() {
+    suspend fun updateRemoteDatabase(userList: List<User> = listOf()) {
         // 1. 리모트에서 로컬에 캐시해줌
-        val userList = friendRemoteDatabase.loadFriendList()
-        Log.d("sdd","1")
         CoroutineScope(Dispatchers.IO).launch {
             friendLocalDatabase.userDao().deleteAllUsers()
             userList.forEach {
@@ -36,14 +38,10 @@ class Repository @Inject constructor(
                 }
             }
         }.join()
-        Log.d("sdd","2")
-    }
-
-    suspend fun loadFriendListFromRemote(): List<User> {
-        return friendRemoteDatabase.loadFriendList()
     }
 
     suspend fun updateFriend(userList: List<User>) {
         friendRemoteDatabase.updateFriend(userList)
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
index fee08fae67..67fe52350c 100644
--- a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
+++ b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
@@ -7,6 +7,7 @@ import com.example.issu_tracker.data.local.FriendDatabase
 import com.example.issu_tracker.data.local.UserDao
 import com.example.issu_tracker.data.repository.*
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestoreSettings
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -36,7 +37,10 @@ object RepositoryModule {
 
     @Provides
     fun provideFireStoreDB(): FirebaseFirestore {
-        return FirebaseFirestore.getInstance()
+        val setting = firestoreSettings { isPersistenceEnabled = false }
+        val db = FirebaseFirestore.getInstance()
+        db.firestoreSettings = setting
+        return db
     }
 
     @Provides
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
index d14bfd95bc..9ac2b16f2a 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.issu_tracker.data.repository.Repository
 import com.example.issu_tracker.data.User
+import com.example.issu_tracker.data.network.NetworkResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -12,22 +13,26 @@ import javax.inject.Inject
 
 @HiltViewModel
 class AccountViewModel @Inject constructor(private val repository: Repository) : ViewModel() {
-    private val _friendList = MutableStateFlow<List<User>>(listOf())
-    val friendList: StateFlow<List<User>> = _friendList
+    private val _friendList = MutableStateFlow<NetworkResult<List<User>>>(NetworkResult.Loading())
+    val friendList: StateFlow<NetworkResult<List<User>>> = _friendList
+
 
     fun loadFriendList() {
         viewModelScope.launch {
-            _friendList.value = repository.loadFriendList()
+            val result = repository.loadFriendList()
+            _friendList.value = result
         }
     }
 
     fun dltFriend(user: User) {
         viewModelScope.launch {
-            val updateList = friendList.value.toMutableList()
-            updateList.remove(user)
-            repository.updateFriend(updateList)
-            _friendList.value = repository.loadFriendListFromRemote()
-            repository.updateRemoteDatabase()
+            if (friendList.value is NetworkResult.Success) {
+                val updateList = (friendList.value as NetworkResult.Success).data.toMutableList()
+                updateList.remove(user)
+                repository.updateFriend(updateList)
+                loadFriendList()
+                repository.updateRemoteDatabase()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
index a0992ee3c3..557dcbb50b 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
@@ -1,9 +1,12 @@
 package com.example.issu_tracker.ui.account
 
+import android.net.Network
+import android.net.NetworkRequest
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.databinding.BindingAdapter
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -13,6 +16,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.issu_tracker.R
+import com.example.issu_tracker.data.network.NetworkResult
 import com.example.issu_tracker.databinding.FragmentIssueBinding
 import com.example.issu_tracker.databinding.FragmentMyAccountBinding
 import com.google.firebase.firestore.auth.User
@@ -33,7 +37,6 @@ class MyAccountFragment : Fragment() {
         setRecyclerView()
         listenFriendListUpdate()
 
-
         return binding.root
     }
 
@@ -41,7 +44,16 @@ class MyAccountFragment : Fragment() {
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 accountViewModel.friendList.collect {
-                    adapter.submitList(it)
+                    if (it is NetworkResult.Success) {
+                        adapter.submitList(it.data)
+                    } else if (it is NetworkResult.Cached) {
+                        adapter.submitList(it.data)
+                        Toast.makeText(
+                            this@MyAccountFragment.requireContext(),
+                            "최신 데이터가 아닐 수 있습니다",
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
                 }
             }
         }
@@ -51,7 +63,7 @@ class MyAccountFragment : Fragment() {
     private fun setRecyclerView() {
         accountViewModel.loadFriendList()
 
-        adapter = FriendAdapter(object :UserAdapterEventListener{
+        adapter = FriendAdapter(object : UserAdapterEventListener {
             override fun dltUser(user: com.example.issu_tracker.data.User) {
                 accountViewModel.dltFriend(user)
             }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
index 399ce5a52b..fdd57887cd 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailEditDialogFragment.kt
@@ -11,7 +11,7 @@ import com.example.issu_tracker.databinding.DetailEditDialogFragmentBinding
 import java.lang.StringBuilder
 
 
-class DetailEditDialogFragment(val labelNameList: List<String>, mileStoneName: String? = null) :
+class DetailEditDialogFragment(private val labelNameList: List<String>, mileStoneName: String? = null) :
     DialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

From bd279568bf7450ea47ff50a98eb0823f1ba97916 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Fri, 1 Jul 2022 01:27:50 +0900
Subject: [PATCH 05/13] =?UTF-8?q?feat=20:=20Issue=EC=9D=98=20Entitiy=20?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 ++
 .../com/example/issu_tracker/data/Comment.kt  |  2 +
 .../com/example/issu_tracker/data/Issue.kt    | 42 ++++++++++++++++++-
 .../com/example/issu_tracker/data/Label.kt    |  3 +-
 .../issu_tracker/data/local/FriendDatabase.kt | 10 -----
 .../issu_tracker/data/local/IssueDao.kt       | 24 +++++++++++
 .../data/local/IssueTrackerDatabase.kt        | 16 +++++++
 7 files changed, 88 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
 create mode 100644 app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
 create mode 100644 app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt

diff --git a/app/build.gradle b/app/build.gradle
index a777ba42b9..c00c0dfaae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,6 +38,9 @@ android {
 }
 
 dependencies {
+
+    implementation 'com.google.code.gson:gson:2.9.0'
+
     //Room
     implementation "androidx.room:room-ktx:2.4.2"
     kapt "androidx.room:room-compiler:2.4.2"
diff --git a/app/src/main/java/com/example/issu_tracker/data/Comment.kt b/app/src/main/java/com/example/issu_tracker/data/Comment.kt
index f0ce20d15d..4940a67308 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Comment.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Comment.kt
@@ -1,7 +1,9 @@
 package com.example.issu_tracker.data
 
+import androidx.room.Entity
 import java.io.Serializable
 
+@Entity
 data class Comment(
     val user: User? = null,
     val content: String = "",
diff --git a/app/src/main/java/com/example/issu_tracker/data/Issue.kt b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
index 1f7eff9924..4ce14940e6 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Issue.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
@@ -1,5 +1,8 @@
 package com.example.issu_tracker.data
 
+import androidx.room.*
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import java.io.Serializable
 import java.lang.Exception
 
@@ -14,7 +17,9 @@ data class IssueDto(
     val user: User? = null
 )
 
+@Entity
 data class Issue(
+    @ColumnInfo(name = "issue_id")
     var id: String,
     val comments: List<Comment>,
     val description: String,
@@ -22,8 +27,43 @@ data class Issue(
     val mileStone: String,
     val state: Boolean,
     val title: String,
+    @Embedded
     val user: User
-) : Serializable
+) : Serializable{
+    @PrimaryKey(autoGenerate = true)
+    var idx: Int = 0
+}
+
+class Converters {
+    @TypeConverter
+    fun fromCommentList(comments: List<Comment>): String? {
+        val gson = Gson()
+        val type = object : TypeToken<List<Comment>>() {}.type
+        return gson.toJson(comments, type)
+    }
+
+    @TypeConverter
+    fun toCommentList(value: String?): List<Comment> {
+        val gson = Gson()
+        val type = object : TypeToken<List<Comment>>() {}.type
+        return gson.fromJson(value, type)
+    }
+
+    @TypeConverter
+    fun fromLabelList(comments: List<Label>): String? {
+        val gson = Gson()
+        val type = object : TypeToken<List<Label>>() {}.type
+        return gson.toJson(comments, type)
+    }
+
+    @TypeConverter
+    fun toLabelList(value: String?): List<Label> {
+        val gson = Gson()
+        val type = object : TypeToken<List<Label>>() {}.type
+        return gson.fromJson(value, type)
+    }
+
+}
 
 fun IssueDto.toIssue(): Issue? {
     return try {
diff --git a/app/src/main/java/com/example/issu_tracker/data/Label.kt b/app/src/main/java/com/example/issu_tracker/data/Label.kt
index b159732d1e..752440972a 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Label.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Label.kt
@@ -1,5 +1,6 @@
 package com.example.issu_tracker.data
 
+import androidx.room.Entity
 import java.io.Serializable
-
+@Entity
 data class Label(val color: String = "", val content: String = "") :Serializable
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
deleted file mode 100644
index b166100384..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.example.issu_tracker.data.local
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import com.example.issu_tracker.data.User
-
-@Database(entities = [User::class], version = 1)
-abstract class FriendDatabase : RoomDatabase() {
-    abstract fun userDao(): UserDao
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
new file mode 100644
index 0000000000..748b9a5e74
--- /dev/null
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
@@ -0,0 +1,24 @@
+package com.example.issu_tracker.data.local
+
+import androidx.room.*
+import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.User
+
+
+@Dao
+interface IssueDao {
+    @Insert
+    suspend fun insert(issue: Issue)
+
+    @Delete
+    suspend fun delete(issue: Issue)
+
+    @Query("SELECT * FROM Issue") // 테이블의 모든 값을 가져와라
+    suspend fun getAll(): List<Issue>
+
+    @Query("DELETE FROM Issue WHERE id = :id")
+    suspend fun deleteIssueByName(id: String)
+
+    @Query("DELETE FROM Issue")
+    suspend fun deleteAllIssue()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
new file mode 100644
index 0000000000..c7f80b7691
--- /dev/null
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
@@ -0,0 +1,16 @@
+package com.example.issu_tracker.data.local
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import com.example.issu_tracker.data.Comment
+import com.example.issu_tracker.data.Converters
+import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.User
+
+@Database(entities = [User::class , Issue::class ], version = 1)
+@TypeConverters(Converters::class)
+abstract class IssueTrackerDatabase : RoomDatabase() {
+    abstract fun userDao(): UserDao
+    abstract fun issueDao(): IssueDao
+}
\ No newline at end of file

From 33f502686c3dae0873c75d5c4b5b75de103e3de3 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Fri, 1 Jul 2022 01:28:35 +0900
Subject: [PATCH 06/13] =?UTF-8?q?feat:=20Issue=20=EC=9D=91=EB=8B=B5=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=84=A4=ED=8A=B8=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=20=EC=83=81=ED=83=9C=EC=B2=98=EB=A6=AC=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/repository/HomeRepository.kt         |  3 +-
 .../data/repository/HomeRepositoryImpl.kt     | 40 ++++++++-------
 .../data/repository/Repository.kt             |  6 +--
 .../issu_tracker/di/RepositoryModule.kt       | 19 ++++---
 .../issu_tracker/ui/home/HomeViewModel.kt     | 49 ++++++++++---------
 .../issu_tracker/ui/issue/IssueFragment.kt    |  8 ++-
 .../ui/issue/IssueSearchFragment.kt           |  2 +-
 7 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
index 47fb2084ba..7f6a7dd1b4 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
@@ -2,10 +2,11 @@ package com.example.issu_tracker.data.repository
 
 import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.data.User
+import com.example.issu_tracker.data.network.NetworkResult
 
 interface HomeRepository {
 
-    suspend fun loadIssues(): List<Issue>
+    suspend fun loadIssues(): NetworkResult<List<Issue>>
     suspend fun updateIssueState(itemId: String, boolean: Boolean)
 
     suspend fun deleteIssueList(list: List<Issue>)
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
index 52660d9391..6309c3e063 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
@@ -1,38 +1,44 @@
 package com.example.issu_tracker.data.repository
 
-import android.util.Log
+
 import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.data.IssueDto
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.data.local.FriendDatabase
+
+import com.example.issu_tracker.data.network.NetworkResult
+import com.example.issu_tracker.data.network.NetworkResult.Companion.EMPTY
 import com.example.issu_tracker.data.toIssue
-import com.example.issu_tracker.ui.home.userUid
 import com.google.firebase.firestore.FirebaseFirestore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
-import java.lang.StringBuilder
+import java.lang.Exception
 import javax.inject.Inject
-import kotlin.coroutines.CoroutineContext
 
 class HomeRepositoryImpl @Inject constructor(
     private val fireStore: FirebaseFirestore
 ) : HomeRepository {
-    override suspend fun loadIssues(): List<Issue> {
-        val list = mutableListOf<Issue>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
+    override suspend fun loadIssues(): NetworkResult<List<Issue>> {
+        try {
+            val list = mutableListOf<Issue>()
+            val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
 
-        collectionData.documents.forEach {
-            val issueObj = it.toObject(IssueDto::class.java)
-            issueObj?.id = it.id
-            issueObj?.let { it1 ->
-                it1.toIssue()?.let { it2 -> list.add(it2) }
-                // 데이터를 추가하는 코드
-                // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+            collectionData.documents.forEach {
+                val issueObj = it.toObject(IssueDto::class.java)
+                issueObj?.id = it.id
+                issueObj?.let { it1 ->
+                    it1.toIssue()?.let { it2 -> list.add(it2) }
+                    // 데이터를 추가하는 코드
+                    // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+                }
             }
+            return if (list.isEmpty()) {
+                NetworkResult.Error(EMPTY)
+            } else NetworkResult.Success(list)
+
+        } catch (e: Exception) {
+            return NetworkResult.Exception(e)
         }
-        return list
     }
 
     override suspend fun updateIssueState(itemId: String, boolean: Boolean) {
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
index d8b568a4e5..8d25632a4e 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
@@ -2,16 +2,16 @@ package com.example.issu_tracker.data.repository
 
 import android.util.Log
 import com.example.issu_tracker.data.User
-import com.example.issu_tracker.data.local.FriendDatabase
+import com.example.issu_tracker.data.local.IssueTrackerDatabase
+
 import com.example.issu_tracker.data.network.NetworkResult
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.lang.Exception
 import javax.inject.Inject
 
 class Repository @Inject constructor(
-    private val friendLocalDatabase: FriendDatabase,
+    private val friendLocalDatabase: IssueTrackerDatabase,
     private val friendRemoteDatabase: FriendRemoteRepository
 ) {
     suspend fun loadFriendList(): NetworkResult<List<User>> {
diff --git a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
index 67fe52350c..8c5b25fbca 100644
--- a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
+++ b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
@@ -2,8 +2,11 @@ package com.example.issu_tracker.di
 
 import android.content.Context
 import androidx.room.Room
+import com.example.issu_tracker.data.Converters
+import com.example.issu_tracker.data.IssueDto
+import com.example.issu_tracker.data.local.IssueDao
 import com.example.issu_tracker.data.repository.Repository
-import com.example.issu_tracker.data.local.FriendDatabase
+import com.example.issu_tracker.data.local.IssueTrackerDatabase
 import com.example.issu_tracker.data.local.UserDao
 import com.example.issu_tracker.data.repository.*
 import com.google.firebase.firestore.FirebaseFirestore
@@ -19,7 +22,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 object RepositoryModule {
 
-
     @Provides
     fun provideHomeRepository(fireStore: FirebaseFirestore): HomeRepository {
         return HomeRepositoryImpl(fireStore)
@@ -52,18 +54,23 @@ object RepositoryModule {
     @Provides
     fun provideUserLocalDataBase(
         @ApplicationContext context: Context
-    ): FriendDatabase = Room
-        .databaseBuilder(context, FriendDatabase::class.java, "friend.db")
+    ): IssueTrackerDatabase = Room
+        .databaseBuilder(context, IssueTrackerDatabase::class.java, "friend.db")
+        .addTypeConverter(Converters())
         .build()
 
     @Singleton
     @Provides
-    fun provideUserDao(friendDatabase: FriendDatabase): UserDao = friendDatabase.userDao()
+    fun provideUserDao(friendDatabase: IssueTrackerDatabase): UserDao = friendDatabase.userDao()
+
+    @Singleton
+    @Provides
+    fun provideIssueDao(friendDatabase: IssueTrackerDatabase): IssueDao = friendDatabase.issueDao()
 
     @Singleton
     @Provides
     fun provideRepository(
-        friendDatabase: FriendDatabase,
+        friendDatabase: IssueTrackerDatabase,
         friendRemoteDatabase: FriendRemoteRepository
     ): Repository = Repository(
         friendDatabase, friendRemoteDatabase
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 9ab0898288..0824a279e0 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.issu_tracker.data.FilterCondition
 import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.network.NetworkResult
 import com.example.issu_tracker.data.repository.HomeRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -15,8 +16,8 @@ import javax.inject.Inject
 @HiltViewModel
 class HomeViewModel @Inject constructor(private val repository: HomeRepository) : ViewModel() {
 
-    private val _issueList = MutableStateFlow<List<Issue>>(listOf())
-    val issueList: StateFlow<List<Issue>> = _issueList
+    private val _issueList = MutableStateFlow<NetworkResult<List<Issue>>>(NetworkResult.Loading())
+    val issueList: StateFlow<NetworkResult<List<Issue>>> = _issueList
 
     private val _filteredIssueList = MutableStateFlow<List<Issue>>(listOf())
     val filteredIssueList: StateFlow<List<Issue>> = _filteredIssueList
@@ -36,7 +37,7 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
         repository.updateIssueState(itemId, boolean)
         getIssueList()
     }
-    
+
     suspend fun deleteIssueList(issueList: List<Issue>) {
         repository.deleteIssueList(issueList)
         getIssueList()
@@ -50,31 +51,33 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
     }
 
     fun filterIssueList(condition: FilterCondition) {
-        val filteredIssueList = _issueList.value
-            .filter {
-                if (condition.state.isNotEmpty()) {
-                    it.state
-                } else {
-                    true
-                }
-            }.filter {
-                if (condition.writer.isNotEmpty()) {
-                    it.user.name == condition.writer
-                } else {
-                    true
-                }
-            }
-            .filter {
-                it.label.any { label ->
-                    if (condition.label.isNotEmpty()) {
-                        label.content == condition.label
+        if (_issueList.value is NetworkResult.Success) {
+            val filteredIssueList = (_issueList.value as NetworkResult.Success).data
+                .filter {
+                    if (condition.state.isNotEmpty()) {
+                        it.state
                     } else {
                         true
                     }
+                }.filter {
+                    if (condition.writer.isNotEmpty()) {
+                        it.user.name == condition.writer
+                    } else {
+                        true
+                    }
+                }
+                .filter {
+                    it.label.any { label ->
+                        if (condition.label.isNotEmpty()) {
+                            label.content == condition.label
+                        } else {
+                            true
+                        }
+                    }
                 }
-            }
 
-        _filteredIssueList.value = filteredIssueList
+            _filteredIssueList.value = filteredIssueList
+        }
     }
 }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index ca754f3cf1..d36be234fb 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -1,6 +1,7 @@
 package com.example.issu_tracker.ui.issue
 
 import android.content.Intent
+import android.net.Network
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -22,6 +23,7 @@ import com.example.issu_tracker.R
 import com.example.issu_tracker.ui.common.SwipeHelperCallback
 import com.example.issu_tracker.data.FilterCondition
 import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.network.NetworkResult
 import com.example.issu_tracker.databinding.FragmentIssueBinding
 import com.example.issu_tracker.ui.detail.DetailIssueActivity
 import com.example.issu_tracker.ui.home.HomeViewModel
@@ -116,7 +118,9 @@ class IssueFragment : Fragment() {
                 launch {
                     // open 상태만 보여주기
                     homeViewModel.issueList.collect {
-                        issueAdapter.submitList(it.filter { it.state })
+                        if (it is NetworkResult.Success) {
+                            issueAdapter.submitList(it.data.filter { it.state })
+                        }
                     }
                 }
 //                launch {
@@ -151,7 +155,7 @@ class IssueFragment : Fragment() {
                 issueAdapter.isEditMode = false
                 binding.clIssueOriginalModeTop.visibility = View.VISIBLE
                 binding.clIssueEditModeTop.visibility = View.GONE
-                Log.d("sdsd" , "sdsd")
+                Log.d("sdsd", "sdsd")
                 itemTouchHelper.attachToRecyclerView(binding.rvIssue)
             }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
index 3f26778f61..55350485ab 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
@@ -54,7 +54,7 @@ class IssueSearchFragment : Fragment() {
 
     private fun initIssueList() {
         val originalIssueList = homeViewModel.issueList.value
-        issueSearchViewModel.initIssueList(originalIssueList)
+       // issueSearchViewModel.initIssueList(originalIssueList)
     }
 
     private fun setNavigationIconEventListener() {

From ad7dc68f6812f65ec1dc13b594c6631e0ffc532e Mon Sep 17 00:00:00 2001
From: cherrylime69 <zerolecture0922@gmail.com>
Date: Fri, 1 Jul 2022 12:07:21 +0900
Subject: [PATCH 07/13] =?UTF-8?q?feat=20:=20firebase=20=EB=A5=BC=20?=
 =?UTF-8?q?=ED=99=9C=EC=9A=A9=ED=95=98=EC=97=AC=20=EC=9D=B4=EC=8A=88=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- sealed class 를 생성하여 실제 issue 와 progress bar 구분
- ProgressBar ViewType 타입 할당
- Is 연산자를 활용하여 sealed class 구분
- firebase의 limit 과 startAfter 메서드를 활용하여 페이징 처리
---
 .../com/example/issu_tracker/data/Issue.kt    |  33 ++--
 .../data/repository/HomeRepository.kt         |  11 +-
 .../data/repository/HomeRepositoryImpl.kt     | 102 +++++++++---
 .../data/repository/IssueEditorRepository.kt  |   4 +-
 .../repository/IssueEditorRepositoryImpl.kt   |  14 +-
 .../ui/common/SwipeHelperCallback.kt          |  20 ++-
 .../ui/detail/DetailIssueActivity.kt          |  17 +-
 .../issu_tracker/ui/home/HomeViewModel.kt     |  52 +++---
 .../issu_tracker/ui/issue/IssueAdapter.kt     | 153 ++++++++++--------
 .../ui/issue/IssueEditorViewModel.kt          |   4 +-
 .../issu_tracker/ui/issue/IssueFragment.kt    |  59 +++++--
 .../ui/issue/IssueSearchAdapter.kt            |  23 +--
 .../ui/issue/IssueSearchFragment.kt           |   2 +-
 .../ui/issue/IssueSearchViewModel.kt          |  11 +-
 .../issu_tracker/ui/issue/IssueViewModel.kt   |  11 +-
 app/src/main/res/layout/item_issue.xml        |   2 +-
 app/src/main/res/layout/item_loading.xml      |  23 +++
 17 files changed, 357 insertions(+), 184 deletions(-)
 create mode 100644 app/src/main/res/layout/item_loading.xml

diff --git a/app/src/main/java/com/example/issu_tracker/data/Issue.kt b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
index 1f7eff9924..2901a2e83b 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Issue.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
@@ -14,20 +14,27 @@ data class IssueDto(
     val user: User? = null
 )
 
-data class Issue(
-    var id: String,
-    val comments: List<Comment>,
-    val description: String,
-    val label: List<Label>,
-    val mileStone: String,
-    val state: Boolean,
-    val title: String,
-    val user: User
-) : Serializable
-
-fun IssueDto.toIssue(): Issue? {
+sealed class IssueList : Serializable {
+
+    object IssueProgressBar : IssueList()
+
+    data class Issue(
+        var id: String,
+        val comments: List<Comment>,
+        val description: String,
+        val label: List<Label>,
+        val mileStone: String,
+        val state: Boolean,
+        val title: String,
+        val user: User
+    ) : Serializable, IssueList()
+}
+
+
+
+fun IssueDto.toIssue(): IssueList.Issue? {
     return try {
-        Issue(id, comments, description, label, mileStoneID, state, title, user!!)
+        IssueList.Issue(id, comments, description, label, mileStoneID, state, title, user!!)
     } catch (e: Exception) {
         null
     }
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
index 47fb2084ba..5c1b41b350 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
@@ -1,14 +1,13 @@
 package com.example.issu_tracker.data.repository
 
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.User
+import com.example.issu_tracker.data.IssueList
 
 interface HomeRepository {
 
-    suspend fun loadIssues(): List<Issue>
+    suspend fun loadFirstPageIssues(): List<IssueList>
+    suspend fun loadNextPageIssues(): List<IssueList>
     suspend fun updateIssueState(itemId: String, boolean: Boolean)
+    suspend fun deleteIssueList(list: List<IssueList>)
+    suspend fun updateIssueListState(list: List<IssueList>, boolean: Boolean)
 
-    suspend fun deleteIssueList(list: List<Issue>)
-
-    suspend fun updateIssueListState(list: List<Issue>, boolean: Boolean)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
index 52660d9391..392ff84e65 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
@@ -1,40 +1,100 @@
 package com.example.issu_tracker.data.repository
 
-import android.util.Log
-import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.data.IssueDto
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.data.local.FriendDatabase
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.toIssue
-import com.example.issu_tracker.ui.home.userUid
+import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.QuerySnapshot
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
-import java.lang.StringBuilder
 import javax.inject.Inject
-import kotlin.coroutines.CoroutineContext
 
 class HomeRepositoryImpl @Inject constructor(
     private val fireStore: FirebaseFirestore
 ) : HomeRepository {
-    override suspend fun loadIssues(): List<Issue> {
-        val list = mutableListOf<Issue>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
+
+    private var lastVisibleDoc: DocumentSnapshot? = null
+
+    /* override suspend fun loadIssues(): List<Issue> {
+         val list = mutableListOf<Issue>()
+         val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
+
+         collectionData.documents.forEach {
+             val issueObj = it.toObject(IssueDto::class.java)
+             issueObj?.id = it.id
+             issueObj?.let { it1 ->
+                 it1.toIssue()?.let { it2 -> list.add(it2) }
+                 // 데이터를 추가하는 코드
+                 // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+             }
+         }
+         return list
+     }*/
+
+    override suspend fun loadFirstPageIssues(): List<IssueList> {
+        val list = mutableListOf<IssueList>()
+        val collectionData =
+            fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title").limit(10).get()
+                .await()
+        lastVisibleDoc = collectionData.documents.last()
+
+        /*  val collectionData: QuerySnapshot = if (lastVisibleDoc != null) {
+              fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).limit(10).get().await()
+          } else {
+              fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).startAfter(lastVisibleDoc)
+                  .limit(10).get().await()
+          }*/
 
         collectionData.documents.forEach {
             val issueObj = it.toObject(IssueDto::class.java)
             issueObj?.id = it.id
-            issueObj?.let { it1 ->
-                it1.toIssue()?.let { it2 -> list.add(it2) }
+            issueObj?.let { issueDto ->
+                issueDto.toIssue()?.let { issue ->
+                    list.add(issue)
+                }
                 // 데이터를 추가하는 코드
-                // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+                // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(issueDto)
             }
         }
         return list
     }
 
+    override suspend fun loadNextPageIssues(): List<IssueList> {
+        val list = mutableListOf<IssueList>()
+        println(lastVisibleDoc)
+        val test = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title").limit(10).get().await().documents.last()
+        val collectionData =
+            fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH)
+                .orderBy("title")
+                .startAfter(lastVisibleDoc)
+                .limit(10)
+                .get()
+                .await()
+
+        println("진짜? ${collectionData.isEmpty}")
+
+
+         collectionData.documents.forEach {
+             val issueObj = it.toObject(IssueDto::class.java)
+             issueObj?.id = it.id
+             issueObj?.let { issueDto ->
+                 issueDto.toIssue()?.let { issue ->
+                     list.add(issue) }
+                 // 데이터를 추가하는 코드
+                 // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+             }
+         }
+
+         if (collectionData.documents.isNotEmpty()) {
+             lastVisibleDoc = collectionData.documents.last()
+         }
+
+        return list
+    }
+
     override suspend fun updateIssueState(itemId: String, boolean: Boolean) {
 
         fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(itemId)
@@ -42,28 +102,28 @@ class HomeRepositoryImpl @Inject constructor(
 
     }
 
-
-    override suspend fun deleteIssueList(list: List<Issue>) {
+    override suspend fun deleteIssueList(list: List<IssueList>) {
         CoroutineScope(Dispatchers.IO).launch {
             for (i in list) {
-                fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id).delete()
+                if (i is IssueList.Issue)
+                    fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id).delete()
             }
         }.join()
     }
 
-
-    override suspend fun updateIssueListState(list: List<Issue>, boolean: Boolean) {
+    override suspend fun updateIssueListState(list: List<IssueList>, boolean: Boolean) {
         CoroutineScope(Dispatchers.IO).launch {
             for (i in list) {
-                fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id)
-                    .update("state", false)
+                if (i is IssueList.Issue)
+                    fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id)
+                        .update("state", false)
             }
         }.join()
     }
 
 
     companion object {
-        const val FIREBASE_COLLECTION_ISSUE_PATH = "Issue2"
+        const val FIREBASE_COLLECTION_ISSUE_PATH = "Issue"
         const val FIREBASE_COLLECTION_FRIEND_PATH = "User"
     }
 }
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
index 11a0b2936a..e272966d81 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
@@ -1,6 +1,6 @@
 package com.example.issu_tracker.data.repository
 
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.Label
 import com.example.issu_tracker.data.User
 
@@ -8,7 +8,7 @@ interface IssueEditorRepository {
 
     suspend fun loadLabel(): Map<String, Label>
     suspend fun loadAssignee(): Map<String, User>
-    fun createNewIssue(newIssue: Issue)
+    fun createNewIssue(newIssue: IssueList)
     suspend fun uploadImageAndGetImageUriFromFireBase(uri: String): String
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
index 5d36375ad9..b1a6d67065 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
@@ -2,7 +2,7 @@ package com.example.issu_tracker.data.repository
 
 import android.util.Log
 import androidx.core.net.toUri
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.Label
 import com.example.issu_tracker.data.User
 import com.google.firebase.firestore.FirebaseFirestore
@@ -40,11 +40,13 @@ class IssueEditorRepositoryImpl @Inject constructor(private val fireStore: Fireb
         return assigneeList
     }
 
-    override fun createNewIssue(newIssue: Issue) {
-        fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(newIssue)
-            .addOnSuccessListener {
-                println("성공")
-            }
+    override fun createNewIssue(newIssue: IssueList) {
+        if (newIssue is IssueList.Issue) {
+            fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(newIssue)
+                .addOnSuccessListener {
+                    println("성공")
+                }
+        }
     }
 
     override suspend fun uploadImageAndGetImageUriFromFireBase(imageUriFromLocal: String): String {
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt b/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
index 3e8ddc21b5..aaeb5a0734 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.ItemTouchHelper.LEFT
 import androidx.recyclerview.widget.ItemTouchHelper.RIGHT
 import androidx.recyclerview.widget.RecyclerView
 import com.example.issu_tracker.R
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.ui.issue.IssueAdapter
 import java.lang.Math.max
 
@@ -20,10 +21,11 @@ class SwipeHelperCallback() : ItemTouchHelper.Callback() {
         recyclerView: RecyclerView,
         viewHolder: RecyclerView.ViewHolder
     ): Int {
-
-        val view = getView(viewHolder)
-        clamp = view.width.toFloat() * (0.3f)
-        return makeMovementFlags(0, LEFT or RIGHT)
+        return if (viewHolder is IssueAdapter.IssueViewHolder) {
+            val view = getView(viewHolder)
+            clamp = view.width.toFloat() * (0.3f)
+            makeMovementFlags(0, LEFT or RIGHT)
+        } else 0
     }
 
 
@@ -47,10 +49,12 @@ class SwipeHelperCallback() : ItemTouchHelper.Callback() {
         // 현재 위치가 clamp 이상 갔을 때 스와이프 상태로 판단한다.
         // 스와이프 위치적으로 없어지는 기준 설정
         (viewHolder as IssueAdapter.IssueViewHolder).issue?.let {
-            if (currentDx <= -clamp) {
-                viewHolder.addSwipedIssue(it)
-            } else {
-                viewHolder.deleteSwipedIssue(it)
+            if (it is IssueList.Issue) {
+                if (currentDx <= -clamp) {
+                    viewHolder.addSwipedIssue(it)
+                } else {
+                    viewHolder.deleteSwipedIssue(it)
+                }
             }
         }
         return 2f
diff --git a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailIssueActivity.kt b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailIssueActivity.kt
index 7471fd53a0..0b4e56c255 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/detail/DetailIssueActivity.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/detail/DetailIssueActivity.kt
@@ -1,33 +1,36 @@
 package com.example.issu_tracker.ui.detail
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Context
 import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.issu_tracker.R
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.databinding.ActivityDetailIssueBinding
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class DetailIssueActivity : AppCompatActivity() {
-    lateinit var binding: ActivityDetailIssueBinding
-    lateinit var issue: Issue
+    private lateinit var binding: ActivityDetailIssueBinding
+    private lateinit var issue: IssueList.Issue
     private lateinit var adapter: CommentAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_detail_issue)
 
-        issue = intent.extras?.get("issue") as Issue
-        binding.tvIssueTitle.text = issue.title
-
         adapter = CommentAdapter(object : DetailEventListener {
             override fun onClicked() {
                 // TODO 자신의 코멘트 더보기 클릭시 구현사항 논의 필요
             }
         })
 
+        issue = intent.extras?.get("issue") as IssueList.Issue
+        binding.tvIssueTitle.text = issue.title
+
         setRecyclerview()
 
         binding.ivDetailInfo.setOnClickListener {
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 9ab0898288..7edd7b301e 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -4,7 +4,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.issu_tracker.data.FilterCondition
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.repository.HomeRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -15,11 +15,11 @@ import javax.inject.Inject
 @HiltViewModel
 class HomeViewModel @Inject constructor(private val repository: HomeRepository) : ViewModel() {
 
-    private val _issueList = MutableStateFlow<List<Issue>>(listOf())
-    val issueList: StateFlow<List<Issue>> = _issueList
+    private val _issueListStateFlow = MutableStateFlow<List<IssueList>>(mutableListOf())
+    val issueListStateFlow: StateFlow<List<IssueList>> = _issueListStateFlow
 
-    private val _filteredIssueList = MutableStateFlow<List<Issue>>(listOf())
-    val filteredIssueList: StateFlow<List<Issue>> = _filteredIssueList
+    private val _filteredIssueListStateFlow = MutableStateFlow<List<IssueList>>(listOf())
+    val filteredIssueListStateFlow: StateFlow<List<IssueList>> = _filteredIssueListStateFlow
 
     init {
         viewModelScope.launch {
@@ -28,53 +28,67 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
     }
 
     suspend fun getIssueList() {
-        val issueDummyData = repository.loadIssues()
-        _issueList.value = issueDummyData
+            val issueList = repository.loadFirstPageIssues().toMutableList()
+            issueList.add(IssueList.IssueProgressBar)
+            _issueListStateFlow.value = issueList
+    }
+
+    fun getNextIssueList() {
+        viewModelScope.launch {
+            val issueList = _issueListStateFlow.value.toMutableList()
+            issueList.removeLast()
+            issueList.addAll(repository.loadNextPageIssues())
+            issueList.add(IssueList.IssueProgressBar)
+            _issueListStateFlow.value = issueList
+        }
     }
 
     suspend fun updateIssueSate(itemId: String, boolean: Boolean) {
         repository.updateIssueState(itemId, boolean)
         getIssueList()
     }
-    
-    suspend fun deleteIssueList(issueList: List<Issue>) {
+
+    suspend fun deleteIssueList(issueList: List<IssueList>) {
         repository.deleteIssueList(issueList)
         getIssueList()
         Log.d("updateDelte", issueList.toString())
     }
 
-    suspend fun updateIssueList(issueList: List<Issue>, boolean: Boolean) {
+    suspend fun updateIssueList(issueList: List<IssueList>, boolean: Boolean) {
         repository.updateIssueListState(issueList, boolean)
         getIssueList()
         Log.d("updateDelte", issueList.toString())
     }
 
     fun filterIssueList(condition: FilterCondition) {
-        val filteredIssueList = _issueList.value
+        val filteredIssueList = _issueListStateFlow.value
             .filter {
-                if (condition.state.isNotEmpty()) {
+                if (condition.state.isNotEmpty() && it is IssueList.Issue) {
                     it.state
                 } else {
                     true
                 }
             }.filter {
-                if (condition.writer.isNotEmpty()) {
+                if (condition.writer.isNotEmpty() && it is IssueList.Issue) {
                     it.user.name == condition.writer
                 } else {
                     true
                 }
             }
             .filter {
-                it.label.any { label ->
-                    if (condition.label.isNotEmpty()) {
-                        label.content == condition.label
-                    } else {
-                        true
+                if (it is IssueList.Issue) {
+                    it.label.any { label ->
+                        if (condition.label.isNotEmpty()) {
+                            label.content == condition.label
+                        } else {
+                            true
+                        }
                     }
                 }
+                false
             }
 
-        _filteredIssueList.value = filteredIssueList
+        _filteredIssueListStateFlow.value = filteredIssueList
     }
 }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
index 03749fd199..3f51952d0f 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
@@ -1,6 +1,5 @@
 package com.example.issu_tracker.ui.issue
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,84 +9,107 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.example.issu_tracker.R
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.databinding.ItemIssueBinding
+import com.example.issu_tracker.databinding.ItemLoadingBinding
 
 
-class IssueAdapter() : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil) {
+class IssueAdapter() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private val issueListItems = mutableListOf<IssueList>()
     var issueAdapterEventListener: IssueAdapterEventListener? = null
     var isEditMode = false
-    val swipedIssueList = mutableListOf<Issue>()
+    val swipedIssueList = mutableListOf<IssueList.Issue>()
     var rootWidth = 0
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IssueViewHolder {
-        val binding: ItemIssueBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(parent.context),
-            R.layout.item_issue,
-            parent,
-            false
-        )
-        return IssueViewHolder(binding)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            VIEW_TYPE_ISSUE -> {
+                val binding: ItemIssueBinding = DataBindingUtil.inflate(
+                    LayoutInflater.from(parent.context),
+                    R.layout.item_issue,
+                    parent,
+                    false
+                )
+                IssueViewHolder(binding)
+            }
+            else -> {
+                val binding =
+                    ItemLoadingBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+                IssueLoadViewHolder(binding)
+            }
+        }
     }
 
-    override fun onBindViewHolder(holder: IssueViewHolder, position: Int) {
-        holder.bind(getItem(position))
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (holder is IssueAdapter.IssueViewHolder) {
+            holder.bind(issueListItems[position])
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (issueListItems[position]) {
+            is IssueList.Issue -> VIEW_TYPE_ISSUE
+            else -> VIEW_TYPE_ISSUE_PROGRESS_BAR
+        }
     }
 
     inner class IssueViewHolder(private val binding: ItemIssueBinding) :
         RecyclerView.ViewHolder(binding.root) {
-        var issue: Issue? = null
-        fun addSwipedIssue(issue: Issue) = swipedIssueList.add(issue)
-        fun deleteSwipedIssue(issue: Issue) = swipedIssueList.remove(issue)
-        fun getSwipedIssueList(): List<Issue> {
+        var issue: IssueList? = null
+        fun addSwipedIssue(issue: IssueList.Issue) = swipedIssueList.add(issue)
+        fun deleteSwipedIssue(issue: IssueList.Issue) = swipedIssueList.remove(issue)
+        fun getSwipedIssueList(): List<IssueList> {
             return swipedIssueList
         }
 
-        fun bind(issue: Issue) {
-            this.issue = issue
-            binding.issue = issue
-
-            if (rootWidth == 0) {
-                getRootWidth()
-            }
+        fun bind(issue: IssueList) {
+            if (issue is IssueList.Issue) {
+                this.issue = issue
+                binding.issue = issue
 
-            // 스와이프 상태 유지 코드
-            if (swipedIssueList.contains(issue)) {
-                binding.clSwipeContainer.x =
-                    (rootWidth) * (-1f / 10 * 3)
-            } else binding.clSwipeContainer.translationX = 0f
+                if (rootWidth == 0) {
+                    getRootWidth()
+                }
 
-            // 스와이프 후 클릭시 닫기
-            binding.tvDeleteClose.setOnClickListener {
+                // 스와이프 상태 유지 코드
                 if (swipedIssueList.contains(issue)) {
-                    issueAdapterEventListener?.updateIssueState(issue.id, false)
-                    swipedIssueList.remove(issue)
+                    binding.clSwipeContainer.x =
+                        (rootWidth) * (-1f / 10 * 3)
+                } else binding.clSwipeContainer.translationX = 0f
+
+                // 스와이프 후 클릭시 닫기
+                binding.tvDeleteClose.setOnClickListener {
+                    if (swipedIssueList.contains(issue)) {
+                        println("이건 됨")
+                        issueAdapterEventListener?.updateIssueState(issue.id, false)
+                        swipedIssueList.remove(issue)
+                    }
                 }
-            }
 
-            // EditMode 에서의 상단 변화 코드
-            if (isEditMode) {
-                binding.cbIssueSelector.visibility = View.VISIBLE
-                binding.cbIssueSelector.isChecked = false
-            } else {
-                binding.cbIssueSelector.visibility = View.GONE
-            }
+                // EditMode 에서의 상단 변화 코드
+                if (isEditMode) {
+                    binding.cbIssueSelector.visibility = View.VISIBLE
+                    binding.cbIssueSelector.isChecked = false
+                } else {
+                    binding.cbIssueSelector.visibility = View.GONE
+                }
 
-            binding.root.setOnLongClickListener {
-                issueAdapterEventListener?.switchToEditMode(issue.id)
-                return@setOnLongClickListener (true)
-            }
+                binding.root.setOnLongClickListener {
+                    issueAdapterEventListener?.switchToEditMode(issue.id)
+                    return@setOnLongClickListener (true)
+                }
 
 
-            binding.root.setOnClickListener {
-                issueAdapterEventListener?.getIntoDetail(issue)
-            }
+                binding.root.setOnClickListener {
+                    issueAdapterEventListener?.getIntoDetail(issue)
+                }
 
-            // EditMode 에서의 셀렉팅
-            binding.cbIssueSelector.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) {
-                    issueAdapterEventListener?.addInCheckList(issue)
-                } else issueAdapterEventListener?.deleteInCheckList(issue)
+                // EditMode 에서의 셀렉팅
+                binding.cbIssueSelector.setOnCheckedChangeListener { _, isChecked ->
+                    if (isChecked) {
+                        issueAdapterEventListener?.addInCheckList(issue)
+                    } else issueAdapterEventListener?.deleteInCheckList(issue)
+                }
             }
         }
 
@@ -103,21 +125,20 @@ class IssueAdapter() : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil
         }
     }
 
+    class IssueLoadViewHolder(private val binding: ItemLoadingBinding) :
+        RecyclerView.ViewHolder(binding.root)
 
-    override fun getItemViewType(position: Int): Int {
-        return position
+    override fun getItemCount(): Int {
+        return issueListItems.size
     }
 
-    companion object {
-        val diffUtil = object : DiffUtil.ItemCallback<Issue>() {
-            override fun areItemsTheSame(oldItem: Issue, newItem: Issue): Boolean {
-                return oldItem.title == newItem.title
-            }
-
-            override fun areContentsTheSame(oldItem: Issue, newItem: Issue): Boolean {
-                return oldItem == newItem
-            }
+    fun submitList(issueList: List<IssueList>) {
+        issueListItems.clear()
+        issueListItems.addAll(issueList)
+    }
 
-        }
+    companion object {
+        const val VIEW_TYPE_ISSUE = 0
+        const val VIEW_TYPE_ISSUE_PROGRESS_BAR = 1
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
index 15460eb002..9855e6db43 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
@@ -3,7 +3,7 @@ package com.example.issu_tracker.ui.issue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.issu_tracker.data.ConditionType
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.Label
 import com.example.issu_tracker.data.User
 import com.example.issu_tracker.data.repository.IssueEditorRepository
@@ -58,7 +58,7 @@ class IssueEditorViewModel @Inject constructor(val repository: IssueEditorReposi
     }
 
     fun createIssue() {
-        val newIssue = Issue(
+        val newIssue = IssueList.Issue(
             id = "",
             comments = listOf(),
             description = _issueBodyStateFlow.value,
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index 80d244a186..8a888760e4 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -15,14 +15,14 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
-import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.example.issu_tracker.R
-import com.example.issu_tracker.ui.common.SwipeHelperCallback
 import com.example.issu_tracker.data.FilterCondition
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.databinding.FragmentIssueBinding
+import com.example.issu_tracker.ui.common.SwipeHelperCallback
 import com.example.issu_tracker.ui.detail.DetailIssueActivity
 import com.example.issu_tracker.ui.home.HomeViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,6 +37,7 @@ class IssueFragment : Fragment() {
     private val homeViewModel: HomeViewModel by activityViewModels<HomeViewModel>()
     private lateinit var itemTouchHelper: ItemTouchHelper
     lateinit var swipeHelperCallback: SwipeHelperCallback
+    private var page = 1
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -58,6 +59,8 @@ class IssueFragment : Fragment() {
         listenEditModeEvent()
         setSelectedIssueCount()
         navigateIssueSearch()
+        recyclerView()
+
     }
 
     private fun saveFilterConditionFromFilterFragment() {
@@ -115,12 +118,21 @@ class IssueFragment : Fragment() {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch {
                     // open 상태만 보여주기
-                    homeViewModel.issueList.collect {
-                        issueAdapter.submitList(it.filter { it.state })
+                    homeViewModel.issueListStateFlow.collect {
+                        println("되는건가 $page")
+                        issueAdapter.submitList(it)
+                        issueAdapter.notifyItemRangeChanged((page - 1) * 10, 10)
+                        /* issueAdapter.submitList(it.filter { issue ->
+                             if (issue is IssueList.Issue) {
+                                 println("당신 $issue")
+                                 issue.state
+                             }
+                             else true
+                         })*/
                     }
                 }
                 launch {
-                    homeViewModel.filteredIssueList.collect {
+                    homeViewModel.filteredIssueListStateFlow.collect {
                         if (it.isNotEmpty()) {
                             issueAdapter.submitList(it)
                         }
@@ -130,6 +142,29 @@ class IssueFragment : Fragment() {
         }
     }
 
+    private fun recyclerView() {
+        binding.rvIssue.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                super.onScrolled(recyclerView, dx, dy)
+
+                val layoutManager = recyclerView.layoutManager
+
+                val lastVisibleItemPosition = if (layoutManager is LinearLayoutManager) {
+                        layoutManager.findLastCompletelyVisibleItemPosition()
+                } else 0
+
+                val itemTotalCount = (recyclerView.adapter?.itemCount ?: 0) - 1
+
+                // 스크롤이 끝에 도달했는지 확인
+                if (!recyclerView.canScrollVertically(1) && lastVisibleItemPosition == itemTotalCount) {
+                    page++
+                    homeViewModel.getNextIssueList()
+                }
+
+            }
+        })
+    }
+
 
     private fun settingRecyclerview() {
         issueAdapter = IssueAdapter()
@@ -157,15 +192,15 @@ class IssueFragment : Fragment() {
                 itemTouchHelper.attachToRecyclerView(binding.rvIssue)
             }
 
-            override fun addInCheckList(issue: Issue) {
+            override fun addInCheckList(issue: IssueList.Issue) {
                 issueViewModel.addSelectedIssue(issue)
             }
 
-            override fun deleteInCheckList(issue: Issue) {
+            override fun deleteInCheckList(issue: IssueList.Issue) {
                 issueViewModel.deleteSelectedIssue(issue)
             }
 
-            override fun getIntoDetail(issue: Issue) {
+            override fun getIntoDetail(issue: IssueList.Issue) {
                 val intent = Intent(requireContext(), DetailIssueActivity::class.java)
                 intent.putExtra("issue", issue)
                 startActivity(intent)
@@ -204,7 +239,7 @@ interface IssueAdapterEventListener {
     fun updateIssueState(itemId: String, boolean: Boolean)
     fun switchToEditMode(itemId: String)
     fun switchToOriginMode()
-    fun addInCheckList(issue: Issue)
-    fun deleteInCheckList(issue: Issue)
-    fun getIntoDetail(issue: Issue)
+    fun addInCheckList(issue: IssueList.Issue)
+    fun deleteInCheckList(issue: IssueList.Issue)
+    fun getIntoDetail(issue: IssueList.Issue)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchAdapter.kt
index c6b1e98d69..00ad23c0b6 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchAdapter.kt
@@ -5,10 +5,10 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.databinding.ItemIssueBinding
 
-class IssueSearchAdapter : ListAdapter<Issue, IssueSearchAdapter.ViewHolder>(diffUtil) {
+class IssueSearchAdapter : ListAdapter<IssueList, IssueSearchAdapter.ViewHolder>(diffUtil) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val binding = ItemIssueBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -19,21 +19,26 @@ class IssueSearchAdapter : ListAdapter<Issue, IssueSearchAdapter.ViewHolder>(dif
         holder.bind(getItem(position))
     }
 
-    class ViewHolder(private val binding: ItemIssueBinding) : RecyclerView.ViewHolder(binding.root) {
+    class ViewHolder(private val binding: ItemIssueBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(issue: Issue) {
-            binding.issue = issue
+        fun bind(issue: IssueList) {
+            if (issue is IssueList.Issue) {
+                binding.issue = issue
+            }
         }
 
     }
 
     companion object {
-        val diffUtil = object : DiffUtil.ItemCallback<Issue>() {
-            override fun areItemsTheSame(oldItem: Issue, newItem: Issue): Boolean {
-                return oldItem.title == newItem.title
+        val diffUtil = object : DiffUtil.ItemCallback<IssueList>() {
+            override fun areItemsTheSame(oldItem: IssueList, newItem: IssueList): Boolean {
+                return if (oldItem is IssueList.Issue && newItem is IssueList.Issue) {
+                    oldItem.title == newItem.title
+                } else false
             }
 
-            override fun areContentsTheSame(oldItem: Issue, newItem: Issue): Boolean {
+            override fun areContentsTheSame(oldItem: IssueList, newItem: IssueList): Boolean {
                 return oldItem == newItem
             }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
index 3f26778f61..9ea38e51e9 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
@@ -53,7 +53,7 @@ class IssueSearchFragment : Fragment() {
     }
 
     private fun initIssueList() {
-        val originalIssueList = homeViewModel.issueList.value
+        val originalIssueList = homeViewModel.issueListStateFlow.value
         issueSearchViewModel.initIssueList(originalIssueList)
     }
 
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchViewModel.kt
index e560baddb5..b229ec91a9 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchViewModel.kt
@@ -1,21 +1,20 @@
 package com.example.issu_tracker.ui.issue
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class IssueSearchViewModel @Inject constructor() : ViewModel() {
 
-    private val issueMap = mutableMapOf<String, Issue>()
-    private val _searchedIssueStateFlow = MutableStateFlow<List<Issue>>(listOf())
+    private val issueMap = mutableMapOf<String, IssueList.Issue>()
+    private val _searchedIssueStateFlow = MutableStateFlow<List<IssueList.Issue>>(listOf())
     val searchedIssueStateFlow = _searchedIssueStateFlow.asStateFlow()
 
-    fun initIssueList(issueList: List<Issue>) {
+    fun initIssueList(issueList: List<IssueList>) {
         issueList.forEach {
+            if (it is IssueList.Issue)
             issueMap[it.title] = it
         }
     }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
index da76697150..76b9f234d6 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
@@ -1,25 +1,26 @@
 package com.example.issu_tracker.ui.issue
 
 import androidx.lifecycle.ViewModel
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
 class IssueViewModel : ViewModel() {
 
-    private val _selectedIssueList = MutableStateFlow<List<Issue>>(mutableListOf())
-    val selectedIssueList: StateFlow<List<Issue>> = _selectedIssueList
+    private val _selectedIssueList = MutableStateFlow<List<IssueList>>(mutableListOf())
+    val selectedIssueList: StateFlow<List<IssueList>> = _selectedIssueList
 
-    fun addSelectedIssue(issue: Issue) {
+    fun addSelectedIssue(issue: IssueList) {
         val newList = _selectedIssueList.value.toMutableList()
         newList.add(issue)
         _selectedIssueList.value = newList
     }
 
-    fun deleteSelectedIssue(issue: Issue) {
+    fun deleteSelectedIssue(issue: IssueList) {
         val newList = _selectedIssueList.value.toMutableList()
         newList.remove(issue)
         _selectedIssueList.value = newList
+        println("지워짐?")
     }
 
     fun clearSelectedList() {
diff --git a/app/src/main/res/layout/item_issue.xml b/app/src/main/res/layout/item_issue.xml
index 857f3a6aa3..b31f431063 100644
--- a/app/src/main/res/layout/item_issue.xml
+++ b/app/src/main/res/layout/item_issue.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="issue"
-            type="com.example.issu_tracker.data.Issue" />
+            type="com.example.issu_tracker.data.IssueList.Issue" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_loading.xml b/app/src/main/res/layout/item_loading.xml
new file mode 100644
index 0000000000..b6cced1d75
--- /dev/null
+++ b/app/src/main/res/layout/item_loading.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ProgressBar
+            android:id="@+id/pb_issue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:indeterminate="true" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From bf4294fe313a0e2370f005bd741d520180d6d859 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Fri, 1 Jul 2022 12:21:12 +0900
Subject: [PATCH 08/13] =?UTF-8?q?fix=20:=20room=20db=20=EB=B2=84=EC=A0=84?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  1 -
 .../issu_tracker/data/local/IssueTrackerDatabase.kt |  2 +-
 .../com/example/issu_tracker/di/RepositoryModule.kt | 13 ++++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7a1c147ce2..5ac247d7be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
 
     <application
         android:name=".IssueTrackerApplication"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
index c7f80b7691..cff5f419be 100644
--- a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
@@ -8,7 +8,7 @@ import com.example.issu_tracker.data.Converters
 import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.data.User
 
-@Database(entities = [User::class , Issue::class ], version = 1)
+@Database(entities = [User::class , Issue::class ], version = 2)
 @TypeConverters(Converters::class)
 abstract class IssueTrackerDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
diff --git a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
index 8c5b25fbca..55f2703836 100644
--- a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
+++ b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
@@ -2,8 +2,9 @@ package com.example.issu_tracker.di
 
 import android.content.Context
 import androidx.room.Room
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.example.issu_tracker.data.Converters
-import com.example.issu_tracker.data.IssueDto
 import com.example.issu_tracker.data.local.IssueDao
 import com.example.issu_tracker.data.repository.Repository
 import com.example.issu_tracker.data.local.IssueTrackerDatabase
@@ -54,10 +55,12 @@ object RepositoryModule {
     @Provides
     fun provideUserLocalDataBase(
         @ApplicationContext context: Context
-    ): IssueTrackerDatabase = Room
-        .databaseBuilder(context, IssueTrackerDatabase::class.java, "friend.db")
-        .addTypeConverter(Converters())
-        .build()
+    ): IssueTrackerDatabase {
+
+        return Room
+            .databaseBuilder(context, IssueTrackerDatabase::class.java, "friend.db")
+            .build()
+    }
 
     @Singleton
     @Provides

From 14aa9de45bfbfcb54afabfa99b99086787675c08 Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Fri, 1 Jul 2022 13:43:49 +0900
Subject: [PATCH 09/13] =?UTF-8?q?refactor=20:=20pr=20=EC=BD=94=EB=A9=98?=
 =?UTF-8?q?=ED=8A=B8=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 코루틴 수정 : Coroutine() -> suspend 함수인 coroutine() 으로 수정하고 .join() 을 삭제
  - suspend 함수가 아닌 Coroutine 에서 선언된 launch 실행문들은 무시되고 함수를 리턴 함 , 최초에는 join 이 있어서 문제가 없었음
- 컨벤션에 맞게 변수이름 수정
---
 .../com/example/issu_tracker/data/User.kt     |  2 +-
 .../issu_tracker/data/local/UserDao.kt        |  7 ++----
 .../repository/FriendRemoteRepositoryIml.kt   |  2 +-
 .../data/repository/Repository.kt             | 25 +++++++++++++------
 .../ui/account/AccountViewModel.kt            |  2 +-
 .../issu_tracker/ui/account/FriendAdapter.kt  |  2 +-
 .../issu_tracker/ui/detail/CommentAdapter.kt  |  2 +-
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/issu_tracker/data/User.kt b/app/src/main/java/com/example/issu_tracker/data/User.kt
index f881004a65..4af1a6a2ed 100644
--- a/app/src/main/java/com/example/issu_tracker/data/User.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/User.kt
@@ -5,7 +5,7 @@ import androidx.room.PrimaryKey
 import java.io.Serializable
 
 @Entity
-data class User(val UID: String = "", val name: String = "", val userPhoto: String?=null) :
+data class User(val uid: String = "", val name: String = "", val userPhoto: String?=null) :
     Serializable {
     @PrimaryKey(autoGenerate = true)
     var id: Int = 0
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt b/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
index bb1bc4d15c..46bfe7343b 100644
--- a/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
@@ -9,9 +9,6 @@ interface UserDao {
     @Insert
     suspend fun insert(user: User)
 
-    @Update
-    suspend fun update(user: User)
-
     @Delete
     suspend fun delete(user: User)
 
@@ -21,8 +18,8 @@ interface UserDao {
     @Query("DELETE FROM User WHERE name = :name")
     suspend fun deleteUserByName(name: String)
 
-    @Query("UPDATE User SET userPhoto =:userPhoto,name=:name WHERE UID = :UID")
-    suspend fun updateUser(userPhoto: String, UID: String, name: String)
+    @Query("UPDATE User SET userPhoto =:userPhoto,name=:name WHERE uid = :uid")
+    suspend fun updateUser(userPhoto: String, uid: String, name: String)
 
     @Query("DELETE FROM User")
     suspend fun deleteAllUsers()
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
index e194c98eb1..2d284642c3 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
@@ -29,7 +29,7 @@ class FriendRemoteRepositoryIml @Inject constructor(private val fireStore: Fireb
             friendData.forEach {
                 val user =
                     User(
-                        it["UID"] ?: "", it["name"] ?: "",
+                        it["uid"] ?: "", it["name"] ?: "",
                         it["userPhoto"] ?: ""
                     )
                 friendList.add(user)
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
index 8d25632a4e..0f798848b0 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/Repository.kt
@@ -7,6 +7,7 @@ import com.example.issu_tracker.data.local.IssueTrackerDatabase
 import com.example.issu_tracker.data.network.NetworkResult
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -21,23 +22,31 @@ class Repository @Inject constructor(
         val loadResult = friendRemoteDatabase.loadFriendList()
 
         return if (loadResult is NetworkResult.Success) {
-            updateRemoteDatabase(loadResult.data)
+            Log.d(":sdfsd", loadResult.data[0].toString())
+            updateLocalDatabase(loadResult.data)
+            Log.d(":sdfsd", (friendLocalDatabase.userDao().getAll()).size.toString())
             NetworkResult.Success(friendLocalDatabase.userDao().getAll())
+
         } else {
+            Log.d(":sdfsd", (friendLocalDatabase.userDao().getAll()).size.toString())
             NetworkResult.Cached(friendLocalDatabase.userDao().getAll())
         }
+
+
     }
 
-    suspend fun updateRemoteDatabase(userList: List<User> = listOf()) {
+    suspend fun updateLocalDatabase(userList: List<User> = listOf()) {
         // 1. 리모트에서 로컬에 캐시해줌
-        CoroutineScope(Dispatchers.IO).launch {
-            friendLocalDatabase.userDao().deleteAllUsers()
-            userList.forEach {
-                launch {
-                    friendLocalDatabase.userDao().insert(it)
+        coroutineScope() {
+            launch {
+                friendLocalDatabase.userDao().deleteAllUsers()
+                userList.forEach {
+                    launch {
+                        friendLocalDatabase.userDao().insert(it)
+                    }
                 }
             }
-        }.join()
+        }
     }
 
     suspend fun updateFriend(userList: List<User>) {
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
index 9ac2b16f2a..e9e402caa9 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
@@ -31,7 +31,7 @@ class AccountViewModel @Inject constructor(private val repository: Repository) :
                 updateList.remove(user)
                 repository.updateFriend(updateList)
                 loadFriendList()
-                repository.updateRemoteDatabase()
+                repository.updateLocalDatabase()
             }
         }
     }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
index 9f39b9c0f2..889b97017b 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
@@ -50,7 +50,7 @@ class FriendAdapter(val userAdapterEventListener: UserAdapterEventListener) :
     companion object {
         val diffUtil = object : DiffUtil.ItemCallback<User>() {
             override fun areItemsTheSame(oldItem: User, newItem: User): Boolean {
-                return oldItem.UID == newItem.UID
+                return oldItem.uid == newItem.uid
             }
 
             override fun areContentsTheSame(oldItem: User, newItem: User): Boolean {
diff --git a/app/src/main/java/com/example/issu_tracker/ui/detail/CommentAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/detail/CommentAdapter.kt
index 612810f725..641693154a 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/detail/CommentAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/detail/CommentAdapter.kt
@@ -56,7 +56,7 @@ class CommentAdapter(val detailEventListener: DetailEventListener) : ListAdapter
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when (getItem(position).user?.UID) {
+        return when (getItem(position).user?.uid) {
             userUid -> MY_COMMENT
             else -> OTHER_COMMENT
         }

From 2729ddf44579ac293fce941d0deac3c43c6722ac Mon Sep 17 00:00:00 2001
From: Linus <zerolecture0922@gmail.com>
Date: Fri, 1 Jul 2022 13:45:42 +0900
Subject: [PATCH 10/13] =?UTF-8?q?feat=20:=20=EB=AC=B4=ED=95=9C=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A1=A4=20=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 맨 마지막 스크롤까지 가면 page 숫자 증가
- page 숫자를 가지고 페이징 처리 구현
---
 .../data/repository/HomeRepository.kt         |   2 +-
 .../data/repository/HomeRepositoryImpl.kt     | 101 +++++++-----------
 .../issu_tracker/ui/home/HomeViewModel.kt     |   4 +-
 .../issu_tracker/ui/issue/IssueFragment.kt    |   4 +-
 4 files changed, 44 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
index 5c1b41b350..61cbbfe963 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
@@ -5,7 +5,7 @@ import com.example.issu_tracker.data.IssueList
 interface HomeRepository {
 
     suspend fun loadFirstPageIssues(): List<IssueList>
-    suspend fun loadNextPageIssues(): List<IssueList>
+    suspend fun loadNextPageIssues(currentNumber: Int): List<IssueList>
     suspend fun updateIssueState(itemId: String, boolean: Boolean)
     suspend fun deleteIssueList(list: List<IssueList>)
     suspend fun updateIssueListState(list: List<IssueList>, boolean: Boolean)
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
index 392ff84e65..9c83f1b786 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
@@ -5,10 +5,7 @@ import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.toIssue
 import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.QuerySnapshot
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
 
@@ -16,39 +13,17 @@ class HomeRepositoryImpl @Inject constructor(
     private val fireStore: FirebaseFirestore
 ) : HomeRepository {
 
-    private var lastVisibleDoc: DocumentSnapshot? = null
-
-    /* override suspend fun loadIssues(): List<Issue> {
-         val list = mutableListOf<Issue>()
-         val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
-
-         collectionData.documents.forEach {
-             val issueObj = it.toObject(IssueDto::class.java)
-             issueObj?.id = it.id
-             issueObj?.let { it1 ->
-                 it1.toIssue()?.let { it2 -> list.add(it2) }
-                 // 데이터를 추가하는 코드
-                 // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
-             }
-         }
-         return list
-     }*/
+    private var lastVisibleDocument: DocumentSnapshot? = null
+    private val collectionData =
+        fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title")
 
     override suspend fun loadFirstPageIssues(): List<IssueList> {
         val list = mutableListOf<IssueList>()
-        val collectionData =
-            fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title").limit(10).get()
-                .await()
-        lastVisibleDoc = collectionData.documents.last()
-
-        /*  val collectionData: QuerySnapshot = if (lastVisibleDoc != null) {
-              fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).limit(10).get().await()
-          } else {
-              fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).startAfter(lastVisibleDoc)
-                  .limit(10).get().await()
-          }*/
-
-        collectionData.documents.forEach {
+        val issueData = collectionData.limit(PAGE_NUMBER).get().await()
+
+        lastVisibleDocument = issueData.last()
+
+        issueData.documents.forEach {
             val issueObj = it.toObject(IssueDto::class.java)
             issueObj?.id = it.id
             issueObj?.let { issueDto ->
@@ -59,38 +34,39 @@ class HomeRepositoryImpl @Inject constructor(
                 // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(issueDto)
             }
         }
+
+        println(lastVisibleDocument)
+
         return list
     }
 
-    override suspend fun loadNextPageIssues(): List<IssueList> {
+    override suspend fun loadNextPageIssues(currentPage: Int): List<IssueList> {
         val list = mutableListOf<IssueList>()
-        println(lastVisibleDoc)
-        val test = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title").limit(10).get().await().documents.last()
-        val collectionData =
-            fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH)
-                .orderBy("title")
-                .startAfter(lastVisibleDoc)
-                .limit(10)
-                .get()
-                .await()
-
-        println("진짜? ${collectionData.isEmpty}")
-
-
-         collectionData.documents.forEach {
-             val issueObj = it.toObject(IssueDto::class.java)
-             issueObj?.id = it.id
-             issueObj?.let { issueDto ->
-                 issueDto.toIssue()?.let { issue ->
-                     list.add(issue) }
-                 // 데이터를 추가하는 코드
-                 // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
-             }
-         }
-
-         if (collectionData.documents.isNotEmpty()) {
-             lastVisibleDoc = collectionData.documents.last()
-         }
+        val lastVisibleDoc = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title")
+            .limit(currentPage * PAGE_NUMBER).get().await().documents.last()
+        val issueData = collectionData
+//            .startAfter(lastVisibleDocument)
+            .startAfter(lastVisibleDoc)
+            .limit(PAGE_NUMBER).get().await()
+
+        println("해보자 $currentPage")
+
+        issueData.documents.forEach {
+            val issueObj = it.toObject(IssueDto::class.java)
+            issueObj?.id = it.id
+            issueObj?.let { issueDto ->
+                issueDto.toIssue()?.let { issue ->
+                    list.add(issue)
+                }
+                // 데이터를 추가하는 코드
+                // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+            }
+        }
+
+        lastVisibleDocument = issueData.last()
+
+        println("${issueData.last()["id"]}")
+        println(lastVisibleDocument)
 
         return list
     }
@@ -125,5 +101,6 @@ class HomeRepositoryImpl @Inject constructor(
     companion object {
         const val FIREBASE_COLLECTION_ISSUE_PATH = "Issue"
         const val FIREBASE_COLLECTION_FRIEND_PATH = "User"
+        const val PAGE_NUMBER: Long = 10
     }
 }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 7edd7b301e..66810f6769 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -33,11 +33,11 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
             _issueListStateFlow.value = issueList
     }
 
-    fun getNextIssueList() {
+    fun getNextIssueList(currentPage: Int) {
         viewModelScope.launch {
             val issueList = _issueListStateFlow.value.toMutableList()
             issueList.removeLast()
-            issueList.addAll(repository.loadNextPageIssues())
+            issueList.addAll(repository.loadNextPageIssues(currentPage))
             issueList.add(IssueList.IssueProgressBar)
             _issueListStateFlow.value = issueList
         }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index 8a888760e4..d92ddec2d6 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -122,7 +122,7 @@ class IssueFragment : Fragment() {
                         println("되는건가 $page")
                         issueAdapter.submitList(it)
                         issueAdapter.notifyItemRangeChanged((page - 1) * 10, 10)
-                        /* issueAdapter.submitList(it.filter { issue ->
+                         /*issueAdapter.submitList(it.filter { issue ->
                              if (issue is IssueList.Issue) {
                                  println("당신 $issue")
                                  issue.state
@@ -158,7 +158,7 @@ class IssueFragment : Fragment() {
                 // 스크롤이 끝에 도달했는지 확인
                 if (!recyclerView.canScrollVertically(1) && lastVisibleItemPosition == itemTotalCount) {
                     page++
-                    homeViewModel.getNextIssueList()
+                    homeViewModel.getNextIssueList(page)
                 }
 
             }

From ac594e449a207a9a71ac7e13407a7d7ae6775356 Mon Sep 17 00:00:00 2001
From: Linus <zerolecture0922@gmail.com>
Date: Fri, 1 Jul 2022 19:42:18 +0900
Subject: [PATCH 11/13] =?UTF-8?q?fix=20:=20conflict=20=ED=95=B4=EA=B2=B0?=
 =?UTF-8?q?=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 .../com/example/issu_tracker/data/Issue.kt    | 35 +++++++++----------
 .../issu_tracker/data/local/IssueDao.kt       | 14 ++++----
 .../data/local/IssueTrackerDatabase.kt        |  5 ++-
 .../data/repository/HomeRepository.kt         |  3 +-
 .../data/repository/HomeRepositoryImpl.kt     | 30 +++++++++-------
 .../issu_tracker/ui/home/HomeViewModel.kt     | 28 +++++++++------
 .../issu_tracker/ui/issue/IssueFragment.kt    | 32 ++++++++---------
 .../ui/issue/IssueSearchFragment.kt           |  5 ++-
 9 files changed, 84 insertions(+), 69 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c00c0dfaae..dd74e51869 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,7 @@ dependencies {
 
     //Room
     implementation "androidx.room:room-ktx:2.4.2"
+    implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.7.1'
     kapt "androidx.room:room-compiler:2.4.2"
     implementation "androidx.room:room-runtime:2.4.2"
     annotationProcessor "androidx.room:room-compiler:2.4.2"
diff --git a/app/src/main/java/com/example/issu_tracker/data/Issue.kt b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
index b45d9c9996..d6c0c1ffa2 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Issue.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
@@ -4,7 +4,6 @@ import androidx.room.*
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import java.io.Serializable
-import java.lang.Exception
 
 data class IssueDto(
     var id: String = "",
@@ -21,22 +20,22 @@ sealed class IssueList : Serializable {
 
     object IssueProgressBar : IssueList()
 
-   @Entity
-  data class Issue(
-    @ColumnInfo(name = "issue_id")
-    var id: String,
-    val comments: List<Comment>,
-    val description: String,
-    val label: List<Label>,
-    val mileStone: String,
-    val state: Boolean,
-    val title: String,
-    @Embedded
-    val user: User
-) : Serializable{
-    @PrimaryKey(autoGenerate = true)
-    var idx: Int = 0
-}, IssueList
+    @Entity
+    data class Issue(
+        @ColumnInfo(name = "issue_id")
+        var id: String,
+        val comments: List<Comment>,
+        val description: String,
+        val label: List<Label>,
+        val mileStone: String,
+        val state: Boolean,
+        val title: String,
+        @Embedded
+        val user: User
+    ) : IssueList(), Serializable {
+        @PrimaryKey(autoGenerate = true)
+        var idx: Int = 0
+    }
 }
 
 class Converters {
@@ -70,7 +69,7 @@ class Converters {
 
 }
 
-fun IssueDto.toIssue(): Issue? {
+fun IssueDto.toIssue(): IssueList.Issue? {
     return try {
         IssueList.Issue(id, comments, description, label, mileStoneID, state, title, user!!)
     } catch (e: Exception) {
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
index 748b9a5e74..dfc2a66a01 100644
--- a/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueDao.kt
@@ -1,20 +1,22 @@
 package com.example.issu_tracker.data.local
 
-import androidx.room.*
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.User
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import com.example.issu_tracker.data.IssueList
 
 
 @Dao
 interface IssueDao {
     @Insert
-    suspend fun insert(issue: Issue)
+    suspend fun insert(issue: IssueList.Issue)
 
     @Delete
-    suspend fun delete(issue: Issue)
+    suspend fun delete(issue: IssueList.Issue)
 
     @Query("SELECT * FROM Issue") // 테이블의 모든 값을 가져와라
-    suspend fun getAll(): List<Issue>
+    suspend fun getAll(): List<IssueList.Issue>
 
     @Query("DELETE FROM Issue WHERE id = :id")
     suspend fun deleteIssueByName(id: String)
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
index cff5f419be..25f8aaa9e6 100644
--- a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
@@ -3,12 +3,11 @@ package com.example.issu_tracker.data.local
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.example.issu_tracker.data.Comment
 import com.example.issu_tracker.data.Converters
-import com.example.issu_tracker.data.Issue
+import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.User
 
-@Database(entities = [User::class , Issue::class ], version = 2)
+@Database(entities = [User::class , IssueList.Issue::class ], version = 2)
 @TypeConverters(Converters::class)
 abstract class IssueTrackerDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
index 28ea74591b..9d781abac1 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
@@ -7,8 +7,7 @@ import com.example.issu_tracker.data.network.NetworkResult
 
 interface HomeRepository {
 
-    suspend fun loadIssues(): NetworkResult<List<IssueList.Issue>>
-    suspend fun loadFirstPageIssues(): List<IssueList>
+    suspend fun loadFirstPageIssues(): NetworkResult<List<IssueList>>
     suspend fun loadNextPageIssues(currentNumber: Int): List<IssueList>
     suspend fun updateIssueState(itemId: String, boolean: Boolean)
     suspend fun deleteIssueList(list: List<IssueList>)
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
index f57fd6e480..a581e90569 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
@@ -21,7 +21,7 @@ class HomeRepositoryImpl @Inject constructor(
     private val collectionData =
         fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).orderBy("title")
 
-    override suspend fun loadFirstPageIssues(): List<IssueList> {
+    /*override suspend fun loadFirstPageIssues(): List<IssueList> {
         val list = mutableListOf<IssueList>()
         val issueData = collectionData.limit(PAGE_NUMBER).get().await()
 
@@ -42,7 +42,7 @@ class HomeRepositoryImpl @Inject constructor(
         println(lastVisibleDocument)
 
         return list
-    }
+    }*/
 
     override suspend fun loadNextPageIssues(currentPage: Int): List<IssueList> {
         val list = mutableListOf<IssueList>()
@@ -62,9 +62,12 @@ class HomeRepositoryImpl @Inject constructor(
                 issueDto.toIssue()?.let { issue ->
                     list.add(issue)
                 }
-                // 데이터를 추가하는 코드
-                // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
-                
+            }
+        }
+
+        // 데이터를 추가하는 코드
+        // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
+
         lastVisibleDocument = issueData.last()
 
         println("${issueData.last()["id"]}")
@@ -72,11 +75,12 @@ class HomeRepositoryImpl @Inject constructor(
 
         return list
     }
-                
-    override suspend fun loadIssues(): NetworkResult<List<Issue>> {
+
+    override suspend fun loadFirstPageIssues(): NetworkResult<List<IssueList>> {
         try {
-            val list = mutableListOf<Issue>()
-            val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
+            val list = mutableListOf<IssueList>()
+            val collectionData =
+                fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).limit(PAGE_NUMBER).get().await()
 
             collectionData.documents.forEach {
                 val issueObj = it.toObject(IssueDto::class.java)
@@ -87,7 +91,7 @@ class HomeRepositoryImpl @Inject constructor(
                     // fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(it1)
                 }
             }
-            
+
             return if (list.isEmpty()) {
                 NetworkResult.Error(EMPTY)
             } else NetworkResult.Success(list)
@@ -95,7 +99,7 @@ class HomeRepositoryImpl @Inject constructor(
         } catch (e: Exception) {
             return NetworkResult.Exception(e)
         }
-     }
+    }
 
     override suspend fun updateIssueState(itemId: String, boolean: Boolean) {
 
@@ -108,7 +112,8 @@ class HomeRepositoryImpl @Inject constructor(
         CoroutineScope(Dispatchers.IO).launch {
             for (i in list) {
                 if (i is IssueList.Issue)
-                    fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id).delete()
+                    fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id)
+                        .delete()
             }
         }.join()
     }
@@ -130,3 +135,4 @@ class HomeRepositoryImpl @Inject constructor(
         const val PAGE_NUMBER: Long = 10
     }
 }
+
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 17bcf1fbe2..52e68cf1ce 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -19,8 +19,8 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
     private val _issueListStateFlow = MutableStateFlow<NetworkResult<List<IssueList>>>(NetworkResult.Loading())
     val issueListStateFlow: StateFlow<NetworkResult<List<IssueList>>> = _issueListStateFlow
 
-    private val _filteredIssueListStateFlow = MutableStateFlow<List<IssueList>>(listOf())
-    val filteredIssueListStateFlow: StateFlow<List<IssueList>> = _filteredIssueListStateFlow
+    private val _filteredIssueListStateFlow = MutableStateFlow<NetworkResult<List<IssueList>>>(NetworkResult.Loading())
+    val filteredIssueListStateFlow: StateFlow<NetworkResult<List<IssueList>>> = _filteredIssueListStateFlow
 
     init {
         viewModelScope.launch {
@@ -29,18 +29,24 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
     }
 
     suspend fun getIssueList() {
-            val issueList = repository.loadFirstPageIssues().toMutableList()
-            issueList.add(IssueList.IssueProgressBar)
-            _issueListStateFlow.value = issueList
+            val issueList = repository.loadFirstPageIssues()
+            if (issueList is NetworkResult.Success) {
+               issueList.data.toMutableList().add(IssueList.IssueProgressBar)
+                _issueListStateFlow.value = issueList
+            }
     }
 
     fun getNextIssueList(currentPage: Int) {
         viewModelScope.launch {
-            val issueList = _issueListStateFlow.value.toMutableList()
-            issueList.removeLast()
-            issueList.addAll(repository.loadNextPageIssues(currentPage))
-            issueList.add(IssueList.IssueProgressBar)
-            _issueListStateFlow.value = issueList
+            val issueListResponse = _issueListStateFlow.value
+            if (issueListResponse is NetworkResult.Success) {
+                val issueList = issueListResponse.data.toMutableList()
+                issueList.add(IssueList.IssueProgressBar)
+                issueList.removeLast()
+                issueList.addAll(repository.loadNextPageIssues(currentPage))
+                issueList.add(IssueList.IssueProgressBar)
+                _issueListStateFlow.value = NetworkResult.Success(issueList)
+            }
         }
     }
 
@@ -90,7 +96,7 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
                 false
             }
             
-        _filteredIssueListStateFlow.value = filteredIssueList
+        _filteredIssueListStateFlow.value = NetworkResult.Success(filteredIssueList)
         
         }
     }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index e94d006acc..3bfb660497 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -121,25 +121,25 @@ class IssueFragment : Fragment() {
                 launch {
                     // open 상태만 보여주기
                     homeViewModel.issueListStateFlow.collect {
-                        println("되는건가 $page")
-                        issueAdapter.submitList(it)
-                        issueAdapter.notifyItemRangeChanged((page - 1) * 10, 10)
-                        /*if (it is NetworkResult.Success) {
-                            issueAdapter.submitList(it.data.filter { it.state })*/
-                            
-                         /*issueAdapter.submitList(it.filter { issue ->
-                             if (issue is IssueList.Issue) {
-                                 println("당신 $issue")
-                                 issue.state
-                             }
-                             else true
-                         })*/
+                        if (it is NetworkResult.Success) {
+                            issueAdapter.submitList(it.data)
+                            issueAdapter.notifyItemRangeChanged((page - 1) * 10, 10)
+                        }
+//                            issueAdapter.submitList(it.data.filter { it.state })
+
+                        /*issueAdapter.submitList(it.filter { issue ->
+                            if (issue is IssueList.Issue) {
+                                println("당신 $issue")
+                                issue.state
+                            }
+                            else true
+                        })*/
                     }
                 }
                 launch {
                     homeViewModel.filteredIssueListStateFlow.collect {
-                        if (it.isNotEmpty()) {
-                            issueAdapter.submitList(it)
+                        if (it is NetworkResult.Success) {
+                            issueAdapter.submitList(it.data)
                         }
                     }
                 }
@@ -155,7 +155,7 @@ class IssueFragment : Fragment() {
                 val layoutManager = recyclerView.layoutManager
 
                 val lastVisibleItemPosition = if (layoutManager is LinearLayoutManager) {
-                        layoutManager.findLastCompletelyVisibleItemPosition()
+                    layoutManager.findLastCompletelyVisibleItemPosition()
                 } else 0
 
                 val itemTotalCount = (recyclerView.adapter?.itemCount ?: 0) - 1
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
index 9ea38e51e9..db284fa15d 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueSearchFragment.kt
@@ -14,6 +14,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.issu_tracker.data.network.NetworkResult
 import com.example.issu_tracker.databinding.FragmentIssueSearchBinding
 import com.example.issu_tracker.ui.home.HomeViewModel
 import com.google.android.material.textfield.TextInputEditText
@@ -54,7 +55,9 @@ class IssueSearchFragment : Fragment() {
 
     private fun initIssueList() {
         val originalIssueList = homeViewModel.issueListStateFlow.value
-        issueSearchViewModel.initIssueList(originalIssueList)
+        if (originalIssueList is NetworkResult.Success) {
+            issueSearchViewModel.initIssueList(originalIssueList.data)
+        }
     }
 
     private fun setNavigationIconEventListener() {

From ef1d50f74f68d061d2987f5f5ccb31c73f5c15be Mon Sep 17 00:00:00 2001
From: shim506 <shim506@naver.com>
Date: Fri, 1 Jul 2022 20:51:59 +0900
Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                              | 4 +++-
 .../example/issu_tracker/data/local/IssueTrackerDatabase.kt   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd74e51869..31a70df13b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,9 @@ plugins {
 
 android {
     compileSdk 32
-
+    packagingOptions {
+        pickFirst "META-INF/DEPENDENCIES"
+    }
     defaultConfig {
         applicationId "com.example.issu_tracker"
         minSdk 23
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
index 25f8aaa9e6..daa46a00f8 100644
--- a/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/local/IssueTrackerDatabase.kt
@@ -7,7 +7,7 @@ import com.example.issu_tracker.data.Converters
 import com.example.issu_tracker.data.IssueList
 import com.example.issu_tracker.data.User
 
-@Database(entities = [User::class , IssueList.Issue::class ], version = 2)
+@Database(entities = [User::class , IssueList.Issue::class ], version = 2,exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class IssueTrackerDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

From 23bd6d0ede143716029164d83a88b84230a28e43 Mon Sep 17 00:00:00 2001
From: Linus <zerolecture0922@gmail.com>
Date: Fri, 1 Jul 2022 20:57:54 +0900
Subject: [PATCH 13/13] =?UTF-8?q?fix=20:=20conflict=20=ED=95=B4=EA=B2=B0?=
 =?UTF-8?q?=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 52e68cf1ce..e558df1cff 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -41,7 +41,6 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
             val issueListResponse = _issueListStateFlow.value
             if (issueListResponse is NetworkResult.Success) {
                 val issueList = issueListResponse.data.toMutableList()
-                issueList.add(IssueList.IssueProgressBar)
                 issueList.removeLast()
                 issueList.addAll(repository.loadNextPageIssues(currentPage))
                 issueList.add(IssueList.IssueProgressBar)