Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Woo POS] Cannot reconnect to Reader after turning internet off and on #12569

Merged
merged 14 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ sealed class ChildToParentEvent {
data object FullScreen : ProductsStatusChanged()
data object WithCart : ProductsStatusChanged()
}
data object NoInternet : ChildToParentEvent()
}

interface WooPosChildrenToParentEventReceiver {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
Expand All @@ -41,13 +42,24 @@ import com.woocommerce.android.ui.woopos.home.toolbar.WooPosFloatingToolbar
import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsScreen
import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsScreenPreview
import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
import org.wordpress.android.util.ToastUtils

@Composable
fun WooPosHomeScreen(
onNavigationEvent: (WooPosNavigationEvent) -> Unit
) {
val viewModel: WooPosHomeViewModel = hiltViewModel()
val state = viewModel.state.collectAsState().value
val context = LocalContext.current
LaunchedEffect(viewModel.toastEvent) {
viewModel.toastEvent.collect { message ->
ToastUtils.showToast(
context,
context.getString(message.message),
ToastUtils.Duration.LONG
)
}
}

WooPosHomeScreen(
state,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package com.woocommerce.android.ui.woopos.home

import androidx.annotation.StringRes
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.woocommerce.android.R
import com.woocommerce.android.viewmodel.getStateFlow
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import javax.inject.Inject
Expand All @@ -21,11 +25,18 @@ class WooPosHomeViewModel @Inject constructor(
initialValue = WooPosHomeState(
screenPositionState = WooPosHomeState.ScreenPositionState.Cart.Visible,
productsInfoDialog = WooPosHomeState.ProductsInfoDialog(isVisible = false),
exitConfirmationDialog = WooPosHomeState.ExitConfirmationDialog(isVisible = false)
exitConfirmationDialog = WooPosHomeState.ExitConfirmationDialog(isVisible = false),
)
)
val state: StateFlow<WooPosHomeState> = _state

private val _toastEvent = MutableSharedFlow<Toast>()
val toastEvent: SharedFlow<Toast> = _toastEvent

data class Toast(
@StringRes val message: Int,
)

init {
listenBottomEvents()
}
Expand Down Expand Up @@ -119,6 +130,12 @@ class WooPosHomeViewModel @Inject constructor(
productsInfoDialog = WooPosHomeState.ProductsInfoDialog(isVisible = true)
)
}

ChildToParentEvent.NoInternet -> {
viewModelScope.launch {
_toastEvent.emit(Toast(R.string.woopos_no_internet_message))
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.woocommerce.android.ui.woopos.home.toolbar.WooPosToolbarUIEvent.OnCar
import com.woocommerce.android.ui.woopos.home.toolbar.WooPosToolbarUIEvent.OnOutsideOfToolbarMenuClicked
import com.woocommerce.android.ui.woopos.home.toolbar.WooPosToolbarUIEvent.OnToolbarMenuClicked
import com.woocommerce.android.ui.woopos.support.WooPosGetSupportFacade
import com.woocommerce.android.ui.woopos.util.WooPosNetworkStatus
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
Expand All @@ -26,6 +27,7 @@ class WooPosToolbarViewModel @Inject constructor(
private val cardReaderFacade: WooPosCardReaderFacade,
private val childrenToParentEventSender: WooPosChildrenToParentEventSender,
private val getSupportFacade: WooPosGetSupportFacade,
private val networkStatus: WooPosNetworkStatus,
) : ViewModel() {
private val _state = MutableStateFlow(
WooPosToolbarState(
Expand Down Expand Up @@ -92,7 +94,15 @@ class WooPosToolbarViewModel @Inject constructor(
cardReaderFacade.disconnectFromReader()
}
}
WooPosToolbarState.WooPosCardReaderStatus.NotConnected -> cardReaderFacade.connectToReader()
WooPosToolbarState.WooPosCardReaderStatus.NotConnected -> {
if (!networkStatus.isConnected()) {
viewModelScope.launch {
childrenToParentEventSender.sendToParent(ChildToParentEvent.NoInternet)
}
} else {
cardReaderFacade.connectToReader()
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.woocommerce.android.ui.woopos.util

import android.content.Context
import dagger.Reusable
import org.wordpress.android.util.NetworkUtils
import javax.inject.Inject

@Reusable
class WooPosNetworkStatus @Inject constructor(
private val context: Context
) {
fun isConnected() = NetworkUtils.isNetworkAvailable(context)
}
1 change: 1 addition & 0 deletions WooCommerce/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4252,6 +4252,7 @@
<string name="woopos_floating_toolbar_menu_open_content_description">Toolbar with card reader status. Menu is open. Double tap to interact.</string>
<string name="woopos_floating_toolbar_pop_up_menu_content_description">Open toolbar menu</string>
<string name="woopos_floating_toolbar_pop_up_menu_open_content_description">Popup menu with options. Swipe to navigate through items.</string>
<string name="woopos_no_internet_message">It looks like you\'re not connected to the internet. Ensure your Wi-Fi is turned on. If you\'re using mobile data, make sure it\'s enabled in your device settings.</string>


<string name="customers_details_customer_section">Customer</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import com.woocommerce.android.ui.woopos.home.ChildToParentEvent
import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender
import com.woocommerce.android.ui.woopos.support.WooPosGetSupportFacade
import com.woocommerce.android.ui.woopos.util.WooPosCoroutineTestRule
import com.woocommerce.android.ui.woopos.util.WooPosNetworkStatus
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever

Expand All @@ -27,6 +29,7 @@ class WooPosToolbarViewModelTest {
}
private val getSupportFacade: WooPosGetSupportFacade = mock()
private val childrenToParentEventSender: WooPosChildrenToParentEventSender = mock()
private val networkStatus: WooPosNetworkStatus = mock()

@Test
fun `given card reader status is NotConnected, when initialized, then state should be NotConnected`() = runTest {
Expand Down Expand Up @@ -105,6 +108,7 @@ class WooPosToolbarViewModelTest {
fun `when ConnectToAReaderClicked passed, then connect to reader should be called`() = runTest {
// GIVEN
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.NotConnected()))
whenever(networkStatus.isConnected()).thenReturn(true)
val viewModel = createViewModel()

// WHEN
Expand Down Expand Up @@ -132,30 +136,33 @@ class WooPosToolbarViewModelTest {
}

@Test
fun `given card reader status is Connected, when OnCardReaderStatusClicked, then disconnect from reader should be called`() = runTest {
// GIVEN
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.Connected(mock())))
val viewModel = createViewModel()
fun `given card reader status is Connected, when OnCardReaderStatusClicked, then disconnect from reader should be called`() =
runTest {
// GIVEN
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.Connected(mock())))
val viewModel = createViewModel()

// WHEN
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)
// WHEN
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)

// THEN
verify(cardReaderFacade).disconnectFromReader()
}
// THEN
verify(cardReaderFacade).disconnectFromReader()
}

@Test
fun `given card reader status is NotConnected, when OnCardReaderStatusClicked, then connect to reader should be called`() = runTest {
// GIVEN
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.NotConnected()))
val viewModel = createViewModel()
fun `given card reader status is NotConnected, when OnCardReaderStatusClicked, then connect to reader should be called`() =
runTest {
// GIVEN
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.NotConnected()))
whenever(networkStatus.isConnected()).thenReturn(true)
val viewModel = createViewModel()

// WHEN
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)
// WHEN
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)

