Skip to content

[POS][Local Catalog] Fix Variation.attributes deserializing #14643

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

[POS][Local Catalog] Fix Variation.attributes deserializing #14643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6e7a9
Fix variation attributes deserializing
samiuelson Sep 22, 2025
2dd7350
Fix attributesJson mapping
samiuelson Sep 24, 2025
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
14 changes: 2 additions & 12 deletions ...lugin/src/main/kotlin/org/wordpress/android/fluxc/model/pos/WooPosVariationApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.wordpress.android.fluxc.model.pos

import com.google.gson.JsonElement
import com.google.gson.annotations.SerializedName

/**
Expand Down Expand Up @@ -49,7 +50,7 @@ data class WooPosVariationApiResponse(
val backordered: Boolean = false,

@SerializedName("attributes")
val attributes: List<VariationAttribute> = emptyList(),
val attributes: JsonElement? = null,

@SerializedName("image")
val image: VariationImage? = null,
Expand All @@ -60,17 +61,6 @@ data class WooPosVariationApiResponse(
@SerializedName("name")
val name: String = ""
) {
data class VariationAttribute(
@SerializedName("id")
val id: Long = 0L,

@SerializedName("name")
val name: String = "",

@SerializedName("option")
val option: String = ""
)

data class VariationImage(
@SerializedName("id")
val id: Long = 0L,
Expand Down
2 changes: 1 addition & 1 deletion ...ss/android/fluxc/network/rest/wpcom/wc/product/pos/WooPosProductResponseToEntityMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fun WooPosVariationApiResponse.mapToPosVariationModel(
stockStatus = this.stockStatus,
manageStock = this.manageStock,
backordered = this.backordered,
attributesJson = this.attributes.toString(),
attributesJson = this.attributes?.toString() ?: "[]",
imageUrl = this.image?.src ?: "",
status = this.status,
downloadable = this.downloadable
Expand Down
14 changes: 4 additions & 10 deletions ...rg/wordpress/android/fluxc/network/rest/wpcom/wc/product/pos/WooPosVariationMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.wordpress.android.fluxc.network.rest.wpcom.wc.product.pos

import com.google.gson.JsonParser
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import org.wordpress.android.fluxc.model.LocalOrRemoteId
Expand All @@ -26,10 +27,7 @@ class WooPosVariationMapperTest {
stockStatus = "instock",
manageStock = true,
backordered = false,
attributes = listOf(
WooPosVariationApiResponse.VariationAttribute(1, "Color", "Blue"),
WooPosVariationApiResponse.VariationAttribute(2, "Size", "Large")
),
attributes = JsonParser.parseString("""[{"id":1,"name":"Color","option":"Blue"},{"id":2,"name":"Size","option":"Large"}]"""),
image = WooPosVariationApiResponse.VariationImage(
id = 789,
src = "https://example.com/image.jpg",
Expand Down Expand Up @@ -105,7 +103,7 @@ class WooPosVariationMapperTest {
val response = WooPosVariationApiResponse(
id = 123L,
productId = 456L,
attributes = emptyList()
attributes = JsonParser.parseString("[]")
)

// When
Expand All @@ -121,11 +119,7 @@ class WooPosVariationMapperTest {
val response = WooPosVariationApiResponse(
id = 123L,
productId = 456L,
attributes = listOf(
WooPosVariationApiResponse.VariationAttribute(1, "Color", "Red"),
WooPosVariationApiResponse.VariationAttribute(2, "Size", "Medium"),
WooPosVariationApiResponse.VariationAttribute(3, "Material", "Cotton")
)
attributes = JsonParser.parseString("""[{"id":1,"name":"Color","option":"Red"},{"id":2,"name":"Size","option":"Medium"},{"id":3,"name":"Material","option":"Cotton"}]""")
)

// When
Expand Down
Loading