Skip to content

Fix line item unit amount parsing from price field. #13187

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

Merged
jaynewstrom-stripe merged 2 commits into from
Jun 3, 2026
Merged

Fix line item unit amount parsing from price field. #13187

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
0044156
Fix line item unit amount parsing from price field.
jaynewstrom-stripe Jun 2, 2026
4b25284
Add another tests.
jaynewstrom-stripe Jun 3, 2026
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
8 changes: 7 additions & 1 deletion ...in/java/com/stripe/android/paymentsheet/repositories/CheckoutSessionResponseJsonParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,10 @@ internal object CheckoutSessionResponseJsonParser : ModelJsonParser<CheckoutSess
val quantity = obj.optInt(FIELD_QUANTITY, -1).takeIf { it > 0 } ?: return@mapNotNull null
val subtotal = obj.optLong(FIELD_SUBTOTAL, -1).takeIf { it >= 0 } ?: return@mapNotNull null
val total = obj.optLong(FIELD_TOTAL, -1).takeIf { it >= 0 } ?: return@mapNotNull null
val unitAmount = if (quantity > 0) total / quantity else null
val unitAmount = obj.optLong(FIELD_UNIT_AMOUNT_OVERRIDE, -1).takeIf { it >= 0 }

@cttsai-stripe cttsai-stripe Jun 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to test the override case?

?: obj.optJSONObject(FIELD_PRICE)
?.optLong(FIELD_UNIT_AMOUNT, -1)
?.takeIf { it >= 0 }
CheckoutSessionResponse.LineItem(
id = id,
name = name,
Expand Down Expand Up @@ -525,6 +528,9 @@ internal object CheckoutSessionResponseJsonParser : ModelJsonParser<CheckoutSess
private const val FIELD_LINE_ITEMS = "line_items"
private const val FIELD_ID = "id"
private const val FIELD_QUANTITY = "quantity"
private const val FIELD_PRICE = "price"
private const val FIELD_UNIT_AMOUNT = "unit_amount"
private const val FIELD_UNIT_AMOUNT_OVERRIDE = "unit_amount_override"
private const val FIELD_ADAPTIVE_PRICING_INFO = "adaptive_pricing_info"
private const val FIELD_ACTIVE_PRESENTMENT_CURRENCY = "active_presentment_currency"
private const val FIELD_INTEGRATION_AMOUNT = "integration_amount"
Expand Down
15 changes: 12 additions & 3 deletions ...eet/src/test/java/com/stripe/android/paymentsheet/repositories/CheckoutSessionFixtures.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ internal object CheckoutSessionFixtures {
"name": "Llama Figure",
"quantity": 1,
"subtotal": 999,
"total": 999
"total": 999,
"price": {
"unit_amount": 999
}
}
]
},
Expand Down Expand Up @@ -578,15 +581,21 @@ internal object CheckoutSessionFixtures {
"name": "Llama Figure",
"quantity": 2,
"subtotal": 1998,
"total": 1998
"total": 1998,
"price": {
"unit_amount": 999
}
},
{
"id": "li_item2",
"object": "item",
"name": "Alpaca Plushie",
"quantity": 1,
"subtotal": 2499,
"total": 2499
"total": 2499,
"price": {
"unit_amount": 2499
}
}
]
},
Expand Down
90 changes: 90 additions & 0 deletions ...ava/com/stripe/android/paymentsheet/repositories/CheckoutSessionResponseJsonParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,96 @@ class CheckoutSessionResponseJsonParserTest {
assertThat(lineItems[1].unitAmount).isEqualTo(2499L)
}

@Test
fun `parse line item unitAmount from unit_amount_override`() {
val json = JSONObject(
"""
{
"session_id": "cs_test_override",
"ui_mode": "custom",
"currency": "usd",
"total_summary": { "due": 7000, "subtotal": 7000, "total": 7000 },
"line_item_group": {
"currency": "usd",
"total": 7000,
"subtotal": 7000,
"due": 7000,
"line_items": [
{
"id": "li_override_item",
"object": "item",
"name": "Widget",
"quantity": 2,
"subtotal": 7000,
"total": 7000,
"unit_amount_override": 3500,
"price": {
"unit_amount": 2999
}
}
]
}
}
""".trimIndent()
)
val result = CheckoutSessionResponseJsonParser.parse(json)

assertThat(result).isNotNull()
val lineItems = result!!.lineItems
assertThat(lineItems).hasSize(1)
assertThat(lineItems[0].id).isEqualTo("li_override_item")
assertThat(lineItems[0].name).isEqualTo("Widget")
assertThat(lineItems[0].quantity).isEqualTo(2)
assertThat(lineItems[0].unitAmount).isEqualTo(3500L)
assertThat(lineItems[0].subtotal).isEqualTo(7000L)
assertThat(lineItems[0].total).isEqualTo(7000L)
}

@Test
fun `parse line item unitAmount from price when total includes tax`() {
val json = JSONObject(
"""
{
"session_id": "cs_test_tax",
"ui_mode": "custom",
"currency": "usd",
"total_summary": { "due": 11034, "subtotal": 10198, "total": 11034 },
"line_item_group": {
"currency": "usd",
"total": 11034,
"subtotal": 10198,
"due": 11034,
"line_items": [
{
"id": "li_tax_item",
"object": "item",
"name": "Classic T-Shirt",
"quantity": 2,
"subtotal": 10198,
"total": 11034,
"unit_amount_override": null,
"price": {
"unit_amount": 5099
}
}
]
}
}
""".trimIndent()
)
val result = CheckoutSessionResponseJsonParser.parse(json)

assertThat(result).isNotNull()
val lineItems = result!!.lineItems
assertThat(lineItems).hasSize(1)
assertThat(lineItems[0].id).isEqualTo("li_tax_item")
assertThat(lineItems[0].name).isEqualTo("Classic T-Shirt")
assertThat(lineItems[0].quantity).isEqualTo(2)
assertThat(lineItems[0].unitAmount).isEqualTo(5099L)
assertThat(lineItems[0].subtotal).isEqualTo(10198L)
assertThat(lineItems[0].total).isEqualTo(11034L)
}

@Test
fun `parse returns empty line items when no line_item_group`() {
val json = JSONObject(
Expand Down
Loading