// THEN
verify(cardReaderFacade).connectToReader()
}
// THEN
verify(cardReaderFacade).connectToReader()
}

@Test
fun `when get support clicked, then should open support form`() {
Expand All @@ -173,9 +180,38 @@ class WooPosToolbarViewModelTest {
verify(getSupportFacade).openSupportForm()
}

@Test
fun `given there is no internet, when trying to connect card reader, then trigger proper event`() = runTest {
// GIVEN
whenever(networkStatus.isConnected()).thenReturn(false)
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.NotConnected()))

// WHEN
val viewModel = createViewModel()
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)

// THEN
verify(childrenToParentEventSender).sendToParent(ChildToParentEvent.NoInternet)
}

@Test
fun `given there is no internet, when trying to connect card reader, then connect card reader method is not called`() = runTest {
// GIVEN
whenever(networkStatus.isConnected()).thenReturn(false)
whenever(cardReaderFacade.readerStatus).thenReturn(flowOf(CardReaderStatus.NotConnected()))

// WHEN
val viewModel = createViewModel()
viewModel.onUiEvent(WooPosToolbarUIEvent.OnCardReaderStatusClicked)

// THEN
verify(cardReaderFacade, never()).connectToReader()
}

private fun createViewModel() = WooPosToolbarViewModel(
cardReaderFacade,
childrenToParentEventSender,
getSupportFacade,
networkStatus
)
}
Loading