Skip to content

Commit a12f401

Browse files
malinajirkamalinajirka
committed
Rename WCPosVariationModel to WooPosVariationEntity
1 parent 8e3f3ab commit a12f401

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.woocommerce.android.ui.woopos.common.data.models.WooPosProductModel
99
import com.woocommerce.android.util.WooLog
1010
import com.woocommerce.android.viewmodel.ResourceProvider
1111
import org.wordpress.android.fluxc.model.WCProductVariationModel
12-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
12+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
1313
import javax.inject.Inject
1414
import javax.inject.Singleton
1515

@@ -74,7 +74,7 @@ class WooPosVariationMapper @Inject constructor(
7474
}
7575

7676
@Suppress("SwallowedException")
77-
fun fromWCPosVariationModel(model: WCPosVariationModel): WooPosVariation {
77+
fun fromWCPosVariationModel(model: WooPosVariationEntity): WooPosVariation {
7878
val attributesList = parseAttributesJson(model.attributesJson)
7979

8080
return WooPosVariation(
@@ -162,7 +162,7 @@ fun ProductVariation.toWooPosVariation(mapper: WooPosVariationMapper): WooPosVar
162162
fun WCProductVariationModel.toWooPosVariation(mapper: WooPosVariationMapper): WooPosVariation =
163163
mapper.fromWCProductVariationModel(this)
164164

165-
fun WCPosVariationModel.toWooPosVariation(mapper: WooPosVariationMapper): WooPosVariation =
165+
fun WooPosVariationEntity.toWooPosVariation(mapper: WooPosVariationMapper): WooPosVariation =
166166
mapper.fromWCPosVariationModel(this)
167167

168168
fun WooPosVariation.getNameForPOS(

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/pos/WooPosProductResponseToEntityMapper.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.wordpress.android.fluxc.network.rest.wpcom.wc.product.pos
33
import org.wordpress.android.fluxc.model.LocalOrRemoteId
44
import org.wordpress.android.fluxc.model.pos.WooPosVariationApiResponse
55
import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.ProductApiResponse
6-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
76
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosProductEntity
7+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
88

99
@Suppress("CyclomaticComplexMethod")
1010
fun ProductApiResponse.mapToWooPOSEntity(localSiteId: LocalOrRemoteId.LocalId): WooPosProductEntity =
@@ -40,8 +40,8 @@ fun ProductApiResponse.mapToWooPOSEntity(localSiteId: LocalOrRemoteId.LocalId):
4040

4141
fun WooPosVariationApiResponse.mapToPosVariationModel(
4242
localSiteId: LocalOrRemoteId.LocalId
43-
): WCPosVariationModel {
44-
return WCPosVariationModel(
43+
): WooPosVariationEntity {
44+
return WooPosVariationEntity(
4545
localSiteId = localSiteId,
4646
remoteProductId = LocalOrRemoteId.RemoteId(this.productId),
4747
remoteVariationId = LocalOrRemoteId.RemoteId(this.id),

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/WCAndroidDatabase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ import org.wordpress.android.fluxc.persistence.entity.WooPaymentsManualDepositEn
8888
import org.wordpress.android.fluxc.persistence.entity.WooShippingLabelEntity
8989
import org.wordpress.android.fluxc.persistence.entity.WooShippingPackagesEntity
9090
import org.wordpress.android.fluxc.persistence.entity.WooShippingShipmentEntity
91-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
9291
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosProductEntity
92+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
9393
import org.wordpress.android.fluxc.persistence.migrations.AutoMigration13to14
9494
import org.wordpress.android.fluxc.persistence.migrations.AutoMigration14to15
9595
import org.wordpress.android.fluxc.persistence.migrations.AutoMigration16to17
@@ -146,7 +146,7 @@ const val WC_DATABASE_VERSION = 64
146146
CustomerFromAnalyticsEntity::class,
147147
WCProductModel::class,
148148
WooPosProductEntity::class,
149-
WCPosVariationModel::class,
149+
WooPosVariationEntity::class,
150150
WCProductCategoryModel::class,
151151
WCProductVariationModel::class,
152152
WCProductTagModel::class,

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/pos/WooPosVariationsDao.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ import androidx.room.Upsert
66
import kotlinx.coroutines.flow.Flow
77
import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
88
import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
9-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
9+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
1010

1111
@Dao
1212
abstract class WooPosVariationsDao {
1313

1414
@Query("SELECT * FROM PosVariationEntity WHERE localSiteId = :localSiteId AND remoteProductId = :productId ORDER BY variationName ASC")
15-
abstract fun observeVariationsForProduct(localSiteId: LocalId, productId: RemoteId): Flow<List<WCPosVariationModel>>
15+
abstract fun observeVariationsForProduct(localSiteId: LocalId, productId: RemoteId): Flow<List<WooPosVariationEntity>>
1616

1717
@Query("SELECT * FROM PosVariationEntity WHERE localSiteId = :localSiteId AND remoteProductId = :productId AND remoteVariationId = :variationId")
1818
abstract suspend fun getVariation(
1919
localSiteId: LocalId,
2020
productId: RemoteId,
2121
variationId: RemoteId
22-
): WCPosVariationModel?
22+
): WooPosVariationEntity?
2323

2424
@Upsert
25-
abstract suspend fun upsertVariations(variations: List<WCPosVariationModel>)
25+
abstract suspend fun upsertVariations(variations: List<WooPosVariationEntity>)
2626

2727
@Upsert
28-
abstract suspend fun upsertVariation(variation: WCPosVariationModel)
28+
abstract suspend fun upsertVariation(variation: WooPosVariationEntity)
2929

3030
@Query("DELETE FROM PosVariationEntity WHERE localSiteId = :localSiteId AND remoteProductId = :productId AND remoteVariationId = :variationId")
3131
abstract suspend fun deleteVariation(localSiteId: LocalId, productId: RemoteId, variationId: RemoteId)

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/pos/WCPosVariationModel.kt‎ renamed to ‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/entity/pos/WooPosVariationEntity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
1111
tableName = "PosVariationEntity",
1212
primaryKeys = ["localSiteId", "remoteProductId", "remoteVariationId"],
1313
)
14-
data class WCPosVariationModel(
14+
data class WooPosVariationEntity(
1515
val localSiteId: LocalId = LocalId(0),
1616
val remoteProductId: RemoteId = RemoteId(0),
1717
val remoteVariationId: RemoteId = RemoteId(0),

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/pos/localcatalog/WooPosLocalCatalogStore.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.pos.mapToWooPOS
1212
import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
1313
import org.wordpress.android.fluxc.persistence.dao.pos.WooPosProductsDao
1414
import org.wordpress.android.fluxc.persistence.dao.pos.WooPosVariationsDao
15-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
1615
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosProductEntity
16+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
1717
import org.wordpress.android.fluxc.tools.CoroutineEngine
1818
import org.wordpress.android.fluxc.utils.HeadersParser
1919
import org.wordpress.android.util.AppLog.T.API
@@ -178,7 +178,7 @@ class WooPosLocalCatalogStore @Inject constructor(
178178
fun observeVariationsForProduct(
179179
siteId: LocalOrRemoteId.LocalId,
180180
productId: LocalOrRemoteId.RemoteId
181-
): Flow<Result<List<WCPosVariationModel>>> =
181+
): Flow<Result<List<WooPosVariationEntity>>> =
182182
posVariationsDao.observeVariationsForProduct(siteId, productId)
183183
.map { variations ->
184184
Result.success(variations)
@@ -196,7 +196,7 @@ class WooPosLocalCatalogStore @Inject constructor(
196196
siteId: LocalOrRemoteId.LocalId,
197197
productId: LocalOrRemoteId.RemoteId,
198198
variationId: LocalOrRemoteId.RemoteId
199-
): Result<WCPosVariationModel?> =
199+
): Result<WooPosVariationEntity?> =
200200
coroutineEngine.withDefaultContext(API, this, "getVariation") {
201201
val variation = posVariationsDao.getVariation(siteId, productId, variationId)
202202
Result.success(variation)

‎libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/pos/WooPosVariationsDaoTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.robolectric.RobolectricTestRunner
1212
import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
1313
import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
1414
import org.wordpress.android.fluxc.persistence.DatabaseTestRule
15-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
15+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
1616
import kotlin.test.assertEquals
1717
import kotlin.test.assertNotNull
1818
import kotlin.test.assertNull
@@ -440,7 +440,7 @@ class WooPosVariationsDaoTest {
440440
status: String = "publish",
441441
lastUpdated: String = "2024-01-01T10:00:00Z",
442442
downloadable: Boolean = false
443-
) = WCPosVariationModel(
443+
) = WooPosVariationEntity(
444444
localSiteId = LocalId(siteId),
445445
remoteProductId = RemoteId(productId),
446446
remoteVariationId = RemoteId(variationId),

‎libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/pos/WooPosLocalCatalogStoreTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.product.pos.WooPosProdu
2626
import org.wordpress.android.fluxc.persistence.WCAndroidDatabase
2727
import org.wordpress.android.fluxc.persistence.dao.pos.WooPosProductsDao
2828
import org.wordpress.android.fluxc.persistence.dao.pos.WooPosVariationsDao
29-
import org.wordpress.android.fluxc.persistence.entity.pos.WCPosVariationModel
3029
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosProductEntity
30+
import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity
3131
import org.wordpress.android.fluxc.store.pos.localcatalog.WooPosLocalCatalogError
3232
import org.wordpress.android.fluxc.store.pos.localcatalog.WooPosLocalCatalogStore
3333
import org.wordpress.android.fluxc.utils.HeadersParser
@@ -817,7 +817,7 @@ class WooPosLocalCatalogStoreTest {
817817
variationId: Long,
818818
name: String,
819819
price: String = "19.99"
820-
) = WCPosVariationModel(
820+
) = WooPosVariationEntity(
821821
localSiteId = testSiteId,
822822
remoteProductId = testRemoteId,
823823
remoteVariationId = RemoteId(variationId),

0 commit comments

Comments
 (0)