Skip to content

Commit b511ac7

Browse files
malinajirkamalinajirka
committed
Add WooPos prefix to WCProductToWooPosProductModelMapper
1 parent e5fc8e6 commit b511ac7

File tree

13 files changed

+25
-25
lines changed

13 files changed

+25
-25
lines changed

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosGetProductById.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.woocommerce.android.ui.woopos.common.data
22

33
import com.woocommerce.android.tools.SelectedSite
4-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
54
import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
5+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
66
import kotlinx.coroutines.Dispatchers.IO
77
import kotlinx.coroutines.withContext
88
import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductRestClient
@@ -12,7 +12,7 @@ class WooPosGetProductById @Inject constructor(
1212
private val selectedSite: SelectedSite,
1313
private val cache: WooPosProductsCache,
1414
private val productRestClient: ProductRestClient,
15-
private val productMapper: WCProductToWooPosProductModelMapper,
15+
private val productMapper: WooPosWCProductToWooPosProductModelMapper,
1616
) {
1717
suspend operator fun invoke(productId: Long): WooPosProductModel? = withContext(IO) {
1818
val cachedProduct = cache.getProductById(productId)

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosPopularProductsProvider.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.woocommerce.android.ui.woopos.common.data
22

33
import com.woocommerce.android.tools.SelectedSite
4-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
54
import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
5+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
66
import kotlinx.coroutines.sync.Mutex
77
import kotlinx.coroutines.sync.withLock
88
import org.wordpress.android.fluxc.store.WCProductStore
@@ -16,7 +16,7 @@ class WooPosPopularProductsProvider @Inject constructor(
1616
private val productStore: WCProductStore,
1717
private val productsCache: WooPosProductsCache,
1818
private val productsTypesFilterConfig: WooPosProductsTypesFilterConfig,
19-
private val productMapper: WCProductToWooPosProductModelMapper,
19+
private val productMapper: WooPosWCProductToWooPosProductModelMapper,
2020
) {
2121
companion object {
2222
private const val MAX_POPULAR_PRODUCTS = 10

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/models/WCProductToWooPosProductModelMapper.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/models/WooPosWCProductToWooPosProductModelMapper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.math.BigDecimal
77
import javax.inject.Inject
88

99
@Reusable
10-
class WCProductToWooPosProductModelMapper @Inject constructor(
10+
class WooPosWCProductToWooPosProductModelMapper @Inject constructor(
1111
private val wooPosProductModelMapper: WooPosProductModelMapper,
1212
private val logger: WooPosLogWrapper
1313
) {

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/searchbyidentifier/WooPosSearchByIdentifierGlobalUniqueSearch.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.woocommerce.android.ui.woopos.common.data.searchbyidentifier
22

33
import com.woocommerce.android.tools.SelectedSite
4-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
4+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
55
import com.woocommerce.android.ui.woopos.common.util.WooPosLogWrapper
66
import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooError
77
import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooErrorType.API_ERROR
@@ -23,7 +23,7 @@ class WooPosSearchByIdentifierGlobalUniqueSearch @Inject constructor(
2323
private val selectedSite: SelectedSite,
2424
private val productStore: WCProductStore,
2525
private val wooPosLogWrapper: WooPosLogWrapper,
26-
private val posProductMapper: WCProductToWooPosProductModelMapper,
26+
private val posProductMapper: WooPosWCProductToWooPosProductModelMapper,
2727
) {
2828
suspend operator fun invoke(globalUniqueId: String): WooPosSearchByIdentifierResult {
2929
val result = productStore.searchProducts(

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/searchbyidentifier/WooPosSearchByIdentifierProductGetOrFetch.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.woocommerce.android.ui.woopos.common.data.searchbyidentifier
22

33
import com.woocommerce.android.tools.SelectedSite
44
import com.woocommerce.android.ui.woopos.common.data.WooPosProductsCache
5-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
5+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
66
import org.wordpress.android.fluxc.store.WCProductStore
77
import javax.inject.Inject
88

@@ -11,7 +11,7 @@ class WooPosSearchByIdentifierProductGetOrFetch @Inject constructor(
1111
private val productStore: WCProductStore,
1212
private val productsCache: WooPosProductsCache,
1313
private val errorMapper: WooPosSearchByIdentifierProductErrorMapper,
14-
private val posProductMapper: WCProductToWooPosProductModelMapper,
14+
private val posProductMapper: WooPosWCProductToWooPosProductModelMapper,
1515
) {
1616
suspend operator fun invoke(productId: Long): WooPosSearchByIdentifierResult {
1717
productsCache.getProductById(productId)?.let { cachedProduct ->

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/products/WooPosProductsDataSource.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.woocommerce.android.WooException
44
import com.woocommerce.android.tools.SelectedSite
55
import com.woocommerce.android.ui.woopos.common.data.WooPosProductsCache
66
import com.woocommerce.android.ui.woopos.common.data.WooPosProductsTypesFilterConfig
7-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
87
import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
8+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
99
import com.woocommerce.android.util.WooLog
1010
import kotlinx.coroutines.Dispatchers
1111
import kotlinx.coroutines.async
@@ -30,7 +30,7 @@ class WooPosProductsDataSource @Inject constructor(
3030
private val productsCache: WooPosProductsCache,
3131
private val productsIndex: WooPosProductsIndex,
3232
private val productsTypesFilterConfig: WooPosProductsTypesFilterConfig,
33-
private val posProductMapper: WCProductToWooPosProductModelMapper,
33+
private val posProductMapper: WooPosWCProductToWooPosProductModelMapper,
3434
) {
3535
private val canLoadMore = AtomicBoolean(false)
3636
private val offset = AtomicInteger(0)

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosSearchProductsDataSource.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.woocommerce.android.WooException
44
import com.woocommerce.android.tools.SelectedSite
55
import com.woocommerce.android.ui.woopos.common.data.WooPosProductsCache
66
import com.woocommerce.android.ui.woopos.common.data.WooPosProductsTypesFilterConfig
7-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
87
import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
8+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
99
import com.woocommerce.android.util.WooLog
1010
import kotlinx.coroutines.Dispatchers
1111
import kotlinx.coroutines.withContext
@@ -22,7 +22,7 @@ class WooPosSearchProductsDataSource @Inject constructor(
2222
private val searchResultsIndex: WooPosSearchResultsIndex,
2323
private val searchPredicate: WooPosProductSearchPredicate,
2424
private val productsTypesFilterConfig: WooPosProductsTypesFilterConfig,
25-
private val posProductModelMapper: WCProductToWooPosProductModelMapper,
25+
private val posProductModelMapper: WooPosWCProductToWooPosProductModelMapper,
2626
) {
2727
companion object {
2828
private const val PAGE_SIZE = 15

‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosPopularProductsProviderTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.woocommerce.android.ui.woopos.common.data
22

33
import com.woocommerce.android.tools.SelectedSite
4-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
4+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
55
import kotlinx.coroutines.test.runTest
66
import org.assertj.core.api.Assertions.assertThat
77
import org.junit.Test
@@ -30,7 +30,7 @@ class WooPosPopularProductsProviderTest {
3030
on { filters }.thenReturn(emptyMap())
3131
on { includeTypes }.thenReturn(emptyList())
3232
}
33-
private val productMapper: WCProductToWooPosProductModelMapper = mock()
33+
private val productMapper: WooPosWCProductToWooPosProductModelMapper = mock()
3434

3535
private val sampleProducts = listOf(
3636
WCProductModel().copy(

‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/common/data/models/WCProductToWooPosProductModelMapperTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import java.math.BigDecimal
1313
class WCProductToWooPosProductModelMapperTest {
1414
private val logger: WooPosLogWrapper = mock()
1515
private val wooPosProductModelMapper = WooPosProductModelMapper(logger)
16-
private val sut: WCProductToWooPosProductModelMapper =
17-
WCProductToWooPosProductModelMapper(wooPosProductModelMapper, logger)
16+
private val sut: WooPosWCProductToWooPosProductModelMapper =
17+
WooPosWCProductToWooPosProductModelMapper(wooPosProductModelMapper, logger)
1818

1919
@Test
2020
fun `when mapping WCProductModel, then all attributes are correctly mapped`() {

‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/common/data/searchbyidentifier/WooPosSearchByIdentifierGlobalUniqueSearchTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.woocommerce.android.ui.woopos.common.data.searchbyidentifier
33
import com.woocommerce.android.model.toAppModel
44
import com.woocommerce.android.tools.SelectedSite
55
import com.woocommerce.android.ui.products.ProductTestUtils
6-
import com.woocommerce.android.ui.woopos.common.data.models.WCProductToWooPosProductModelMapper
6+
import com.woocommerce.android.ui.woopos.common.data.models.WooPosWCProductToWooPosProductModelMapper
77
import com.woocommerce.android.ui.woopos.common.util.WooPosLogWrapper
88
import com.woocommerce.android.ui.woopos.util.generateWooPosProduct
99
import kotlinx.coroutines.test.runTest
@@ -28,7 +28,7 @@ class WooPosSearchByIdentifierGlobalUniqueSearchTest {
2828
private val productStore: WCProductStore = mock()
2929
private val site: SiteModel = mock()
3030
private val wooPosLogWrapper: WooPosLogWrapper = mock()
31-
private val posProductMapper: WCProductToWooPosProductModelMapper = mock()
31+
private val posProductMapper: WooPosWCProductToWooPosProductModelMapper = mock()
3232

3333
@Before
3434
fun setup() {

0 commit comments

Comments
 (0)