Fix issue where requests were being duplicated.

Author: mitchtabian

app/src/androidTest/java/com/codingwithmitch/cleannotes/framework/datasource/cache/NoteDaoServiceTests.kt

@@ -235,7 +235,8 @@ class NoteDaoServiceTests: BaseTest(){
         noteDaoService.updateNote(
             primaryKey = newNote.id,
             title = newTitle,
-            body = newBody
+            body = newBody,
+            timestamp = null
         )
 
         val notes = noteDaoService.searchNotes()

app/src/main/java/com/codingwithmitch/cleannotes/business/domain/model/Note.kt

@@ -12,5 +12,25 @@ data class Note(
     val created_at: String
 ) : Parcelable{
 
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
 
+        other as Note
+
+        if (id != other.id) return false
+        if (title != other.title) return false
+        if (body != other.body) return false
+        if (created_at != other.created_at) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + title.hashCode()
+        result = 31 * result + body.hashCode()
+        result = 31 * result + created_at.hashCode()
+        return result
+    }
 }

app/src/main/java/com/codingwithmitch/cleannotes/business/domain/state/DataChannelManager.kt

@@ -49,6 +49,7 @@ abstract class DataChannelManager<ViewState> {
     private fun offerToDataChannel(dataState: DataState<ViewState>){
         dataChannel.let {
             if(!it.isClosedForSend){
+                printLogD("DCM", "offer to channel!")
                 it.offer(dataState)
             }
         }
@@ -58,7 +59,7 @@ abstract class DataChannelManager<ViewState> {
         stateEvent: StateEvent,
         jobFunction: Flow<DataState<ViewState>?>
     ){
-        if(!isStateEventActive(stateEvent)){
+        if(canExecuteNewStateEvent(stateEvent)){
             printLogD("DCM", "launching job: ${stateEvent.eventName()}")
             addStateEvent(stateEvent)
             jobFunction
@@ -71,7 +72,19 @@ abstract class DataChannelManager<ViewState> {
         }
     }
 
-    private fun isMessageStackEmpty(): Boolean {
+    private fun canExecuteNewStateEvent(stateEvent: StateEvent): Boolean{
+        // If a job is already active, do not allow duplication
+        if(isJobAlreadyActive(stateEvent)){
+            return false
+        }
+        // if a dialog is showing, do not allow new StateEvents
+        if(!isMessageStackEmpty()){
+            return false
+        }
+        return true
+    }
+
+    fun isMessageStackEmpty(): Boolean {
         return messageStack.isStackEmpty()
     }
 
@@ -83,7 +96,10 @@ abstract class DataChannelManager<ViewState> {
         messageStack.add(stateMessage)
     }
 
-    fun clearStateMessage(index: Int = 0) = messageStack.removeAt(index)
+    fun clearStateMessage(index: Int = 0){
+        printLogD("DataChannelManager", "clear state message")
+        messageStack.removeAt(index)
+    }
 
     fun clearAllStateMessages() = messageStack.clear()
 
@@ -99,7 +115,7 @@ abstract class DataChannelManager<ViewState> {
     fun clearActiveStateEventCounter()
             = stateEventManager.clearActiveStateEventCounter()
 
-    private fun addStateEvent(stateEvent: StateEvent)
+    fun addStateEvent(stateEvent: StateEvent)
             = stateEventManager.addStateEvent(stateEvent)
 
     fun removeStateEvent(stateEvent: StateEvent?)

app/src/main/java/com/codingwithmitch/cleannotes/business/domain/state/StateEventManager.kt

@@ -3,6 +3,7 @@ package com.codingwithmitch.cleannotes.business.domain.state
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.codingwithmitch.cleannotes.util.EspressoIdlingResource
+import com.codingwithmitch.cleannotes.util.printLogD
 
 /**
  * - Keeps track of active StateEvents in DataChannelManager
@@ -23,6 +24,7 @@ class StateEventManager {
     }
 
     fun clearActiveStateEventCounter(){
+        printLogD("DCM", "Clear active state events")
         EspressoIdlingResource.clear()
         activeStateEvents.clear()
         syncNumActiveStateEvents()
@@ -35,6 +37,7 @@ class StateEventManager {
     }
 
     fun removeStateEvent(stateEvent: StateEvent?){
+        printLogD("DCM sem", "remove state event: ${stateEvent?.eventName()}")
         stateEvent?.let {
             EspressoIdlingResource.decrement()
         }
@@ -43,12 +46,9 @@ class StateEventManager {
     }
 
     fun isStateEventActive(stateEvent: StateEvent): Boolean{
-        for(eventName in activeStateEvents.keys){
-            if(stateEvent.eventName().equals(eventName)){
-                return true
-            }
-        }
-        return false
+        printLogD("DCM sem", "is state event active? " +
+                "${activeStateEvents.containsKey(stateEvent.eventName())}")
+        return activeStateEvents.containsKey(stateEvent.eventName())
     }
 
     private fun syncNumActiveStateEvents(){

app/src/main/java/com/codingwithmitch/cleannotes/business/interactors/notelist/SearchNotes.kt

@@ -20,7 +20,6 @@ class SearchNotes(
         page: Int,
         stateEvent: StateEvent
     ): Flow<DataState<NoteListViewState>?> = flow {
-
         var updatedPage = page
         if(page <= 0){
             updatedPage = 1

app/src/main/java/com/codingwithmitch/cleannotes/framework/presentation/common/BaseViewModel.kt

@@ -73,23 +73,34 @@ abstract class BaseViewModel<ViewState> : ViewModel()
         jobFunction: Flow<DataState<ViewState>?>
     ) = dataChannelManager.launchJob(stateEvent, jobFunction)
 
-    fun isJobAlreadyActive(stateEvent: StateEvent): Boolean {
-        printLogD("BaseViewModel", "is job already active? ${dataChannelManager.isJobAlreadyActive(stateEvent)} ")
-        return dataChannelManager.isJobAlreadyActive(stateEvent)
-    }
+//    private fun isJobAlreadyActive(stateEvent: StateEvent): Boolean {
+//        return dataChannelManager.isJobAlreadyActive(stateEvent)
+//    }
+//
+//    private fun isMessageStackEmpty() = dataChannelManager.isMessageStackEmpty()
+//
+//    fun canExecuteNewStateEvent(stateEvent: StateEvent): Boolean{
+//        // If a job is already active, do not allow duplication
+//        if(dataChannelManager.isJobAlreadyActive(stateEvent)){
+//            return false
+//        }
+//        // if a dialog is showing, do not allow new StateEvents
+//        if(!isMessageStackEmpty()){
+//            return false
+//        }
+//        return true
+//    }
 
     fun getCurrentViewStateOrNew(): ViewState{
-        val value = viewState.value?.let{
-            it
-        }?: initNewViewState()
-        return value
+        return viewState.value ?: initNewViewState()
     }
 
     fun setViewState(viewState: ViewState){
         _viewState.value = viewState
     }
 
     fun clearStateMessage(index: Int = 0){
+        printLogD("BaseViewModel", "clearStateMessage")
         dataChannelManager.clearStateMessage(index)
     }
 

app/src/main/java/com/codingwithmitch/cleannotes/framework/presentation/notedetail/NoteDetailViewModel.kt

@@ -45,7 +45,7 @@ constructor(
 
     override fun setStateEvent(stateEvent: StateEvent) {
 
-        if(!isJobAlreadyActive(stateEvent)){
+//        if(canExecuteNewStateEvent(stateEvent)){
             val job: Flow<DataState<NoteDetailViewState>?> = when(stateEvent){
 
                 is UpdateNoteEvent -> {
@@ -88,7 +88,7 @@ constructor(
                 }
             }
             launchJob(stateEvent, job)
-        }
+//        }
     }
 
     fun beginPendingDelete(note: Note){

app/src/main/java/com/codingwithmitch/cleannotes/framework/presentation/notelist/NoteListFragment.kt

@@ -43,6 +43,7 @@ import com.codingwithmitch.cleannotes.util.TodoCallback
 import com.codingwithmitch.cleannotes.util.printLogD
 import kotlinx.android.synthetic.main.fragment_note_list.*
 import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers.Main
 import javax.inject.Inject
 
 
@@ -479,6 +480,7 @@ constructor(
     }
 
     private fun startNewSearch(){
+        printLogD("DCM", "start new search")
         viewModel.clearList()
         viewModel.loadFirstPage()
     }

app/src/main/java/com/codingwithmitch/cleannotes/framework/presentation/notelist/NoteListViewModel.kt

@@ -89,7 +89,8 @@ constructor(
 
     override fun setStateEvent(stateEvent: StateEvent) {
 
-        if(!isJobAlreadyActive(stateEvent)){
+//        if(canExecuteNewStateEvent(stateEvent)){
+//            dataChannelManager.addStateEvent(stateEvent)
             val job: Flow<DataState<NoteListViewState>?> = when(stateEvent){
 
                 is InsertNewNoteEvent -> {
@@ -157,7 +158,7 @@ constructor(
                 }
             }
             launchJob(stateEvent, job)
-        }
+//        }
     }
 
     private fun removeSelectedNotesFromList(){
@@ -394,19 +395,20 @@ constructor(
     }
 
     fun loadFirstPage() {
-        if(!isJobAlreadyActive(SearchNotesEvent())){
+//        if(canExecuteNewStateEvent(SearchNotesEvent())){
             setQueryExhausted(false)
             resetPage()
             setStateEvent(SearchNotesEvent())
             printLogD("NoteListViewModel",
                 "loadFirstPage: ${getCurrentViewStateOrNew().searchQuery}")
-        }
+//        }
     }
 
     fun nextPage(){
-        if(!isJobAlreadyActive(SearchNotesEvent())
-            && !isQueryExhausted()
-        ){
+//        if(canExecuteNewStateEvent(SearchNotesEvent())
+//            && !isQueryExhausted()
+//        ){
+        if(!isQueryExhausted()){
             printLogD("NoteListViewModel", "attempting to load next page...")
             clearLayoutManagerState()
             incrementPageNumber()
@@ -422,16 +424,19 @@ constructor(
     }
 
     fun retrieveNumNotesInCache(){
-        if(!isJobAlreadyActive(GetNumNotesInCacheEvent())){
-            setStateEvent(GetNumNotesInCacheEvent())
-        }
+//        if(canExecuteNewStateEvent(GetNumNotesInCacheEvent())){
+//            setStateEvent(GetNumNotesInCacheEvent())
+//        }
+        setStateEvent(GetNumNotesInCacheEvent())
     }
 
     fun refreshSearchQuery(){
-        if(!isJobAlreadyActive(SearchNotesEvent())){
-            setQueryExhausted(false)
-            setStateEvent(SearchNotesEvent(false))
-        }
+//        if(canExecuteNewStateEvent(SearchNotesEvent())){
+//            setQueryExhausted(false)
+//            setStateEvent(SearchNotesEvent(false))
+//        }
+        setQueryExhausted(false)
+        setStateEvent(SearchNotesEvent(false))
     }
 
     fun getLayoutManagerState(): Parcelable? {