Cache clearing implemented

lakshya-20 · web-flow · commit 828e5ab05175 · 2021-06-27T13:29:04.000+05:30
Fixes #111 : cache clearing implemented
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt
@@ -12,6 +12,7 @@ interface CacheDataSource {
     suspend fun deleteFiles(): Int
     suspend fun insertUrls(urls: List<Url>): Long
     suspend fun getUrls(fileId: String): List<Url>
+    suspend fun deleteUrls(): Int
     suspend fun insertFileMetaData(fileMetaData: FileMetaData): Long
     suspend fun getAllFileMetaData(): List<FileMetaData>
     suspend fun deleteFileMetaData(uuid: String)
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt
@@ -49,6 +49,10 @@ constructor(
         return urlCacheMapper.mapFromEntityList(urls)
     }
 
+    override suspend fun deleteUrls(): Int {
+        return urlDao.deleteUrls()
+    }
+
     override suspend fun insertFileMetaData(fileMetaData: FileMetaData): Long {
         val data: FileMetaDataCacheEntity = fileMetaDataMapper.mapToEntity(fileMetaData)
         return fileWorkerDao.insertFileMetaData(data)
diff --git a/app/src/main/java/com/github/code/gambit/data/local/UrlDao.kt b/app/src/main/java/com/github/code/gambit/data/local/UrlDao.kt
@@ -17,4 +17,7 @@ interface UrlDao {
 
     @Query("SELECT * FROM urls WHERE fileId = :fileId ORDER BY timestamp DESC")
     suspend fun getUrls(fileId: String): List<UrlCacheEntity>
+
+    @Query("DELETE FROM urls")
+    suspend fun deleteUrls(): Int
 }
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/ApiRequest.kt b/app/src/main/java/com/github/code/gambit/data/remote/ApiRequest.kt
@@ -11,7 +11,7 @@ suspend fun <T> apiRequest(
     keyType: LastEvaluatedKeyManager.KeyType,
     call: suspend (lek: String) -> ListResponse<T>
 ): List<T> {
-    val response = call.invoke(lekManager.getLastEvalKey(LastEvaluatedKeyManager.KeyType.FILE))
+    val response = call.invoke(lekManager.getLastEvalKey(keyType))
     response.body?.let { body ->
         body.lastEvaluatedKey?.let { lekManager.putLastEvalKey(it, keyType) }
         return body.items
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSource.kt b/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSource.kt
@@ -5,7 +5,7 @@ import com.github.code.gambit.data.model.Url
 import com.github.code.gambit.data.model.User
 
 interface NetworkDataSource {
-    suspend fun getFiles(): List<File>
+    suspend fun getFiles(force: Boolean = false): List<File>
     suspend fun searchFiles(searchParam: String): List<File>
     suspend fun filterFiles(start: String, end: String): List<File>
     suspend fun uploadFile(file: File): File
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSourceImpl.kt b/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSourceImpl.kt
@@ -19,8 +19,8 @@ class NetworkDataSourceImpl(
     private val userNetworkMapper: UserNetworkMapper
 ) : NetworkDataSource {
 
-    override suspend fun getFiles(): List<File> {
-        return fileNetworkMapper.mapFromEntityList(fileService.getFiles())
+    override suspend fun getFiles(force: Boolean): List<File> {
+        return fileNetworkMapper.mapFromEntityList(fileService.getFiles(force))
     }
 
     override suspend fun filterFiles(start: String, end: String): List<File> {
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileService.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileService.kt
@@ -4,7 +4,7 @@ import com.github.code.gambit.data.entity.network.FileNetworkEntity
 
 interface FileService {
 
-    suspend fun getFiles(): List<FileNetworkEntity>
+    suspend fun getFiles(force: Boolean): List<FileNetworkEntity>
     suspend fun searchFile(searchParam: String): List<FileNetworkEntity>
     suspend fun filterFiles(start: String, end: String): List<FileNetworkEntity>
     suspend fun uploadFile(fileNetworkEntity: FileNetworkEntity): FileNetworkEntity
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt
@@ -14,7 +14,10 @@ class FileServiceImpl(
 
     private val userId get() = userManager.getUserId()
 
-    override suspend fun getFiles(): List<FileNetworkEntity> {
+    override suspend fun getFiles(force: Boolean): List<FileNetworkEntity> {
+        if (force) {
+            lekManager.putLastEvalKey("", LastEvaluatedKeyManager.KeyType.FILE)
+        }
         return apiRequest(lekManager, LastEvaluatedKeyManager.KeyType.FILE) { lek ->
             apiService.getFiles(userId, lek, null)
         }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepository.kt b/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepository.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
 
 interface HomeRepository {
 
-    suspend fun getFiles(): Flow<ServiceResult<List<File>>>
+    suspend fun getFiles(clearCache: Boolean = false): Flow<ServiceResult<List<File>>>
     suspend fun searchFile(searchString: String): Flow<ServiceResult<List<File>>>
     suspend fun searchFileByFilter(filter: Filter): Flow<ServiceResult<List<File>>>
     suspend fun deleteFile(file: File): Flow<ServiceResult<Boolean>>
diff --git a/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt
@@ -20,11 +20,21 @@ constructor(
     private val networkDataSource: NetworkDataSource
 ) : HomeRepository {
 
-    override suspend fun getFiles(): Flow<ServiceResult<List<File>>> {
+    private suspend fun clearCacheDb() {
+        cacheDataSource.deleteFiles()
+        cacheDataSource.deleteUrls()
+    }
+
+    override suspend fun getFiles(clearCache: Boolean): Flow<ServiceResult<List<File>>> {
         return flow {
             val data: List<File>
             try {
-                data = networkDataSource.getFiles()
+                if (clearCache) {
+                    data = networkDataSource.getFiles(true)
+                    clearCacheDb()
+                } else {
+                    data = networkDataSource.getFiles()
+                }
                 cacheDataSource.insertFiles(data)
                 val files = cacheDataSource.getFiles()
                 emit(ServiceResult.Success(files))
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt
@@ -1,6 +1,7 @@
 package com.github.code.gambit.ui.fragment.home.main
 
 import android.os.Bundle
+import android.os.Handler
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.FrameLayout
@@ -64,6 +65,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
     private val searchBinding get() = _searchBinding
 
     private var isFirstLoading = true
+    private var isLoading = false
 
     @Inject
     lateinit var homeRepository: HomeRepository
@@ -111,12 +113,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
 
         binding.swipeRefresh.setOnRefreshListener {
             binding.swipeRefresh.isRefreshing = false
-            viewModel.setEvent(HomeEvent.GetFiles)
-        }
-
-        binding.swipeRefresh.setOnDragListener { _, dragEvent ->
-            Timber.tag("home").i("drag: ${dragEvent.y}")
-            true
+            setHomeFileEvent(true)
         }
 
         binding.clearFilter.setOnClickListener {
@@ -129,7 +126,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
 
         setUpFileRecyclerView()
         registerEventCallbacks()
-        viewModel.setEvent(HomeEvent.GetFiles)
+        setHomeFileEvent()
     }
 
     private fun registerUrlComponent() {
@@ -256,9 +253,10 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
                 val pastVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
                 if (!recyclerView.canScrollVertically(1) &&
                     newState == RecyclerView.SCROLL_STATE_IDLE &&
-                    pastVisibleItem + visibleItemCount >= totalItemCount
+                    pastVisibleItem + visibleItemCount >= totalItemCount &&
+                    !isLoading
                 ) {
-                    viewModel.setEvent(HomeEvent.GetFiles)
+                    setHomeFileEvent()
                 }
             }
 
@@ -327,6 +325,14 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
         }
     }
 
+    private fun setHomeFileEvent(cacheClear: Boolean = false) {
+        if (!isLoading) {
+            isLoading = true
+            Handler().postDelayed({ isLoading = false }, 1000)
+            viewModel.setEvent(HomeEvent.GetFiles(cacheClear))
+        }
+    }
+
     private fun applyFilter(filter: Filter) {
         viewModel.setEvent(HomeEvent.FilterFiles(filter))
     }
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeViewModel.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeViewModel.kt
@@ -27,9 +27,9 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
     fun setEvent(event: HomeEvent) {
         viewModelScope.launch {
             when (event) {
-                HomeEvent.GetFiles -> {
+                is HomeEvent.GetFiles -> {
                     _homeState.postValue(HomeState.Loading())
-                    getFile()
+                    getFile(event.clearCache)
                 }
                 is HomeEvent.GenerateUrl -> {
                     _homeState.postValue(HomeState.Loading())
@@ -62,8 +62,8 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
         }
     }
 
-    private suspend fun getFile() {
-        homeRepository.getFiles().collect {
+    private suspend fun getFile(clearCache: Boolean) {
+        homeRepository.getFiles(clearCache).collect {
             when (it) {
                 is ServiceResult.Error -> postError(it.exception)
                 is ServiceResult.Success -> {
@@ -160,7 +160,7 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
 }
 
 sealed class HomeEvent {
-    object GetFiles : HomeEvent()
+    data class GetFiles(val clearCache: Boolean = false) : HomeEvent()
     data class FilterFiles(val filter: Filter) : HomeEvent()
     data class DeleteFile(val file: File) : HomeEvent()
     data class GetUrls(val file: File) : HomeEvent()

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,7 @@ interface UrlDao {`
`17`	`17`
`18`	`18`	`@Query("SELECT * FROM urls WHERE fileId = :fileId ORDER BY timestamp DESC")`
`19`	`19`	`suspend fun getUrls(fileId: String): List<UrlCacheEntity>`
	`20`	`+`
	`21`	`+ @Query("DELETE FROM urls")`
	`22`	`+ suspend fun deleteUrls(): Int`
`20`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class NetworkDataSourceImpl(`
`19`	`19`	`private val userNetworkMapper: UserNetworkMapper`
`20`	`20`	`) : NetworkDataSource {`
`21`	`21`
`22`		`- override suspend fun getFiles(): List<File> {`
`23`		`- return fileNetworkMapper.mapFromEntityList(fileService.getFiles())`
	`22`	`+ override suspend fun getFiles(force: Boolean): List<File> {`
	`23`	`+ return fileNetworkMapper.mapFromEntityList(fileService.getFiles(force))`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`override suspend fun filterFiles(start: String, end: String): List<File> {`